Scope JSON parameter parser errors

Author: jnunemaker

lib/flipper/api/json_params.rb

@@ -65,22 +65,18 @@ def update_params(env, data, strict:)
           raise InvalidRequestBody unless parsed_request_body.is_a?(Hash)
           raise InvalidRequestBody unless ParameterParsing.valid_encoding?(parsed_request_body)
 
-          query_params = parse_nested_query(env[QUERY_STRING].to_s)
+          query_params = parse_nested_query(env[QUERY_STRING].to_s, strict: strict)
           unless compatible_parameter_shapes?(query_params, parsed_request_body)
             raise InvalidRequestBody
           end
         end
 
         env["parsed_request_body".freeze] = parsed_request_body
-        parsed_query_string = parse_query(env[QUERY_STRING].to_s)
+        parsed_query_string = parse_query_string(env[QUERY_STRING].to_s, strict: strict)
         parsed_query_string.merge!(parsed_request_body)
-        env[QUERY_STRING] = build_query(parsed_query_string)
+        env[QUERY_STRING] = build_query_string(parsed_query_string, strict: strict)
         env.delete('rack.request.query_hash'.freeze)
         env.delete('rack.request.query_string'.freeze)
-      rescue *ParameterParsing.errors
-        raise InvalidRequestBody if strict
-
-        raise
       end
 
       def parse_json_body(data, strict:)
@@ -91,8 +87,28 @@ def parse_json_body(data, strict:)
         raise
       end
 
-      def parse_nested_query(data)
+      def parse_nested_query(data, strict:)
         ParameterParsing.parse_nested_query(data)
+      rescue *ParameterParsing.errors
+        raise InvalidRequestBody if strict
+
+        raise
+      end
+
+      def parse_query_string(data, strict:)
+        parse_query(data)
+      rescue *ParameterParsing.errors
+        raise InvalidRequestBody if strict
+
+        raise
+      end
+
+      def build_query_string(params, strict:)
+        build_query(params)
+      rescue *ParameterParsing.errors
+        raise InvalidRequestBody if strict
+
+        raise
       end
 
       def compatible_parameter_shapes?(left, right)

spec/flipper/api/mutation_input_spec.rb

@@ -359,6 +359,16 @@
     expect(adapter_state).to eq(baseline_state)
   end
 
+  it 'does not classify JSON decoder range errors as client errors' do
+    allow(Flipper::Typecast).to receive(:from_json).and_raise(RangeError, 'decoder failure')
+
+    expect do
+      post '/features', JSON.generate(name: 'unreachable'), 'CONTENT_TYPE' => 'application/json'
+    end.to raise_error(RangeError, 'decoder failure')
+
+    expect(adapter_state).to eq(baseline_state)
+  end
+
   it 'does not classify form input stream range errors as client errors' do
     env = Rack::MockRequest.env_for(
       '/features',