Skip to content

fix(cloudflare/worker): don't merge query params into external redirects #288

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

Merged
smecsia merged 1 commit into from
May 21, 2026
Merged

fix(cloudflare/worker): don't merge query params into external redirects #288

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
29 changes: 15 additions & 14 deletions pkg/clouds/pulumi/cloudflare/registrar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,22 +249,23 @@ async function handleRequest(origRequest) {
if (location) {
const target = new URL(location, url);

// merge original query string with redirect's own query params
// redirect params take precedence over original request params
if (url.search) {
const origParams = new URLSearchParams(url.search);
const targetParams = new URLSearchParams(target.search);
for (const [key, value] of origParams) {
if (!targetParams.has(key)) {
targetParams.append(key, value);
// Only rewrite hostname AND merge query params if redirect is to our
// target upstream. External redirects (S3 presigned URLs, OAuth, etc.)
// must pass through unchanged — extra query params break S3 signatures
// and may leak request secrets (e.g. ?secret=) to third parties.
if (target.hostname === overrideHost) {
// merge original query string with redirect's own query params
// redirect params take precedence over original request params
if (url.search) {
const origParams = new URLSearchParams(url.search);
const targetParams = new URLSearchParams(target.search);
for (const [key, value] of origParams) {
if (!targetParams.has(key)) {
targetParams.append(key, value);
}
}
target.search = targetParams.toString();
}
target.search = targetParams.toString();
}

// Only rewrite hostname if redirect is to our target upstream (overrideHost)
// External redirects (e.g., to Microsoft login) should pass through unchanged
if (target.hostname === overrideHost) {
target.hostname = origHost;
target.protocol = new URL(request.url).protocol;
}
Expand Down
Loading