Sanitize uacomment #6647
Merged
Sanitize uacomment #6647
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
| @@ -22,7 +22,15 @@ | |||
| /** This is needed because the foreach macro can't get over the comma in pair<t1, t2> */ | |||
| #define PAIRTYPE(t1, t2) std::pair<t1, t2> | |||
|
|
|||
| std::string SanitizeString(const std::string& str); | |||
| static const int SAFE_CHARS_DEFAULT = 0; //!< Default rule in SanitizeString() | |||
There was a problem hiding this comment.
nit: would a enum not be more adequate for a such operation?
There was a problem hiding this comment.
+1 for using enum. This is a perfect fit for one.
Not sure passing in the characters in a string is better. The idea makes sense, but having it like this keeps open the possibility of optimizing SanitizeString to use something else than string.find() on every character.
|
Concept ACK. |
| strSubVersion = FormatSubVersion(CLIENT_NAME, CLIENT_VERSION, mapMultiArgs.count("-uacomment") ? mapMultiArgs["-uacomment"] : std::vector<string>()); | ||
| // sanitize comments per BIP-0014, format user agent and check total size | ||
| std::vector<string> uacomments; | ||
| BOOST_FOREACH(string cmt, mapMultiArgs["-uacomment"]) |
There was a problem hiding this comment.
Alternative: error out if SanitizeString(x) != x, instead of silently dropping characters
There was a problem hiding this comment.
Made it to return error~~, but I am thinking about using warnings instead for the whole uacomment thing.~~
maflcko
force-pushed
the
MarcoFalke-2015-uacommentFix
branch
2 times, most recently
from
afb1e38
to
dfafd6f
Compare
|
Force pushed changes requested in the comments. |
* SanitizeString() can be requested to be more strict * Throw error when SanitizeString() changes uacomments * Fix tests
maflcko
force-pushed
the
MarcoFalke-2015-uacommentFix
branch
from
dfafd6f
to
1c1b1b3
Compare
laanwj
added a commit
that referenced
this pull request
Sep 22, 2015
1c1b1b3 [uacomment] Sanitize per BIP-0014 (MarcoFalke)
|
Tested ACK |
This was referenced May 18, 2017
zkbot
added a commit
to zcash/zcash
that referenced
this pull request
Mar 21, 2018
Misc upstream PRs Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#6077 - Second commit only (first was already applied to 0.11.X and then reverted) - bitcoin/bitcoin#6284 - bitcoin/bitcoin#6489 - bitcoin/bitcoin#6462 - bitcoin/bitcoin#6647 - bitcoin/bitcoin#6235 - bitcoin/bitcoin#6905 - bitcoin/bitcoin#6780 - Excluding second commit (QT) and third commit (requires bitcoin/bitcoin#6993) - bitcoin/bitcoin#6961 - Excluding QT parts, and a small `src/policy/policy.cpp` change which depends on a bunch of other PRs, which we'll have to remember to come back to. - bitcoin/bitcoin#7044 - bitcoin/bitcoin#8856 - bitcoin/bitcoin#9002 Part of #2074 and #2132.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
SanitizeString()can be requested to be more strictSanitizeString()touacomments