Improve code style in AppSec rack middlewares

DataDog · Jan 14, 2025 · b2604ff · b2604ff
1 parent 3b2a59a
commit b2604ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/lib/datadog/appsec/contrib/rack/request_body_middleware.rb b/lib/datadog/appsec/contrib/rack/request_body_middleware.rb
@@ -25,15 +25,14 @@ def call(env)
 
             http_response = nil
             block_actions = catch(::Datadog::AppSec::Ext::INTERRUPT) do
-              http_response, = Instrumentation.gateway.push(
-                'rack.request.body', Gateway::Request.new(env)
-              ) do
+              http_response, = Instrumentation.gateway.push('rack.request.body', Gateway::Request.new(env)) do
                 @app.call(env)
               end
 
               nil
             end
-            http_response = AppSec::Response.negotiate(env, block_actions).to_rack if block_actions
+
+            return AppSec::Response.negotiate(env, block_actions).to_rack if block_actions
 
             http_response
           end

diff --git a/lib/datadog/appsec/contrib/rack/request_middleware.rb b/lib/datadog/appsec/contrib/rack/request_middleware.rb
@@ -72,8 +72,8 @@ def call(env)
             add_appsec_tags(processor, ctx)
             add_request_tags(ctx, env)
 
-            gateway_request = Gateway::Request.new(env)
             http_response = nil
+            gateway_request = Gateway::Request.new(env)
             gateway_response = nil
 
             block_actions = catch(::Datadog::AppSec::Ext::INTERRUPT) do