howler-api 4.1.0.dev1560__tar.gz → 4.1.0.dev1573__tar.gz

{howler_api-4.1.0.dev1560 → howler_api-4.1.0.dev1573}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: howler-api
-Version: 4.1.0.dev1560
+Version: 4.1.0.dev1573
 Summary: Howler - API server
 License: MIT
 Keywords: howler,alerting,gc,canada,cse-cst,cse,cst,cyber,cccs

{howler_api-4.1.0.dev1560 → howler_api-4.1.0.dev1573}/howler/actions/add_to_bundle.py

@@ -8,7 +8,7 @@ from howler.common.loader import datastore
 from howler.odm.models.action import VALID_TRIGGERS
 from howler.odm.models.case import CaseItemTypes
 from howler.odm.models.user import User
-from howler.services import bundle_compat_service, case_service
+from howler.services import bundle_compat_service, case_service, comms_service
 from howler.utils.str_utils import sanitize_lucene_query
 
 OPERATION_ID = "add_to_bundle"
@@ -70,7 +70,8 @@ def execute(query: str, bundle_id: Optional[str] = None, user: Optional[User] =
             )
             return report
 
-        folder = case_service.get_parent_from_path(case, "hits", create_if_missing=True)
+        original_item_count = len(case.items)
+        folder = case_service.get_parent_from_path(case, "hits", create_if_missing=True, user=user)
 
         added = []
         skipped = []
@@ -83,11 +84,16 @@ def execute(query: str, bundle_id: Optional[str] = None, user: Optional[User] =
                     item_name=name,
                     item_value=hit.howler.id,
                     item_parent=folder.id if folder else None,
+                    user=user,
                 )
                 added.append(hit.howler.id)
             except Exception:  # pragma: no cover
                 skipped.append(hit.howler.id)
 
