feat(GraphQL): Support auth with custom DQL

graphql/dgraph/graphquery.go

@@ -65,10 +65,24 @@ func writeQuery(b *strings.Builder, query *gql.GraphQuery, prefix string) {
 		x.Check2(b.WriteString(query.Alias))
 		x.Check2(b.WriteString(" : "))
 	}
-	x.Check2(b.WriteString(query.Attr))
+
+	if query.IsCount {
+		x.Check2(b.WriteString(fmt.Sprintf("count(%s)", query.Attr)))
+	} else if query.Attr != "val" {
+		x.Check2(b.WriteString(query.Attr))
+	} else if isAggregateFn(query.Func) {
+		x.Check2(b.WriteString("sum(val("))
+		writeNeedVar(b, query)
+		x.Check2(b.WriteRune(')'))
+	} else {
+		x.Check2(b.WriteString("val("))
+		writeNeedVar(b, query)
+		x.Check2(b.WriteRune(')'))
+	}
 
 	if query.Func != nil {
 		writeRoot(b, query)
+		x.Check2(b.WriteRune(')'))
 	}
 
 	if query.Filter != nil {
@@ -93,6 +107,12 @@ func writeQuery(b *strings.Builder, query *gql.GraphQuery, prefix string) {
 		}
 	}
 
+	if query.IsGroupby {
+		x.Check2(b.WriteString(" @groupby("))
+		writeGroupByAttributes(b, query.GroupbyAttrs)
+		x.Check2(b.WriteRune(')'))
+	}
+
 	switch {
 	case len(query.Children) > 0:
 		prefixAdd := ""
@@ -112,7 +132,40 @@ func writeQuery(b *strings.Builder, query *gql.GraphQuery, prefix string) {
 	}
 }
 
-func writeUIDFunc(b *strings.Builder, uids []uint64, args []gql.Arg) {
+func writeNeedVar(b *strings.Builder, query *gql.GraphQuery) {
+	for i, v := range query.NeedsVar {
+		if i != 0 {
+			x.Check2(b.WriteString(", "))
+		}
+		x.Check2(b.WriteString(v.Name))
+	}
+}
+
+func isAggregateFn(f *gql.Function) bool {
+	if f == nil {
+		return false
+	}
+	switch f.Name {
+	case "min", "max", "avg", "sum":
+		return true
+	}
+	return false
+}
+
+func writeGroupByAttributes(b *strings.Builder, attrList []gql.GroupByAttr) {
+	for i, attr := range attrList {
+		if i != 0 {
+			x.Check2(b.WriteString(", "))
+		}
+		if attr.Alias != "" {
+			x.Check2(b.WriteString(attr.Alias))
+			x.Check2(b.WriteString(" : "))
+		}
+		x.Check2(b.WriteString(attr.Attr))
+	}
+}
+
+func writeUIDFunc(b *strings.Builder, uids []uint64, args []gql.Arg, needVar []gql.VarContext) {
 	x.Check2(b.WriteString("uid("))
 	if len(uids) > 0 {
 		// uid function with uint64 - uid(0x123, 0x456, ...)
@@ -122,14 +175,21 @@ func writeUIDFunc(b *strings.Builder, uids []uint64, args []gql.Arg) {
 			}
 			x.Check2(b.WriteString(fmt.Sprintf("%#x", uid)))
 		}
-	} else {
+	} else if len(args) > 0 {
 		// uid function with a Dgraph query variable - uid(Post1)
 		for i, arg := range args {
 			if i != 0 {
 				x.Check2(b.WriteString(", "))
 			}
 			x.Check2(b.WriteString(arg.Value))
 		}
+	} else {
+		for i, v := range needVar {
+			if i != 0 {
+				x.Check2(b.WriteString(", "))
+			}
+			x.Check2(b.WriteString(v.Name))
+		}
 	}
 	x.Check2(b.WriteString(")"))
 }
@@ -145,25 +205,49 @@ func writeRoot(b *strings.Builder, q *gql.GraphQuery) {
 	}
 
 	switch {
+	case q.Func.Name == "has":
+		x.Check2(b.WriteString(fmt.Sprintf("(func: has(%s)", q.Func.Attr)))
 	case q.Func.Name == "uid":
 		x.Check2(b.WriteString("(func: "))
-		writeUIDFunc(b, q.Func.UID, q.Func.Args)
+		writeUIDFunc(b, q.Func.UID, q.Func.Args, q.Func.NeedsVar)
 	case q.Func.Name == "type" && len(q.Func.Args) == 1:
 		x.Check2(b.WriteString(fmt.Sprintf("(func: type(%s)", q.Func.Args[0].Value)))
 	case q.Func.Name == "eq":
 		x.Check2(b.WriteString("(func: eq("))
-		writeFilterArguments(b, q.Func.Args)
+		writeFilterArguments(b, q.Func.Args, q.Func.Attr, q.Func.Name)
 		x.Check2(b.WriteRune(')'))
 	}
 	writeOrderAndPage(b, q, true)
-	x.Check2(b.WriteRune(')'))
 }
 
