Repository navigation
Conversation
Publisher pages had origin URLs rewritten in the body but not in headers, so browsers followed Location and Refresh to the origin, preloaded Link targets from it, and blocked rewritten resources under the forwarded CSP. Map origin URLs in Location, Content-Location, Refresh, and Link (including imagesrcset) to the serving host on every publisher response, and add serving-host sources beside origin sources in Content-Security-Policy and its report-only variant. Rewriting runs before the template-cache gate so cached templates replay the rewritten policy headers; bump the template schema to 6 so entries stored with origin-only policy metadata are not replayed. Leave a Location or Refresh target unchanged when it names the current request URL under a different scheme than the origin, so an origin scheme upgrade cannot loop the browser. Closes #1128 Signed-off-by: dhruv8sh <dhruv8sh@proton.me>
prk-Jr
left a comment
There was a problem hiding this comment.
Summary
Solid, well-tested change. Rewrites origin URLs in Location, Content-Location, Refresh, Link, and both CSP headers; Set-Cookie/Vary untouched. Host matching is strict and case-insensitive, multi-value headers preserve order, and the rewrite runs before template-cache capture (with the schema bump to 6) in the shared handle_publisher_request path used by all adapters. No blocking findings.
Non-blocking
- 🤔 Loop-guard escape logs only at
debug(inline, suggestion) - 🤔 Same-URL cookie-setting redirect can loop when the cookie has
Domain=<origin host>(inline) - 🌱 CSP
:*/ explicit default-port sources not matched (inline) - ⛏ Docs row omits
report-to(inline, suggestion)
📌 Out of scope
Set-Cookie Domain, Reporting-Endpoints/Report-To, and Access-Control-Allow-Origin still pass through unchanged. Leaving report endpoints alone matches the report-uri choice; the Set-Cookie Domain gap (see inline comment) is worth a follow-up issue. Asset-proxy routes (handle_asset_proxy_request) also bypass this rewrite, consistent with the docs saying "publisher response".
📝 Note
The PR checklist says "Uses tracing macros", but the code correctly uses log — only the checklist wording is off.
Verification
cargo fmt --all -- --check✅cargo clippy-fastly✅ (no warnings)cargo test -p trusted-server-core(host) ✅ 2916 passed, 0 failed (includes 18 newresponse_header_rewritetests and 5 new publisher tests)- Both suggestions scratch-verified (fmt/clippy/tests; docs prettier check)
- CI: all 20 checks passing
ChristianPavilonis
left a comment
There was a problem hiding this comment.
Review summary
Reviewed 7871acdd56324d20c182e0c3093e5bd535dd96e9 against 80483011e30a446ac741b4423e36f8d142c5d2ac, branch fix/rewrite-origin-urls-in-response-headers into main. Approving with two P2 edge-case findings posted inline.
Inspected all five changed files and traced the rewrite through publisher response modes, cache capture/replay, all four adapters, and final header overrides. Cache-hit, repeated-policy-header, and previous-schema rejection tests confirm rewritten policy replay for the tested core cache implementation.
Validation and review context
cargo test -p trusted-server-core response_header_rewrite --locked: 18 passed. Initial compilation timed out; rerun completed.cargo test -p trusted-server-core publisher::tests --locked: 372 passed.cargo test -p trusted-server-core platform::template_cache --locked: 32 passed.cargo test -p trusted-server-core --locked --quiet: 2,916 unit tests passed; 4 doctests passed, 5 ignored.cargo fmt --all -- --check: passed.- An exact-module scratch executable and two
node --input-type=moduleChromium fixtures reproduced the inline findings. - CI: All 20 reported checks passed; none reported failed or skipped.
- Existing feedback: Inspected the review, inline comments, unresolved threads, replies, and issue comments. Neither finding duplicates existing feedback.
- Residual risk: Browser fixtures exercised the exact rewrite module, not a deployed adapter. Adapter suites, production Fastly cache, and lint checks were not rerun locally.
- Revision remained unchanged; working tree is clean. No repository files were edited and no review work was delegated.
A scheme-change redirect such as https://origin.example.com?x=1 or one with dot segments was compared to the request path as raw text, so it did not match /?x=1 and was rewritten back to the URL the browser had just requested, looping. Parse the target as a URL so the comparison sees the same path and query the browser will follow. Signed-off-by: dhruv8sh <dhruv8sh@proton.me>
Deduplication compared whole source expressions case-insensitively, so a policy listing origin paths /A.js and /a.js gained a serving-host sibling only for /A.js and the rewritten /a.js stayed blocked. Compare scheme and host case-insensitively and the path exactly, as CSP path matching does. Signed-off-by: dhruv8sh <dhruv8sh@proton.me>
When the origin forces a different scheme than publisher.origin_url, every navigation leaves the serving host and bypasses Trusted Server. That almost always means origin_url has the wrong scheme, so surface it as a warning naming the setting to check. Signed-off-by: dhruv8sh <dhruv8sh@proton.me>
Signed-off-by: dhruv8sh <dhruv8sh@proton.me>
Same-scheme redirects to the current URL are now kept on the serving host, but Set-Cookie Domain attributes are not rewritten. A cookie scoped to the origin host is rejected on the serving host, so a cookie-gated self-redirect repeats. State this in the navigation rewrite docs and the configuration guide. Signed-off-by: dhruv8sh <dhruv8sh@proton.me>
…ls-in-response-headers Signed-off-by: dhruv8sh <dhruv8sh@proton.me>
Summary
Location/Refreshoff the appliance, preloadedLinktargets straight from the origin, and blocked rewritten resources under a CSP that only allowed the origin.Location,Content-Location,RefreshandLink(includingimagesrcset) are rewritten. For CSP, a serving-host source is added beside each origin source, and no origin source is removed. Each response's own header values are rewritten, so per-page policies survive; this is not one static replacement.http://origin forcing HTTPS) is left unchanged so it can't loop. Same-scheme redirects to the current URL, such as after a form POST, are still rewritten.Changes
crates/trusted-server-core/src/response_header_rewrite.rsLocation,Content-Location,Refresh,Link(<target>and quotedimagesrcset) and CSP/CSP-Report-Only. CSP is additive with de-duplication, andreport-uri/report-toare skipped. Includes the scheme-change loop guard and unit tests.crates/trusted-server-core/src/publisher.rsLink. Updates two schema-version pins.crates/trusted-server-core/src/platform/template_cache.rsTEMPLATE_SCHEMA_VERSIONfrom 5 to 6, so templates stored with origin-only policy metadata are not replayed after deploy. Updates the golden-key test.crates/trusted-server-core/src/lib.rspub(crate)).docs/guide/configuration.md[response_headers]still overrides the rewrite, and that host rewriting cannot authorize inline inserts that lack a nonce.Closes
Closes #1128
Test plan
cargo test-fastly && cargo test-axum(alsocargo test-cloudflare,cargo test-spin, and theparityintegration test)cargo clippy-fastly && cargo clippy-axum(alsoclippy-cloudflare,clippy-cloudflare-wasm,clippy-spin-native,clippy-spin-wasm)cargo fmt --all -- --checkcd crates/trusted-server-js/lib && npx vitest run(Node 24.12.0, per.tool-versions)cd crates/trusted-server-js/lib && npm run formatcd docs && npm run format(plus the markdown check outsidedocs/)cargo build --package trusted-server-adapter-fastly --release --target wasm32-wasip1fastly compute serveNot yet done: re-running the issue's browser checks (Chrome against the Axum dev server) for
Location,Refresh,Linkpreload and the CSPimg-srccase.Checklist
unwrap()in production code — useexpect("should ...")tracingmacros (notprintln!)