Skip to content
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.

Sign up for GitHub

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

fix(GraphQL): Added error for case when multiple filter functions are used in filter. #7368

Merged
merged 3 commits into from
Jan 27, 2021
Merged

fix(GraphQL): Added error for case when multiple filter functions are used in filter. #7368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab0a719
added fix and test
JatinDev543 Jan 27, 2021
15d97ac
clear code
JatinDev543 Jan 27, 2021
17a6309
addressed abhimanyu's comments
JatinDev543 Jan 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion graphql/e2e/common/error_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,4 +348,18 @@
{ }
errors:
[ { "message": "Out of range value '2147483648', for type `Int`",
"locations": [ { "line": 2, "column": 53 } ] } ]
"locations": [ { "line": 2, "column": 53 } ] } ]

- name: "Error when multiple filter functions are used"
gqlrequest: |
query {
queryBook(filter:{bookId: {eq:2 le:2}})
{
bookId
}
}
gqlvariables: |
{ }
errors:
[ { "message": "Int64Filter filter expects only one filter function, got: 2",
"locations": [ { "line": 2, "column": 29 } ] } ]
1 change: 1 addition & 0 deletions graphql/schema/rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ func init() {
validator.AddRule("Check arguments of cascade directive", directiveArgumentsCheck)
validator.AddRule("Check range for Int type", intRangeCheck)
validator.AddRule("Input Coercion to List", listInputCoercion)
validator.AddRule("Check filter functions", filterCheck)

}

Expand Down
17 changes: 17 additions & 0 deletions graphql/schema/validation_rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,17 @@ package schema

import (
"errors"
"github.com/dgraph-io/dgraph/x"
"strconv"

"github.com/dgraph-io/gqlparser/v2/ast"
"github.com/dgraph-io/gqlparser/v2/validator"
)

var allowedFilters = []string{"StringHashFilter", "StringExactFilter", "StringFullTextFilter",
"StringRegExpFilter", "StringTermFilter", "DateTimeFilter", "FloatFilter", "Int64Filter", "IntFilter", "PointGeoFilter",
"ContainsFilter", "IntersectsFilter", "PolygonGeoFilter"}

func listInputCoercion(observers *validator.Events, addError validator.AddErrFunc) {
observers.OnValue(func(walker *validator.Walker, value *ast.Value) {
if value.Definition == nil || value.ExpectedType == nil {
Expand Down Expand Up @@ -51,6 +56,18 @@ func listInputCoercion(observers *validator.Events, addError validator.AddErrFun
})
}

func filterCheck(observers *validator.Events, addError validator.AddErrFunc) {
observers.OnValue(func(walker *validator.Walker, value *ast.Value) {
if value.Definition == nil {
return
}

if x.HasString(allowedFilters, value.Definition.Name) && len(value.Children) > 1 {
addError(validator.Message("%s filter expects only one filter function, got: %d", value.Definition.Name, len(value.Children)), validator.At(value.Position))
}
})
}

func variableTypeCheck(observers *validator.Events, addError validator.AddErrFunc) {
observers.OnValue(func(walker *validator.Walker, value *ast.Value) {
if value.Definition == nil || value.ExpectedType == nil ||
Expand Down