howler-api 4.0.0.dev1148__tar.gz → 4.0.0.dev1167__tar.gz

{howler_api-4.0.0.dev1148 → howler_api-4.0.0.dev1167}/PKG-INFO

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

{howler_api-4.0.0.dev1148 → howler_api-4.0.0.dev1167}/howler/common/classification.py

@@ -1,7 +1,7 @@
 import itertools
 import logging
 from copy import copy
-from typing import Any, Dict, KeysView, List, Optional, Set, Tuple, Union, cast
+from typing import TYPE_CHECKING, Any, Dict, KeysView, List, Optional, Set, Tuple, Union, cast
 
 from howler.common.exceptions import (
     HowlerKeyError,
@@ -10,6 +10,9 @@ from howler.common.exceptions import (
 )
 from howler.common.loader import APP_NAME
 
+if TYPE_CHECKING:
+    from howler.odm.base import ClassificationObject
+
 log = logging.getLogger(f"{APP_NAME}.classification")
 
 
@@ -203,15 +206,12 @@ class Classification(object):
             if not self.is_valid(classification_definition["restricted"]):
                 raise InvalidDefinition("Classification definition's restricted classification is invalid.")
 
-            self.UNRESTRICTED = classification_definition["unrestricted"]
-            self.RESTRICTED = classification_definition["restricted"]
-
-            self.UNRESTRICTED = self.normalize_classification(classification_definition["unrestricted"])
-            self.RESTRICTED = self.normalize_classification(classification_definition["restricted"])
+            self.UNRESTRICTED: str = self.normalize_classification(classification_definition["unrestricted"])
+            self.RESTRICTED: str = self.normalize_classification(classification_definition["restricted"])
 
         except Exception as e:
-            self.UNRESTRICTED = self.NULL_CLASSIFICATION
-            self.RESTRICTED = self.INVALID_CLASSIFICATION
+            self.UNRESTRICTED: str = self.NULL_CLASSIFICATION
+            self.RESTRICTED: str = self.INVALID_CLASSIFICATION
 
             self.invalid_mode = True
 
@@ -758,7 +758,9 @@ class Classification(object):
             skip_auto_select=True,
         )
 
-    def is_accessible(self, user_c12n: str, c12n: str, ignore_invalid: bool = False) -> bool:
+    def is_accessible(
+        self, user_c12n: "str | ClassificationObject", c12n: "str | ClassificationObject", ignore_invalid: bool = False
+    ) -> bool:
         """
         Given a user classification, check if a user is allow to see a certain classification
 
@@ -778,6 +780,12 @@ class Classification(object):
         if c12n is None:
             return True
 
+        if not isinstance(user_c12n, str):
+            user_c12n = user_c12n.value
+
+        if not isinstance(c12n, str):
+            c12n = c12n.value
+
         try:
             user_lvl, user_req, user_groups, user_subgroups = self._get_classification_parts(user_c12n)
             lvl, req, groups, subgroups = self._get_classification_parts(c12n)

{howler_api-4.0.0.dev1148 → howler_api-4.0.0.dev1167}/howler/config.py

@@ -14,9 +14,9 @@ CLASSIFICATION = loader.get_classification(os.getenv("HWL_CLASSIFICATION_PATH",
 
 AUDIT = config.ui.audit
 
-SECRET_KEY = config.ui.secret_key
-DEBUG = config.ui.debug
-MAX_CLASSIFICATION = CLASSIFICATION.UNRESTRICTED
+SECRET_KEY: str = config.ui.secret_key
+DEBUG: bool = config.ui.debug
+MAX_CLASSIFICATION: str = CLASSIFICATION.UNRESTRICTED
 
 HWL_UNSECURED_UI = os.environ.get("HWL_UNSECURED_UI", "false").lower() == "true"
 HWL_USE_REST_API = os.environ.get("HWL_USE_REST_API", "true").lower() == "true"

{howler_api-4.0.0.dev1148 → howler_api-4.0.0.dev1167}/howler/odm/base.py

@@ -18,8 +18,8 @@ import typing
 from datetime import datetime
 from enum import Enum as PyEnum
 from enum import EnumMeta
+from typing import TYPE_CHECKING, Callable
 from typing import Any as _Any
-from typing import Callable
 from venv import logger
 
 import arrow
@@ -84,6 +84,9 @@ FULL_URI = f"^((?:(?:[A-Za-z]*:)?//)?(?:\\S+(?::\\S*)?@)?({IP_REGEX}|{DOMAIN_REG
 PLATFORM_REGEX = r"^(Windows|Linux|MacOS|Android|iOS)$"
 PROCESSOR_REGEX = r"^x(64|86)$"
 
+if TYPE_CHECKING:
+    from howler.common.classification import Classification as ClassificationEngine
+
 
 def flat_to_nested(data: dict[str, _Any]) -> dict[str, _Any]:
     sub_data: dict[str, _Any] = {}
@@ -689,10 +692,10 @@ class Float(_Field):
 
 
 class ClassificationObject(object):
-    def __init__(self, engine, value, is_uc=False):
-        self.engine = engine
-        self.is_uc = is_uc
-        self.value = engine.normalize_classification(value, skip_auto_select=is_uc)
+    def __init__(self, engine: "ClassificationEngine", value, is_uc=False):
+        self.engine: "ClassificationEngine" = engine
+        self.is_uc: bool = is_uc
+        self.value: str = engine.normalize_classification(value, skip_auto_select=is_uc)
 
     def get_access_control_parts(self):
         return self.engine.get_access_control_parts(self.value, user_classification=self.is_uc)

{howler_api-4.0.0.dev1148 → howler_api-4.0.0.dev1167}/pyproject.toml

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