-func writeFilterArguments(b *strings.Builder, args []gql.Arg) {
+func maybeQuoteArg(fn string, arg interface{}) string {
+	switch arg := arg.(type) {
+	case string: // dateTime also parsed as string
+		if fn == "regexp" {
+			return arg
+		}
+		return fmt.Sprintf("%q", arg)
+	case float64, float32:
+		return fmt.Sprintf("\"%v\"", arg)
+	default:
+		return fmt.Sprintf("%v", arg)
+	}
+}
+
+func writeFilterArguments(b *strings.Builder, args []gql.Arg, attr, fn string) {
+	if attr != "" {
+		x.Check2(b.WriteString(attr))
+		if len(args) != 0 {
+			x.Check2(b.WriteString(", "))
+		}
+	}
 	for i, arg := range args {
 		if i != 0 {
 			x.Check2(b.WriteString(", "))
 		}
+		if attr != "" {
+			arg.Value = maybeQuoteArg(fn, arg.Value)
+		}
 		x.Check2(b.WriteString(arg.Value))
 	}
 }
@@ -175,10 +259,10 @@ func writeFilterFunction(b *strings.Builder, f *gql.Function) {
 
 	switch {
 	case f.Name == "uid":
-		writeUIDFunc(b, f.UID, f.Args)
+		writeUIDFunc(b, f.UID, f.Args, f.NeedsVar)
 	default:
 		x.Check2(b.WriteString(fmt.Sprintf("%s(", f.Name)))
-		writeFilterArguments(b, f.Args)
+		writeFilterArguments(b, f.Args, f.Attr, f.Name)
 		x.Check2(b.WriteRune(')'))
 	}
 }
@@ -215,6 +299,15 @@ func hasOrderOrPage(q *gql.GraphQuery) bool {
 	return len(q.Order) > 0 || hasFirst || hasOffset
 }
 
+func IsValueVar(attr string, q *gql.GraphQuery) bool {
+	for _, vars := range q.NeedsVar {
+		if attr == vars.Name && vars.Typ == 2 {
+			return true
+		}
+	}
+	return false
+}
+
 func writeOrderAndPage(b *strings.Builder, query *gql.GraphQuery, root bool) {
 	var wroteOrder, wroteFirst bool
 
@@ -227,7 +320,13 @@ func writeOrderAndPage(b *strings.Builder, query *gql.GraphQuery, root bool) {
 		} else {
 			x.Check2(b.WriteString("orderasc: "))
 		}
-		x.Check2(b.WriteString(ord.Attr))
+		if IsValueVar(ord.Attr, query) {
+			x.Check2(b.WriteString("val("))
+			x.Check2(b.WriteString(ord.Attr))
+			x.Check2(b.WriteRune(')'))
+		} else {
+			x.Check2(b.WriteString(ord.Attr))
+		}
 		wroteOrder = true
 	}
 

graphql/e2e/auth/auth_test.go

@@ -322,6 +322,122 @@ func (s Student) add(t *testing.T) {
 	require.JSONEq(t, result, string(gqlResponse.Data))
 }
 
+func TestAuthWithCustomDQL(t *testing.T) {
+	TestCases := []TestCase{
+		{
+			name: "RBAC OR filter query; RBAC Pass",
+			query: `
+		query{
+			queryProjectsOrderByName{
+				name
+			}
+		}
+		`,
+			role:   "ADMIN",
+			result: `{"queryProjectsOrderByName":[{"name": "Project1"},{"name": "Project2"}]}`,
+		},
+		{
+			name: "RBAC OR filter query; RBAC fail",
+			query: `
+		query{
+			queryProjectsOrderByName{
+				name
+			}
+		}
+		`,
+			role:   "USER",
+			user:   "user1",
+			result: `{"queryProjectsOrderByName":[{"name": "Project1"}]}`,
+		},
+		{
+			name: "RBAC OR filter query; missing jwt",
+			query: `
+		query{
+			queryProjectsOrderByName{
+				name
+			}
+		}
+		`,
+			result: `{"queryProjectsOrderByName":[]}`,
+		},
+		{
+			name: "var query; RBAC AND filter query; RBAC pass",
+			query: `
+		query{
+			queryIssueSortedByOwnerAge{
+				msg
+			}
+		}
+		`,
+			role:   "ADMIN",
+			user:   "user2",
+			result: `{"queryIssueSortedByOwnerAge": [{"msg": "Issue2"}]}`,
+		},
+		{
+			name: "var query; RBAC AND filter query; RBAC fail",
+			query: `
+		query{
+			queryIssueSortedByOwnerAge{
+				msg
+			}
+		}
+		`,
+			role:   "USER",
+			user:   "user2",
+			result: `{"queryIssueSortedByOwnerAge": []}`,
+		},
+		{
+			name: "DQL query with @cascade and pagination",
+			query: `
+		query{
+			queryFirstTwoMovieWithNonNullRegion{
+				content
+				code
+				regionsAvailable{
+					name
+				}
+			}
+		}
+		`,
+			role: "ADMIN",
+			user: "user1",
+			result: `{"queryFirstTwoMovieWithNonNullRegion": [
+				{
+				  "content": "Movie3",
+				  "code": "m3",
+				  "regionsAvailable": [
+					{
+					  "name": "Region1"
+					}
+				  ]
+				},
+				{
+				  "content": "Movie4",
+				  "code": "m4",
+				  "regionsAvailable": [
+					{
+					  "name": "Region5"
+					}
+				  ]
+				}
+			  ]
+			}`,
+		},
+	}
+
+	for _, tcase := range TestCases {
+		t.Run(tcase.name, func(t *testing.T) {
+			getUserParams := &common.GraphQLParams{
+				Headers: common.GetJWT(t, tcase.user, tcase.role, metaInfo),
+				Query:   tcase.query,
+			}
+			gqlResponse := getUserParams.ExecuteAsPost(t, common.GraphqlURL)
+			common.RequireNoGQLErrors(t, gqlResponse)
+			require.JSONEq(t, tcase.result, string(gqlResponse.Data))
+		})
+	}
+}
+
 func TestAddMutationWithXid(t *testing.T) {
 	mutation := `
 	mutation addTweets($tweet: AddTweetsInput!){