Skip to content

fix password rewriting #5256

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

Merged
merged 3 commits into from
Apr 24, 2020
Merged

fix password rewriting #5256

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3759ba9
fix password rewriting
MichaelJCompton Apr 21, 2020
49d2680
add type filter in correct spot
MichaelJCompton Apr 21, 2020
fac59fd
Merge branch 'master' into mjc/graphql-password
MichaelJCompton Apr 24, 2020
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
10 changes: 6 additions & 4 deletions graphql/resolve/query_rewriter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ func (qr *queryRewriter) Rewrite(ctx context.Context,
}

dgQuery := rewriteAsGet(gqlQuery, uid, xid)
addTypeFilter(dgQuery, gqlQuery.Type())

return dgQuery, nil

case schema.FilterQuery:
Expand Down Expand Up @@ -193,8 +191,12 @@ func addArgumentsToField(dgQuery *gql.GraphQuery, field schema.Field) {
}

func rewriteAsGet(field schema.Field, uid uint64, xid *string) *gql.GraphQuery {
var dgQuery *gql.GraphQuery

if xid == nil {
return rewriteAsQueryByIds(field, []uint64{uid})
dgQuery = rewriteAsQueryByIds(field, []uint64{uid})
addTypeFilter(dgQuery, field.Type())
return dgQuery
}

xidArgName := field.XIDArg()
Expand All @@ -206,7 +208,6 @@ func rewriteAsGet(field schema.Field, uid uint64, xid *string) *gql.GraphQuery {
},
}

var dgQuery *gql.GraphQuery
if uid > 0 {
dgQuery = &gql.GraphQuery{
Attr: field.ResponseName(),
Expand All @@ -227,6 +228,7 @@ func rewriteAsGet(field schema.Field, uid uint64, xid *string) *gql.GraphQuery {
}
addSelectionSetFrom(dgQuery, field)
addUID(dgQuery)
addTypeFilter(dgQuery, field.Type())
return dgQuery
}

Expand Down
6 changes: 3 additions & 3 deletions graphql/resolve/query_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1154,17 +1154,17 @@
name: "Password query"
gqlquery: |
query {
checkUserPassword(name: "0x1", pwd: "Password") {
checkUserPassword(name: "user1", pwd: "Password") {
name
}
}
dgquery: |-
query {
checkUserPassword(func: eq(User.name, "0x1")) @filter((eq(val(pwd), 1))) {
checkUserPassword(func: eq(User.name, "user1")) @filter((eq(val(pwd), 1) AND type(User))) {
name : User.name
dgraph.uid : uid
}
checkPwd(func: eq(User.name, "0x1")) {
checkPwd(func: eq(User.name, "user1")) @filter(type(User)) {
pwd as checkpwd(User.pwd, "Password")
}
}