fix: accept valid CM3000 status page with redirect markers

Author: itsDNNS

app/drivers/cm3000.py

@@ -197,17 +197,20 @@ def _ensure_status_page(html: str) -> None:
         if not html:
             raise RuntimeError("CM3000 returned an empty status page")
 
+        has_sys_info = _RE_SYS_INFO.search(html) is not None
+        has_channel_data = any(
+            regex.search(html) for regex in (_RE_DS_QAM, _RE_US_ATDMA, _RE_DS_OFDM, _RE_US_OFDMA)
+        )
+        if has_sys_info and has_channel_data:
+            return
+
         lower_html = html.lower()
         if any(marker in lower_html for marker in _LOGIN_MARKERS):
             raise RuntimeError(
                 "CM3000 authentication failed: modem returned a login page instead "
                 "of DocsisStatus.htm after authentication"
             )
 
-        has_sys_info = _RE_SYS_INFO.search(html) is not None
-        has_channel_data = any(
-            regex.search(html) for regex in (_RE_DS_QAM, _RE_US_ATDMA, _RE_DS_OFDM, _RE_US_OFDMA)
-        )
         if not has_sys_info or not has_channel_data:
             raise RuntimeError(
                 "CM3000 status page did not contain the expected DOCSIS data blocks"

tests/test_cm3000_driver.py

@@ -273,6 +273,21 @@ def test_login_rejects_login_page_false_positive(self, driver):
             with pytest.raises(RuntimeError, match="returned a login page"):
                 driver.login()
 
+    def test_login_accepts_status_page_even_with_login_markers(self, driver):
+        mock_response = MagicMock()
+        mock_response.raise_for_status = MagicMock()
+        mock_response.text = """
+            <script>
+            if (sessionStorage.getItem('PrivateKey') === null) {
+                window.location.replace('../Login.htm');
+            }
+            </script>
+        """ + STATUS_HTML
+
+        with patch.object(driver._session, "get", return_value=mock_response):
+            driver.login()
+            assert driver._status_html == mock_response.text
+
 
 # -- DOCSIS data: structure --