The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(webapp): bound a download ticket by one use count and its mint-time TTL
Adolanium11cbd54d500e
diff --git a/hermes_cli/web_server_file_tickets.py b/hermes_cli/web_server_file_tickets.pyindex 52f85e0daea..63a2ed281d5 100644--- a/hermes_cli/web_server_file_tickets.py+++ b/hermes_cli/web_server_file_tickets.py@@ -5,14 +5,15 @@ header, and the session token grants host shells and file access, so it mustnever appear in a URL the browser records (download history, "Copy videoaddress"). An authenticated ``POST /api/files/ticket`` mints a ticket that letsthe loopback token gate admit GET/HEAD of exactly one route + query and nothing-else. A browser retries a failed or cancelled download by requesting that same-URL again, so a download ticket allows a few redemptions of that exact request-and then dies, still inside its short TTL. It is not a reusable credential. A-media element issues many Range requests for one source, so a stream ticket is-reusable until it expires. Each ticket captures the resolved file (on the-profile's SSH workspace when it has one, as for native Desktop's download) and-the named profile homes it belongs to; the resource opener refuses it once one-of those homes is missing or+else. A browser retries a failed download by requesting the same URL, and the+gate spends a download ticket's use before the file is even opened, so a failed+or cut-off first response has already used one. A download ticket therefore+admits up to ``DOWNLOAD_MAX_REDEMPTIONS`` requests (GET or HEAD) within+``DOWNLOAD_TTL_SECONDS`` of minting, then dies. A media element issues many+Range requests for one source, so a stream ticket is reusable until it expires.+Each ticket captures the resolved file (on the profile's SSH workspace+when it has one, as for native Desktop's download) and the named profile homes it+belongs to; the resource opener refuses it once one of those homes is missing ordeleted (``hermes_constants.assert_named_profile_home_live``). A ticket minted fora request that presented the browser session token records that credential'sgeneration (``hermes_cli.browser_credential``) and redeems only while it is@@ -36,9 +37,8 @@ if TYPE_CHECKING:from starlette.requests import RequestDOWNLOAD_TTL_SECONDS = 60-#: The original GET, the browser's restart after it cancels that request, and-#: one retry of a failed or cancelled download. Past this the ticket is spent-#: even though the download TTL has not elapsed.+#: Requests one download ticket admits: the first fetch and two repeats of that+#: same URL. Kept small because the URL sits in download history and proxy logs.DOWNLOAD_MAX_REDEMPTIONS = 3#: A transcript video may be played long after it mounted; seeking past the#: buffered range needs the ticket again.@@ -74,15 +74,15 @@ class FileAuthority:class _Ticket:scope: _Scopeexpires_at: float- single_use: bool+ #: Requests (GET or HEAD) a download ticket still admits; None for a stream ticket, which+ #: lasts until it expires.+ uses_left: int | Noneauthority: FileAuthority#: Generation of the browser credential the minting request presented#: (``hermes_cli.browser_credential``; None for any other credential): the ticket redeems only#: while it is current, so a sign-out that lands between the request's admission and the mint#: still ends it.generation: str | None = None- #: Download tickets only. Stream tickets stay until expiry and ignore this.- uses_remaining: int = 0_lock = threading.Lock()@@ -112,16 +112,15 @@ def mint(route: str, query: Mapping[str, str], *, authority: FileAuthority,a request admitted with *session_token*, it records that browser credential's generation andredeems only while it is current."""route_path = ROUTES[route]- single_use = route == "download"+ download = route == "download"now = time.monotonic()ticket = secrets.token_urlsafe(32)entry = _Ticket(scope=_scope(route_path, query.items()),- expires_at=now + (DOWNLOAD_TTL_SECONDS if single_use else STREAM_TTL_SECONDS),- single_use=single_use,+ expires_at=now + (DOWNLOAD_TTL_SECONDS if download else STREAM_TTL_SECONDS),+ uses_left=DOWNLOAD_MAX_REDEMPTIONS if download else None,authority=authority,generation=None if session_token is None else browser_credential.generation_of(session_token),- uses_remaining=DOWNLOAD_MAX_REDEMPTIONS if single_use else 0,)with _lock:for stale in [key for key, value in _tickets.items() if value.expires_at <= now]:@@ -143,21 +142,20 @@ def revoke_replaced() -> int:return len(replaced)-def _spend_download(ticket: str, entry: _Ticket) -> None:- """Count one same-URL redemption. Caller holds ``_lock``. Stream tickets are not spent."""- if not entry.single_use:+def _spend_use(ticket: str, entry: _Ticket) -> None:+ """Count one admitted request against a download ticket, dropping it at its last use. Caller+ holds ``_lock``. A stream ticket has no count."""+ if entry.uses_left is None:return- remaining = entry.uses_remaining - 1- if remaining > 0:- _tickets[ticket] = replace(entry, uses_remaining=remaining)+ if entry.uses_left > 1:+ _tickets[ticket] = replace(entry, uses_left=entry.uses_left - 1)else:del _tickets[ticket]def redeem(request: Request) -> bool:- """True when ``?ticket=`` authorizes this exact request. A download ticket grants only a few- redemptions of that same URL; a stream ticket lasts until it expires. A ticket minted under a- browser credential that has since been replaced is dropped instead."""+ """True when ``?ticket=`` authorizes this exact request; spends one of a download ticket's uses.+ A ticket minted under a browser credential that has since been replaced is dropped instead."""ticket = request.query_params.get("ticket", "")if not ticket or request.method not in ("GET", "HEAD"):return False@@ -169,7 +167,7 @@ def redeem(request: Request) -> bool:if entry.generation is not None and not browser_credential.is_current(entry.generation):del _tickets[ticket]return False- _spend_download(ticket, entry)+ _spend_use(ticket, entry)# Carry the captured authority through middleware to the resource opener.# A middleware-only check would race deletion before FileResponse opens it.request.state.file_ticket_authority = entry.authoritydiff --git a/tests/hermes_cli/test_web_server_file_ticket_retries.py b/tests/hermes_cli/test_web_server_file_ticket_retries.pyindex d488a448017..eebca0cc191 100644--- a/tests/hermes_cli/test_web_server_file_ticket_retries.py+++ b/tests/hermes_cli/test_web_server_file_ticket_retries.py@@ -1,14 +1,14 @@-"""A browser retry of the same download URL redeems that ticket again, a few times.--The download is fetched once, and the browser repeats that exact URL when the-download fails or is cancelled. Those retries succeed inside the download TTL.-The ticket is not a reusable credential: a different path, query, or method is-refused without spending a retry, an expired ticket is refused, and signing out-drops one minted under the replaced browser credential. Stream tickets stay-reusable until they expire.+"""A browser retry of the same download URL redeems its ticket again, a few times (#144667).++The loopback gate spends a download ticket's use before the file is opened, and the browser+retries a failed download by requesting that exact URL. The ticket stays bounded: it admits+``DOWNLOAD_MAX_REDEMPTIONS`` requests (a HEAD counts like a GET) within ``DOWNLOAD_TTL_SECONDS``+of minting. A different path, query or method is refused without using one up, and signing out+drops a ticket minted under the replaced browser credential even with uses left. Stream tickets+stay reusable until they expire."""-import time+from types import SimpleNamespaceimport pytestfrom starlette.testclient import TestClient@@ -49,23 +49,25 @@ def test_the_same_download_url_can_be_retried_a_few_times_then_dies(browser_downclient, browser, clip = browser_downloadroute = web_server_file_tickets.ROUTES["download"]params = _mint(client, "download", path=str(clip))- # A handful of browser retries, not a credential that lasts for the TTL.- assert 1 < web_server_file_tickets.DOWNLOAD_MAX_REDEMPTIONS <= 5assert browser.get(route, params=params).content == b"hello"- assert (- browser.get(route, params={**params, "path": str(clip) + ".other"}).status_code- == 401- )+ retry = browser.get(route, params=params)+ assert (retry.status_code, retry.content) == (200, b"hello")++ # Refused requests use none of the ticket's uses.+ assert browser.get(route, params={**params, "path": str(clip) + ".other"}).status_code == 401assert browser.get(route, params={**params, "profile": "other"}).status_code == 401assert browser.post(route, params=params).status_code == 401- assert (- browser.get(web_server_file_tickets.ROUTES["stream"], params=params).status_code- == 401- )- for _ in range(web_server_file_tickets.DOWNLOAD_MAX_REDEMPTIONS - 1):+ assert browser.get(web_server_file_tickets.ROUTES["stream"], params=params).status_code == 401++ # A handful of uses, not a credential that lasts for the TTL. A HEAD of the+ # URL is admitted like a GET and uses one up.+ assert 2 < web_server_file_tickets.DOWNLOAD_MAX_REDEMPTIONS <= 5+ for _ in range(web_server_file_tickets.DOWNLOAD_MAX_REDEMPTIONS - 3):assert browser.get(route, params=params).content == b"hello"+ assert browser.head(route, params=params).status_code == 200assert browser.get(route, params=params).status_code == 401+ assert browser.head(route, params=params).status_code == 401stream = _mint(client, "stream", path=str(clip))for _ in range(web_server_file_tickets.DOWNLOAD_MAX_REDEMPTIONS + 1):@@ -77,25 +79,23 @@ def test_the_same_download_url_can_be_retried_a_few_times_then_dies(browser_downassert (partial.status_code, partial.content) == (206, b"ell")-def test_an_expired_download_ticket_is_refused_while_retries_remain(- browser_download, monkeypatch-):+def test_a_download_ticket_dies_its_ttl_after_minting_with_uses_left(browser_download, monkeypatch):client, browser, clip = browser_downloadroute = web_server_file_tickets.ROUTES["download"]- real = time.monotonic- offset = {"seconds": 0.0}+ clock = {"now": 1000.0}monkeypatch.setattr(- web_server_file_tickets.time, "monotonic", lambda: real() + offset["seconds"]+ web_server_file_tickets, "time", SimpleNamespace(monotonic=lambda: clock["now"]))- fresh = _mint(client, "download", path=str(clip))- assert browser.get(route, params=fresh).content == b"hello"- offset["seconds"] = web_server_file_tickets.DOWNLOAD_TTL_SECONDS + 1- assert browser.get(route, params=fresh).status_code == 401+ params = _mint(client, "download", path=str(clip))+ assert browser.get(route, params=params).content == b"hello"+ clock["now"] += web_server_file_tickets.DOWNLOAD_TTL_SECONDS - 1+ assert browser.get(route, params=params).content == b"hello"- monkeypatch.setattr(web_server_file_tickets, "DOWNLOAD_TTL_SECONDS", 0)- expired = _mint(client, "download", path=str(clip))- assert browser.get(route, params=expired).status_code == 401+ # Uses are left; only the TTL, counted from minting, refuses it.+ assert web_server_file_tickets.DOWNLOAD_MAX_REDEMPTIONS > 2+ clock["now"] += 1+ assert browser.get(route, params=params).status_code == 401def test_sign_out_drops_a_download_ticket_minted_under_the_browser_credential(