fix: validate returnTo parameter to prevent open redirect#46
Open
nitishagar wants to merge 1 commit into
Open
Conversation
|
|
IDisposable
approved these changes
Jan 28, 2026
IDisposable
left a comment
IDisposable
left a comment
Contributor
There was a problem hiding this comment.
This is an extremely good idea. :)
adamshiervani
requested changes
Feb 2, 2026
Comment on lines
+185
to
+209
| // Validate returnTo before redirecting (defense in depth) | ||
| if (!isValidReturnToUrl(returnTo, APP_HOSTNAME)) { | ||
| console.warn("Invalid returnTo URL detected at redirect point:", returnTo); | ||
| // Fall back to safe default | ||
| const safeUrl = new URL(`${APP_HOSTNAME}/devices`); | ||
| safeUrl.searchParams.append("tempToken", tempToken); | ||
| safeUrl.searchParams.append("deviceId", deviceId); | ||
| safeUrl.searchParams.append("oidcGoogle", tokenSet.id_token.toString()); | ||
| safeUrl.searchParams.append("clientId", process.env.GOOGLE_CLIENT_ID); | ||
| return res.redirect(safeUrl.toString()); | ||
| } | ||
|
|
||
| const url = new URL(returnTo); | ||
| url.searchParams.append("tempToken", tempToken); | ||
| url.searchParams.append("deviceId", deviceId); | ||
| url.searchParams.append("oidcGoogle", tokenSet.id_token.toString()); | ||
| url.searchParams.append("clientId", process.env.GOOGLE_CLIENT_ID); | ||
| return res.redirect(url.toString()); | ||
| } | ||
| // Validate returnTo before redirecting (defense in depth) | ||
| if (!isValidReturnToUrl(returnTo, APP_HOSTNAME)) { | ||
| console.warn("Invalid returnTo URL detected at redirect point:", returnTo); | ||
| // Fall back to safe default | ||
| return res.redirect(`${APP_HOSTNAME}/devices`); | ||
| } |
Contributor
There was a problem hiding this comment.
This is not needed, as we are the one setting the session cookie, and we sign them with our COOKIE_SECRET.
Author
There was a problem hiding this comment.
👍 - removed both output-side checks in Callback() (this one in the no-device branch, and the equivalent one in the device-adopt branch). The load-bearing input validation in Google() stays.
Add URL validation for the returnTo parameter in OIDC authentication flow to prevent open redirect vulnerabilities. - Add isValidReturnToUrl() helper function to validate URLs - Validate returnTo at input point (when storing in session) - Export isValidReturnToUrl so it can be unit-tested directly - Reject external URLs with BadRequestError The returnTo is validated once at the only write site (the Google() handler); the session cookie is HMAC-signed, so the value read at redirect time is the value that was validated at write time. Output-side re-validation in Callback() was therefore tautologically redundant and is removed. Fixes jetkvm#7
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
4 participants
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.
Add URL validation for the returnTo parameter in OIDC authentication flow to prevent open redirect vulnerabilities.
Fixes #7