Automate browser based workflows with AI
Python aiapiautomationbrowserbrowser-automationcomputergptllmplaywrightpowerautomatepuppeteerpythonrpaseleniumvisionworkflow
chore(security): timing-safe comparison for API-key and bearer-token auth (#5607)
Shuchang Zhengd12e773b9b5c
diff --git a/skyvern/cli/core/session_manager.py b/skyvern/cli/core/session_manager.pyindex 226f59082..396aa9add 100644--- a/skyvern/cli/core/session_manager.py+++ b/skyvern/cli/core/session_manager.py@@ -2,6 +2,7 @@ from __future__ import annotationsimport asyncioimport itertools+import secretsimport timefrom collections import dequefrom contextlib import asynccontextmanager@@ -147,6 +148,19 @@ def _api_key_hash(api_key: str | None) -> str | None:return hash_api_key_for_cache(api_key)+def _hashes_equal(a: str | None, b: str | None) -> bool:+ """Constant-time comparison of two API-key hashes (either may be None).++ Using ``==`` on secret-derived values leaks content byte-by-byte through+ response-time side channels. ``secrets.compare_digest`` avoids that; we+ wrap it so ``None`` on either side is handled without branching on+ contents.+ """+ if a is None or b is None:+ return a is b+ return secrets.compare_digest(a, b)++def _matches_current(current: SessionState,*,@@ -156,7 +170,7 @@ def _matches_current() -> bool:if current.browser is None or current.context is None:return False- if current.api_key_hash != _api_key_hash(get_active_api_key()):+ if not _hashes_equal(current.api_key_hash, _api_key_hash(get_active_api_key())):return Falseif session_id:@@ -202,7 +216,7 @@ async def resolve_browser(registered is not Noneand registered.browser is not Noneand registered.context is not None- and registered.api_key_hash == active_api_key_hash+ and _hashes_equal(registered.api_key_hash, active_api_key_hash)):_current_session.set(registered)return registered.browser, registered.contextdiff --git a/skyvern/cli/core/unified_server.py b/skyvern/cli/core/unified_server.pyindex bdb61576c..89f9f9cd2 100644--- a/skyvern/cli/core/unified_server.py+++ b/skyvern/cli/core/unified_server.py@@ -7,6 +7,7 @@ This server provides:from __future__ import annotations+import secretsfrom dataclasses import dataclassimport httpx@@ -40,7 +41,9 @@ class UnifiedServer:"""Check API key if configured."""if self.config.api_key:provided_key = request.headers.get("x-api-key")- if provided_key != self.config.api_key:+ # Use secrets.compare_digest to avoid leaking the configured API+ # key byte-by-byte through response-time side channels.+ if provided_key is None or not secrets.compare_digest(provided_key, self.config.api_key):LOG.warning("Unauthorized request: invalid or missing API key",method=request.method,