ensure enforce_request_limits returns json errors

Author: GrantBirki

lib/hooks/app/api.rb

@@ -94,7 +94,7 @@ def self.create(config:, endpoints:, log:)
                     plugin.on_request(rack_env)
                   end
 
-                  enforce_request_limits(config)
+                  enforce_request_limits(config, request_context)
                   request.body.rewind
                   raw_body = request.body.read
 

lib/hooks/app/helpers.rb

@@ -17,10 +17,11 @@ def uuid
       # Enforce request size and timeout limits
       #
       # @param config [Hash] The configuration hash, must include :request_limit
+      # @param request_context [Hash] Context for the request, e.g. request ID (optional)
       # @raise [StandardError] Halts with error if request body is too large
       # @return [void]
       # @note Timeout enforcement should be handled at the server level (e.g., Puma)
-      def enforce_request_limits(config)
+      def enforce_request_limits(config, request_context = {})
         # Optimized content length check - check most common sources first
         content_length = request.content_length if respond_to?(:request) && request.respond_to?(:content_length)
 
@@ -34,7 +35,8 @@ def enforce_request_limits(config)
         content_length = content_length&.to_i
 
         if content_length && content_length > config[:request_limit]
-          error!("request body too large", 413)
+          request_id = request_context&.dig(:request_id)
+          error!({ error: "request_body_too_large", message: "request body too large", request_id: }, 413)
         end
 
         # Note: Timeout enforcement would typically be handled at the server level (Puma, etc.)

spec/unit/lib/hooks/app/helpers_spec.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "tempfile"
+require "json"
 require_relative "../../../spec_helper"
 
 describe Hooks::App::Helpers do
@@ -23,7 +24,7 @@ def request
       end
 
       def error!(message, code)
-        raise StandardError, "#{code}: #{message}"
+        raise StandardError, "#{code}: #{message.to_json}"
       end
     end
   end
@@ -57,8 +58,20 @@ def error!(message, code)
 
       it "raises error when content length exceeds limit" do
         helper.headers["Content-Length"] = "1500"
-
-        expect { helper.enforce_request_limits(config) }.to raise_error(StandardError, /413.*too large/)
+        request_context = { request_id: "test-request-id" }
+
+        error = nil
+        begin
+          helper.enforce_request_limits(config, request_context)
+        rescue StandardError => e
+          error = e
+        end
+
+        expect(error).to be_a(StandardError)
+        expect(error.message).to start_with("413: ")
+        body = error.message.sub("413: ", "")
+        parsed = JSON.parse(body)
+        expect(parsed).to eq({ "error" => "request_body_too_large", "message" => "request body too large", "request_id" => "test-request-id" })
       end
     end