arthexis 0.1.22__py3-none-any.whl → 0.1.23__py3-none-any.whl

nodes/views.py

@@ -43,24 +43,68 @@ PROXY_TOKEN_TIMEOUT = 300
 PROXY_CACHE_PREFIX = "nodes:proxy-session:"
 
 
-def _load_signed_node(request, requester_id: str):
+def _load_signed_node(
+    request,
+    requester_id: str,
+    *,
+    mac_address: str | None = None,
+    public_key: str | None = None,
+):
     signature = request.headers.get("X-Signature")
     if not signature:
         return None, JsonResponse({"detail": "signature required"}, status=403)
-    node = Node.objects.filter(uuid=requester_id).first()
-    if not node or not node.public_key:
-        return None, JsonResponse({"detail": "unknown requester"}, status=403)
     try:
-        public_key = serialization.load_pem_public_key(node.public_key.encode())
-        public_key.verify(
-            base64.b64decode(signature),
-            request.body,
-            padding.PKCS1v15(),
-            hashes.SHA256(),
-        )
+        signature_bytes = base64.b64decode(signature)
     except Exception:
         return None, JsonResponse({"detail": "invalid signature"}, status=403)
-    return node, None
+
+    candidates: list[Node] = []
+    seen: set[int] = set()
+
+    lookup_values: list[tuple[str, str]] = []
+    if requester_id:
+        lookup_values.append(("uuid", requester_id))
+    if mac_address:
+        lookup_values.append(("mac_address__iexact", mac_address))
+    if public_key:
+        lookup_values.append(("public_key", public_key))
+
+    for field, value in lookup_values:
+        node = Node.objects.filter(**{field: value}).first()
+        if not node or not node.public_key:
+            continue
+        if node.pk is not None and node.pk in seen:
+            continue
+        if node.pk is not None:
+            seen.add(node.pk)
+        candidates.append(node)
+
+    if not candidates:
+        return None, JsonResponse({"detail": "unknown requester"}, status=403)
+
+    for node in candidates:
+        try:
+            loaded_key = serialization.load_pem_public_key(node.public_key.encode())
+            loaded_key.verify(
+                signature_bytes,
+                request.body,
+                padding.PKCS1v15(),
+                hashes.SHA256(),
+            )
+        except Exception:
+            continue
+        return node, None
+
+    return None, JsonResponse({"detail": "invalid signature"}, status=403)
+
+
+def _clean_requester_hint(value, *, strip: bool = True) -> str | None:
+    if not isinstance(value, str):
+        return None
+    cleaned = value.strip() if strip else value
+    if not cleaned:
+        return None
+    return cleaned
 
 
 def _sanitize_proxy_target(target: str | None, request) -> str:
@@ -589,26 +633,21 @@ def export_rfids(request):
         return JsonResponse({"detail": "invalid json"}, status=400)
 
     requester = payload.get("requester")
-    signature = request.headers.get("X-Signature")
     if not requester:
         return JsonResponse({"detail": "requester required"}, status=400)
-    if not signature:
-        return JsonResponse({"detail": "signature required"}, status=403)
 
-    node = Node.objects.filter(uuid=requester).first()
-    if not node or not node.public_key:
-        return JsonResponse({"detail": "unknown requester"}, status=403)
-
-    try:
-        public_key = serialization.load_pem_public_key(node.public_key.encode())
-        public_key.verify(
-            base64.b64decode(signature),
-            request.body,
-            padding.PKCS1v15(),
-            hashes.SHA256(),
-        )
-    except Exception:
-        return JsonResponse({"detail": "invalid signature"}, status=403)
+    requester_mac = _clean_requester_hint(payload.get("requester_mac"))
+    requester_public_key = _clean_requester_hint(
+        payload.get("requester_public_key"), strip=False
+    )
+    node, error_response = _load_signed_node(
+        request,
+        requester,
+        mac_address=requester_mac,
+        public_key=requester_public_key,
+    )
+    if error_response is not None:
+        return error_response
 
     tags = [serialize_rfid(tag) for tag in RFID.objects.all().order_by("label_id")]
 
@@ -628,26 +667,21 @@ def import_rfids(request):
         return JsonResponse({"detail": "invalid json"}, status=400)
 
     requester = payload.get("requester")
-    signature = request.headers.get("X-Signature")
     if not requester:
         return JsonResponse({"detail": "requester required"}, status=400)
