Fix decrypting keystores with password ending in pipe character #5282
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
This only affects users which provide their password from a file via
'--importKeystoresPassword' and the password ends with a pipe character
('|'). The pipe character was trimmed off by the regex which is only
supposed to remove newline characters and carriage return characters.
Performance Report✔️ no performance regression detected Full benchmark results
|
g11tech
approved these changes
Mar 18, 2023
twoeths
pushed a commit
that referenced
this pull request
Mar 20, 2023
This only affected users which provide their password from a file via
'--importKeystoresPassword' and the password ends with a pipe character
('|'). The pipe character was trimmed off by the regex which is only
supposed to remove newline characters and carriage return characters.
|
🎉 This PR is included in v1.6.0 🎉 |
|
🎉 This PR is included in v1.7.0 🎉 |
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
Closes #5276
Description
Fix decrypting keystores with password ending in pipe character. This only affects users which provide their password from a file via
--importKeystoresPasswordand the password ends with a pipe character (|). The pipe character was trimmed off by the regex which is only supposed to remove newline characters and carriage return characters.Breakdown of our previous regex
[...]: Square brackets define a character set. Any character inside the brackets can be matched.\n: Represents a newline character.|: The pipe symbol acts as an OR operator, meaning either the character before or after the pipe can be matched. However, it is unnecessary to include the pipe symbol inside the square brackets, as the square brackets already create a set of characters that can be matched.\r: Represents a carriage return character.+$: The plus sign means "one or more" of the preceding element (in this case, newline or carriage return characters). The dollar sign represents the end of the string.Updated regex
The new regex
/[\n\r]+$/gwill only match newline and carriage return characters at the end of the string and replace them with an empty string""