Wrap broken header tuple item operations

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

Author: cursoragent

hyperbrowser/header_utils.py

@@ -19,9 +19,16 @@ def _read_header_items(
         raise HyperbrowserError(mapping_error_message, original_error=exc) from exc
     normalized_items: list[tuple[object, object]] = []
     for item in raw_items:
-        if not isinstance(item, tuple) or len(item) != 2:
-            raise HyperbrowserError(mapping_error_message)
-        normalized_items.append((item[0], item[1]))
+        try:
+            if not isinstance(item, tuple):
+                raise HyperbrowserError(mapping_error_message)
+            if len(item) != 2:
+                raise HyperbrowserError(mapping_error_message)
+            normalized_items.append((item[0], item[1]))
+        except HyperbrowserError:
+            raise
+        except Exception as exc:
+            raise HyperbrowserError(mapping_error_message, original_error=exc) from exc
     return normalized_items
 
 

tests/test_header_utils.py

@@ -18,6 +18,24 @@ def items(self):
         return [("X-Trace-Id", "trace-1", "extra-item")]
 
 
+class _BrokenLenTuple(tuple):
+    def __len__(self):
+        raise RuntimeError("broken tuple length")
+
+
+class _BrokenIndexTuple(tuple):
+    def __getitem__(self, index):
+        raise RuntimeError("broken tuple indexing")
+
+
+class _BrokenTupleItemMapping(dict):
+    def __init__(self, broken_item):
+        self._broken_item = broken_item
+
+    def items(self):
+        return [self._broken_item]
+
+
 def test_normalize_headers_trims_header_names():
     headers = normalize_headers(
         {"  X-Correlation-Id  ": "abc123"},
@@ -231,3 +249,28 @@ def test_merge_headers_rejects_malformed_override_mapping_items():
             _MalformedHeaderItemsMapping(),
             mapping_error_message="headers must be a mapping of string pairs",
         )
+
+
+def test_normalize_headers_wraps_broken_tuple_length_errors():
+    with pytest.raises(
+        HyperbrowserError, match="headers must be a mapping of string pairs"
+    ) as exc_info:
+        normalize_headers(
+            _BrokenTupleItemMapping(_BrokenLenTuple(("X-Trace-Id", "trace-1"))),
+            mapping_error_message="headers must be a mapping of string pairs",
+        )
+
+    assert exc_info.value.original_error is not None
+
+
+def test_merge_headers_wraps_broken_tuple_index_errors():
+    with pytest.raises(
+        HyperbrowserError, match="headers must be a mapping of string pairs"
+    ) as exc_info:
+        merge_headers(
+            {"X-Trace-Id": "trace-1"},
+            _BrokenTupleItemMapping(_BrokenIndexTuple(("X-Trace-Id", "trace-2"))),
+            mapping_error_message="headers must be a mapping of string pairs",
+        )
+
+    assert exc_info.value.original_error is not None