axis 68__tar.gz → 69__tar.gz

{axis-68 → axis-69}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: axis
-Version: 68
+Version: 69
 Summary: A Python library for communicating with devices from Axis Communications
 Author-email: Robert Svensson <Kane610@users.noreply.github.com>
 License: MIT
@@ -27,19 +27,19 @@ Provides-Extra: requirements
 Requires-Dist: aiohttp==3.13.5; extra == "requirements"
 Requires-Dist: httpx==0.28.1; extra == "requirements"
 Requires-Dist: orjson==3.11.8; extra == "requirements"
-Requires-Dist: packaging==26.0; extra == "requirements"
+Requires-Dist: packaging==26.2; extra == "requirements"
 Requires-Dist: xmltodict==1.0.4; extra == "requirements"
 Provides-Extra: requirements-test
-Requires-Dist: mypy==1.20.0; extra == "requirements-test"
-Requires-Dist: pytest==9.0.2; extra == "requirements-test"
+Requires-Dist: mypy==1.20.2; extra == "requirements-test"
+Requires-Dist: pytest==9.0.3; extra == "requirements-test"
 Requires-Dist: pytest-aiohttp==1.1.0; extra == "requirements-test"
 Requires-Dist: pytest-asyncio==1.3.0; extra == "requirements-test"
 Requires-Dist: pytest-cov==7.1.0; extra == "requirements-test"
-Requires-Dist: respx==0.22.0; extra == "requirements-test"
-Requires-Dist: ruff==0.15.9; extra == "requirements-test"
-Requires-Dist: types-xmltodict==v1.0.1.20260113; extra == "requirements-test"
+Requires-Dist: respx==0.23.1; extra == "requirements-test"
+Requires-Dist: ruff==0.15.12; extra == "requirements-test"
+Requires-Dist: types-xmltodict==v1.0.1.20260408; extra == "requirements-test"
 Provides-Extra: requirements-dev
-Requires-Dist: pre-commit==4.5.1; extra == "requirements-dev"
+Requires-Dist: pre-commit==4.6.0; extra == "requirements-dev"
 Dynamic: license-file
 
 # axis

axis-69/axis/interfaces/aiohttp_digest.py

