mirror of
https://github.com/Sea-Haven-Industries/open-swe.git
synced 2026-09-30 18:33:15 +00:00
* fix: enforce a replay window on Linear webhooks (AUTHZ-001) verify_linear_signature accepted any correctly-signed body with no freshness check, so a captured request could be replayed indefinitely. Parse the signed webhookTimestamp (Unix ms) and reject requests outside a 60s window, failing closed when the field is missing or malformed — mirroring the Slack verifier. * fix: stop leaking upstream auth-error bodies into user comments get_github_token_for_user folded the raw upstream response text into the error string that becomes a Slack/Linear comment (AUTH-RESP-LEAK-01). Log the full body server-side only and return a generic "GitHub auth failed (status <code>)". Also document the accepted shared-installation-token blast radius on the bot-token-only path (AUTHZ-003). * fix: bind sandbox and token caches to repo to prevent thread-id collision A PR head-branch name is attacker-controllable and get_thread_id_from_branch derives a thread_id from its first UUID with no repo binding (TID-COLLIDE-01). The in-memory sandbox cache and the per-thread GitHub-token cache were keyed on thread_id alone, and a cached sandbox was reused after only an echo-ping, so a different repo's webhook could bind to another thread's sandbox or token. Without changing the persistent thread-id scheme: - Persist the bound repo (owner/name) in thread metadata on sandbox creation and refuse to reuse a sandbox whose bound repo does not match the current event (SandboxRepoMismatchError); the in-memory proxy also carries the binding. - Bind the GitHub-token cache entries to their repo and evict on a cross-repo read so a colliding thread_id cannot be served another repo's token. - Thread repo through the reviewer and the webhook token resolvers. * fix: scope s3:ListBucket to the releases/ prefix (F-1/IAC-04) The instance role and the GitHub deploy app role granted s3:ListBucket on the whole assets bucket. Every caller (deploy.sh, the publish/rollback scripts) only ever lists under releases/, so add a StringLike s3:prefix=releases/* condition. GetBucketLocation has no s3:prefix in its request context, so it moves to its own unconditioned statement. Also document the accepted F-2 cross-env existence-oracle residual on BatchGetSecretValue. * chore: suppress test-fixture credential false positive; document AUTHZ-002 Add a machine-level suppression for the fake Datadog key in the test_team_credentials encryption-roundtrip fixture (CWE-798, not a real credential). Clarify that the within-org thread-write path is intentional by design (AUTHZ-002) — comment only, no behavior change. * fix: casefold repo-binding keys to avoid spurious cross-repo mismatch GitHub owner/name are case-insensitive. Casefold the owner/name key on both the write (binding) and read (compare) sides — repo_cache_key and the metadata bound_repo read — so Org/Repo and org/repo resolve to one repo and a legitimate same-repo run cannot raise a spurious SandboxRepoMismatchError (Gap 2). * fix: stop leaking upstream auth body in unexpected-result branch The 2xx-but-missing-token/url branch echoed the parsed upstream response body into the user-facing error. Return a generic message and log response_data server-side only, mirroring the existing HTTPStatusError fix (Gap 4). * fix: fail closed for unbound-legacy sandboxes and catch repo mismatch Gap 1: a thread with a persisted sandbox_id but no in-memory cache and no recorded bound_repo (a pre-binding legacy thread, post-deploy) previously reconnected-and-served the sandbox to the current repo, then rebound it. Now fail closed: drop the stale id and recreate a fresh sandbox bound to this repo, logging a reconnect-with-missing-binding event. A sandbox is never served to a repo unless its binding is known and matches; new threads bind on first run unchanged. Gap 3: catch SandboxRepoMismatchError at the agent and reviewer run entrypoints, log it for alarming, and surface a clean sanitized error instead of letting an opaque deep-stack exception crash-loop the worker. * chore: suppress test-fixture credential false positive in token-TTL tests Add a machine-level suppression for the fake "ghp_secret" GitHub token used by the cached-token TTL/revocation unit tests (CWE-798). Not a real credential and not a valid PAT; scoped to the unit test only.
169 lines
6.1 KiB
Python
169 lines
6.1 KiB
Python
"""GitHub token lookup utilities."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
from collections.abc import Mapping
|
|
from datetime import UTC, datetime, timedelta
|
|
from typing import Any
|
|
|
|
from langgraph.config import get_config
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
# Treat tokens with <= this many seconds remaining as expired so we re-auth
|
|
# before kicking off long agent runs.
|
|
_GITHUB_TOKEN_EXPIRY_SKEW_SECONDS = 60
|
|
# Hard cap on how long an entry stays cached regardless of the token's own
|
|
# expiry, so entries for threads that are never read again don't accumulate.
|
|
_GITHUB_TOKEN_MAX_TTL = timedelta(hours=24)
|
|
# thread_id -> (token, token_expires_at, cached_at, bound_repo). ``bound_repo``
|
|
# ("owner/name") binds the entry to the repo it was resolved for so a colliding
|
|
# thread_id originating from a different repo cannot reuse another repo's token.
|
|
_GITHUB_TOKEN_CACHE: dict[str, tuple[str, str | None, datetime, str | None]] = {}
|
|
|
|
|
|
class GitHubAuthError(Exception):
|
|
"""Raised when a GitHub call returns 401, signalling a stale/revoked token."""
|
|
|
|
|
|
def repo_cache_key(repo: Any) -> str | None:
|
|
"""Normalize a repo dict/string to a casefolded ``owner/name`` (None if unknown).
|
|
|
|
GitHub owner/name are case-insensitive, so the key is casefolded on both the
|
|
write (binding) and read (compare) sides to keep ``Org/Repo`` and ``org/repo``
|
|
a single repo and avoid spurious cross-repo mismatches.
|
|
"""
|
|
if isinstance(repo, str):
|
|
cleaned = repo.strip()
|
|
return cleaned.casefold() or None
|
|
if isinstance(repo, Mapping):
|
|
owner = repo.get("owner")
|
|
name = repo.get("name")
|
|
if isinstance(owner, str) and isinstance(name, str) and owner and name:
|
|
return f"{owner}/{name}".casefold()
|
|
return None
|
|
|
|
|
|
def cache_github_token_for_thread(
|
|
thread_id: str, token: str, expires_at: str | None = None, *, repo: Any = None
|
|
) -> None:
|
|
"""Cache a GitHub token in process for the current thread."""
|
|
if not thread_id or not token:
|
|
return
|
|
now = datetime.now(UTC)
|
|
_GITHUB_TOKEN_CACHE[thread_id] = (token, expires_at, now, repo_cache_key(repo))
|
|
_evict_expired(now=now)
|
|
|
|
|
|
def _is_expired(expires_at: Any, *, now: datetime | None = None) -> bool:
|
|
"""Return True when ``expires_at`` is past (or close to) ``now``."""
|
|
if expires_at is None:
|
|
return False
|
|
|
|
parsed: datetime | None = None
|
|
if isinstance(expires_at, int | float):
|
|
try:
|
|
parsed = datetime.fromtimestamp(float(expires_at), tz=UTC)
|
|
except (OverflowError, OSError, ValueError):
|
|
return False
|
|
elif isinstance(expires_at, str):
|
|
raw = expires_at.strip()
|
|
if not raw:
|
|
return False
|
|
if raw.endswith("Z"):
|
|
raw = raw[:-1] + "+00:00"
|
|
try:
|
|
parsed = datetime.fromisoformat(raw)
|
|
except ValueError:
|
|
return False
|
|
|
|
if parsed is None:
|
|
return False
|
|
if parsed.tzinfo is None:
|
|
parsed = parsed.replace(tzinfo=UTC)
|
|
|
|
current = (now or datetime.now(UTC)).astimezone(UTC)
|
|
return (parsed - current).total_seconds() <= _GITHUB_TOKEN_EXPIRY_SKEW_SECONDS
|
|
|
|
|
|
def _entry_expired(expires_at: str | None, cached_at: datetime, *, now: datetime) -> bool:
|
|
"""Expired when past the token's own expiry or the 24h cache cap."""
|
|
if now - cached_at >= _GITHUB_TOKEN_MAX_TTL:
|
|
return True
|
|
return _is_expired(expires_at, now=now)
|
|
|
|
|
|
def _evict_expired(*, now: datetime | None = None) -> None:
|
|
current = now or datetime.now(UTC)
|
|
stale = [
|
|
tid
|
|
for tid, (_token, expires_at, cached_at, _repo) in _GITHUB_TOKEN_CACHE.items()
|
|
if _entry_expired(expires_at, cached_at, now=current)
|
|
]
|
|
for tid in stale:
|
|
_GITHUB_TOKEN_CACHE.pop(tid, None)
|
|
|
|
|
|
def _cached_token_if_fresh(
|
|
thread_id: str | None, *, expected_repo: Any = None
|
|
) -> tuple[str | None, str | None]:
|
|
if not thread_id:
|
|
return None, None
|
|
cached = _GITHUB_TOKEN_CACHE.get(thread_id)
|
|
if not cached:
|
|
return None, None
|
|
token, expires_at, cached_at, bound_repo = cached
|
|
if _entry_expired(expires_at, cached_at, now=datetime.now(UTC)):
|
|
_GITHUB_TOKEN_CACHE.pop(thread_id, None)
|
|
logger.info("Cached GitHub token for thread %s has expired; re-resolving", thread_id)
|
|
return None, None
|
|
expected = repo_cache_key(expected_repo)
|
|
if expected and bound_repo and expected != bound_repo:
|
|
_GITHUB_TOKEN_CACHE.pop(thread_id, None)
|
|
logger.warning(
|
|
"Cached GitHub token for thread %s is bound to repo %s, not %s; "
|
|
"refusing cross-repo reuse",
|
|
thread_id,
|
|
bound_repo,
|
|
expected,
|
|
)
|
|
return None, None
|
|
return token, expires_at
|
|
|
|
|
|
def _thread_id_from_config(run_config: Mapping[str, Any]) -> str | None:
|
|
configurable = run_config.get("configurable", {})
|
|
if not isinstance(configurable, Mapping):
|
|
return None
|
|
thread_id = configurable.get("thread_id")
|
|
return thread_id if isinstance(thread_id, str) and thread_id else None
|
|
|
|
|
|
def _repo_from_config(run_config: Mapping[str, Any]) -> Any:
|
|
configurable = run_config.get("configurable", {})
|
|
if not isinstance(configurable, Mapping):
|
|
return None
|
|
return configurable.get("repo")
|
|
|
|
|
|
def get_github_token(run_config: Mapping[str, Any] | None = None) -> str | None:
|
|
"""Resolve the current thread's GitHub token from process memory."""
|
|
resolved = run_config if run_config is not None else get_config()
|
|
token, _expires_at = _cached_token_if_fresh(
|
|
_thread_id_from_config(resolved), expected_repo=_repo_from_config(resolved)
|
|
)
|
|
return token
|
|
|
|
|
|
async def get_github_token_from_thread(
|
|
thread_id: str, *, expected_repo: Any = None
|
|
) -> tuple[str | None, str | None]:
|
|
"""Resolve the current process's cached GitHub token for a thread."""
|
|
return _cached_token_if_fresh(thread_id, expected_repo=expected_repo)
|
|
|
|
|
|
async def invalidate_cached_github_token(thread_id: str) -> None:
|
|
"""Clear a cached GitHub token for a thread."""
|
|
_GITHUB_TOKEN_CACHE.pop(thread_id, None)
|
|
logger.info("Invalidated cached GitHub token for thread %s", thread_id)
|