providing the explicit value 'null' to non‐null_argument is not valid (#2038)

dugenkui03 · web-flow · commit 49bbbeb1c65f · 2020-10-21T20:56:05.000+11:00
diff --git a/src/main/java/graphql/validation/ValidationErrorType.java b/src/main/java/graphql/validation/ValidationErrorType.java
@@ -33,5 +33,6 @@ public enum ValidationErrorType {
     DuplicateFragmentName,
     DuplicateDirectiveName,
     DuplicateArgumentNames,
-    DuplicateVariableName
+    DuplicateVariableName,
+    NullValueForNonNullArgument
 }
diff --git a/src/main/java/graphql/validation/rules/ProvidedNonNullArguments.java b/src/main/java/graphql/validation/rules/ProvidedNonNullArguments.java
@@ -6,6 +6,8 @@
 import graphql.language.Directive;
 import graphql.language.Field;
 import graphql.language.Node;
+import graphql.language.NullValue;
+import graphql.language.Value;
 import graphql.schema.GraphQLArgument;
 import graphql.schema.GraphQLDirective;
 import graphql.schema.GraphQLFieldDefinition;
@@ -41,6 +43,14 @@ public void checkField(Field field) {
                 String message = String.format("Missing field argument %s", graphQLArgument.getName());
                 addError(ValidationErrorType.MissingFieldArgument, field.getSourceLocation(), message);
             }
+
+            if(argument!=null) {
+                Value value = argument.getValue();
+                if ((value == null || value instanceof NullValue) && nonNullType && noDefaultValue) {
+                    String message = String.format("null value for non-null field argument %s", graphQLArgument.getName());
+                    addError(ValidationErrorType.NullValueForNonNullArgument, field.getSourceLocation(), message);
+                }
+            }
         }
     }
 
diff --git a/src/test/groovy/graphql/validation/rules/ProvidedNonNullArgumentsTest.groovy b/src/test/groovy/graphql/validation/rules/ProvidedNonNullArgumentsTest.groovy
@@ -3,6 +3,8 @@ package graphql.validation.rules
 import graphql.language.Argument
 import graphql.language.Directive
 import graphql.language.Field
+import graphql.language.NonNullType
+import graphql.language.NullValue
 import graphql.language.StringValue
 import graphql.schema.GraphQLArgument
 import graphql.schema.GraphQLDirective
@@ -141,4 +143,27 @@ class ProvidedNonNullArgumentsTest extends Specification {
         then:
         errorCollector.getErrors().isEmpty()
     }
+
+    def "provide the explicit value null is not valid for non null argument"() {
+        given:
+        def fieldArg = GraphQLArgument.newArgument().name("arg")
+                .type(GraphQLNonNull.nonNull(GraphQLString))
+
+        def fieldDef = GraphQLFieldDefinition.newFieldDefinition()
+                .name("field")
+                .type(GraphQLString)
+                .argument(fieldArg)
+                .build()
+
+        validationContext.getFieldDef() >> fieldDef
+
+        def defaultNullArg = Argument.newArgument().name("arg").value(NullValue.newNullValue().build()).build()
+        def field = new Field("field", [defaultNullArg])
+
+        when:
+        providedNonNullArguments.checkField(field)
+
+        then:
+        errorCollector.containsValidationError(ValidationErrorType.NullValueForNonNullArgument)
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,6 @@ public enum ValidationErrorType {`
`33`	`33`	`DuplicateFragmentName,`
`34`	`34`	`DuplicateDirectiveName,`
`35`	`35`	`DuplicateArgumentNames,`
`36`		`- DuplicateVariableName`
	`36`	`+ DuplicateVariableName,`
	`37`	`+ NullValueForNonNullArgument`
`37`	`38`	`}`