@@ -0,0 +1,266 @@
+"""Aiohttp digest authentication handler.
+
+Implements library-managed RFC 2617 digest authentication for aiohttp requests
+to handle special characters in request parameters that break middleware-based auth.
+"""
+
+from __future__ import annotations
+
+import hashlib
+import logging
+import re
+import secrets
+from typing import TYPE_CHECKING, Any, cast
+from urllib.parse import quote, urlsplit
+
+from ..models.configuration import AuthScheme
+
+if TYPE_CHECKING:
+    from ..device import AxisDevice
+
+LOGGER = logging.getLogger(__name__)
+TIME_OUT = 15
+
+
+class AiohttpDigestAuth:
+    """Manages digest authentication for aiohttp requests."""
+
+    def __init__(self, device: AxisDevice) -> None:
+        """Initialize digest auth handler."""
+        self.device = device
+        self._nonce: str | None = None
+        self._nonce_count = 0
+
+    def should_use_library_digest(self, http_client: str, has_basic_auth: bool) -> bool:
+        """Return if aiohttp requests should use library-managed digest auth.
+
+        Args:
+            http_client: Name of HTTP client ("aiohttp" or "httpx").
+            has_basic_auth: Whether basic auth is configured.
+
+        Returns:
+            True if library-managed digest should be used.
+
+        """
+        return (
+            http_client == "aiohttp"
+            and not has_basic_auth
+            and self.device.config.auth_scheme != AuthScheme.BASIC
+        )
+
+    def request_target(
+        self, url: str, params: dict[str, str] | None, should_encode: bool
+    ) -> tuple[str, dict[str, str] | None]:
+        """Return request URL and params for aiohttp request.
+
+        With library-managed digest auth, pre-encode params into the URL so the
+        signed URI exactly matches the request-target on the wire.
+
+        Args:
+            url: Base request URL.
+            params: Optional query parameters.
+            should_encode: Whether to pre-encode params for digest signing.
+
+        Returns:
+            Tuple of (request_url, request_params) to use in actual request.
+
+        """
+        if params is None or not should_encode:
+            return url, params
+
+        separator = "&" if "?" in url else "?"
+        encoded_parts = [
+            f"{quote(k, safe='')}={quote(v, safe='')}" for k, v in params.items()
+        ]
+        encoded_query = "&".join(encoded_parts)
+        encoded_url = f"{url}{separator}{encoded_query}"
+        return encoded_url, None
+
+    def extract_challenge(self, headers: Any) -> str | None:
+        """Return digest challenge header when present.
+
+        Args:
+            headers: Response headers (dict-like or aiohttp MultiDictProxy).
+
+        Returns:
+            Digest challenge string if present, None otherwise.
+
+        """
+        candidates: list[str] = []
+        if hasattr(headers, "getall"):
+            candidates.extend(cast("list[str]", headers.getall("WWW-Authenticate", [])))
+        else:
+            for name, value in cast("dict[str, str]", headers).items():
+                if name.lower() == "www-authenticate":
+                    candidates.append(value)
+
+        for value in candidates:
+            if value.lower().startswith("digest "):
+                return value
+        return None
+
+    def build_authorization(
+        self,
+        method: str,
+        request_url: str,
+        digest_challenge: str,
+    ) -> str | None:
+        """Build digest authorization header from challenge and request URI.
+
+        Args:
+            method: HTTP method (GET, POST, etc.).
+            request_url: Full request URL (will extract path + query).
+            digest_challenge: Digest challenge string from WWW-Authenticate header.
+
+        Returns:
+            Authorization header value or None if digest cannot be built.
+
+        """
+        challenge_values = {
+            key.lower(): value.strip('"')
+            for key, value in re.findall(
+                r"(\w+)=((?:\"[^\"]*\")|(?:[^,]+))", digest_challenge
+            )
+        }
+
+        realm = challenge_values.get("realm")
+        nonce = challenge_values.get("nonce")
+        if realm is None or nonce is None:
+            return None
+
+        algorithm = challenge_values.get("algorithm", "MD5").upper()
+        if algorithm != "MD5":
+            LOGGER.debug("Unsupported digest algorithm for aiohttp path: %s", algorithm)
+            return None
+
+        uri = self._digest_uri(request_url)
+        qop = None
+        if qop_header := challenge_values.get("qop"):
+            qop_values = [value.strip() for value in qop_header.split(",")]
+            if "auth" in qop_values:
+                qop = "auth"
+
+        username = self.device.config.username
+        password = self.device.config.password
+        ha1 = hashlib.md5(f"{username}:{realm}:{password}".encode()).hexdigest()
+        ha2 = hashlib.md5(f"{method.upper()}:{uri}".encode()).hexdigest()
+
+        parts = [
+            f'username="{username}"',
+            f'realm="{realm}"',
+            f'nonce="{nonce}"',
+            f'uri="{uri}"',
+            'algorithm="MD5"',
+        ]
+
+        if opaque := challenge_values.get("opaque"):
+            parts.append(f'opaque="{opaque}"')
+
+        if qop == "auth":
+            if nonce != self._nonce:
+                self._nonce = nonce
+                self._nonce_count = 0
+
+            self._nonce_count += 1
+            nc = f"{self._nonce_count:08x}"
+            cnonce = secrets.token_hex(8)
+            response = hashlib.md5(
+                f"{ha1}:{nonce}:{nc}:{cnonce}:{qop}:{ha2}".encode()
+            ).hexdigest()
+            parts.extend(
+                [
+                    f'response="{response}"',
+                    f"qop={qop}",
+                    f"nc={nc}",
+                    f'cnonce="{cnonce}"',
+                ]
+            )
+        else:
+            response = hashlib.md5(f"{ha1}:{nonce}:{ha2}".encode()).hexdigest()
+            parts.append(f'response="{response}"')
+
+        return f"Digest {', '.join(parts)}"
+
+    def _digest_uri(self, request_url: str) -> str:
+        """Return path + query request-target URI for digest signing.
+
+        Args:
+            request_url: Full request URL.
+
+        Returns:
+            Path and query string for digest signature.
+
+        """
+        split_result = urlsplit(request_url)
+        if split_result.query:
+            return f"{split_result.path}?{split_result.query}"
+        return split_result.path
+
+    async def perform_request(
+        self,
+        session: Any,
+        method: str,
+        url: str,
+        request_data: bytes | dict[str, str] | None,
+        headers: dict[str, str] | None,
+        params: dict[str, str] | None,
+    ) -> tuple[int, dict[str, str], bytes]:
+        """Execute aiohttp request with digest auth handling.
+
+        Args:
+            session: aiohttp ClientSession.
+            method: HTTP method.
+            url: Request URL.
+            request_data: Request body (bytes or form data).
+            headers: Request headers.
+            params: Query parameters.
+
+        Returns:
+            Tuple of (status_code, response_headers, response_content).
+
+        """
+        request_url, request_params = self.request_target(url, params, True)
+        request_headers = dict(headers) if headers is not None else {}
+
+        # First attempt without auth to get challenge
+        async with session.request(
+            method,
+            request_url,
+            data=request_data,
+            headers=request_headers,
+            params=request_params,
+            auth=None,
+            timeout=TIME_OUT,
+        ) as response:
+            response_content = await response.read()
+            response_headers = dict(response.headers)
+            if response.status != 401:
+                return response.status, response_headers, response_content
+
+            digest_challenge = self.extract_challenge(response.headers)
+            if digest_challenge is None:
+                return response.status, response_headers, response_content
+
+        # Build digest auth and retry
+        digest_authorization = self.build_authorization(
+            method=method,
+            request_url=request_url,
+            digest_challenge=digest_challenge,
+        )
+        if digest_authorization is None:
+            return 401, {}, b""
+
+        retry_headers = dict(request_headers)
+        retry_headers["Authorization"] = digest_authorization
+
+        async with session.request(
+            method,
+            request_url,
+            data=request_data,
+            headers=retry_headers,
+            params=request_params,
+            auth=None,
+            timeout=TIME_OUT,
+        ) as response:
+            response_content = await response.read()
+            return response.status, dict(response.headers), response_content

