fix: correctly allow redirects to external URLs #5005
Merged
Conversation
This file contains 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
📊 Benchmark resultsComparing with 1e5f8b0 Package size: 222 MB(no change) Legend
|
danez
commented
Aug 26, 2022
| @@ -70,7 +70,7 @@ const proxyToExternalUrl = function ({ dest, destURL, req, res }) { | |||
| pathRewrite: () => destURL, | |||
| ...(Buffer.isBuffer(req.originalBody) && { buffer: toReadableStream(req.originalBody) }), | |||
| }) | |||
| return handler(req, res, {}) | |||
| return handler(req, res, () => {}) | |||
There was a problem hiding this comment.
I only noticed this because a request was not matching and http-proxy-rewrite was actually calling next (the third parameter)
next is not a function
danez
commented
Aug 26, 2022
| @@ -185,7 +185,7 @@ const serveRedirect = async function ({ match, options, proxy, req, res }) { | |||
|
|
|||
| const staticFile = await getStatic(decodeURIComponent(reqUrl.pathname), options.publicFolder) | |||
| if (staticFile) { | |||
| req.url = encodeURIComponent(staticFile) + reqUrl.search | |||
| req.url = encodeURI(staticFile) + reqUrl.search | |||
There was a problem hiding this comment.
This fixes a problem where static URLs are escaped to %2Findex.html. This was introduced in #2665 but even now after changing the to escapeUri the tests still work.
danez
commented
Aug 26, 2022
| body: 'param=value', | ||
| followRedirect: false, | ||
| }), | ||
| ) |
There was a problem hiding this comment.
Just replaced with got instead of custom HTTP request.
danez
commented
Aug 26, 2022
| t.is(response3, '<html><h1>not-foo') | ||
| }) | ||
| }) | ||
| }) |
There was a problem hiding this comment.
These tests are all duplicates and are actually also in 500.command.dev.test.js
checked by comparing the two files.
tinfoil-knight
previously approved these changes
Aug 27, 2022
danez
changed the title
|
About the commit message, it is true that the commit message on its own sounds weird with the double |
tinfoil-knight
approved these changes
Aug 30, 2022
jackiewmacharia
approved these changes
Aug 30, 2022
khendrikse
pushed a commit
that referenced
this pull request
Sep 9, 2022
* fix: fix redirects to external URLs * chore: fix nit from review Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
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.
🎉 Thanks for submitting a pull request! 🎉
Summary
#4109 change the behavior so that every redirect to an external URL was actually executed as a rewrite. The tests only checked the response body which is identical no matter if redirect or rewrite.
This is now fixed and the tests adapted to actually check if a redirect is happening.
Fixes #2710
Fixes #1242