fix: percent decode path segments #129
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
davidpdrsn
requested changes
Aug 26, 2021
ttys3
force-pushed
the
master
branch
2 times, most recently
from
7f8c06d
to
b51e9ce
Compare
davidpdrsn
reviewed
Aug 26, 2021
ttys3
force-pushed
the
master
branch
4 times, most recently
from
68067f1
to
bf1fa52
Compare
davidpdrsn
reviewed
Aug 26, 2021
Comment on lines
72
to
73
| let path_decoded: Cow<str>; | ||
| if let Ok(decoded_utf8) = percent_decode(path.as_ref()).decode_utf8() { |
There was a problem hiding this comment.
I think this should work as well.
Suggested change
| let path_decoded: Cow<str>; | |
| if let Ok(decoded_utf8) = percent_decode(path.as_ref()).decode_utf8() { | |
| let path_decoded = if let Ok(decoded_utf8) = percent_decode(path.as_ref()).decode_utf8() { |
There was a problem hiding this comment.
Wow, this could save a Cow import
|
Nice! Wanna add a line to changelog? |
ttys3
force-pushed
the
master
branch
2 times, most recently
from
f38408e
to
30c4820
Compare
Changelog added, thank you for being so patient to a Rust newbie. today I learned a lot |
davidpdrsn
approved these changes
Aug 26, 2021
|
Thanks for fixing this! |
davidpdrsn
added a commit
that referenced
this pull request
Nov 13, 2021
- New middleware: Add `Cors` for setting [CORS] headers ([#112]) - New middleware: Add `AsyncRequireAuthorization` ([#118]) - `Compression`: Don't recompress HTTP responses ([#140]) - `Compression` and `Decompression`: Pass configuration from layer into middleware ([#132]) - `ServeDir` and `ServeFile`: Improve performance ([#137]) - `Compression`: Remove needless `ResBody::Error: Into<BoxError>` bounds ([#117]) - `ServeDir`: Percent decode path segments ([#129]) - `ServeDir`: Use correct redirection status ([#130]) - `ServeDir`: Return `404 Not Found` on requests to directories if `append_index_html_on_directories` is set to `false` ([#122]) [#112]: #112 [#118]: #118 [#140]: #140 [#132]: #132 [#137]: #137 [#117]: #117 [#129]: #129 [#130]: #130 [#122]: #122
Merged
davidpdrsn
added a commit
that referenced
this pull request
Nov 13, 2021
- New middleware: Add `Cors` for setting [CORS] headers ([#112]) - New middleware: Add `AsyncRequireAuthorization` ([#118]) - `Compression`: Don't recompress HTTP responses ([#140]) - `Compression` and `Decompression`: Pass configuration from layer into middleware ([#132]) - `ServeDir` and `ServeFile`: Improve performance ([#137]) - `Compression`: Remove needless `ResBody::Error: Into<BoxError>` bounds ([#117]) - `ServeDir`: Percent decode path segments ([#129]) - `ServeDir`: Use correct redirection status ([#130]) - `ServeDir`: Return `404 Not Found` on requests to directories if `append_index_html_on_directories` is set to `false` ([#122]) [#112]: #112 [#118]: #118 [#140]: #140 [#132]: #132 [#137]: #137 [#117]: #117 [#129]: #129 [#130]: #130 [#122]: #122
davidpdrsn
added a commit
that referenced
this pull request
Nov 13, 2021
- New middleware: Add `Cors` for setting [CORS] headers ([#112]) - New middleware: Add `AsyncRequireAuthorization` ([#118]) - `Compression`: Don't recompress HTTP responses ([#140]) - `Compression` and `Decompression`: Pass configuration from layer into middleware ([#132]) - `ServeDir` and `ServeFile`: Improve performance ([#137]) - `Compression`: Remove needless `ResBody::Error: Into<BoxError>` bounds ([#117]) - `ServeDir`: Percent decode path segments ([#129]) - `ServeDir`: Use correct redirection status ([#130]) - `ServeDir`: Return `404 Not Found` on requests to directories if `append_index_html_on_directories` is set to `false` ([#122]) [#112]: #112 [#118]: #118 [#140]: #140 [#132]: #132 [#137]: #137 [#117]: #117 [#129]: #129 [#130]: #130 [#122]: #122
davidpdrsn
added a commit
that referenced
this pull request
Nov 13, 2021
- New middleware: Add `Cors` for setting [CORS] headers ([#112]) - New middleware: Add `AsyncRequireAuthorization` ([#118]) - `Compression`: Don't recompress HTTP responses ([#140]) - `Compression` and `Decompression`: Pass configuration from layer into middleware ([#132]) - `ServeDir` and `ServeFile`: Improve performance ([#137]) - `Compression`: Remove needless `ResBody::Error: Into<BoxError>` bounds ([#117]) - `ServeDir`: Percent decode path segments ([#129]) - `ServeDir`: Use correct redirection status ([#130]) - `ServeDir`: Return `404 Not Found` on requests to directories if `append_index_html_on_directories` is set to `false` ([#122]) [#112]: #112 [#118]: #118 [#140]: #140 [#132]: #132 [#137]: #137 [#117]: #117 [#129]: #129 [#130]: #130 [#122]: #122
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.
Motivation
ServerDirdoes not do url decode.When I try to GET a uri like
/中文文件.txtthe user agent will send
/%E4%B8%AD%E6%96%87%E6%96%87%E4%BB%B6.txt, andServerDirjust try to open a file named/%E4%B8%AD%E6%96%87%E6%96%87%E4%BB%B6.txt, cause a404file not found error.related issue #114
Solution
decode uri path before open it as an file path