{axis-68 → axis-69}/axis/interfaces/vapix.py

@@ -12,6 +12,7 @@ import httpx
 from ..errors import RequestError, raise_error
 from ..models.configuration import AuthScheme
 from ..models.pwdgrp_cgi import SecondaryGroup
+from .aiohttp_digest import AiohttpDigestAuth
 from .api_discovery import ApiDiscoveryHandler
 from .api_handler import ApiHandler, HandlerGroup
 from .applications import ApplicationsHandler
@@ -56,6 +57,7 @@ class Vapix:
         self.device = device
         self._http_client = self._client_name()
         self._aiohttp_digest_middleware: Any | None = None
+        self._aiohttp_digest_auth = AiohttpDigestAuth(device)
 
         if self._http_client == "aiohttp":
             if device.config.auth_scheme == AuthScheme.BASIC:
@@ -445,6 +447,16 @@ class Vapix:
             content if content is not None else data
         )
         session = self._aiohttp_session()
+
+        if (
+            self._http_client == "aiohttp"
+            and not self._aiohttp_auth()
+            and self.device.config.auth_scheme != AuthScheme.BASIC
+        ):
+            return await self._aiohttp_digest_auth.perform_request(
+                session, method, url, request_data, headers, params
+            )
+
         request_kwargs: dict[str, Any] = {
             "data": request_data,
             "headers": headers,

{axis-68 → axis-69}/axis/models/api_discovery.py

@@ -18,16 +18,22 @@ LOGGER = logging.getLogger(__name__)
 class ApiId(enum.StrEnum):
     """The API discovery ID."""
 
+    AIR_QUALITY = "airquality"
     ANALYTICS_METADATA_CONFIG = "analytics-metadata-config"
     API_DISCOVERY = "api-discovery"
+    APPLICATION = "application"
     AUDIO_ANALYTICS = "audio-analytics"
     AUDIO_DEVICE_CONTROL = "audio-device-control"
     AUDIO_MIXER = "audio-mixer"
     AUDIO_STREAMING_CAPABILITIES = "audio-streaming-capabilities"
+    AUDIT_LOG = "audit-log"
     BASIC_DEVICE_INFO = "basic-device-info"
     CAPTURE_MODE = "capture-mode"
     CUSTOM_HTTP_HEADER = "customhttpheader"
     CUSTOM_FIRMWARE_CERTIFICATE = "custom-firmware-certificate"
+    DAY_NIGHT = "daynight"
+    DEVICE_CONFIG = "device-config"
+    DEVICE_SELF_TEST = "device-self-test"
     DISK_MANAGEMENT = "disk-management"
     DISK_NETWORK_SHARE = "disk-network-share"
     DISK_PROPERTIES = "disk-properties"
@@ -40,6 +46,7 @@ class ApiId(enum.StrEnum):
     IMAGE_SIZE = "image-size"
     IO_PORT_MANAGEMENT = "io-port-management"
     LIGHT_CONTROL = "light-control"
+    MEDIA_CGI = "media-cgi"
     MEDIA_CLIP = "mediaclip"
     MDNS_SD = "mdnssd"
     MQTT_CLIENT = "mqtt-client"
@@ -48,10 +55,12 @@ class ApiId(enum.StrEnum):
     NTP = "ntp"
     OAK = "oak"
     ON_SCREEN_CONTROLS = "onscreencontrols"
+    OPTICS_CONTROL = "optics-control"
     OVERLAY_IMAGE = "overlayimage"
     PACKAGE_MANAGER = "packagemanager"
     PARAM_CGI = "param-cgi"
     PIR_SENSOR_CONFIGURATION = "pir-sensor-configuration"
+    POWER_SETTINGS = "power-settings"
     PRIVACY_MASK = "privacy-mask"
     PTZ_CONTROL = "ptz-control"
     RECORDING = "recording"
@@ -61,17 +70,23 @@ class ApiId(enum.StrEnum):
     REMOTE_SERVICE = "remoteservice"
     REMOTE_SYSLOG = "remote-syslog"
     RTSP_OVER_WEBSOCKET = "rtsp-over-websocket"
+    SERIAL_PORT = "serial-port"
     SHUTTERGAIN_CGI = "shuttergain-cgi"
     SIGNED_VIDEO = "signed-video"
     SIP = "sip"
     SSH = "ssh"
+    STRAIGHTEN_IMAGE = "straightenimage"
     STREAM_PROFILES = "stream-profiles"
+    STREAM_STATUS = "streamstatus"
+    SUPERVISED_IO = "supervised-io"
     SYSTEM_READY = "systemready"
     TEMPERATURE_CONTROL = "temperaturecontrol"
     TIME_SERVICE = "time-service"
     UPNP = "upnp"
     USER_MANAGEMENT = "user-management"
+    VIDEO_STREAMING_INDICATOR = "video-streaming-indicator"
     VIEW_AREA = "view-area"
+    WIDGET_OVERLAY = "widget-overlay"
     ZIP_STREAM = "zipstream"
 
     UNKNOWN = "unknown"

{axis-68 → axis-69}/axis.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: axis
-Version: 68
+Version: 69
 Summary: A Python library for communicating with devices from Axis Communications
 Author-email: Robert Svensson <Kane610@users.noreply.github.com>
 License: MIT
@@ -27,19 +27,19 @@ Provides-Extra: requirements
 Requires-Dist: aiohttp==3.13.5; extra == "requirements"
 Requires-Dist: httpx==0.28.1; extra == "requirements"
 Requires-Dist: orjson==3.11.8; extra == "requirements"
-Requires-Dist: packaging==26.0; extra == "requirements"
+Requires-Dist: packaging==26.2; extra == "requirements"
 Requires-Dist: xmltodict==1.0.4; extra == "requirements"
 Provides-Extra: requirements-test
-Requires-Dist: mypy==1.20.0; extra == "requirements-test"
-Requires-Dist: pytest==9.0.2; extra == "requirements-test"
+Requires-Dist: mypy==1.20.2; extra == "requirements-test"
+Requires-Dist: pytest==9.0.3; extra == "requirements-test"
 Requires-Dist: pytest-aiohttp==1.1.0; extra == "requirements-test"
 Requires-Dist: pytest-asyncio==1.3.0; extra == "requirements-test"
 Requires-Dist: pytest-cov==7.1.0; extra == "requirements-test"
-Requires-Dist: respx==0.22.0; extra == "requirements-test"
-Requires-Dist: ruff==0.15.9; extra == "requirements-test"
-Requires-Dist: types-xmltodict==v1.0.1.20260113; extra == "requirements-test"
+Requires-Dist: respx==0.23.1; extra == "requirements-test"
+Requires-Dist: ruff==0.15.12; extra == "requirements-test"
+Requires-Dist: types-xmltodict==v1.0.1.20260408; extra == "requirements-test"
 Provides-Extra: requirements-dev
-Requires-Dist: pre-commit==4.5.1; extra == "requirements-dev"
+Requires-Dist: pre-commit==4.6.0; extra == "requirements-dev"
 Dynamic: license-file
 
 # axis

{axis-68 → axis-69}/axis.egg-info/SOURCES.txt

@@ -17,6 +17,7 @@ axis.egg-info/entry_points.txt
 axis.egg-info/requires.txt
 axis.egg-info/top_level.txt
 axis/interfaces/__init__.py
+axis/interfaces/aiohttp_digest.py
 axis/interfaces/api_discovery.py
 axis/interfaces/api_handler.py
 axis/interfaces/basic_device_info.py

{axis-68 → axis-69}/axis.egg-info/requires.txt

@@ -9,18 +9,18 @@ xmltodict>=0.13.0
 aiohttp==3.13.5
 httpx==0.28.1
 orjson==3.11.8
-packaging==26.0
+packaging==26.2
 xmltodict==1.0.4
 
 [requirements-dev]
-pre-commit==4.5.1
+pre-commit==4.6.0
 
 [requirements-test]
-mypy==1.20.0
-pytest==9.0.2
+mypy==1.20.2
+pytest==9.0.3
 pytest-aiohttp==1.1.0
 pytest-asyncio==1.3.0
 pytest-cov==7.1.0
-respx==0.22.0
-ruff==0.15.9
-types-xmltodict==v1.0.1.20260113
+respx==0.23.1
+ruff==0.15.12
+types-xmltodict==v1.0.1.20260408

{axis-68 → axis-69}/pyproject.toml

@@ -1,10 +1,10 @@
 [build-system]
-requires = ["setuptools==82.0.1", "wheel==0.46.3"]
+requires = ["setuptools==82.0.1", "wheel==0.47.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name        = "axis"
-version     = "68"
+version     = "69"
 license     = {text = "MIT"}
 description = "A Python library for communicating with devices from Axis Communications"
 readme      = "README.md"
@@ -33,21 +33,21 @@ requirements = [
     "aiohttp==3.13.5",
     "httpx==0.28.1",
     "orjson==3.11.8",
-    "packaging==26.0",
+    "packaging==26.2",
     "xmltodict==1.0.4",
 ]
 requirements-test = [
-    "mypy==1.20.0",
-    "pytest==9.0.2",
+    "mypy==1.20.2",
+    "pytest==9.0.3",
     "pytest-aiohttp==1.1.0",
     "pytest-asyncio==1.3.0",
     "pytest-cov==7.1.0",
-    "respx==0.22.0",
-    "ruff==0.15.9",
-    "types-xmltodict==v1.0.1.20260113",
+    "respx==0.23.1",
+    "ruff==0.15.12",
+    "types-xmltodict==v1.0.1.20260408",
 ]
 requirements-dev = [
-    "pre-commit==4.5.1"
+    "pre-commit==4.6.0"
 ]
 
 [project.urls]