fix: support regex_uri with unsafe_uri in proxy-rewrite #9813
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
Signed-off-by: revolyssup <ashishjaitiwari15112000@gmail.com>
5 tasks
Signed-off-by: revolyssup <ashishjaitiwari15112000@gmail.com>
|
Please fix the code lint |
monkeyDluffy6017
added
the
wait for update
Signed-off-by: revolyssup <ashishjaitiwari15112000@gmail.com>
@monkeyDluffy6017 Done. Please approve CI |
Sn0rt
approved these changes
Jul 12, 2023
apisix/plugins/proxy-rewrite.lua
Outdated
Comment on lines
353
to
363
| if conf.use_real_request_uri_unsafe and conf.regex_uri then | ||
| local index | ||
| if separator_escaped then | ||
| index = str_find(upstream_uri,"?") | ||
| end | ||
| if index then | ||
| upstream_uri = sub_str(upstream_uri, 1, index - 1) | ||
| ..sub_str(upstream_uri,index) | ||
| end | ||
| ctx.var.upstream_uri = upstream_uri | ||
| end |
There was a problem hiding this comment.
Why do you add these code?
There was a problem hiding this comment.
You're right, in the if block above this when the safe encoding was on then this logic was added to first remove the ? and then readd after safely encoding. When we're skipping the safe encoding then we don't need to do any of that but I added it by mistake. Removed this.
Signed-off-by: revolyssup <ashishjaitiwari15112000@gmail.com>
AlinsRan
previously approved these changes
Jul 14, 2023
monkeyDluffy6017
approved these changes
Jul 14, 2023
monkeyDluffy6017
requested changes
Jul 14, 2023
…x into revolyssup/fixunsafebug
done |
monkeyDluffy6017
approved these changes
Jul 14, 2023
monkeyDluffy6017
added
approved
and removed
wait for update
AlinsRan
approved these changes
Jul 14, 2023
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.
Description
Fixes #9638
Tests to be added
Checklist