Harden operation-name builder against non-string components

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

Author: cursoragent

hyperbrowser/client/polling.py

@@ -29,6 +29,15 @@ class _NonRetryablePollingError(HyperbrowserError):
     pass
 
 
+def _coerce_operation_name_component(value: object, *, fallback: str) -> str:
+    if isinstance(value, str):
+        return value
+    try:
+        return str(value)
+    except Exception:
+        return fallback
+
+
 def _normalize_non_negative_real(value: float, *, field_name: str) -> float:
     is_supported_numeric_type = isinstance(value, Real) or isinstance(value, Decimal)
     if isinstance(value, bool) or not is_supported_numeric_type:
@@ -68,24 +77,31 @@ def _validate_operation_name(operation_name: str) -> None:
 
 
 def build_operation_name(prefix: str, identifier: str) -> str:
-    normalized_identifier = identifier.strip()
+    normalized_prefix = _coerce_operation_name_component(prefix, fallback="")
+    raw_identifier = _coerce_operation_name_component(identifier, fallback="unknown")
+    normalized_identifier = raw_identifier.strip()
     if not normalized_identifier:
         normalized_identifier = "unknown"
     normalized_identifier = "".join(
         "?" if ord(character) < 32 or ord(character) == 127 else character
         for character in normalized_identifier
     )
 
-    operation_name = f"{prefix}{normalized_identifier}"
+    operation_name = f"{normalized_prefix}{normalized_identifier}"
     if len(operation_name) <= _MAX_OPERATION_NAME_LENGTH:
         return operation_name
     available_identifier_length = (
-        _MAX_OPERATION_NAME_LENGTH - len(prefix) - len(_TRUNCATED_OPERATION_NAME_SUFFIX)
+        _MAX_OPERATION_NAME_LENGTH
+        - len(normalized_prefix)
+        - len(_TRUNCATED_OPERATION_NAME_SUFFIX)
     )
     if available_identifier_length > 0:
         truncated_identifier = normalized_identifier[:available_identifier_length]
-        return f"{prefix}{truncated_identifier}{_TRUNCATED_OPERATION_NAME_SUFFIX}"
-    return prefix[:_MAX_OPERATION_NAME_LENGTH]
+        return (
+            f"{normalized_prefix}{truncated_identifier}"
+            f"{_TRUNCATED_OPERATION_NAME_SUFFIX}"
+        )
+    return normalized_prefix[:_MAX_OPERATION_NAME_LENGTH]
 
 
 def build_fetch_operation_name(operation_name: str) -> str:

tests/test_polling.py

@@ -83,6 +83,41 @@ def test_build_operation_name_uses_unknown_for_blank_identifier():
     assert operation_name == "crawl job unknown"
 
 
+def test_build_operation_name_supports_non_string_identifier_values():
+    operation_name = build_operation_name(
+        "crawl job ",
+        123,  # type: ignore[arg-type]
+    )
+
+    assert operation_name == "crawl job 123"
+
+
+def test_build_operation_name_falls_back_for_unstringifiable_identifiers():
+    class _BadIdentifier:
+        def __str__(self) -> str:
+            raise RuntimeError("cannot stringify")
+
+    operation_name = build_operation_name(
+        "crawl job ",
+        _BadIdentifier(),  # type: ignore[arg-type]
+    )
+
+    assert operation_name == "crawl job unknown"
+
+
+def test_build_operation_name_falls_back_for_unstringifiable_prefixes():
+    class _BadPrefix:
+        def __str__(self) -> str:
+            raise RuntimeError("cannot stringify")
+
+    operation_name = build_operation_name(
+        _BadPrefix(),  # type: ignore[arg-type]
+        "identifier",
+    )
+
+    assert operation_name == "identifier"
+
+
 def test_poll_until_terminal_status_allows_immediate_terminal_on_zero_max_wait():
     status = poll_until_terminal_status(
         operation_name="sync immediate zero wait",