howler-api 4.0.0.dev993__tar.gz → 4.0.0.dev1005__tar.gz

{howler_api-4.0.0.dev993 → howler_api-4.0.0.dev1005}/PKG-INFO

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

{howler_api-4.0.0.dev993 → howler_api-4.0.0.dev1005}/howler/api/v1/search.py

@@ -715,7 +715,7 @@ def histogram(index, field, **kwargs):
     params: dict[str, Any] = {}
     if field_info is None:
         return bad_request(err=f"Field '{field}' is not a valid field in index: {index}")
-    elif field_info["type"] == "integer":
+    elif field_info["type"] in ("integer", "long"):
         params = {"start": 0, "end": 2000, "gap": 100}
     elif field_info["type"] == "date":
         storage = datastore()

howler_api-4.0.0.dev1005/howler/common/net.py

@@ -0,0 +1,128 @@
+import socket
+import uuid
+from ipaddress import IPv4Network, ip_address
+from typing import Union
+
+from howler.common.net_static import TLDS_ALPHA_BY_DOMAIN
+
+# IANA Special-Use Domain Names Registry
+# https://www.iana.org/assignments/special-use-domain-names/special-use-domain-names.xhtml
+IANA_SPECIAL_USE_TLDS = {
+    "LOCALHOST",  # RFC 6761 - loopback address
+    "TEST",  # RFC 6761 - testing
+    "EXAMPLE",  # RFC 6761 - documentation examples
+    "INVALID",  # RFC 6761 - invalid domain names
+    "LOCAL",  # RFC 6762 - mDNS/Bonjour local network names
+    "ONION",  # RFC 7686 - Tor hidden services
+}
+
+# Common private network suffixes used in enterprise environments
+# These are NOT IANA-registered but are widely used organizational conventions
+PRIVATE_NETWORK_SUFFIXES = {
+    "INTERNAL",
+    "LAN",
+    "HOME",
+    "CORP",
+    "LOCALDOMAIN",
+}
+
+
+def is_valid_port(value: Union[int, str, float]) -> bool:
+    "Check if a port is valid"
+    try:
+        if 1 <= int(value) <= 65535:
+            return True
+    except ValueError:
+        pass
+
+    return False
+
+
+def is_valid_domain(
+    domain: str,
+    allow_special_use_tlds: bool = True,
+    allow_private_suffixes: bool = True,
+) -> bool:
+    """Check if a domain is valid.
+
+    Args:
+        domain: The domain to validate.
+        allow_special_use_tlds: If True, accepts IANA special-use TLDs
+            (.localhost, .local, .onion, .test, .example, .invalid).
+            Set to False to reject these domains.
+            Defaults to True for backward compatibility.
+        allow_private_suffixes: If True, accepts common private network suffixes
+            (.internal, .lan, .home, .corp, .localdomain).
+            Set to False to reject these domains.
+            Defaults to True for backward compatibility.
+
+    Note:
+        To validate public internet domains only (e.g., for SSRF protection),
+        set both allow_special_use_tlds=False and allow_private_suffixes=False.
+
+    Returns:
+        True if the domain has a valid TLD, False otherwise.
+    """
+    if "@" in domain:
+        return False
+
+    if "." in domain:
+        tld = domain.split(".")[-1].upper()
+        if tld in TLDS_ALPHA_BY_DOMAIN:
+            return True
+        if allow_special_use_tlds and tld in IANA_SPECIAL_USE_TLDS:
+            return True
+        if allow_private_suffixes and tld in PRIVATE_NETWORK_SUFFIXES:
+            return True
+
+    return False
+
+
+def is_valid_ip(ip: str) -> bool:
+    "Check if an ip is valid"
+    parts = ip.split(".")
+    if len(parts) == 4:
+        for p in parts:
+            try:
+                if not (0 <= int(p) <= 255):
+                    return False
+            except ValueError:
+                return False
+
+        if int(parts[0]) == 0:
+            return False
+
+        if int(parts[3]) == 0:
+            return False
+
+        return True
+
+    return False
+
+
+def is_ip_in_network(ip: str, network: IPv4Network) -> bool:
+    "Check if an ip is in a given network"
+    if not is_valid_ip(ip):
+        return False
+
+    return ip_address(ip) in network
+
+
+def is_valid_email(email: str) -> bool:
+    "Check if an email is valid"
+    parts = email.split("@")
+    if len(parts) == 2:
+        if is_valid_domain(parts[1]):
+            return True
+
+    return False
+
+
+def get_hostname() -> str:
+    "Get the hostname of the computer howler is running on"
+    return socket.gethostname()
+
+
+def get_mac_address() -> str:
+    "Get the mac address of the computer howler is running on"
+    return "".join(["{0:02x}".format((uuid.getnode() >> i) & 0xFF) for i in range(0, 8 * 6, 8)][::-1]).upper()

{howler_api-4.0.0.dev993 → howler_api-4.0.0.dev1005}/pyproject.toml

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

howler_api-4.0.0.dev993/howler/common/net.py

@@ -1,79 +0,0 @@
-import socket
-import uuid
-from ipaddress import IPv4Network, ip_address
-from typing import Union
-
-from howler.common.net_static import TLDS_ALPHA_BY_DOMAIN
-
-
-def is_valid_port(value: Union[int, str, float]) -> bool:
-    "Check if a port is valid"
-    try:
-        if 1 <= int(value) <= 65535:
-            return True
-    except ValueError:
-        pass
-
-    return False
-
-
-def is_valid_domain(domain: str) -> bool:
-    "Check if a domain is valid"
-    if "@" in domain:
-        return False
-
-    if "." in domain:
-        tld = domain.split(".")[-1]
-        return tld.upper() in TLDS_ALPHA_BY_DOMAIN
-
-    return False
-
-
-def is_valid_ip(ip: str) -> bool:
-    "Check if an ip is valid"
-    parts = ip.split(".")
-    if len(parts) == 4:
-        for p in parts:
-            try:
-                if not (0 <= int(p) <= 255):
-                    return False
-            except ValueError:
-                return False
-
-        if int(parts[0]) == 0:
-            return False
-
-        if int(parts[3]) == 0:
-            return False
-
-        return True
-
-    return False
-
-
-def is_ip_in_network(ip: str, network: IPv4Network) -> bool:
-    "Check if an ip is in a given network"
-    if not is_valid_ip(ip):
-        return False
-
-    return ip_address(ip) in network
-
-
-def is_valid_email(email: str) -> bool:
-    "Check if an email is valid"
-    parts = email.split("@")
-    if len(parts) == 2:
-        if is_valid_domain(parts[1]):
-            return True
-
-    return False
-
-
-def get_hostname() -> str:
-    "Get the hostname of the computer howler is running on"
-    return socket.gethostname()
-
-
-def get_mac_address() -> str:
-    "Get the mac address of the computer howler is running on"
-    return "".join(["{0:02x}".format((uuid.getnode() >> i) & 0xFF) for i in range(0, 8 * 6, 8)][::-1]).upper()