Ruby: Make array inclusion barrier more sensitive #11534
Merged
Conversation
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
hmac
force-pushed
the
array-inclusion-barrier-guard-constant
branch
2 times, most recently
from
bb20ac9 to
99c06ad
Compare
hvitved
reviewed
Dec 12, 2022
| @@ -116,7 +116,7 @@ private predicate stringConstArrayInclusionCall( | |||
| isArrayConstant(t.getContainerNode().asExpr(), arr) | |||
| | | |||
| forall(ExprCfgNode elem | elem = arr.getAnArgument() | | |||
| elem instanceof ExprNodes::StringLiteralCfgNode | |||
| elem.getConstantValue().isStringlikeValue(_) | |||
There was a problem hiding this comment.
Consider replacing all occurrences of ExprNodes::StringLiteralCfgNode in this file.
There was a problem hiding this comment.
This seems to make sense, I think it would allow us to cover guards like:
guardvar = "safe"
case input
when guardvar
# input is validated
else
# input is not validated
end
alexrford
reviewed
Jan 3, 2023
This demonstrates that we are missing a guard when a case branch compares against a string-valued variable rather than a string literal.
This increases the sensitivity of our barrier guards.
hmac
force-pushed
the
array-inclusion-barrier-guard-constant
branch
from
448131e to
4d228bc
Compare
alexrford
approved these changes
Jan 5, 2023
hvitved
reviewed
Jan 9, 2023
| // Only consider strings without any interpolations | ||
| not strLitNode.getExpr().getComponent(_) instanceof StringInterpolationComponent and | ||
| exists(ExprCfgNode strNode | | ||
| strNode.getConstantValue().isStringlikeValue(_) and | ||
| c.getExpr() instanceof EqExpr and | ||
| branch = true | ||
| or | ||
| c.getExpr() instanceof CaseEqExpr and branch = true |
There was a problem hiding this comment.
strnode is not restricted in this disjunct and the one below
There was a problem hiding this comment.
Thank you! I missed this comment until recently. A fix for this is here: #12052
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.
This change means we recognise barriers where a variable is tested for inclusion in an array which contains variables, rather than just string literals. The only requirement is that the variables have a stringlike
ConstantValue.