ast: Disallowing partial object rules to have other partial object rule within their immediate extent #5864
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
…le within their immediate extent The compiler should disallow single-value rules to have other rules within their extent. Previously, the compiler would erroneously allow such overlaps, where the immediate "child" rule of a partial object rule in the rule tree was also a partial object rule. This condition is not expected during evaluation, which will result in a broken object merge. Fixes: open-policy-agent#5855 Signed-off-by: Johan Fylling <[email protected]>
✅ Deploy Preview for openpolicyagent ready!
To edit notification comments on pull requests, go to your Netlify site settings. |
srenatus
reviewed
Apr 25, 2023
srenatus
previously approved these changes
Apr 25, 2023
| singleValueConflicts = append(singleValueConflicts, childRule.Ref()) | ||
| } | ||
| } | ||
| } | ||
| if len(c.Children) > 0 { | ||
| singleValueConflicts = node.flattenChildren() |
There was a problem hiding this comment.
Just from looking at the code, it looks like singleValueConflicts could be set in line 912, and end up being overwritten here. But I guess the two branches are mutually exclusive?
There was a problem hiding this comment.
I think they are 🤔 .
But you have a good point. I'll make this an append to be on the safe side. Don't think its worthwhile looking for duplicates, though.
…onflict is found Signed-off-by: Johan Fylling <[email protected]>
johanfylling
force-pushed
the
jf/invalid_partial_object_merge
branch
from
2c19c24 to
01210a1
Compare
srenatus
approved these changes
Apr 25, 2023
kjothen
pushed a commit
to kjothen/opa
that referenced
this pull request
Apr 25, 2023
…le within their immediate extent (open-policy-agent#5864) The compiler should disallow single-value rules to have other rules within their extent. Previously, the compiler would erroneously allow such overlaps, where the immediate "child" rule of a partial object rule in the rule tree was also a partial object rule. This condition is not expected during evaluation, which will result in a broken object merge. Fixes: open-policy-agent#5855 Signed-off-by: Johan Fylling <[email protected]>
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.
The compiler should disallow single-value rules to have other rules within their extent. Previously, the compiler would erroneously allow such overlaps, where the immediate "child" rule of a partial object rule in the rule tree was also a partial object rule. This condition is not expected during evaluation, which will result in a broken object merge.
Fixes: #5855