Merge pull request #181 from Juanmcuello/json-body-parser-fix

Rack::JSONBodyParser. Do not rescue JSON:ParserError
rack · Oct 24, 2020 · 095edc9 · 095edc9
2 parents 0a2e085 + ecc8a47
commit 095edc9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/lib/rack/contrib/json_body_parser.rb b/lib/rack/contrib/json_body_parser.rb
@@ -55,16 +55,18 @@ def initialize(
     end
 
     def call(env)
-      if @verbs.include?(env[Rack::REQUEST_METHOD]) &&
-         @matcher.call(@media, env['CONTENT_TYPE'])
+      begin
+        if @verbs.include?(env[Rack::REQUEST_METHOD]) &&
+           @matcher.call(@media, env['CONTENT_TYPE'])
 
-        update_form_hash_with_json_body(env)
+          update_form_hash_with_json_body(env)
+        end
+      rescue JSON::ParserError
+        body = { error: 'Failed to parse body as JSON' }.to_json
+        header = { 'Content-Type' => 'application/json' }
+        return Rack::Response.new(body, 400, header).finish
       end
       @app.call(env)
-    rescue JSON::ParserError
-      body = { error: 'Failed to parse body as JSON' }.to_json
-      header = { 'Content-Type' => 'application/json' }
-      Rack::Response.new(body, 400, header).finish
     end
 
     private

diff --git a/test/spec_rack_json_body_parser_spec.rb b/test/spec_rack_json_body_parser_spec.rb
@@ -66,6 +66,12 @@ def create_parser(app, **args, &block)
     _(result).must_be_empty
   end
 
+  specify "should not rescue JSON:ParserError raised by the app" do
+    env = mock_env
+    app = ->(env) { raise JSON::ParserError }
+    _( -> { create_parser(app).call(env) }).must_raise JSON::ParserError
+  end
+
   describe "contradiction between body and type" do
     specify "should return bad request with a JSON-encoded error message" do
       env = mock_env(input: 'This is not JSON')