-
Notifications
You must be signed in to change notification settings - Fork 6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
syntax: Reject semver version individual parts in strings #14886
Open
Xanewok
wants to merge
3
commits into
ethereum:develop
Choose a base branch
from
Xanewok:restrain-pragma-version-part-strings
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -240,6 +240,8 @@ SemVerMatchExpression::MatchComponent SemVerMatchExpressionParser::parseMatchCom | |||||||||||||
component.prefix = Token::Assign; | ||||||||||||||
} | ||||||||||||||
|
||||||||||||||
auto const partsStartPos = m_pos; | ||||||||||||||
|
||||||||||||||
component.levelsPresent = 0; | ||||||||||||||
while (component.levelsPresent < 3) | ||||||||||||||
{ | ||||||||||||||
|
@@ -250,6 +252,18 @@ SemVerMatchExpression::MatchComponent SemVerMatchExpressionParser::parseMatchCom | |||||||||||||
else | ||||||||||||||
break; | ||||||||||||||
} | ||||||||||||||
|
||||||||||||||
// Validate that the parsed version parts are either a single string literal or multiple bare tokens, | ||||||||||||||
// i.e. "1.2.3" or 1.2.3 but not 1."2.3", "1".2.3 or 1"."2.3. | ||||||||||||||
auto const partsEndPos = m_pos; // Points *after* the last version part | ||||||||||||||
for (auto i = partsStartPos; i < partsEndPos; ++i) | ||||||||||||||
{ | ||||||||||||||
if (m_tokens[i] == Token::StringLiteral && partsStartPos != partsEndPos - 1) | ||||||||||||||
{ | ||||||||||||||
solThrow(SemVerError, "String literals are only allowed as the only component in a version pragma."); | ||||||||||||||
} | ||||||||||||||
Comment on lines
+261
to
+264
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also a side note - our style is to not use scoping braces
Suggested change
|
||||||||||||||
} | ||||||||||||||
|
||||||||||||||
// TODO we do not support pre and build version qualifiers for now in match expressions | ||||||||||||||
// (but we do support them in the actual versions) | ||||||||||||||
return component; | ||||||||||||||
|
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
3 changes: 3 additions & 0 deletions
3
test/libsolidity/syntaxTests/pragma/broken_version_strings_digit.sol
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
pragma solidity ^"0"."8"."2"; | ||
// ---- | ||
// ParserError 1684: (0-29): Invalid version pragma. String literals are only allowed as the only component in a version pragma. |
3 changes: 3 additions & 0 deletions
3
test/libsolidity/syntaxTests/pragma/broken_version_strings_dots.sol
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
pragma solidity ^ 0 "." 8 "." 2; | ||
// ---- | ||
// ParserError 1684: (0-32): Invalid version pragma. String literals are only allowed as the only component in a version pragma. |
3 changes: 3 additions & 0 deletions
3
test/libsolidity/syntaxTests/pragma/broken_version_strings_part.sol
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
pragma solidity ^ 0."8.0"; | ||
// ---- | ||
// ParserError 1684: (0-26): Invalid version pragma. String literals are only allowed as the only component in a version pragma. |
3 changes: 3 additions & 0 deletions
3
test/libsolidity/syntaxTests/pragma/broken_version_strings_prefix.sol
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
pragma solidity "^0.8.0"; | ||
// ---- | ||
// ParserError 1684: (0-25): Invalid version pragma. Expected the start of a version number but instead found character '^'. Version number is invalid or the pragma is not terminated with a semicolon. |
1 change: 1 addition & 0 deletions
1
test/libsolidity/syntaxTests/pragma/version_component_string_mixed.sol
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
pragma solidity >= 0.0 <= "123456"; |
1 change: 1 addition & 0 deletions
1
test/libsolidity/syntaxTests/pragma/version_component_string_prefix.sol
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
pragma solidity <= "123456"; |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you even this loop and the positional tracking? I think you can have a counter/boolean in the above
while
loop, and check whethercurrentToken() == Token::StringLiteral
, and then error out as soon as you have more than 1?