clue-api 1.3.0.dev96__tar.gz → 1.3.0.dev102__tar.gz

{clue_api-1.3.0.dev96 → clue_api-1.3.0.dev102}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clue-api
-Version: 1.3.0.dev96
+Version: 1.3.0.dev102
 Summary: Clue distributed enrichment service
 License: MIT
 License-File: LICENSE

{clue_api-1.3.0.dev96 → clue_api-1.3.0.dev102}/clue/app.py

@@ -2,6 +2,8 @@ import warnings
 
 from gevent import monkey
 
+from clue.constants.supported_types import SUPPORTED_TYPES
+
 monkey.patch_all()
 
 import os
@@ -132,7 +134,8 @@ app.register_blueprint(registration_api)
 app.register_blueprint(static_api)
 
 
-logger.info("Checking extensions for additional routes")
+logger.info("Checking extensions for initialization and additional routes")
+num_buildin_types = len(SUPPORTED_TYPES)
 for extension in get_extensions():
     if extension.modules.init:
         extension.modules.init(flask_app=app)
@@ -144,6 +147,8 @@ for extension in get_extensions():
         logger.info("Enabling additional endpoint: %s", route.url_prefix)
         app.register_blueprint(route)
 
+logger.info("%s types configured (%s custom types)", len(SUPPORTED_TYPES), len(SUPPORTED_TYPES) - num_buildin_types)
+
 # Setup OAuth providers
 if config.auth.oauth.enabled:
     providers = []

{clue_api-1.3.0.dev96 → clue_api-1.3.0.dev102}/clue/common/regex.py

@@ -40,5 +40,3 @@ URI_ONLY = f"^{URI_REGEX}$"
 UUID4_REGEX = r"^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
 
 EMAIL_PATH_REGEX = r"^[A-Z]+_EMAIL://.*"
-HBS_AGENT_ID_REGEX = r"[0-9a-fA-F]{1,4}\.[0-9a-fA-F]{1,4}\.[0-9a-fA-F]{1,4}\.[0-9a-fA-F]{1,4}"
-HBS_AGENT_ID_ONLY_REGEX = f"^{HBS_AGENT_ID_REGEX}$"

{clue_api-1.3.0.dev96 → clue_api-1.3.0.dev102}/clue/constants/supported_types.py

@@ -3,7 +3,6 @@ from clue.common.regex import (
     DOMAIN_ONLY_REGEX,
     EMAIL_PATH_REGEX,
     EMAIL_REGEX,
-    HBS_AGENT_ID_REGEX,
     IPV4_ONLY_REGEX,
     IPV6_ONLY_REGEX,
     MD5_REGEX,
@@ -32,16 +31,17 @@ SUPPORTED_TYPES = {
     "md5": MD5_REGEX,
     "sha1": SHA1_REGEX,
     "sha256": SHA256_REGEX,
-    "hbs_oid": None,
-    "hbs_agent_id": HBS_AGENT_ID_REGEX,
     "telemetry": None,
-    "howler_id": None,
     "hostname": None,
     "tenant-id": UUID4_REGEX,
 }
 
+CASE_INSENSITIVE_TYPES = ["ip", "domain", "port", "tenant-id", "hbs_oid", "hbs_agent_id"]
+
 
-def add_supported_type(type: str, regex: str | None = None, namespace: str | None = None):
+def add_supported_type(
+    type: str, regex: str | None = None, namespace: str | None = None, case_insensitive: bool = False
+):
     r"""Add a supported type to the SUPPORTED_TYPES registry.
 
     This function registers a new type with an optional regex pattern for validation.
@@ -62,10 +62,11 @@ def add_supported_type(type: str, regex: str | None = None, namespace: str | Non
     """
     if not namespace:
         logger.info("Adding new type %s to the default namespace with regex %s", type, regex)
-        SUPPORTED_TYPES[type] = regex
+        new_entry = type
     else:
         logger.info("Adding type %s to namespace %s with regex %s", type, namespace, regex)
-        SUPPORTED_TYPES[f"{namespace}/{type}"] = regex
+        new_entry = f"{namespace}/{type}"
 
-
-CASE_INSENSITIVE_TYPES = ["ip", "domain", "port", "tenant-id", "hbs_oid", "hbs_agent_id"]
+    SUPPORTED_TYPES[new_entry] = regex
+    if case_insensitive:
+        CASE_INSENSITIVE_TYPES.append(new_entry)

{clue_api-1.3.0.dev96 → clue_api-1.3.0.dev102}/clue/extensions/config.py

@@ -59,6 +59,10 @@ class BaseExtensionConfig(BaseSettings):
 
             data["modules"]["routes"] = new_routes
 
+        if "init" in data["modules"]:
+            if isinstance(data["modules"]["init"], bool):
+                data["modules"]["init"] = f"{plugin_name}.init:initialize"
+
         if "obo_module" in data["modules"]:
             if isinstance(data["modules"]["obo_module"], bool):
                 data["modules"]["obo_module"] = f"{plugin_name}.obo:get_obo_token"

{clue_api-1.3.0.dev96 → clue_api-1.3.0.dev102}/pyproject.toml

@@ -142,7 +142,7 @@ log_cli_level = "WARN"
 [tool.poetry]
 package-mode = true
 name = "clue-api"
-version = "1.3.0.dev96"
+version = "1.3.0.dev102"
 description = "Clue distributed enrichment service"
 authors = ["Canadian Centre for Cyber Security <contact@cyber.gc.ca>"]
 license = "MIT"