throw error when int literal is too big or too small

andimarek · andimarek · commit aabed3ae8f08 · 2016-03-13T08:55:12.000+01:00
diff --git a/src/main/java/graphql/Scalars.java b/src/main/java/graphql/Scalars.java
@@ -12,9 +12,11 @@
 
 public class Scalars {
 
+    private static final BigInteger INT_MAX = BigInteger.valueOf(Integer.MAX_VALUE);
+    private static final BigInteger INT_MIN = BigInteger.valueOf(Integer.MIN_VALUE);
 
     public static GraphQLScalarType GraphQLInt = new GraphQLScalarType("Int", "Built-in Int", new Coercing() {
-        @Override
+
         public Object serialize(Object input) {
             if (input instanceof String) {
                 return Integer.parseInt((String) input);
@@ -34,6 +36,9 @@ public Object parseValue(Object input) {
         public Object parseLiteral(Object input) {
             if (!(input instanceof IntValue)) return null;
             BigInteger value = ((IntValue) input).getValue();
+            if (value.compareTo(INT_MIN) == -1 || value.compareTo(INT_MAX) == 1) {
+                throw new GraphQLException("Int literal is too big or too small");
+            }
             return value.intValue();
         }
     });
diff --git a/src/test/groovy/graphql/ScalarsTest.groovy b/src/test/groovy/graphql/ScalarsTest.groovy
@@ -56,8 +56,8 @@ class ScalarsTest extends Specification {
         Scalars.GraphQLLong.getCoercing().parseLiteral(literal) == result
 
         where:
-        literal                          | result
-        new StringValue("42")            | 42
+        literal               | result
+        new StringValue("42") | 42
         new IntValue(new BigInteger("42"))                | 42
         new IntValue(new BigInteger("42345784398534785")) | 42345784398534785l
     }
@@ -87,6 +87,17 @@ class ScalarsTest extends Specification {
 
     }
 
+    def "int parse error for too big/small literal"() {
+        when:
+        Scalars.GraphQLInt.getCoercing().parseLiteral(new IntValue(BigInteger.valueOf(intValue)))
+
+        then:
+        thrown(GraphQLException)
+
+        where:
+        intValue << [Integer.MIN_VALUE - 1l, Integer.MAX_VALUE + 1l]
+    }
+
     def "Int serialize/parseValue object"() {
         expect:
         Scalars.GraphQLInt.getCoercing().serialize(value) == result
