Skip to content

The agent that grows with you

test(webapp): download retry tests reuse the file-route fixtures, and sign-out covers download links

unsupportedpastels6ec5ef672066
diff --git a/tests/hermes_cli/test_web_server_file_ticket_retries.py b/tests/hermes_cli/test_web_server_file_ticket_retries.py
index 6bb9709ff59..3fbddfd0a0d 100644
--- a/tests/hermes_cli/test_web_server_file_ticket_retries.py
+++ b/tests/hermes_cli/test_web_server_file_ticket_retries.py
@@ -3,52 +3,43 @@
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.
+of minting. A different path, query or method is refused without using one up. Stream tickets
+stay reusable until they expire. Signing out ends both (``test_webapp_sign_out_sockets.py``).
"""
+import secrets
from types import SimpleNamespace
import pytest
from starlette.testclient import TestClient
-from hermes_cli import browser_credential, web_server, web_server_file_tickets
+from hermes_cli import web_server, web_server_file_tickets
+from tests.hermes_cli.test_web_server_file_ticket_generations import _ticket
+from tests.hermes_cli.test_web_server_files import forced_files_client
@pytest.fixture
-def browser_download(monkeypatch, tmp_path):
- root = tmp_path / "files"
+def browser_download(forced_files_client, monkeypatch):
+ """The Webapp's file routes under a fresh session token, a file in the managed root, and a
+ browser that sends no session header (a download link cannot)."""
+ client, root = forced_files_client
+ monkeypatch.setattr(web_server, "_SESSION_TOKEN", secrets.token_urlsafe(32))
+ client.headers[web_server._SESSION_HEADER_NAME] = web_server._SESSION_TOKEN
+ monkeypatch.setattr(web_server.app.state, "ui_surface", "webapp", raising=False)
root.mkdir()
clip = root / "clip.mp4"
clip.write_bytes(b"hello")
- monkeypatch.setenv("HERMES_DASHBOARD_FILES_ROOT", str(root))
- for key, value in (
- ("auth_required", False),
- ("bound_host", None),
- ("ui_surface", "webapp"),
- ):
- monkeypatch.setattr(web_server.app.state, key, value, raising=False)
- client = TestClient(web_server.app)
- client.headers[web_server._SESSION_HEADER_NAME] = web_server._SESSION_TOKEN
browser = TestClient(web_server.app)
try:
yield client, browser, clip
finally:
browser.close()
- client.close()
-
-
-def _mint(client, route, **query):
- minted = client.post("/api/files/ticket", json={"route": route, **query})
- assert minted.status_code == 200, minted.text
- return {**query, "ticket": minted.json()["ticket"]}
def test_the_same_download_url_can_be_retried_a_few_times_then_dies(browser_download):
client, browser, clip = browser_download
route = web_server_file_tickets.ROUTES["download"]
- params = _mint(client, "download", path=str(clip))
+ params = _ticket(client, "download", {"path": str(clip)})
assert browser.get(route, params=params).content == b"hello"
retry = browser.get(route, params=params)
@@ -66,7 +57,7 @@ def test_the_same_download_url_can_be_retried_a_few_times_then_dies(browser_down
assert browser.get(route, params=params).status_code == 401
assert browser.head(route, params=params).status_code == 401
- stream = _mint(client, "stream", path=str(clip))
+ stream = _ticket(client, "stream", {"path": str(clip)})
for _ in range(web_server_file_tickets.DOWNLOAD_MAX_REDEMPTIONS + 1):
partial = browser.get(
web_server_file_tickets.ROUTES["stream"],
@@ -84,7 +75,7 @@ def test_a_download_ticket_dies_its_ttl_after_minting_with_uses_left(browser_dow
web_server_file_tickets, "time", SimpleNamespace(monotonic=lambda: clock["now"])
)
- params = _mint(client, "download", path=str(clip))
+ params = _ticket(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"
@@ -93,24 +84,3 @@ def test_a_download_ticket_dies_its_ttl_after_minting_with_uses_left(browser_dow
assert web_server_file_tickets.DOWNLOAD_MAX_REDEMPTIONS > 2
clock["now"] += 1
assert browser.get(route, params=params).status_code == 401
-
-
-def test_sign_out_drops_a_download_ticket_minted_under_the_browser_credential(
- browser_download, monkeypatch
-):
- client, browser, clip = browser_download
- route = web_server_file_tickets.ROUTES["download"]
- params = _mint(client, "download", path=str(clip))
- assert browser.get(route, params=params).content == b"hello"
- other = web_server_file_tickets.mint(
- "download",
- {"path": str(clip)},
- authority=web_server_file_tickets.FileAuthority(clip, ()),
- session_token=None,
- )
- monkeypatch.setattr(web_server, "_SESSION_TOKEN", web_server._SESSION_TOKEN)
- browser_credential.rotate("b" * 43)
-
- assert browser.get(route, params=params).status_code == 401
- kept = browser.get(route, params={"path": str(clip), "ticket": other})
- assert kept.content == b"hello"
diff --git a/tests/hermes_cli/test_webapp_sign_out_sockets.py b/tests/hermes_cli/test_webapp_sign_out_sockets.py
index 11ca0be7829..32ddf0305d5 100644
--- a/tests/hermes_cli/test_webapp_sign_out_sockets.py
+++ b/tests/hermes_cli/test_webapp_sign_out_sockets.py
@@ -2,8 +2,8 @@
``hermes webapp --sign-out`` (control verb ``webapp-sign-out``) replaces the session token and closes
the live sockets that token authenticated, directly or through a ticket minted with it: each tab's
-host terminal and event stream close at once with code 4401, and the media links it minted stop
-streaming. A socket opened with another credential stays connected. The verb runs on a
+host terminal and event stream close at once with code 4401, and the media and download links it
+minted stop working. A socket opened with another credential stays connected. The verb runs on a
control-socket worker thread, not on the sockets' event loops.
"""
import json
@@ -87,20 +87,25 @@ def test_signing_out_with_no_open_tabs_still_replaces_the_credential(webapp, sig
assert client.post("/api/webapp/socket-ticket?socket=gateway", headers={"X-Hermes-Session-Token": _TOKEN}).status_code == 401
-def test_signing_out_ends_the_media_links_the_session_token_minted(webapp, sign_out, tmp_path, monkeypatch):
- """A media element's stream link is reusable for an hour; after sign-out it streams nothing."""
[email protected]("route", ["stream", "download"])
+def test_signing_out_ends_the_file_links_the_session_token_minted(webapp, sign_out, tmp_path, monkeypatch, route):
+ """A media element's stream link is reusable for an hour and a download link for a few retries;
+ after sign-out, with uses left, neither reads anything."""
+ from hermes_cli import web_server_file_tickets
+
client = webapp.client
root = tmp_path / "files"
root.mkdir()
(root / "clip.mp4").write_bytes(b"hello")
monkeypatch.setenv("HERMES_DASHBOARD_FILES_ROOT", str(root))
- minted = client.post("/api/files/ticket", json={"route": "stream", "path": str(root / "clip.mp4")},
+ minted = client.post("/api/files/ticket", json={"route": route, "path": str(root / "clip.mp4")},
headers={"X-Hermes-Session-Token": _TOKEN})
assert minted.status_code == 200, minted.text
- stream = {"path": str(root / "clip.mp4"), "ticket": minted.json()["ticket"]}
- assert client.get("/api/files/stream", params=stream).content == b"hello"
+ link = {"path": str(root / "clip.mp4"), "ticket": minted.json()["ticket"]}
+ endpoint = web_server_file_tickets.ROUTES[route]
+ assert client.get(endpoint, params=link).content == b"hello"
sign_out()
- assert client.get("/api/files/stream", params=stream).status_code == 401
+ assert client.get(endpoint, params=link).status_code == 401
def test_a_media_link_minted_while_signing_out_streams_nothing(webapp, sign_out, tmp_path, monkeypatch):
@@ -127,10 +132,11 @@ def test_a_media_link_minted_while_signing_out_streams_nothing(webapp, sign_out,
assert client.get("/api/files/stream", params=stream).status_code == 401
-def test_a_media_link_another_credential_minted_keeps_streaming_after_sign_out(webapp, sign_out, tmp_path,
- monkeypatch):
[email protected]("route", ["stream", "download"])
+def test_a_file_link_another_credential_minted_keeps_working_after_sign_out(webapp, sign_out, tmp_path,
+ monkeypatch, route):
"""Signing out ends the links minted under the browser credential and no others: a link minted
- with another credential (a service token, a native client's grant) keeps streaming."""
+ with another credential (a service token, a native client's grant) keeps working."""
from hermes_cli import web_server_file_tickets
client = webapp.client
@@ -140,11 +146,12 @@ def test_a_media_link_another_credential_minted_keeps_streaming_after_sign_out(w
monkeypatch.setenv("HERMES_DASHBOARD_FILES_ROOT", str(root))
path = str(root / "clip.mp4")
ticket = web_server_file_tickets.mint(
- "stream", {"path": path}, authority=web_server_file_tickets.FileAuthority(root / "clip.mp4", ()))
- stream = {"path": path, "ticket": ticket}
- assert client.get("/api/files/stream", params=stream).content == b"hello"
+ route, {"path": path}, authority=web_server_file_tickets.FileAuthority(root / "clip.mp4", ()))
+ link = {"path": path, "ticket": ticket}
+ endpoint = web_server_file_tickets.ROUTES[route]
+ assert client.get(endpoint, params=link).content == b"hello"
sign_out()
- assert client.get("/api/files/stream", params=stream).content == b"hello"
+ assert client.get(endpoint, params=link).content == b"hello"
def test_a_socket_admitted_while_the_token_is_replaced_closes_at_once(monkeypatch):