Fix tokenization of escaped and single quoted input - #1375
Open
czpilar wants to merge 3 commits into
Open
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
Replace the regex based whitespace splitting in DefaultCommandParser with a character-by-character state machine that understands backslash escaping and both double and single quote delimiters. The previous regex counted all quote characters equally, so an odd number of escaped quotes made the parser split inside a quoted value. Unbalanced quotes are now rejected with a clear error message instead of producing a mis-parsed command. Resolves spring-projects#1374 Signed-off-by: David Pilar <david@czpilar.net>
The quoting behavior was documented in 2.x but the section was lost in later documentation rewrites. Document the rules implemented by DefaultCommandParser in the command syntax page. See spring-projects#1374 Signed-off-by: David Pilar <david@czpilar.net>
JLine's LineReader strips escape characters from the line returned by readLine() when event expansion is enabled, so escaped quotes typed in interactive mode never reached the command parser. In 3.x this did not matter because the shell consumed the words of JLine's ParsedLine instead of the returned raw line. Disable event expansion on the line reader since escape resolution is the responsibility of the command parser. See spring-projects#1374 Signed-off-by: David Pilar <david@czpilar.net>
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
1 participant
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.
Replace the regex based whitespace splitting in DefaultCommandParser with a character-by-character state machine that understands backslash escaping and both double and single quote delimiters. The previous regex counted all quote characters equally, so an odd number of escaped quotes made the parser split inside a quoted value. Unbalanced quotes are now rejected with a clear error message instead of producing a mis-parsed command.
Resolves #1374