-    if not signature:
-        return JsonResponse({"detail": "signature required"}, status=403)
-
-    node = Node.objects.filter(uuid=requester).first()
-    if not node or not node.public_key:
-        return JsonResponse({"detail": "unknown requester"}, status=403)
 
-    try:
-        public_key = serialization.load_pem_public_key(node.public_key.encode())
-        public_key.verify(
-            base64.b64decode(signature),
-            request.body,
-            padding.PKCS1v15(),
-            hashes.SHA256(),
-        )
-    except Exception:
-        return JsonResponse({"detail": "invalid signature"}, status=403)
+    requester_mac = _clean_requester_hint(payload.get("requester_mac"))
+    requester_public_key = _clean_requester_hint(
+        payload.get("requester_public_key"), strip=False
+    )
+    node, error_response = _load_signed_node(
+        request,
+        requester,
+        mac_address=requester_mac,
+        public_key=requester_public_key,
+    )
+    if error_response is not None:
+        return error_response
 
     rfids = payload.get("rfids", [])
     if not isinstance(rfids, list):
@@ -704,7 +738,16 @@ def proxy_session(request):
     if not requester:
         return JsonResponse({"detail": "requester required"}, status=400)
 
-    node, error_response = _load_signed_node(request, requester)
+    requester_mac = _clean_requester_hint(payload.get("requester_mac"))
+    requester_public_key = _clean_requester_hint(
+        payload.get("requester_public_key"), strip=False
+    )
+    node, error_response = _load_signed_node(
+        request,
+        requester,
+        mac_address=requester_mac,
+        public_key=requester_public_key,
+    )
     if error_response is not None:
         return error_response
 
@@ -844,7 +887,16 @@ def proxy_execute(request):
     if not requester:
         return JsonResponse({"detail": "requester required"}, status=400)
 
-    node, error_response = _load_signed_node(request, requester)
+    requester_mac = _clean_requester_hint(payload.get("requester_mac"))
+    requester_public_key = _clean_requester_hint(
+        payload.get("requester_public_key"), strip=False
+    )
+    node, error_response = _load_signed_node(
+        request,
+        requester,
+        mac_address=requester_mac,
+        public_key=requester_public_key,
+    )
     if error_response is not None:
         return error_response
 

ocpp/admin.py

@@ -208,7 +208,7 @@ class ChargerConfigurationAdmin(admin.ModelAdmin):
 @admin.register(Location)
 class LocationAdmin(EntityModelAdmin):
     form = LocationAdminForm
-    list_display = ("name", "latitude", "longitude")
+    list_display = ("name", "zone", "contract_type", "latitude", "longitude")
     change_form_template = "admin/ocpp/location/change_form.html"
 
 
@@ -771,6 +771,17 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
                     level=messages.ERROR,
                 )
                 continue
