howler-api 4.0.0.dev978__tar.gz → 4.0.0.dev982__tar.gz

{howler_api-4.0.0.dev978 → howler_api-4.0.0.dev982}/PKG-INFO

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

{howler_api-4.0.0.dev978 → howler_api-4.0.0.dev982}/howler/actions/demote.py

@@ -76,6 +76,7 @@ def execute(
                     *hit_helper.demote_hit(escalation=escalation),
                     odm_helper.update("howler.assessment", None),
                     odm_helper.update("howler.rationale", None),
+                    odm_helper.update("howler.assignment", None),
                 ],
             )
         else:
@@ -93,7 +94,7 @@ def execute(
             ds.hit.update_by_query(
                 query,
                 [
-                    *hit_helper.assess_hit(assessment, rationale),
+                    *hit_helper.assess_hit(assessment, rationale, user=(user if user else "automation")),
                     odm_helper.update(
                         "howler.assignment",
                         user.get("uname", "automation") if user else "automation",

{howler_api-4.0.0.dev978 → howler_api-4.0.0.dev982}/howler/actions/promote.py

@@ -10,6 +10,7 @@ from howler.odm.models.howler_data import (
     AssessmentEscalationMap,
     Escalation,
 )
+from howler.odm.models.user import User
 from howler.utils.str_utils import sanitize_lucene_query
 
 OPERATION_ID = "promote"
@@ -26,6 +27,7 @@ def execute(
     escalation: Escalation = Escalation.ALERT,
     assessment: Optional[str] = None,
     rationale: Optional[str] = None,
+    user: Optional[User] = None,
     **kwargs,
 ):
     """Promote a hit.
@@ -73,6 +75,7 @@ def execute(
                     *hit_helper.promote_hit(escalation=escalation),
                     odm_helper.update("howler.assessment", None),
                     odm_helper.update("howler.rationale", None),
+                    odm_helper.update("howler.assignment", None),
                 ],
             )
         else:
@@ -87,7 +90,9 @@ def execute(
                 )
                 return report
 
-            ds.hit.update_by_query(query, hit_helper.assess_hit(assessment, rationale))
+            ds.hit.update_by_query(
+                query, hit_helper.assess_hit(assessment, rationale, user=(user if user else "automation"))
+            )
 
         report.append(
             {

{howler_api-4.0.0.dev978 → howler_api-4.0.0.dev982}/howler/helper/hit.py

@@ -24,13 +24,16 @@ def assess_hit(
     assessment: Optional[str] = None,
     rationale: Optional[str] = None,
     hit: Optional[Union[dict[str, Any], Hit]] = None,
+    *,
+    user: User | str,
     **kwargs,
 ) -> list[OdmUpdateOperation]:
     """Update the assessment and esclation of a hit
 
     Args:
+        user (User | str): The user making the assessment
         assessment (Optional[str], optional): The assessment to set the hit to. Defaults to None.
-        hit (Optional[dict[str, Any]], optional): The hit to update. Defaults to None.
+        hit (Optional[Union[dict[str, Any], Hit]], optional): The hit to update. Defaults to None.
 
     Raises:
         InvalidDataException: An invalid assessment was provided
@@ -63,10 +66,16 @@ def assess_hit(
         escalation,
     )
 
+    if assessment is None:
+        assessor_id = None
+    else:
+        assessor_id = user.get("uname", user.get("username", None)) if isinstance(user, User) else user
+
     return [
         odm_helper.update("howler.assessment", assessment),
         odm_helper.update("howler.escalation", escalation),
         odm_helper.update("howler.rationale", rationale, silent=True),
+        odm_helper.update("howler.assessor", assessor_id, silent=True),
     ]
 
 

{howler_api-4.0.0.dev978 → howler_api-4.0.0.dev982}/howler/odm/helper.py

@@ -168,6 +168,7 @@ def generate_useful_hit(lookups: dict[str, dict[str, Any]], users: list[str], pr
     hit.howler.status = "open"
     hit.howler.assignment = "unassigned"
     hit.howler.escalation = choice([Escalation.HIT, Escalation.ALERT])
+    hit.howler.assessor = None
 
     if randint(1, 10) > 9:
         hit.howler.expiry = datetime.now() + timedelta(days=randint(1, 60))

{howler_api-4.0.0.dev978 → howler_api-4.0.0.dev982}/howler/odm/models/howler_data.py

@@ -210,6 +210,12 @@ class HowlerData(odm.Model):
         description="Unique identifier of the assigned user.",
         default=DEFAULT_ASSIGNMENT,
     )
+    assessor: Optional[str] = odm.Optional(
+        odm.Keyword(
+            description="The most recent person to assess a hit",
+            default=None,
+        )
+    )
     bundles: list[str] = odm.List(
         odm.Keyword(
             description="A list of bundle IDs this hit is a part of. Corresponds to the howler.id of the bundle."

{howler_api-4.0.0.dev978 → howler_api-4.0.0.dev982}/howler/odm/random_data.py

@@ -577,6 +577,7 @@ def create_hits(ds: HowlerDatastore, hit_count: int = 200):
                 hit.howler.id,
                 [
                     *assess_hit(
+                        user=user,
                         assessment=choice(Assessment.list()),
                         rationale=get_random_string(),
                         hit=hit,

{howler_api-4.0.0.dev978 → howler_api-4.0.0.dev982}/howler/services/hit_service.py

@@ -111,7 +111,7 @@ def get_hit_workflow() -> Workflow:
                     "source": [HitStatus.OPEN, HitStatus.IN_PROGRESS],
                     "transition": HitStatusTransition.ASSESS,
                     "dest": HitStatus.RESOLVED,
-                    "actions": [assess_hit, assign_hit],
+                    "actions": [assess_hit],
                 }
             ),
             Transition(

{howler_api-4.0.0.dev978 → howler_api-4.0.0.dev982}/pyproject.toml

@@ -152,7 +152,7 @@ suppress-none-returning = true
 [tool.poetry]
 package-mode = true
 name = "howler-api"
-version = "4.0.0.dev978"
+version = "4.0.0.dev982"
 description = "Howler - API server"
 authors = [
     "Canadian Centre for Cyber Security <howler@cyber.gc.ca>",