Improve extension parser key and value diagnostics

Co-authored-by: Shri Sukhani <shrisukhani@users.noreply.github.com>

Author: cursoragent

hyperbrowser/client/managers/extension_utils.py

@@ -106,14 +106,33 @@ def parse_extension_list_response_data(response_data: Any) -> List[ExtensionResp
                 f"{index} but got {_get_type_name(extension)}"
             )
         try:
-            extension_payload = dict(extension)
+            extension_keys = list(extension.keys())
         except HyperbrowserError:
             raise
         except Exception as exc:
             raise HyperbrowserError(
                 f"Failed to read extension object at index {index}",
                 original_error=exc,
             ) from exc
+        for key in extension_keys:
+            if isinstance(key, str):
+                continue
+            raise HyperbrowserError(
+                f"Expected extension object keys to be strings at index {index}"
+            )
+        extension_payload: dict[str, object] = {}
+        for key in extension_keys:
+            try:
+                extension_payload[key] = extension[key]
+            except HyperbrowserError:
+                raise
+            except Exception as exc:
+                key_display = _format_key_display(key)
+                raise HyperbrowserError(
+                    "Failed to read extension object value for key "
+                    f"'{key_display}' at index {index}",
+                    original_error=exc,
+                ) from exc
         try:
             parsed_extensions.append(ExtensionResponse(**extension_payload))
         except HyperbrowserError:

tests/test_extension_utils.py

@@ -287,3 +287,79 @@ def __getitem__(self, key: str) -> object:
         parse_extension_list_response_data({"extensions": [_BrokenExtensionMapping()]})
 
     assert exc_info.value.original_error is None
+
+
+def test_parse_extension_list_response_data_rejects_non_string_extension_keys():
+    with pytest.raises(
+        HyperbrowserError,
+        match="Expected extension object keys to be strings at index 0",
+    ):
+        parse_extension_list_response_data(
+            {
+                "extensions": [
+                    {1: "invalid-key"},  # type: ignore[dict-item]
+                ]
+            }
+        )
+
+
+def test_parse_extension_list_response_data_wraps_extension_value_read_failures():
+    class _BrokenValueLookupMapping(Mapping[str, object]):
+        def __iter__(self) -> Iterator[str]:
+            yield "name"
+
+        def __len__(self) -> int:
+            return 1
+
+        def __getitem__(self, key: str) -> object:
+            _ = key
+            raise RuntimeError("cannot read extension value")
+
+    with pytest.raises(
+        HyperbrowserError,
+        match="Failed to read extension object value for key 'name' at index 0",
+    ) as exc_info:
+        parse_extension_list_response_data({"extensions": [_BrokenValueLookupMapping()]})
+
+    assert exc_info.value.original_error is not None
+
+
+def test_parse_extension_list_response_data_sanitizes_extension_value_read_keys():
+    class _BrokenValueLookupMapping(Mapping[str, object]):
+        def __iter__(self) -> Iterator[str]:
+            yield "bad\tkey"
+
+        def __len__(self) -> int:
+            return 1
+
+        def __getitem__(self, key: str) -> object:
+            _ = key
+            raise RuntimeError("cannot read extension value")
+
+    with pytest.raises(
+        HyperbrowserError,
+        match="Failed to read extension object value for key 'bad\\?key' at index 0",
+    ) as exc_info:
+        parse_extension_list_response_data({"extensions": [_BrokenValueLookupMapping()]})
+
+    assert exc_info.value.original_error is not None
+
+
+def test_parse_extension_list_response_data_preserves_hyperbrowser_value_read_errors():
+    class _BrokenValueLookupMapping(Mapping[str, object]):
+        def __iter__(self) -> Iterator[str]:
+            yield "name"
+
+        def __len__(self) -> int:
+            return 1
+
+        def __getitem__(self, key: str) -> object:
+            _ = key
+            raise HyperbrowserError("custom extension value read failure")
+
+    with pytest.raises(
+        HyperbrowserError, match="custom extension value read failure"
+    ) as exc_info:
+        parse_extension_list_response_data({"extensions": [_BrokenValueLookupMapping()]})
+
+    assert exc_info.value.original_error is None