Fix URL parameter decoding in web server #3313
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
|
I think this has been fixed in #2956, please reopen if I'm wrong. |
|
Ok, rebased the test-related commits on top of master, and the tests fail. Haven't looked into the "why" yet, but i guess the fix which was merged was not comprehensive enough. |
innodron
reviewed
Oct 4, 2017
| @@ -317,8 +313,8 @@ void ESP8266WebServer::_parseArguments(String data) { | |||
| continue; | |||
| } | |||
| RequestArgument& arg = _currentArgs[iarg]; | |||
| arg.key = data.substring(pos, equal_sign_index); | |||
| arg.value = data.substring(equal_sign_index + 1, next_arg_index); | |||
| arg.key = urlDecode(data.substring(pos, equal_sign_index)); | |||
There was a problem hiding this comment.
Why decode the key as well, any use case ?
There was a problem hiding this comment.
Any case that uses non-URL-safe characters in key names is a use case for this. They need to be decoded as well as values.
The parameters string needs to be first split on & and =, and URL decoding on parts done after that. Otherwise URL encoded & and = within parameter names and values cause incorrect splitting.
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.
The parameters string needs to be first split on
&and=, and URL decoding on parts done after that. Otherwise URL encoded&and=within parameter names and values cause incorrect splitting.I haven't been able to actually test this, except that it compiles. Running the test gives me a "begin timeout" for some reason before the test run starts. Compilation and upload appear to work fine.