Skip to content

security: use request.url instead of req.headers.host in revalidation patch #1331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ashutosh0x wants to merge 1 commit into
base: main
Choose a base branch
from
Open

security: use request.url instead of req.headers.host in revalidation patch #1331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .changeset/fix-host-header-revalidation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
"@opennextjs/cloudflare": patch
---

fix: use constant internal origin instead of req.headers.host in revalidation patch

The `res.revalidate()` patch now uses a constant internal origin (`https://self.local`)
instead of the user-controllable `req.headers.host` for the `WORKER_SELF_REFERENCE.fetch()`
URL. The service binding routes to the correct worker regardless of the URL host, so the
host value is only metadata. This eliminates host header injection without affecting
functionality.
2 changes: 1 addition & 1 deletion packages/cloudflare/src/cli/build/patches/plugins/res-revalidate.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ describe("patchResRevalidate", () => {
- method: 'HEAD',
- headers: revalidateHeaders
- });
+ const res = await (await import("@opennextjs/cloudflare")).getCloudflareContext().env.WORKER_SELF_REFERENCE.fetch(\`\${req.headers.host.includes("localhost") ? "http":"https" }://\${req.headers.host}\${urlPath}\`,{method:'HEAD', headers:revalidateHeaders});
+ const res = await (await import("@opennextjs/cloudflare")).getCloudflareContext().env.WORKER_SELF_REFERENCE.fetch(\`https://self.local\${urlPath}\`,{method:'HEAD', headers:revalidateHeaders});
// we use the cache header to determine successful revalidate as
// a non-200 status code can be returned from a successful revalidate
// e.g. notFound: true returns 404 status code but is successful
Expand Down
2 changes: 1 addition & 1 deletion packages/cloudflare/src/cli/build/patches/plugins/res-revalidate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ rule:
has:
kind: identifier

fix: await (await import("@opennextjs/cloudflare")).getCloudflareContext().env.WORKER_SELF_REFERENCE.fetch(\`\${$REQ.headers.host.includes("localhost") ? "http":"https" }://\${$REQ.headers.host}$URL_PATH\`,{method:'HEAD', headers:$HEADERS})
fix: await (await import("@opennextjs/cloudflare")).getCloudflareContext().env.WORKER_SELF_REFERENCE.fetch(\`https://self.local$URL_PATH\`,{method:'HEAD', headers:$HEADERS})
`;

export const patchResRevalidate: CodePatcher = {
Expand Down