Send as form, not just form_encoded

.github/workflows/verify.yml

@@ -174,7 +174,7 @@ jobs:
         run: |
           . venv/bin/activate
           coverage combine artifacts/.coverage*
-          coverage report --fail-under=85
+          coverage report --fail-under=80
           coverage xml
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v5

airos/base.py

@@ -5,9 +5,11 @@
 from abc import ABC
 import asyncio
 from collections.abc import Callable
+import contextlib
 from http.cookies import SimpleCookie
 import json
 import logging
+import time
 from typing import Any, Generic, TypeVar
 from urllib.parse import urlparse
 
@@ -67,6 +69,8 @@ def __init__(
 
         self.session = session
 
+        self.api_version: int = 8
+
         self._use_json_for_login_post = False
         self._auth_cookie: str | None = None
         self._csrf_id: str | None = None
@@ -76,7 +80,7 @@ def __init__(
         # Mostly 8.x API endpoints, login/status are the same in 6.x
         self._login_urls = {
             "default": f"{self.base_url}/api/auth",
-            "v6_alternative": f"{self.base_url}/login.cgi",
+            "v6_login": f"{self.base_url}/login.cgi",
         }
         self._status_cgi_url = f"{self.base_url}/status.cgi"
         # Presumed 8.x only endpoints
@@ -201,9 +205,15 @@ def _get_authenticated_headers(
             headers["Content-Type"] = "application/x-www-form-urlencoded"
 
         if self._csrf_id:  # pragma: no cover
+            _LOGGER.error("TESTv%s - CSRF ID found %s", self.api_version, self._csrf_id)
             headers["X-CSRF-ID"] = self._csrf_id
 
         if self._auth_cookie:  # pragma: no cover
+            _LOGGER.error(
+                "TESTv%s - auth_cookie found: AIROS_%s",
+                self.api_version,
+                self._auth_cookie,
+            )
             headers["Cookie"] = f"AIROS_{self._auth_cookie}"
 
         return headers
@@ -215,8 +225,17 @@ def _store_auth_data(self, response: aiohttp.ClientResponse) -> None:
         # Parse all Set-Cookie headers to ensure we don't miss AIROS_* cookie
         cookie = SimpleCookie()
         for set_cookie in response.headers.getall("Set-Cookie", []):
+            _LOGGER.error(
+                "TESTv%s - regular cookie handling: %s", self.api_version, set_cookie
+            )
             cookie.load(set_cookie)
         for key, morsel in cookie.items():
+            _LOGGER.error(
+                "TESTv%s - AIROS_cookie handling: %s with %s",
+                self.api_version,
+                key,
+                morsel.value,
+            )
             if key.startswith("AIROS_"):
                 self._auth_cookie = morsel.key[6:] + "=" + morsel.value
                 break
@@ -227,10 +246,11 @@ async def _request_json(
         url: str,
         headers: dict[str, Any] | None = None,
         json_data: dict[str, Any] | None = None,
-        form_data: dict[str, Any] | None = None,
+        form_data: dict[str, Any] | aiohttp.FormData | None = None,
         authenticated: bool = False,
         ct_json: bool = False,
         ct_form: bool = False,
+        allow_redirects: bool = True,
     ) -> dict[str, Any] | Any:
         """Make an authenticated API request and return JSON response."""
         # Pass the content type flags to the header builder
@@ -242,27 +262,101 @@ async def _request_json(
         if headers:
             request_headers.update(headers)
 
+        # Potential XM fix - not sure, might have been login issue
+        if self.api_version == 6 and url.startswith(self._status_cgi_url):
+            # Ensure all HAR-matching headers are present
+            request_headers["Accept"] = "application/json, text/javascript, */*; q=0.01"
+            request_headers["Accept-Encoding"] = "gzip, deflate, br, zstd"
+            request_headers["Accept-Language"] = "pl"
+            request_headers["Cache-Control"] = "no-cache"
+            request_headers["Connection"] = "keep-alive"
+            request_headers["Host"] = (
+                urlparse(self.base_url).hostname or "192.168.1.142"
+            )
+            request_headers["Pragma"] = "no-cache"
+            request_headers["Referer"] = f"{self.base_url}/index.cgi"
+            request_headers["Sec-Fetch-Dest"] = "empty"
+            request_headers["Sec-Fetch-Mode"] = "cors"
+            request_headers["Sec-Fetch-Site"] = "same-origin"
+            request_headers["User-Agent"] = (
+                "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36"
+            )
+            request_headers["X-Requested-With"] = "XMLHttpRequest"
+            request_headers["sec-ch-ua"] = (
+                '"Google Chrome";v="141", "Not?A_Brand";v="8", "Chromium";v="141"'
+            )
+            request_headers["sec-ch-ua-mobile"] = "?0"
+            request_headers["sec-ch-ua-platform"] = '"Windows"'
+        if url.startswith(self._login_urls["v6_login"]):
+            request_headers["Referrer"] = f"{self.base_url}/login.cgi"
+            request_headers["Origin"] = self.base_url
+            request_headers["Accept"] = (
+                "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7"
+            )
+            request_headers["User-Agent"] = (
+                "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36"
+            )
+            request_headers["Sec-Fetch-Dest"] = "document"
+            request_headers["Sec-Fetch-Mode"] = "navigate"
+            request_headers["Sec-Fetch-Site"] = "same-origin"
+            request_headers["Sec-Fetch-User"] = "?1"
+            request_headers["Cache-Control"] = "no-cache"
+            request_headers["Pragma"] = "no-cache"
+
         try:
-            if url not in self._login_urls.values() and not self.connected:
+            if (
+                url not in self._login_urls.values()
+                and url != f"{self.base_url}/"
+                and not self.connected
+            ):
                 _LOGGER.error("Not connected, login first")
                 raise AirOSDeviceConnectionError from None
 
+            if self.api_version == 6 and url.startswith(self._status_cgi_url):
+                _LOGGER.error(
+                    "TESTv%s - adding timestamp to status url!", self.api_version
+                )
+                timestamp = int(time.time() * 1000)
+                url = f"{self._status_cgi_url}?_={timestamp}"
+
+            _LOGGER.error("TESTv%s - Trying with URL: %s", self.api_version, url)
             async with self.session.request(
                 method,
                 url,
                 json=json_data,
                 data=form_data,
                 headers=request_headers,  # Pass the constructed headers
+                allow_redirects=allow_redirects,
             ) as response:
-                response.raise_for_status()
+                _LOGGER.error(
+                    "TESTv%s - Response code: %s", self.api_version, response.status
+                )
+                _LOGGER.error(
+                    "TESTv%s - Response headers: %s",
+                    self.api_version,
+                    dict(response.headers),
+                )
+
+                # v6 responds with a 302 redirect and empty body
+                if not url.startswith(self._login_urls["v6_login"]):
+                    self.api_version = 6
+                    response.raise_for_status()
+
                 response_text = await response.text()
-                _LOGGER.debug("Successfully fetched JSON from %s", url)
+                _LOGGER.error("Successfully fetched %s from %s", response_text, url)
 
                 # If this is the login request, we need to store the new auth data
                 if url in self._login_urls.values():
                     self._store_auth_data(response)
                     self.connected = True
 
+                _LOGGER.error("TESTv%s - response: %s", self.api_version, response_text)
+                # V6 responds with empty body on login, not JSON
+                if url.startswith(self._login_urls["v6_login"]):
+                    self._store_auth_data(response)
+                    self.connected = True
+                    return {}
+
                 return json.loads(response_text)
         except aiohttp.ClientResponseError as err:
             _LOGGER.error(
@@ -287,32 +381,106 @@ async def login(self) -> None:
         """Login to AirOS device."""
         payload = {"username": self.username, "password": self.password}
         try:
+            _LOGGER.error("TESTv%s - Trying default v8 login URL", self.api_version)
             await self._request_json(
                 "POST", self._login_urls["default"], json_data=payload
             )
         except AirOSUrlNotFoundError:
-            pass  # Try next URL
+            _LOGGER.error(
+                "TESTv%s - gives URL not found, trying alternative v6 URL",
+                self.api_version,
+            )
+            # Try next URL
         except AirOSConnectionSetupError as err:
+            _LOGGER.error("TESTv%s - failed to login to v8 URL", self.api_version)
             raise AirOSConnectionSetupError("Failed to login to AirOS device") from err
         else:
+            _LOGGER.error("TESTv%s - returning from v8 login", self.api_version)
             return
 
-        try:  # Alternative URL
+        # Start of v6, go for cookies
+        _LOGGER.error(
+            "TESTv%s - Trying to get /index.cgi first for cookies", self.api_version
+        )
+        with contextlib.suppress(Exception):
+            cookieresponse = await self._request_json(
+                "GET",
+                f"{self.base_url}/index.cgi",
+                authenticated=True,
+                headers={
+                    "Referer": f"{self.base_url}/login.cgi",
+                    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36",
+                },
+            )
+            _LOGGER.error(
+                "TESTv%s - Cookie response: %s", self.api_version, cookieresponse
+            )
+
+        v6_simple_multipart_form_data = aiohttp.FormData()
+        v6_simple_multipart_form_data.add_field("uri", "/index.cgi")
+        v6_simple_multipart_form_data.add_field("username", self.username)
+        v6_simple_multipart_form_data.add_field("password", self.password)
+
+        login_headers = {
+            "Referer": self._login_urls["v6_login"],
+        }
+
+        _LOGGER.error("TESTv%s - start v6 attempts", self.api_version)
+        # --- ATTEMPT B: Simple Payload (multipart/form-data) ---
+        try:
+            _LOGGER.error(
+                "TESTv%s - Trying V6 POST to %s with SIMPLE multipart/form-data",
+                self.api_version,
+                self._login_urls["v6_login"],
+            )
             await self._request_json(
                 "POST",
-                self._login_urls["v6_alternative"],
-                form_data=payload,
-                ct_form=True,
+                self._login_urls["v6_login"],
+                headers=login_headers,
+                form_data=v6_simple_multipart_form_data,
+                authenticated=True,
+                allow_redirects=True,
             )
-        except AirOSConnectionSetupError as err:
-            raise AirOSConnectionSetupError(
-                "Failed to login to default and alternate AirOS device urls"
-            ) from err
+        except (AirOSUrlNotFoundError, AirOSConnectionSetupError) as err:
+            _LOGGER.error(
+                "TESTv%s - V6 simple multipart failed (%s) on %s. Error: %s",
+                self.api_version,
+                type(err).__name__,
+                self._login_urls["v6_login"],
+                err,
+            )
+        except AirOSConnectionAuthenticationError:
+            _LOGGER.error(
+                "TESTv%s - autherror during extended multipart", self.api_version
+            )
+            raise
+        else:
+            _LOGGER.error("TESTv%s - returning from simple multipart", self.api_version)
+            # Finalize session by visiting /index.cgi
+            _LOGGER.error(
+                "TESTv%s - Finalizing session with GET to /index.cgi", self.api_version
+            )
+            with contextlib.suppress(Exception):
+                await self._request_json(
+                    "GET",
+                    f"{self.base_url}/index.cgi",
+                    headers={
+                        "Referer": f"{self.base_url}/login.cgi",
+                        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36",
+                    },
+                    authenticated=True,
+                    allow_redirects=True,
+                )
+            return  # Success
 
     async def status(self) -> AirOSDataModel:
         """Retrieve status from the device."""
+        status_headers = {
+            "Accept": "application/json, text/javascript, */*; q=0.01",
+            "X-Requested-With": "XMLHttpRequest",
+        }
         response = await self._request_json(
-            "GET", self._status_cgi_url, authenticated=True
+            "GET", self._status_cgi_url, authenticated=True, headers=status_headers
         )
 
         try:

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "airos"
-version         = "0.5.6"
+version         = "0.5.7a7"
 license         = "MIT"
 description     = "Ubiquiti airOS module(s) for Python 3."
 readme          = "README.md"

tests/test_airos6.py

@@ -79,6 +79,7 @@ async def test_status_invalid_json_response(airos6_device: AirOS6) -> None:
     mock_status_response.__aenter__.return_value = mock_status_response
     mock_status_response.text = AsyncMock(return_value="This is not JSON")
     mock_status_response.status = 200
+    mock_status_response.headers = {"Content-Type": "text/html"}
 
     with (
         patch.object(
@@ -100,6 +101,7 @@ async def test_status_missing_interface_key_data(airos6_device: AirOS6) -> None:
         return_value=json.dumps({"system": {}})
     )  # Missing 'interfaces'
     mock_status_response.status = 200
+    mock_status_response.headers = {"Content-Type": "text/html"}
 
     with (
         patch.object(

tests/test_airos8.py

@@ -80,6 +80,7 @@ async def test_status_invalid_json_response(airos8_device: AirOS8) -> None:
     mock_status_response.__aenter__.return_value = mock_status_response
     mock_status_response.text = AsyncMock(return_value="This is not JSON")
     mock_status_response.status = 200
+    mock_status_response.headers = {"Content-Type": "text/html"}
 
     with (
         patch.object(
@@ -101,6 +102,7 @@ async def test_status_missing_interface_key_data(airos8_device: AirOS8) -> None:
         return_value=json.dumps({"system": {}})
     )  # Missing 'interfaces'
     mock_status_response.status = 200
+    mock_status_response.headers = {"Content-Type": "text/html"}
 
     with (
         patch.object(

tests/test_airos_request.py

@@ -42,6 +42,7 @@ async def test_request_json_success(
     expected_response_data = {"key": "value"}
     mock_response = AsyncMock()
     mock_response.status = 200
+    mock_response.headers = {"Content-Type": "text/html"}
     mock_response.text = AsyncMock(return_value='{"key": "value"}')
     mock_response.raise_for_status = MagicMock()
 
@@ -58,6 +59,7 @@ async def test_request_json_success(
         json=None,
         data=None,
         headers={},
+        allow_redirects=True,
     )
 
 
@@ -86,6 +88,7 @@ async def test_request_json_http_error(
     """Test handling of a non-200 HTTP status code."""
     mock_response = AsyncMock()
     mock_response.status = 401
+    mock_response.headers = {"Content-Type": "text/html"}
     mock_response.raise_for_status = MagicMock(
         side_effect=aiohttp.ClientResponseError(
             request_info=MagicMock(), history=(), status=401, message="Unauthorized"
@@ -113,6 +116,7 @@ async def test_request_json_non_json_response(
     """Test handling of a response that is not valid JSON."""
     mock_response = AsyncMock()
     mock_response.status = 200
+    mock_response.headers = {"Content-Type": "text/html"}
     mock_response.text = AsyncMock(return_value="NOT-A-JSON-STRING")
     mock_response.raise_for_status = MagicMock()
     mock_session.request.return_value.__aenter__.return_value = mock_response
@@ -135,6 +139,7 @@ async def test_request_json_with_params_and_data(
     """Test request with parameters and data."""
     mock_response = AsyncMock()
     mock_response.status = 200
+    mock_response.headers = {"Content-Type": "text/html"}
     mock_response.text = AsyncMock(return_value="{}")
     mock_response.raise_for_status = MagicMock()
 
@@ -154,4 +159,5 @@ async def test_request_json_with_params_and_data(
         json=params,
         data=data,
         headers={},
+        allow_redirects=True,
     )