fix: preserve csrf context for same-server file fetches#17400
Open
rasitakyol wants to merge 1 commit into
Open
fix: preserve csrf context for same-server file fetches#17400rasitakyol wants to merge 1 commit into
rasitakyol wants to merge 1 commit into
Conversation
rasitakyol
marked this pull request as ready for review
July 18, 2026 14:24
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What?
Why?
Cloud storage focal-point updates can re-fetch an image through a protected Payload route. The internal request kept too little CSRF context, so cookie authentication failed and
req.userwas null. Absolute URLs generated fromserverURLwere also treated as external.How?
Originheader is forwarded only as CSRF metadata after the target matches that trusted origin.Origin, andSec-Fetch-Sitefrom cross-origin requests.externalFileHeaderFiltercontract unchanged. This also addresses the origin-trust concern raised in fix(uploads): prevent SSRF and auth-cookie leak in getExternalFile #17290 without blanket-stripping authentication required by protected same-server storage routes.pnpm test:int:sqlite test/uploads/int.spec.ts(110 passed),pnpm build:payload --force, Prettier, source ESLint, andgit diff --check.Fixes #17293