M1: make the first story turn work with no Internet
Phase 0B ran the upstream application on a network with no route out and the first turn died in tiktoken, which downloads its BPE table the first time anything counts a token. The browser separately fetched three font families from Google on every page load. Neither is visible on a machine that has been online once, which is why both now have tests. The tokenizer table is vendored at backend/app/context/vendor/cl100k_base.tiktoken and backend/app/context/encoding.py builds the encoding from it directly, verifying its SHA-256 against the digest tiktoken itself pins for that URL. No code path in the tokenizer can reach the network any more — not a warm cache, not an environment variable a deployment could forget. The encoding was checked token for token against tiktoken's own. The three font families are self-hosted as variable fonts under frontend/public/fonts/ (343 KiB, Latin and Latin Extended), declared in frontend/src/styles/fonts.css, and re-vendored by frontend/tools/vendor_fonts.py. Their OFL licences ship beside them. With no remote asset left, the CSP drops both Google hosts and gains object-src, base-uri and form-action; woff2 also gets its real media type, which Python's table lacks on a slim image. A trusted-LAN Ollama turned out not to work at all over HTTPS. httpx verifies against the certifi bundle, so an endpoint whose certificate comes from a CA the user installed on their own machines — a StartOS server's Ollama, for one — was refused with CERTIFICATE_VERIFY_FAILED while curl and the browser on the same host accepted it. app/tlstrust.py builds one context that unions the platform CA store with certifi's, and all four outbound clients use it. A union rather than a swap, so an image with an empty system store cannot start failing on endpoints that worked before. Verification itself is untouched: CERT_REQUIRED, hostname checking on, and no insecure escape hatch. The storyteller listener is now loopback by explicit statement rather than by inheriting uvicorn's default: start.sh, start.ps1, and docker-compose.yml, which publishes to 127.0.0.1 rather than every interface. Reaching an Ollama on another machine is outbound and needs none of that inbound exposure. backend/requirements.lock pins the exact tested closure; requirements.txt keeps the ranges. DEVELOPMENT.md covers setup, the same-host and trusted-LAN Ollama configurations, and how to re-run the offline proof. PROVENANCE.md records the upstream commit, the MIT terms, and both vendored assets. Verified, not just compiled. On an --internal Docker network with 1.1.1.1 unreachable and no name resolving, a campaign was created and played for six turns through same-host Ollama, restarted, and resumed. A second run played ten turns through Ollama on a separate physical machine on the LAN over verified HTTPS, summaries and embeddings included, with the storyteller's default route deleted so the LAN was reachable and the Internet was not. Its capture: 893 packets to the approved host, 730 loopback, zero anywhere else, and zero DNS queries. Two induced model failures left the accepted story bit-identical. The inherited SPA was opened in a browser and a campaign read back from it. Evidence is in planning/reports/M1-BASELINE-REPORT.md, along with the findings that did not belong in this change. 648 backend tests pass, up from the inherited 632; frontend lint and build are clean; the image builds. No M2 work is included: the hosted, cloud, analytics, Postgres and scripting surfaces are untouched. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017foPNqFjAJa2Ngebf5mEfL
This commit is contained in:
co-authored by
Claude Opus 5
parent
7f182a86e9
commit
c1a73b3d77
@@ -0,0 +1,160 @@
|
||||
"""Guards on the offline baseline: nothing a story turn needs is fetched.
|
||||
|
||||
Phase 0B ran the upstream application on a network with no route out and the
|
||||
first turn died in `tiktoken`, which downloads its BPE table the first time
|
||||
anything counts a token — invisible on a machine that had already been online
|
||||
once. The browser separately pulled three font families from Google on every
|
||||
page load. Both are now local, and these tests fail if either comes back.
|
||||
|
||||
The distinction that matters here is *runtime* assets. Downloading a dependency
|
||||
at install time is fine; downloading one while the user is playing is not.
|
||||
|
||||
python -m pytest tests/test_offline_assets.py -v
|
||||
|
||||
Acceptance tests A01, H01 and H11.
|
||||
"""
|
||||
import hashlib
|
||||
import inspect
|
||||
import re
|
||||
import socket
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
from app.context import builder, encoding
|
||||
from app.main import app
|
||||
|
||||
REPO = Path(__file__).resolve().parents[2]
|
||||
FRONTEND = REPO / "frontend"
|
||||
|
||||
# Any absolute http(s) URL. Matched against the places a browser would actually
|
||||
# be told to fetch from: markup attributes and CSS url()/@import.
|
||||
REMOTE_URL = re.compile(rb"https?://[^\s\"'()>]+")
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def client():
|
||||
with TestClient(app) as c:
|
||||
yield c
|
||||
|
||||
|
||||
# --- the tokenizer -------------------------------------------------------
|
||||
|
||||
|
||||
def test_vendored_table_is_present_and_intact():
|
||||
"""The digest is the whole reason the vendored copy is trustworthy."""
|
||||
data = encoding.BPE_PATH.read_bytes()
|
||||
assert hashlib.sha256(data).hexdigest() == encoding.BPE_SHA256
|
||||
|
||||
|
||||
def test_pinned_digest_still_matches_tiktokens_own():
|
||||
"""`tiktoken` hardcodes the digest it expects for `cl100k_base`. If an
|
||||
upgrade ever points that name at a different table, the vendored copy is
|
||||
stale and every token count would quietly disagree with upstream's."""
|
||||
import tiktoken_ext.openai_public
|
||||
|
||||
source = inspect.getsource(tiktoken_ext.openai_public.cl100k_base)
|
||||
assert encoding.BPE_SHA256 in source
|
||||
assert encoding.SOURCE_URL in source
|
||||
|
||||
|
||||
def test_token_counting_makes_no_network_call(monkeypatch):
|
||||
"""The real regression. `count_tokens` runs on every turn; on a host with
|
||||
no route out, the upstream version raised ConnectionError instead of
|
||||
narrating."""
|
||||
encoding.get_encoding.cache_clear()
|
||||
|
||||
def refuse(*args, **kwargs):
|
||||
raise AssertionError("the tokenizer tried to open a socket")
|
||||
|
||||
monkeypatch.setattr(socket, "socket", refuse)
|
||||
monkeypatch.setattr(socket, "create_connection", refuse)
|
||||
monkeypatch.setattr(socket, "getaddrinfo", refuse)
|
||||
|
||||
try:
|
||||
assert builder.count_tokens("The lighthouse keeper's lamp guttered.") > 0
|
||||
finally:
|
||||
encoding.get_encoding.cache_clear()
|
||||
|
||||
|
||||
def test_token_counts_are_unchanged():
|
||||
"""Golden values from the encoding built by upstream's own
|
||||
`tiktoken.get_encoding("cl100k_base")`, checked equal token for token
|
||||
across ASCII and accented text. The context
|
||||
budget is computed from these numbers, so a silently different tokenizer
|
||||
would silently change what fits in a prompt."""
|
||||
assert builder.count_tokens("") == 0
|
||||
assert builder.count_tokens("hello world") == 2
|
||||
assert builder.count_tokens(
|
||||
"The lighthouse keeper's lamp guttered in the salt wind."
|
||||
) == 13
|
||||
assert builder.count_tokens("naïve café — résumé") == 8
|
||||
|
||||
|
||||
def test_round_trip_survives_the_awkward_characters():
|
||||
enc = encoding.get_encoding()
|
||||
for text in ("", "naïve café — résumé 🜂 龍", "tabs\tand\r\nCRLF", "a" * 500):
|
||||
assert enc.decode(enc.encode(text)) == text
|
||||
|
||||
|
||||
# --- the browser ---------------------------------------------------------
|
||||
|
||||
|
||||
def test_csp_names_no_remote_origin(client):
|
||||
csp = client.get("/api/health").headers["content-security-policy"]
|
||||
assert "fonts.googleapis.com" not in csp
|
||||
assert "fonts.gstatic.com" not in csp
|
||||
assert "//" not in csp, f"CSP still allows a remote origin: {csp}"
|
||||
assert "font-src 'self'" in csp
|
||||
assert "connect-src 'self'" in csp
|
||||
|
||||
|
||||
def test_index_html_fetches_nothing_remote():
|
||||
html = (FRONTEND / "index.html").read_bytes()
|
||||
# The comment explaining where the fonts went is not a fetch, so match
|
||||
# attributes rather than the whole file.
|
||||
for attr in re.findall(rb"(?:href|src)\s*=\s*\"([^\"]*)\"", html):
|
||||
assert not REMOTE_URL.match(attr), attr
|
||||
|
||||
|
||||
def test_stylesheets_fetch_nothing_remote():
|
||||
for css in sorted((FRONTEND / "src").rglob("*.css")):
|
||||
text = css.read_bytes()
|
||||
for statement in re.findall(rb"(?:url|@import)\s*\(?[^;{}]*", text):
|
||||
assert not REMOTE_URL.search(statement), f"{css.name}: {statement}"
|
||||
|
||||
|
||||
def test_every_declared_font_file_exists():
|
||||
"""A @font-face pointing at a file that is not in the tree falls back to a
|
||||
system font on the developer's machine and 404s on a user's."""
|
||||
css = (FRONTEND / "src" / "styles" / "fonts.css").read_text()
|
||||
declared = re.findall(r"url\('/fonts/([^']+)'\)", css)
|
||||
assert declared, "fonts.css declares no faces"
|
||||
for name in declared:
|
||||
assert (FRONTEND / "public" / "fonts" / name).is_file(), name
|
||||
|
||||
|
||||
def _without_comments(text: bytes) -> bytes:
|
||||
"""Comments name the hosts these files no longer talk to — the note in
|
||||
`index.html` saying where the fonts went, and the `/* from ... */` line
|
||||
recording where each vendored face was downloaded from. Both are
|
||||
documentation. Strip them, then the check below can be blunt."""
|
||||
text = re.sub(rb"<!--.*?-->", b"", text, flags=re.S)
|
||||
return re.sub(rb"/\*.*?\*/", b"", text, flags=re.S)
|
||||
|
||||
|
||||
@pytest.mark.skipif(
|
||||
not (Path(__file__).resolve().parents[2] / "frontend" / "dist" / "index.html").exists(),
|
||||
reason="SPA not built; run `npm run build` in frontend/ to check the shipped bundle",
|
||||
)
|
||||
def test_built_spa_fetches_no_fonts_remotely():
|
||||
"""The source is what the tests above read; this is what users are served."""
|
||||
dist = FRONTEND / "dist"
|
||||
for path in list(dist.rglob("*.html")) + list(dist.rglob("*.css")):
|
||||
text = _without_comments(path.read_bytes())
|
||||
assert b"fonts.googleapis.com" not in text, path
|
||||
assert b"fonts.gstatic.com" not in text, path
|
||||
for path in dist.rglob("*.css"):
|
||||
for url in re.findall(rb"url\(([^)]*)\)", _without_comments(path.read_bytes())):
|
||||
assert not REMOTE_URL.search(url), f"{path}: {url}"
|
||||
@@ -0,0 +1,93 @@
|
||||
"""Guards on outbound TLS verification.
|
||||
|
||||
A trusted-LAN Ollama is often served over HTTPS with a certificate from a CA
|
||||
the user installed on their own machines rather than one the public web knows.
|
||||
`httpx` verifies against `certifi` alone, so such an endpoint failed here while
|
||||
`curl` and the browser accepted it. `app/tlstrust.py` unions the machine's CA
|
||||
store with certifi's; these tests keep that union honest in both directions —
|
||||
it must not lose a public CA, and it must not stop verifying.
|
||||
|
||||
Everything here is local. Nothing in this file opens a socket, so the suite
|
||||
still runs with no network.
|
||||
|
||||
python -m pytest tests/test_tls_trust.py -v
|
||||
"""
|
||||
import ast
|
||||
import ssl
|
||||
from pathlib import Path
|
||||
|
||||
import certifi
|
||||
import pytest
|
||||
|
||||
from app import tlstrust
|
||||
|
||||
APP = Path(__file__).resolve().parents[1] / "app"
|
||||
|
||||
|
||||
def test_verification_is_not_weakened():
|
||||
"""The point of the change is *where* trust comes from, never whether it is
|
||||
checked. A context that skipped verification would make every one of these
|
||||
endpoints reachable, including a hostile one."""
|
||||
context = tlstrust.ssl_context()
|
||||
assert context.verify_mode is ssl.CERT_REQUIRED
|
||||
assert context.check_hostname is True
|
||||
|
||||
|
||||
def test_context_is_built_once():
|
||||
assert tlstrust.ssl_context() is tlstrust.ssl_context()
|
||||
|
||||
|
||||
def test_public_certificate_authorities_are_still_trusted():
|
||||
"""The union is a strict superset of what httpx trusted before. Swapping
|
||||
certifi for the platform store instead would quietly break public
|
||||
endpoints on an image whose system store is empty or stale."""
|
||||
ours = {c for c in tlstrust.ssl_context().get_ca_certs(binary_form=True)}
|
||||
|
||||
certifi_only = ssl.create_default_context(cafile=certifi.where())
|
||||
theirs = {c for c in certifi_only.get_ca_certs(binary_form=True)}
|
||||
|
||||
assert theirs, "certifi's bundle came back empty; the comparison proves nothing"
|
||||
assert theirs <= ours, f"{len(theirs - ours)} certifi roots are missing from the union"
|
||||
|
||||
|
||||
def _async_client_calls(path: Path):
|
||||
"""Every `httpx.AsyncClient(...)` construction in a module, as AST nodes."""
|
||||
tree = ast.parse(path.read_text())
|
||||
for node in ast.walk(tree):
|
||||
if not isinstance(node, ast.Call):
|
||||
continue
|
||||
func = node.func
|
||||
if (
|
||||
isinstance(func, ast.Attribute)
|
||||
and func.attr == "AsyncClient"
|
||||
and isinstance(func.value, ast.Name)
|
||||
and func.value.id == "httpx"
|
||||
):
|
||||
yield node
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"module",
|
||||
["providers/openai_compatible.py", "routers/settings.py"],
|
||||
)
|
||||
def test_every_http_client_uses_the_shared_context(module):
|
||||
"""Checked in the source rather than at runtime, because the failure this
|
||||
catches is a *new* client added later without the context — which no
|
||||
existing test would exercise, and which would work perfectly until someone
|
||||
pointed it at a LAN endpoint."""
|
||||
calls = list(_async_client_calls(APP / module))
|
||||
assert calls, f"no httpx.AsyncClient found in {module} — has it been renamed?"
|
||||
for call in calls:
|
||||
keywords = {kw.arg for kw in call.keywords}
|
||||
assert "verify" in keywords, (
|
||||
f"{module}:{call.lineno} builds an httpx.AsyncClient without "
|
||||
f"verify=tlstrust.ssl_context()"
|
||||
)
|
||||
|
||||
|
||||
def test_no_other_module_builds_its_own_client():
|
||||
"""If a third module starts making outbound requests, it has to be added to
|
||||
the list above rather than inheriting certifi-only trust by default."""
|
||||
known = {APP / "providers/openai_compatible.py", APP / "routers/settings.py"}
|
||||
found = {p for p in APP.rglob("*.py") if any(_async_client_calls(p))}
|
||||
assert found == known, f"unexpected httpx.AsyncClient call sites: {found - known}"
|
||||
Reference in New Issue
Block a user