howler-api 3.4.0.dev933__tar.gz → 3.4.0.dev947__tar.gz

{howler_api-3.4.0.dev933 → howler_api-3.4.0.dev947}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: howler-api
-Version: 3.4.0.dev933
+Version: 3.4.0.dev947
 Summary: Howler - API server
 License: MIT
 Keywords: howler,alerting,gc,canada,cse-cst,cse,cst,cyber,cccs
@@ -42,7 +42,7 @@ Requires-Dist: prometheus-client (==0.25.0)
 Requires-Dist: pydantic (>=2.11.4,<3.0.0)
 Requires-Dist: pydantic-settings[yaml] (>=2.9.1,<3.0.0)
 Requires-Dist: pydash (>=8.0.5,<9.0.0)
-Requires-Dist: pyjwt (==2.12.1)
+Requires-Dist: pyjwt (==2.13.0)
 Requires-Dist: pysigma (==0.11.23)
 Requires-Dist: pysigma-backend-elasticsearch (>=1.1.2,<2.0.0)
 Requires-Dist: python-baseconv (==1.2.2)

{howler_api-3.4.0.dev933 → howler_api-3.4.0.dev947}/howler/helper/discover.py

@@ -17,6 +17,9 @@ def get_apps_list(discovery_url: Optional[str]) -> list[dict[str, str]]:
     Returns:
         list[dict[str, str]]: A list of other apps
     """
+    if not config.discovery.enabled or discovery_url is None:
+        return []
+
     if discovery_url not in DISCO_CACHE:
         apps = []
 
@@ -25,7 +28,7 @@ def get_apps_list(discovery_url: Optional[str]) -> list[dict[str, str]]:
 
         try:
             resp = requests.get(
-                typing.cast(str, discovery_url or config.ui.discover_url),
+                typing.cast(str, discovery_url or config.discovery.url),
                 headers={"accept": "application/json"},
                 timeout=5,
             )

{howler_api-3.4.0.dev933 → howler_api-3.4.0.dev947}/howler/odm/helper.py

@@ -31,7 +31,7 @@ from howler.security.utils import get_password_hash
 from howler.utils.constants import TESTING
 from howler.utils.uid import get_random_id
 
-APPS = get_apps_list(discovery_url=config.ui.discover_url)
+APPS = get_apps_list(discovery_url=config.discovery.url)
 ESCALATIONS = Escalation.list()
 EXAMPLE_ANALYTICS = ["Password Checker", "Bad Guy Finder", "Exploit Patcher"]
 

{howler_api-3.4.0.dev933 → howler_api-3.4.0.dev947}/howler/odm/models/config.py

@@ -471,6 +471,18 @@ class Telemetry(BaseModel):
     )
 
 
+class Discovery(BaseModel):
+    """Service discovery configuration for Howler.
+
+    Defines settings for enabling and configuring service discovery,
+    allowing Howler instances to locate and communicate with each other
+    in distributed deployments.
+    """
+
+    url: Optional[str] = Field(default=None, description="Discovery URL")
+    enabled: bool = Field(default=False, description="Should discovery be enabled?")
+
+
 class Core(BaseModel):
     """Core application configuration for Howler.
 
@@ -493,6 +505,8 @@ class Core(BaseModel):
     notebook: Notebook = Notebook()
     "Configuration for Notebook Integration"
 
+    enable_eureka_discovery: bool = Field(default=True, description="Should Eureka discovery be disabled?")
+
 
 root_path = Path("/etc") / APP_NAME.replace("-dev", "").replace("-stg", "")
 
@@ -553,6 +567,8 @@ class Config(BaseSettings):
     logging: Logging = Logging()
     system: System = System()
     ui: UI = UI()
+    discovery: Discovery = Discovery()
+
     mapping: dict[str, str] = Field(description="Mapping of alert keys to clue types", default={})
 
     model_config = SettingsConfigDict(

{howler_api-3.4.0.dev933 → howler_api-3.4.0.dev947}/howler/security/utils.py

@@ -182,6 +182,6 @@ def get_disco_url(host_url: Optional[str]):
 
             return f"https://{hostname}/eureka/apps"
         else:
-            return config.ui.discover_url
+            return config.discovery.url
     else:
-        return config.ui.discover_url
+        return config.discovery.url

{howler_api-3.4.0.dev933 → howler_api-3.4.0.dev947}/pyproject.toml

@@ -152,7 +152,7 @@ suppress-none-returning = true
 [tool.poetry]
 package-mode = true
 name = "howler-api"
-version = "3.4.0.dev933"
+version = "3.4.0.dev947"
 description = "Howler - API server"
 authors = [
     "Canadian Centre for Cyber Security <howler@cyber.gc.ca>",
@@ -207,7 +207,7 @@ gunicorn = "23.0.0"
 packaging = "<25.0"
 passlib = "1.7.4"
 prometheus-client = "0.25.0"
-pyjwt = "2.12.1"
+pyjwt = "2.13.0"
 python-baseconv = "1.2.2"
 python-datemath = "3.0.3"
 pyyaml = "6.0.3"