Explicitly reject string-subclass request context values

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

Author: cursoragent

hyperbrowser/transport/error_utils.py

@@ -100,7 +100,10 @@ def _normalize_request_method(method: Any) -> str:
             raw_method = memoryview(raw_method).tobytes().decode("ascii")
         except (TypeError, ValueError, UnicodeDecodeError):
             return "UNKNOWN"
-    elif not isinstance(raw_method, str):
+    elif isinstance(raw_method, str):
+        if type(raw_method) is not str:
+            return "UNKNOWN"
+    elif type(raw_method) is not str:
         try:
             raw_method = str(raw_method)
         except Exception:
@@ -145,7 +148,10 @@ def _normalize_request_url(url: Any) -> str:
             raw_url = memoryview(raw_url).tobytes().decode("utf-8")
         except (TypeError, ValueError, UnicodeDecodeError):
             return "unknown URL"
-    elif not isinstance(raw_url, str):
+    elif isinstance(raw_url, str):
+        if type(raw_url) is not str:
+            return "unknown URL"
+    elif type(raw_url) is not str:
         try:
             raw_url = str(raw_url)
         except Exception:

tests/test_transport_error_utils.py

@@ -55,6 +55,14 @@ def __str__(self) -> str:
     url = "https://example.com/method-like"
 
 
+class _StringSubclassMethodRequest:
+    class _MethodSubclass(str):
+        pass
+
+    method = _MethodSubclass("get")
+    url = "https://example.com/subclass-method"
+
+
 class _WhitespaceInsideUrlRequest:
     method = "GET"
     url = "https://example.com/with space"
@@ -65,6 +73,14 @@ class _BytesUrlContextRequest:
     url = b"https://example.com/from-bytes"
 
 
+class _StringSubclassUrlRequest:
+    class _UrlSubclass(str):
+        pass
+
+    method = "GET"
+    url = _UrlSubclass("https://example.com/subclass-url")
+
+
 class _InvalidBytesUrlContextRequest:
     method = "GET"
     url = b"\xff\xfe"
@@ -118,6 +134,12 @@ def request(self):  # type: ignore[override]
         return _MethodLikeRequest()
 
 
+class _RequestErrorWithStringSubclassMethodContext(httpx.RequestError):
+    @property
+    def request(self):  # type: ignore[override]
+        return _StringSubclassMethodRequest()
+
+
 class _RequestErrorWithWhitespaceInsideUrl(httpx.RequestError):
     @property
     def request(self):  # type: ignore[override]
@@ -130,6 +152,12 @@ def request(self):  # type: ignore[override]
         return _BytesUrlContextRequest()
 
 
+class _RequestErrorWithStringSubclassUrlContext(httpx.RequestError):
+    @property
+    def request(self):  # type: ignore[override]
+        return _StringSubclassUrlRequest()
+
+
 class _RequestErrorWithInvalidBytesUrlContext(httpx.RequestError):
     @property
     def request(self):  # type: ignore[override]
@@ -403,6 +431,15 @@ def test_extract_request_error_context_accepts_stringifiable_method_values():
     assert url == "https://example.com/method-like"
 
 
+def test_extract_request_error_context_rejects_string_subclass_method_values():
+    method, url = extract_request_error_context(
+        _RequestErrorWithStringSubclassMethodContext("network down")
+    )
+
+    assert method == "UNKNOWN"
+    assert url == "https://example.com/subclass-method"
+
+
 def test_extract_request_error_context_rejects_urls_with_whitespace():
     method, url = extract_request_error_context(
         _RequestErrorWithWhitespaceInsideUrl("network down")
@@ -421,6 +458,15 @@ def test_extract_request_error_context_supports_bytes_url_values():
     assert url == "https://example.com/from-bytes"
 
 
+def test_extract_request_error_context_rejects_string_subclass_url_values():
+    method, url = extract_request_error_context(
+        _RequestErrorWithStringSubclassUrlContext("network down")
+    )
+
+    assert method == "GET"
+    assert url == "unknown URL"
+
+
 def test_extract_request_error_context_rejects_invalid_bytes_url_values():
     method, url = extract_request_error_context(
         _RequestErrorWithInvalidBytesUrlContext("network down")