first pass

Author: rawls238

graphql/core/validation/__init__.py

@@ -68,9 +68,13 @@ def enter(self, node, key, parent, path, ancestors):
             result = False
 
         if result is None and getattr(self.instance, 'visit_spread_fragments', False) and isinstance(node, FragmentSpread):
-            fragment = self.instance.context.get_fragment(node.name.value)
-            if fragment:
-                visit(fragment, self)
+            try:
+                fragment = self.instance.context.get_fragment(node.name.value)
+            except KeyError:
+                pass
+            else:
+                if fragment:
+                    visit(fragment, self)
 
         if result is False:
             self.type_info.leave(node)

graphql/core/validation/rules.py

@@ -1,6 +1,6 @@
 from ..utils import type_from_ast, is_valid_literal_value
 from ..error import GraphQLError
-from ..type.definition import is_composite_type, is_input_type, is_leaf_type, GraphQLNonNull
+from ..type.definition import is_composite_type, is_input_type, is_leaf_type, GraphQLNonNull, GraphQLList
 from ..language import ast
 from ..language.visitor import Visitor, visit
 from ..language.printer import print_ast
@@ -623,7 +623,54 @@ def bad_value_for_default_arg_message(var_name, type, value):
 
 
 class VariablesInAllowedPosition(ValidationRule):
-    pass
+    visit_spread_fragments = True
+
+    def __init__(self, context):
+        super(VariablesInAllowedPosition, self).__init__(context)
+        self.var_def_map = {}
+        self.visited_fragment_names = {}
+
+    def enter_OperationDefinition(self, *args):
+        self.var_def_map = {}
+        self.visited_fragment_names = {}
+
+    def enter_VariableDefinition(self, var_def_ast, *args):
+        self.var_def_map[var_def_ast.variable.name.value] = var_def_ast
+
+    def enter_Variable(self, variable_ast, *args):
+        var_name = variable_ast.name.value
+        var_def = self.var_def_map[var_name]
+        var_type = var_def and type_from_ast(self.context.get_schema(), var_def.type)
+        input_type = self.context.get_input_type()
+        if var_type and input_type and not self.var_type_allowed_for_type(self.effective_type(var_type, var_def), input_type):
+            return GraphQlError(self.bad_var_pos_message(var_name, var_type, input_type, [variable_ast]))
+
+    def enter_FragmentSpread(self, spread_ast, *args):
+        if spread_ast.name.value in self.visited_fragment_names:
+            return False
+        self.visited_fragment_names[spread_ast.name.value] = True;
+
+    @staticmethod
+    def effective_type(var_type, var_def):
+        if not var_def.default_value or isinstance(var_def, GraphQLNonNull):
+            return var_type
+        return GraphQLNonNull(var_type)
+
+    @staticmethod
+    def var_type_allowed_for_type(var_type, expected_type):
+        if isinstance(expected_type, GraphQLNonNull):
+            if isinstance(var_type, GraphQLNonNull):
+                return VariablesInAllowedPosition.var_type_allowed_for_type(var_type.of_type, expected_type.of_type)
+            return False
+        if isinstance(var_type, GraphQLNonNull):
+            return VariablesInAllowedPosition.var_type_allowed_for_type(var_type.of_type, expected_type)
+        if isinstance(var_type, GraphQLList) and isinstance(expected_type, GraphQLList):
+            return VariablesInAllowedPosition.var_type_allowed_for_type(var_type.of_type, expected_type.of_type)
+        return var_type == expected_type
+
+    @staticmethod
+    def bad_var_pos_message(var_name, var_type, expected_type):
+        return 'Variable {} of type {} used in position expecting type {}'.format(var_name, var_type, expected_type)
 
 
 class OverlappingFieldsCanBeMerged(ValidationRule):

tests/core_validation/test_variables_in_allowed_position.py

@@ -0,0 +1,25 @@
+from graphql.core.language.location import SourceLocation
+from graphql.core.validation.rules import VariablesInAllowedPosition
+from utils import expect_passes_rule, expect_fails_rule
+
+def test_boolean_boolean():
+    expect_passes_rule(VariablesInAllowedPosition, '''
+      query Query($booleanArg: Boolean)
+      {
+        complicatedArgs {
+          booleanArgField(booleanArg: $booleanArg)
+        }
+      }
+    ''')
+def test_boolean_boolean_in_fragment():
+    expect_passes_rule(VariablesInAllowedPosition, '''
+      fragment booleanArgFrag on ComplicatedArgs {
+        booleanArgField(booleanArg: $booleanArg)
+      }
+      query Query($booleanArg: Boolean)
+      {
+        complicatedArgs {
+          ...booleanArgFrag
+        }
+      }
+    ''')