+            tx_obj = store.get_transaction(charger.charger_id, connector_value)
+            if tx_obj is not None:
+                self.message_user(
+                    request,
+                    (
+                        f"{charger}: reset skipped because a session is active; "
+                        "stop the session first."
+                    ),
+                    level=messages.WARNING,
+                )
+                continue
             message_id = uuid.uuid4().hex
             msg = json.dumps([
                 2,

ocpp/models.py

@@ -15,6 +15,7 @@ from nodes.models import Node
 
 from core.models import (
     EnergyAccount,
+    EnergyTariff,
     Reference,
     RFID as CoreRFID,
     ElectricVehicle as CoreElectricVehicle,
@@ -35,6 +36,22 @@ class Location(Entity):
     longitude = models.DecimalField(
         max_digits=9, decimal_places=6, null=True, blank=True
     )
+    zone = models.CharField(
+        max_length=3,
+        choices=EnergyTariff.Zone.choices,
+        blank=True,
+        null=True,
+        help_text=_("CFE climate zone used to select matching energy tariffs."),
+    )
+    contract_type = models.CharField(
+        max_length=16,
+        choices=EnergyTariff.ContractType.choices,
+        blank=True,
+        null=True,
+        help_text=_(
+            "CFE service contract type required to match energy tariff pricing."
+        ),
+    )
 
     def __str__(self) -> str:  # pragma: no cover - simple representation
         return self.name
@@ -481,11 +498,17 @@ class Charger(Entity):
         ref_value = self._full_url()
         if url_targets_local_loopback(ref_value):
             return
-        if not self.reference or self.reference.value != ref_value:
+        if not self.reference:
             self.reference = Reference.objects.create(
                 value=ref_value, alt_text=self.charger_id
             )
             super().save(update_fields=["reference"])
+        elif self.reference.value != ref_value:
+            Reference.objects.filter(pk=self.reference_id).update(
+                value=ref_value, alt_text=self.charger_id
+            )
+            self.reference.value = ref_value
+            self.reference.alt_text = self.charger_id
 
     def refresh_manager_node(self, node: Node | None = None) -> Node | None:
         """Ensure ``manager_node`` matches the provided or local node."""
@@ -783,7 +806,11 @@ class Transaction(Entity):
     def vehicle_identifier(self) -> str:
         """Return the preferred vehicle identifier for this transaction."""
 
-        return (self.vid or self.vin or "").strip()
+        vid = (self.vid or "").strip()
+        if vid:
+            return vid
+
+        return (self.vin or "").strip()
 
     @property
     def vehicle_identifier_source(self) -> str:

ocpp/tests.py

@@ -177,6 +177,36 @@ class DispatchActionTests(TestCase):
         self.assertEqual(metadata.get("trigger_target"), "BootNotification")
         self.assertEqual(metadata.get("log_key"), log_key)
 
+    def test_reset_rejected_when_transaction_active(self):
+        charger = Charger.objects.create(charger_id="RESETBLOCK")
+        dummy = DummyWebSocket()
+        connection_key = store.set_connection(charger.charger_id, charger.connector_id, dummy)
+        self.addCleanup(lambda: store.connections.pop(connection_key, None))
+        tx_obj = Transaction.objects.create(
+            charger=charger,
+            connector_id=charger.connector_id,
+            start_time=timezone.now(),
+        )
+        tx_key = store.set_transaction(charger.charger_id, charger.connector_id, tx_obj)
+        self.addCleanup(lambda: store.transactions.pop(tx_key, None))
+
+        request = self.factory.post(
+            "/chargers/RESETBLOCK/action/",
+            data=json.dumps({"action": "reset"}),
+            content_type="application/json",
+        )
+        request.user = SimpleNamespace(
+            is_authenticated=True,
+            is_superuser=True,
+            is_staff=True,
+        )
+
+        response = dispatch_action(request, charger.charger_id)
+        self.assertEqual(response.status_code, 409)
+        payload = json.loads(response.content.decode("utf-8"))
+        self.assertIn("stop the session first", payload.get("detail", "").lower())
+        self.assertFalse(dummy.sent)
+
 class ChargerFixtureTests(TestCase):
     fixtures = [
         p.name
@@ -218,6 +248,62 @@ class ChargerFixtureTests(TestCase):
         self.assertEqual(cp2.name, "Simulator #2")
 
 
+class ChargerRefreshManagerNodeTests(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        local = Node.objects.create(
+            hostname="local-node",
+            address="127.0.0.1",
+            port=8000,
+            mac_address="aa:bb:cc:dd:ee:ff",
+            current_relation=Node.Relation.SELF,
+        )
+        Node.objects.filter(pk=local.pk).update(mac_address="AA:BB:CC:DD:EE:FF")
+        cls.local_node = Node.objects.get(pk=local.pk)
+
+    def test_refresh_manager_node_assigns_local_to_unsaved_charger(self):
+        charger = Charger(charger_id="UNSAVED")
+
+        with patch("nodes.models.Node.get_current_mac", return_value="aa:bb:cc:dd:ee:ff"):
+            result = charger.refresh_manager_node()
+
+        self.assertEqual(result, self.local_node)
+        self.assertEqual(charger.manager_node, self.local_node)
+
+    def test_refresh_manager_node_updates_persisted_charger(self):
+        remote = Node.objects.create(
+            hostname="remote-node",
+            address="10.0.0.1",
+            port=9000,
+            mac_address="11:22:33:44:55:66",
+        )
+        charger = Charger.objects.create(
+            charger_id="PERSISTED",
+            manager_node=remote,
+        )
+
+        charger.refresh_manager_node(node=self.local_node)
+
+        self.assertEqual(charger.manager_node, self.local_node)
+        charger.refresh_from_db()
+        self.assertEqual(charger.manager_node, self.local_node)
+
+    def test_refresh_manager_node_handles_missing_local_node(self):
+        remote = Node.objects.create(
+            hostname="existing-manager",
+            address="10.0.0.2",
+            port=9001,
+            mac_address="22:33:44:55:66:77",
+        )
+        charger = Charger(charger_id="NOLOCAL", manager_node=remote)
+
+        with patch.object(Node, "get_local", return_value=None):
+            result = charger.refresh_manager_node()
+
+        self.assertIsNone(result)
+        self.assertEqual(charger.manager_node, remote)
+
+
 class ChargerUrlFallbackTests(TestCase):
     @override_settings(ALLOWED_HOSTS=["fallback.example", "10.0.0.0/8"])
     def test_reference_created_when_site_missing(self):
@@ -2320,6 +2406,43 @@ class ChargerAdminTests(TestCase):
             store.pop_connection(charger.charger_id, charger.connector_id)
             store.clear_pending_calls(charger.charger_id)
 
+    def test_reset_charger_action_skips_when_transaction_active(self):
+        charger = Charger.objects.create(charger_id="RESETADMIN")
+
+        class DummyConnection:
+            def __init__(self):
+                self.sent: list[str] = []
+
+            async def send(self, message):
+                self.sent.append(message)
+
+        ws = DummyConnection()
+        store.set_connection(charger.charger_id, charger.connector_id, ws)
+        tx_obj = Transaction.objects.create(
+            charger=charger,
+            connector_id=charger.connector_id,
+            start_time=timezone.now(),
+        )
+        store.set_transaction(charger.charger_id, charger.connector_id, tx_obj)
+        try:
+            url = reverse("admin:ocpp_charger_changelist")
+            response = self.client.post(
+                url,
+                {
+                    "action": "reset_chargers",
+                    "index": 0,
+                    "select_across": 0,
+                    "_selected_action": [charger.pk],
+                },
+                follow=True,
+            )
+            self.assertEqual(response.status_code, 200)
+            self.assertFalse(ws.sent)
+            self.assertContains(response, "stop the session first")
+        finally:
+            store.pop_connection(charger.charger_id, charger.connector_id)
+            store.pop_transaction(charger.charger_id, charger.connector_id)
+
     def test_admin_log_view_displays_entries(self):
         charger = Charger.objects.create(charger_id="LOG2")
         log_id = store.identity_key(charger.charger_id, charger.connector_id)

ocpp/views.py

@@ -1609,6 +1609,15 @@ def charger_session_search(request, cid, connector=None):
             transactions = qs.order_by("-start_time")
         except ValueError:
             transactions = []
+    if transactions is not None:
+        transactions = list(transactions)
+        rfid_cache: dict[str, dict[str, str | None]] = {}
+        for tx in transactions:
+            details = _transaction_rfid_details(tx, cache=rfid_cache)
+            label_value = None
+            if details:
+                label_value = str(details.get("label") or "").strip() or None
+            tx.rfid_label = label_value
     overview = _connector_overview(charger, request.user)
     connector_links = [
         {
@@ -1734,7 +1743,7 @@ def charger_log_page(request, cid, connector=None):
 @csrf_exempt
 @api_login_required
 def dispatch_action(request, cid, connector=None):
-    connector_value, _ = _normalize_connector_slug(connector)
+    connector_value, _normalized_slug = _normalize_connector_slug(connector)
     log_key = store.identity_key(cid, connector_value)
     if connector_value is None:
         charger_obj = (
@@ -1750,11 +1759,11 @@ def dispatch_action(request, cid, connector=None):
         )
     if charger_obj is None:
         if connector_value is None:
-            charger_obj, _ = Charger.objects.get_or_create(
+            charger_obj, _created = Charger.objects.get_or_create(
                 charger_id=cid, connector_id=None
             )
         else:
-            charger_obj, _ = Charger.objects.get_or_create(
+            charger_obj, _created = Charger.objects.get_or_create(
                 charger_id=cid, connector_id=connector_value
             )
 
@@ -1925,6 +1934,13 @@ def dispatch_action(request, cid, connector=None):
             },
         )
     elif action == "reset":
+        tx_obj = store.get_transaction(cid, connector_value)
+        if tx_obj is not None:
+            detail = _(
+                "Reset is blocked while a charging session is active. "
+                "Stop the session first."
+            )
+            return JsonResponse({"detail": detail}, status=409)
         message_id = uuid.uuid4().hex
         ocpp_action = "Reset"
         expected_statuses = CALL_EXPECTED_STATUSES.get(ocpp_action)

pages/tests.py

@@ -109,6 +109,7 @@ from nodes.models import (
     NodeRole,
     NodeFeature,
     NodeFeatureAssignment,
+    NetMessage,
 )
 from django.contrib.auth.models import AnonymousUser
 
@@ -721,18 +722,36 @@ class AdminDashboardAppListTests(TestCase):
 
     def test_horologia_hidden_without_celery_feature(self):
         resp = self.client.get(reverse("admin:index"))
-        self.assertNotContains(resp, "5. Horologia MODELS")
+        self.assertNotContains(resp, "5. Horologia</a>")
 
     def test_horologia_visible_with_celery_feature(self):
         feature = NodeFeature.objects.create(slug="celery-queue", display="Celery Queue")
         NodeFeatureAssignment.objects.create(node=self.node, feature=feature)
         resp = self.client.get(reverse("admin:index"))
-        self.assertContains(resp, "5. Horologia MODELS")
+        self.assertContains(resp, "5. Horologia</a>")
 
     def test_horologia_visible_with_celery_lock(self):
         self.celery_lock.write_text("")
         resp = self.client.get(reverse("admin:index"))
-        self.assertContains(resp, "5. Horologia MODELS")
+        self.assertContains(resp, "5. Horologia</a>")
+
+    def test_dashboard_shows_last_net_message(self):
+        NetMessage.objects.all().delete()
+        NetMessage.objects.create(subject="Older", body="First body")
+        NetMessage.objects.create(subject="Latest", body="Signal ready")
+
+        resp = self.client.get(reverse("admin:index"))
+
+        self.assertContains(resp, gettext("Net message"))
+        self.assertContains(resp, "Latest — Signal ready")
+        self.assertNotContains(resp, gettext("No net messages available"))
+
+    def test_dashboard_shows_placeholder_without_net_message(self):
+        NetMessage.objects.all().delete()
+
+        resp = self.client.get(reverse("admin:index"))
+
+        self.assertContains(resp, gettext("No net messages available"))
 
 class AdminSidebarTests(TestCase):
     def setUp(self):
@@ -2083,7 +2102,7 @@ class ControlNavTests(TestCase):
 
     def test_readme_pill_visible(self):
         resp = self.client.get(reverse("pages:readme"))
-        self.assertContains(resp, 'href="/read/"')
+        self.assertContains(resp, 'href="/read/docs/cookbooks/install-start-stop-upgrade-uninstall"')
         self.assertContains(resp, 'badge rounded-pill text-bg-secondary">COOKBOOKS')
 
     def test_cookbook_pill_has_no_dropdown(self):
@@ -2099,7 +2118,7 @@ class ControlNavTests(TestCase):
 
         self.assertContains(
             resp,
-            '<a class="nav-link" href="/read/"><span class="badge rounded-pill text-bg-secondary">COOKBOOKS</span></a>',
+            '<a class="nav-link" href="/read/docs/cookbooks/install-start-stop-upgrade-uninstall"><span class="badge rounded-pill text-bg-secondary">COOKBOOKS</span></a>',
             html=True,
         )
         self.assertNotContains(resp, 'dropdown-item" href="/man/"')
@@ -2205,7 +2224,7 @@ class SatelliteNavTests(TestCase):
 
     def test_readme_pill_visible(self):
         resp = self.client.get(reverse("pages:readme"))
-        self.assertContains(resp, 'href="/read/"')
+        self.assertContains(resp, 'href="/read/docs/cookbooks/install-start-stop-upgrade-uninstall"')
         self.assertContains(resp, 'badge rounded-pill text-bg-secondary">COOKBOOKS')
 
 

pages/urls.py

@@ -17,6 +17,11 @@ urlpatterns = [
     path("sitemap.xml", views.sitemap, name="pages-sitemap"),
     path("release/", views.release_admin_redirect, name="release-admin"),
     path("client-report/", views.client_report, name="client-report"),
+    path(
+        "client-report/download/<int:report_id>/",
+        views.client_report_download,
+        name="client-report-download",
+    ),
     path("release-checklist", views.release_checklist, name="release-checklist"),
     path("login/", views.login_view, name="login"),
     path("authenticator/setup/", views.authenticator_setup, name="authenticator-setup"),