+        if len(case.items) != original_item_count:
+            case.save(refresh="wait_for")
+            comms_service.emit("cases", {"case": case.as_primitives()})
+
         if skipped:
             report.append(
                 {

{howler_api-4.1.0.dev1560 → howler_api-4.1.0.dev1573}/howler/actions/add_to_case.py

@@ -1,19 +1,23 @@
-from typing import Optional
-
 import chevron
 
 from howler.common.exceptions import InvalidDataException, NotFoundException
 from howler.common.loader import datastore
+from howler.common.logging import get_logger
+from howler.datastore.exceptions import DataStoreException, VersionConflictException
 from howler.odm.models.action import VALID_TRIGGERS
-from howler.services import case_service
+from howler.odm.models.user import User
+from howler.services import case_service, comms_service
+
+logger = get_logger(__file__)
 
 OPERATION_ID = "add_to_case"
 
 
 def execute(  # noqa: C901
     query: str,
-    case_id: Optional[str] = None,
+    case_id: str | None = None,
     destination: str = "related/{{howler.analytic}} ({{howler.id}})",
+    user: User | None = None,
     **kwargs,
 ):
     """Add matching alerts to a given case.
@@ -37,8 +41,8 @@ def execute(  # noqa: C901
 
     ds = datastore()
 
-    case = ds.case.get(case_id)
-    if case is None:
+    case, version = case_service.get_case(case_id, as_odm=True, version=True, user=user)
+    if not case:
         return [
             {
                 "query": query,
@@ -63,6 +67,7 @@ def execute(  # noqa: C901
     report = []
     skipped = []
     added = []
+    original_item_count = len(case.items)
 
     for hit in hits:
         rendered_destination = chevron.render(destination, hit.as_primitives())
@@ -73,7 +78,7 @@ def execute(  # noqa: C901
             name = rendered_destination
 
         try:
-            parent = case_service.get_parent_from_path(case, item_path, create_if_missing=True)
+            parent = case_service.get_parent_from_path(case, item_path, create_if_missing=True, user=user)
 
             case_service.append_case_item(
                 case,
@@ -81,6 +86,7 @@ def execute(  # noqa: C901
                 item_value=hit.howler.id,
                 item_name=name,
                 item_parent=parent.id if parent else None,
+                user=user,
             )
             added.append(hit.howler.id)
         except InvalidDataException as e:
@@ -90,6 +96,21 @@ def execute(  # noqa: C901
         except Exception as e:  # pragma: no cover
             skipped.append(f"{hit.howler.id}: {e}")
 
+    if len(case.items) != original_item_count:
+        try:
+            case.save(refresh="wait_for", version=version)
+        except (DataStoreException, VersionConflictException):
+            logger.exception("Exception on save:")
+            return [
+                {
+                    "query": query,
+                    "outcome": "error",
+                    "title": "Case update failed",
+                    "message": "There was a datastore error or version conflict when updating the case.",
+                }
+            ]
+        comms_service.emit("cases", {"case": case.as_primitives()})
+
     if added:
         report.append(
             {

{howler_api-4.1.0.dev1560 → howler_api-4.1.0.dev1573}/howler/api/socket.py

@@ -1,3 +1,5 @@
+"""Websocket and inter-pod communication API endpoints."""
+
 import base64
 import json
 import os
@@ -11,8 +13,11 @@ import howler.services.viewer_service as viewer_service
 from howler.api import ok, unauthorized
 from howler.common.logging import get_logger
 from howler.helper.ws import ConnectionClosed, Server
+from howler.odm.models.user import User
 from howler.security.login import api_login
 from howler.security.socket import websocket_auth, ws_response
+from howler.security.utils import is_classification_accessible
+from howler.services import case_service
 from howler.utils.socket_utils import check_action
 
 HWL_INTERPOD_COMMS_SECRET = os.getenv("HWL_INTERPOD_COMMS_SECRET", "secret")
@@ -70,7 +75,7 @@ def get_viewers(entity_id: str, **kwargs):  # pragma: no cover
 @tracer.start_as_current_span(f"{__name__}.connect")
 @socket_api.route("/connect", websocket=True)  # type: ignore
 @websocket_auth(required_priv=["R"])
-def connect(ws: Server, *args: Any, ws_id: str, **kwargs):  # noqa: C901
+def connect(ws: Server, *args: Any, ws_id: str, user: User | None = None, **kwargs):  # noqa: C901
     """Connect to the server to monitor for updates via websocket
 
     Variables:
@@ -86,22 +91,39 @@ def connect(ws: Server, *args: Any, ws_id: str, **kwargs):  # noqa: C901
     outstanding_actions: list[tuple[str, str, bool]] = []
 
     def send_hit(data: dict[str, Any]):
+        """Send an access-controlled hit update to the websocket client."""
+        if user and user.classification:
+            if not is_classification_accessible(user, data["hit"].get("classification")):
+                return
+
         logger.debug("Sending hit update: %s", data["hit"]["howler"]["id"])
         ws.send(ws_response("hits", data))
 
     def send_broadcast(data: dict[str, str]):
+        """Send a broadcast event to the websocket client."""
         logger.debug("Sending broadcast: %s", data)
         ws.send(ws_response("broadcast", {"event": data}))
 
     def send_action(data: dict[str, str]):
+        """Send an action update to the websocket client."""
         logger.debug("Sending action: %s", data)
         ws.send(ws_response("action", data))
 
     def send_case(data: dict[str, Any]):  # pragma: no cover
-        logger.debug("Sending case update: %s", data.get("case", {}).get("case_id", "unknown"))
-        ws.send(ws_response("cases", data))
+        """Send an access-controlled case update to the websocket client."""
+        case_data = data.get("case", {})
+
+        if user and user.classification:
+            if not is_classification_accessible(user, case_data.get("classification")):
+                return
+
+            case_service.filter_case_items_by_classification(case_data, user.classification)
+
+        logger.debug("Sending case update: %s", case_data.get("case_id"))
+        ws.send(ws_response("cases", {**data, "case": case_data}))
 
     def send_viewers_update(data: dict[str, Any]):  # pragma: no cover
+        """Send a viewer-presence update to the websocket client."""
         logger.debug("Sending viewers update: %s", data.get("id", "unknown"))
         ws.send(ws_response("viewers_update", data))
 
@@ -135,7 +157,12 @@ def connect(ws: Server, *args: Any, ws_id: str, **kwargs):  # noqa: C901
                     return
 
                 outstanding_actions = check_action(
-                    obj["id"], obj["action"], obj["broadcast"], outstanding_actions=outstanding_actions, **kwargs
+                    obj["id"],
+                    obj["action"],
+                    obj["broadcast"],
+                    outstanding_actions=outstanding_actions,
+                    user=user,
+                    **kwargs,
                 )
                 logger.debug("%s: Outstanding actions count=%s", ws_id, len(outstanding_actions))
             else:
@@ -154,5 +181,12 @@ def connect(ws: Server, *args: Any, ws_id: str, **kwargs):  # noqa: C901
         comms_service.off("viewers_update", send_viewers_update)
 
         for id, action, broadcast in outstanding_actions:
-            outstanding_actions = check_action(id, action, broadcast, outstanding_actions=outstanding_actions, **kwargs)
+            outstanding_actions = check_action(
+                id,
+                action,
+                broadcast,
+                outstanding_actions=outstanding_actions,
+                user=user,
+                **kwargs,
+            )
         logger.info("%s: WS connect handler finished", ws_id)