finalize session with GET /index.cgi after login following HAR

Author: CoMPaTech

airos/base.py

@@ -275,6 +275,21 @@ async def _request_json(
             request_headers["Sec-Fetch-Dest"] = "empty"
             request_headers["Sec-Fetch-Mode"] = "cors"
             request_headers["Sec-Fetch-Site"] = "same-origin"
+        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 (
@@ -304,9 +319,14 @@ async def _request_json(
                 _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 url != self._login_urls["v6_login"]:
+                if not url.startswith(self._login_urls["v6_login"]):
                     self.api_version = 6
                     response.raise_for_status()
 
@@ -416,6 +436,21 @@ async def login(self) -> None:
             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:

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()
 
@@ -87,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"
@@ -114,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
@@ -136,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()