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
@@ -18,13 +18,12 @@ top of the prompt re-prices everything below it. See the comments on the static
|
||||
block and the live sections in `build_context`.
|
||||
"""
|
||||
|
||||
import functools
|
||||
from dataclasses import dataclass
|
||||
|
||||
import tiktoken
|
||||
|
||||
from .. import models, worldstate
|
||||
from . import history
|
||||
from . import encoding, history
|
||||
|
||||
AUTHORS_NOTE_DEPTH = 3 # actions from the end of history
|
||||
CARD_BUDGET_SHARE = 0.4 # max share of non-reserved budget that story cards may take
|
||||
@@ -61,9 +60,11 @@ MIN_LENGTH_FLOOR_WORDS = 60
|
||||
MAX_LENGTH_FLOOR_WORDS = 300
|
||||
|
||||
|
||||
@functools.lru_cache(maxsize=1)
|
||||
# Built from the table vendored in `encoding.py`, not fetched: the upstream
|
||||
# `tiktoken.get_encoding("cl100k_base")` downloads it on first use, and this
|
||||
# is called on every turn.
|
||||
def _encoding() -> tiktoken.Encoding:
|
||||
return tiktoken.get_encoding("cl100k_base")
|
||||
return encoding.get_encoding()
|
||||
|
||||
|
||||
def count_tokens(text: str) -> int:
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
"""`cl100k_base` without a first-use download.
|
||||
|
||||
Upstream called `tiktoken.get_encoding("cl100k_base")`, which fetches the BPE
|
||||
table from `openaipublic.blob.core.windows.net` the first time it is used and
|
||||
caches it under the system temp directory. That download is invisible on a
|
||||
developer machine that has already made it once, and fatal on a machine with
|
||||
outbound Internet blocked: the context builder counts tokens on *every* turn,
|
||||
so the first story turn died with a `ConnectionError` instead of narrating
|
||||
(Phase 0B offline report; acceptance tests A01 and H11).
|
||||
|
||||
The table is vendored beside this module and the `Encoding` is constructed from
|
||||
it directly, so no code path inside the tokenizer can reach the network — not a
|
||||
cache that happens to be warm, and not an environment variable a deployment
|
||||
could forget to set.
|
||||
|
||||
The vendored file's SHA-256 is verified against the digest `tiktoken` itself
|
||||
pins for that URL. A truncated checkout or a substituted table then fails
|
||||
loudly, rather than silently changing every token count the context budget is
|
||||
computed from.
|
||||
"""
|
||||
|
||||
import base64
|
||||
import functools
|
||||
import hashlib
|
||||
from pathlib import Path
|
||||
|
||||
import tiktoken
|
||||
|
||||
ENCODING_NAME = "cl100k_base"
|
||||
|
||||
#: Where the table came from, recorded so the vendored copy can be re-derived.
|
||||
SOURCE_URL = "https://openaipublic.blob.core.windows.net/encodings/cl100k_base.tiktoken"
|
||||
|
||||
#: The digest `tiktoken_ext.openai_public.cl100k_base()` pins for SOURCE_URL.
|
||||
BPE_SHA256 = "223921b76ee99bde995b7ff738513eef100fb51d18c93597a113bcffe865b2a7"
|
||||
|
||||
BPE_PATH = Path(__file__).resolve().parent / "vendor" / "cl100k_base.tiktoken"
|
||||
|
||||
# Both copied from `tiktoken_ext.openai_public.cl100k_base()`. They are part of
|
||||
# the encoding's identity: the same merge table with a different pattern is a
|
||||
# different tokenizer, so they are pinned here rather than imported, and the
|
||||
# round-trip test asserts this build agrees with tiktoken's own.
|
||||
_PAT_STR = r"""'(?i:[sdmt]|ll|ve|re)|[^\r\n\p{L}\p{N}]?+\p{L}++|\p{N}{1,3}+| ?[^\s\p{L}\p{N}]++[\r\n]*+|\s++$|\s*[\r\n]|\s+(?!\S)|\s"""
|
||||
_SPECIAL_TOKENS = {
|
||||
"<|endoftext|>": 100257,
|
||||
"<|fim_prefix|>": 100258,
|
||||
"<|fim_middle|>": 100259,
|
||||
"<|fim_suffix|>": 100260,
|
||||
"<|endofprompt|>": 100276,
|
||||
}
|
||||
|
||||
|
||||
def _mergeable_ranks() -> dict[bytes, int]:
|
||||
try:
|
||||
data = BPE_PATH.read_bytes()
|
||||
except OSError as exc: # pragma: no cover - packaging fault, not a run fault
|
||||
raise RuntimeError(
|
||||
f"The vendored {ENCODING_NAME} table is missing at {BPE_PATH}. "
|
||||
f"Re-download it from {SOURCE_URL} (SHA-256 {BPE_SHA256})."
|
||||
) from exc
|
||||
|
||||
digest = hashlib.sha256(data).hexdigest()
|
||||
if digest != BPE_SHA256:
|
||||
raise RuntimeError(
|
||||
f"The vendored {ENCODING_NAME} table at {BPE_PATH} has SHA-256 "
|
||||
f"{digest}, expected {BPE_SHA256}."
|
||||
)
|
||||
|
||||
# Same parse as tiktoken.load.load_tiktoken_bpe, minus its fetch/cache step.
|
||||
ranks: dict[bytes, int] = {}
|
||||
for line in data.splitlines():
|
||||
if not line:
|
||||
continue
|
||||
try:
|
||||
token, rank = line.split()
|
||||
ranks[base64.b64decode(token)] = int(rank)
|
||||
except Exception as exc:
|
||||
raise ValueError(f"Error parsing line {line!r} in {BPE_PATH}") from exc
|
||||
return ranks
|
||||
|
||||
|
||||
@functools.lru_cache(maxsize=1)
|
||||
def get_encoding() -> tiktoken.Encoding:
|
||||
"""The `cl100k_base` encoding, built from the vendored table."""
|
||||
return tiktoken.Encoding(
|
||||
name=ENCODING_NAME,
|
||||
pat_str=_PAT_STR,
|
||||
mergeable_ranks=_mergeable_ranks(),
|
||||
special_tokens=_SPECIAL_TOKENS,
|
||||
)
|
||||
+100256
File diff suppressed because it is too large
Load Diff
+25
-4
@@ -1,3 +1,4 @@
|
||||
import mimetypes
|
||||
import os
|
||||
from contextlib import asynccontextmanager
|
||||
from pathlib import Path
|
||||
@@ -68,8 +69,18 @@ app.add_middleware(BodySizeLimitMiddleware)
|
||||
|
||||
class SecurityHeadersMiddleware:
|
||||
"""Standard hardening headers on every response. Pure ASGI (wraps `send`)
|
||||
so SSE streams pass through unbuffered. The CSP allows exactly what the
|
||||
SPA uses: same-origin everything, inline styles (React), Google Fonts."""
|
||||
so SSE streams pass through unbuffered.
|
||||
|
||||
The CSP allows exactly what the SPA uses, and that is now same-origin and
|
||||
nothing else: scripts, styles, fonts, images and XHR/SSE all resolve to the
|
||||
app itself. The fonts used to come from Google, which made an Internet
|
||||
request on every page load; they are self-hosted under /fonts/ instead
|
||||
(frontend/tools/vendor_fonts.py), so `font-src 'self'` covers them and the
|
||||
two remote hosts are gone from the policy.
|
||||
|
||||
`'unsafe-inline'` stays on `style-src` because React writes inline `style`
|
||||
attributes. It is deliberately absent from `script-src`.
|
||||
"""
|
||||
|
||||
_HEADERS = [
|
||||
(b"x-content-type-options", b"nosniff"),
|
||||
@@ -79,10 +90,13 @@ class SecurityHeadersMiddleware:
|
||||
b"content-security-policy",
|
||||
b"default-src 'self'; "
|
||||
b"script-src 'self'; "
|
||||
b"style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; "
|
||||
b"font-src https://fonts.gstatic.com; "
|
||||
b"style-src 'self' 'unsafe-inline'; "
|
||||
b"font-src 'self'; "
|
||||
b"img-src 'self' data:; "
|
||||
b"connect-src 'self'; "
|
||||
b"object-src 'none'; "
|
||||
b"base-uri 'none'; "
|
||||
b"form-action 'self'; "
|
||||
b"frame-ancestors 'none'",
|
||||
),
|
||||
]
|
||||
@@ -171,6 +185,13 @@ class SPAStaticFiles(StaticFiles):
|
||||
return response
|
||||
|
||||
|
||||
# Python's mimetypes table has no entry for woff2 on a slim Debian image, so
|
||||
# StaticFiles served the self-hosted fonts as application/octet-stream. Browsers
|
||||
# take them anyway — a @font-face src carries its own format() hint — but the
|
||||
# honest type costs one line.
|
||||
mimetypes.add_type("font/woff2", ".woff2")
|
||||
mimetypes.add_type("font/woff", ".woff")
|
||||
|
||||
frontend_dist = Path(__file__).resolve().parent.parent.parent / "frontend" / "dist"
|
||||
if frontend_dist.is_dir():
|
||||
app.mount("/", SPAStaticFiles(directory=frontend_dist, html=True), name="frontend")
|
||||
|
||||
@@ -3,7 +3,7 @@ from typing import AsyncIterator
|
||||
|
||||
import httpx
|
||||
|
||||
from .. import debuglog, netguard
|
||||
from .. import debuglog, netguard, tlstrust
|
||||
from .base import PromptParts, Provider, ProviderError
|
||||
|
||||
# Appended after the story text in chat mode, so a chat-tuned model continues
|
||||
@@ -247,7 +247,9 @@ class OpenAICompatibleProvider(Provider):
|
||||
log = debuglog.start_entry(url, self.model, body)
|
||||
received: list[str] = []
|
||||
try:
|
||||
async with httpx.AsyncClient(timeout=httpx.Timeout(120, connect=10)) as client:
|
||||
async with httpx.AsyncClient(
|
||||
timeout=httpx.Timeout(120, connect=10), verify=tlstrust.ssl_context()
|
||||
) as client:
|
||||
async with client.stream("POST", url, json=body, headers=self._headers()) as resp:
|
||||
if resp.status_code != 200:
|
||||
detail = (await resp.aread()).decode(errors="replace")[:500]
|
||||
@@ -354,7 +356,9 @@ class OpenAICompatibleProvider(Provider):
|
||||
|
||||
log = debuglog.start_entry(url, self.model, body)
|
||||
try:
|
||||
async with httpx.AsyncClient(timeout=httpx.Timeout(120, connect=10)) as client:
|
||||
async with httpx.AsyncClient(
|
||||
timeout=httpx.Timeout(120, connect=10), verify=tlstrust.ssl_context()
|
||||
) as client:
|
||||
resp = await client.post(url, json=body, headers=self._headers())
|
||||
except httpx.HTTPError as exc:
|
||||
debuglog.finish_entry(log, error=str(exc))
|
||||
@@ -381,7 +385,9 @@ class OpenAICompatibleProvider(Provider):
|
||||
body = {"model": self.model, "input": texts}
|
||||
log = debuglog.start_entry(url, self.model, body)
|
||||
try:
|
||||
async with httpx.AsyncClient(timeout=httpx.Timeout(60, connect=10)) as client:
|
||||
async with httpx.AsyncClient(
|
||||
timeout=httpx.Timeout(60, connect=10), verify=tlstrust.ssl_context()
|
||||
) as client:
|
||||
resp = await client.post(url, json=body, headers=self._headers())
|
||||
except httpx.HTTPError as exc:
|
||||
debuglog.finish_entry(log, error=str(exc))
|
||||
|
||||
@@ -3,7 +3,7 @@ from fastapi import APIRouter, Depends, Request
|
||||
from sqlalchemy.orm import Session
|
||||
from starlette.concurrency import run_in_threadpool
|
||||
|
||||
from .. import auth, limits, models, netguard, schemas, security
|
||||
from .. import auth, limits, models, netguard, schemas, security, tlstrust
|
||||
from ..database import get_db
|
||||
|
||||
router = APIRouter(prefix="/api/settings", tags=["settings"])
|
||||
@@ -95,7 +95,7 @@ async def list_endpoint_models(cfg: auth.ProviderConfig) -> dict:
|
||||
if cfg.api_key:
|
||||
headers["Authorization"] = f"Bearer {cfg.api_key}"
|
||||
try:
|
||||
async with httpx.AsyncClient(timeout=10) as client:
|
||||
async with httpx.AsyncClient(timeout=10, verify=tlstrust.ssl_context()) as client:
|
||||
resp = await client.get(url, headers=headers)
|
||||
except httpx.HTTPError as exc:
|
||||
return {"ok": False, "detail": f"Connection failed: {exc}"}
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
"""Verify TLS against this machine's own trust store as well as certifi's.
|
||||
|
||||
`httpx` verifies against the `certifi` bundle, which carries the public web's
|
||||
certificate authorities and nothing else. A trusted-LAN inference host often
|
||||
has no public certificate: on a StartOS server, Ollama is served over HTTPS
|
||||
with a certificate from a local CA that the user installs on the machines they
|
||||
use it from. `curl` and the browser accepted such an endpoint; this
|
||||
application refused it:
|
||||
|
||||
Connection failed: [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify
|
||||
failed: self-signed certificate in certificate chain
|
||||
|
||||
That is a wrong answer for the deployment this project targets
|
||||
(`planning/DECISIONS/002-ollama-only-v1.md`), because the user had already
|
||||
made the decision to trust that CA, at the level where such decisions belong.
|
||||
|
||||
So the rule is the one a user already expects from everything else on their
|
||||
machine: **a CA installed on this host is trusted by this application.** This
|
||||
is not a relaxation of verification. Certificates are still verified, hostnames
|
||||
are still checked, and a certificate signed by nobody the machine trusts is
|
||||
still refused — `AIDND_ENDPOINT_INSECURE` and its like deliberately do not
|
||||
exist.
|
||||
|
||||
The two stores are unioned rather than swapped. `ssl.create_default_context()`
|
||||
alone would be a behaviour *change* — it loads only the platform's default CA
|
||||
locations (`/etc/ssl/certs` on Debian and Ubuntu), and a stripped-down image
|
||||
whose system store is empty or stale would start failing on endpoints that
|
||||
used to work. Adding certifi on top makes this a strict superset of the old
|
||||
behaviour, so nothing that verified before can stop verifying now.
|
||||
|
||||
Building a context parses every certificate in both stores, so it is done once
|
||||
and cached. The result is read-only afterwards and is shared safely across
|
||||
concurrent requests.
|
||||
"""
|
||||
|
||||
import functools
|
||||
import ssl
|
||||
|
||||
import certifi
|
||||
|
||||
|
||||
@functools.lru_cache(maxsize=1)
|
||||
def ssl_context() -> ssl.SSLContext:
|
||||
"""The verification context every outbound HTTPS client should use."""
|
||||
context = ssl.create_default_context() # the platform's CA store
|
||||
context.load_verify_locations(cafile=certifi.where()) # plus the public web's
|
||||
return context
|
||||
Reference in New Issue
Block a user