fix: returns error with illegal args with unknowns flag (#7127) #7149
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
kd-labs
force-pushed
the
illegal-unknown-args
branch
from
212dbd1
to
13205b0
Compare
srenatus
reviewed
Nov 4, 2024
cmd/eval.go
Outdated
Comment on lines
141
to
154
| //* check if illegal arguments is passed with unknowns flag | ||
| regexArr := regexp.MustCompile(`^\[.*\]$`) | ||
| for _, unknwn := range p.unknowns { | ||
| if regexArr.MatchString(unknwn) { | ||
| return errors.New(errIllegalUnknownsArg.Error()) | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
I wonder if we can attempt to parse it using ast.ParseTerm, like
t, err := ast.ParseTerm(unknwn)
if err != nil { ... }and then check t.Value's type, like
switch t.Value.(type) {
case ast.Ref: // OK
default:
return errors.New(errIllegalUnknownsArg.Error())
}That way, we should be able to capture more illegal inputs than using the regexp. For example, proficient rego users could attempt to pass a set of things like {data.unknown, input.foobar} using {..} which isn't captured by the regular expression.
There was a problem hiding this comment.
sure...will look into it
kd-labs
force-pushed
the
illegal-unknown-args
branch
2 times, most recently
from
ca4d344
to
b0d4c94
Compare
srenatus
reviewed
Nov 22, 2024
| name: "happy path: passing ref as unknown", | ||
| unknowns: "data.posts", | ||
| expectedErr: nil, | ||
| }, |
There was a problem hiding this comment.
Please, could you add cases for these?
inputinput.users
just to be sure that it'll all end up a ref.
There was a problem hiding this comment.
I've made the required changes in the test cases. could you plz review
…agent#7127) Signed-off-by: kunal.das <[email protected]>
Signed-off-by: kunal.das <[email protected]>
Signed-off-by: kunal.das <[email protected]>
kd-labs
force-pushed
the
illegal-unknown-args
branch
from
b0d4c94
to
f34fb2a
Compare
srenatus
reviewed
Nov 22, 2024
cmd/eval.go
Outdated
| case ast.Ref: | ||
| return nil | ||
| default: | ||
| return errors.New(errIllegalUnknownsArg.Error()) |
There was a problem hiding this comment.
Hmm. Can't we simplify this? 🤔
Suggested change
| return errors.New(errIllegalUnknownsArg.Error()) | |
| return errIllegalUnknownsArg |
srenatus
reviewed
Nov 22, 2024
cmd/eval.go
Outdated
| @@ -132,6 +137,21 @@ func validateEvalParams(p *evalCommandParams, cmdArgs []string) error { | |||
| return errors.New("invalid output format for evaluation") | |||
| } | |||
|
|
|||
| //* check if illegal arguments is passed with unknowns flag | |||
There was a problem hiding this comment.
[nit]
Suggested change
| //* check if illegal arguments is passed with unknowns flag | |
| // check if illegal arguments is passed with unknowns flag |
Signed-off-by: kunal.das <[email protected]>
Signed-off-by: kunal.das <[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.
Why the changes in this PR are needed?
What are the changes in this PR?
Notes to assist PR review:
Further comments: