Add guard clause to GraphQL gateway watcher

DataDog · Sep 5, 2024 · 31da3fb · 31da3fb
1 parent d620229
commit 31da3fb
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/lib/datadog/appsec/contrib/graphql/gateway/watcher.rb b/lib/datadog/appsec/contrib/graphql/gateway/watcher.rb
@@ -27,27 +27,27 @@ def watch_multiplex(gateway = Instrumentation.gateway)
 
                   scope = AppSec::Scope.active_scope
 
-                  if scope
-                    AppSec::Reactive::Operation.new('graphql.multiplex') do |op|
-                      GraphQL::Reactive::Multiplex.subscribe(op, scope.processor_context) do |result|
-                        event = {
-                          waf_result: result,
-                          trace: scope.trace,
-                          span: scope.service_entry_span,
-                          multiplex: gateway_multiplex,
-                          actions: result.actions
-                        }
+                  return stack.call(gateway_multiplex.arguments) unless scope
 
-                        if scope.service_entry_span
-                          scope.service_entry_span.set_tag('appsec.blocked', 'true') if result.actions.include?('block')
-                          scope.service_entry_span.set_tag('appsec.event', 'true')
-                        end
+                  AppSec::Reactive::Operation.new('graphql.multiplex') do |op|
+                    GraphQL::Reactive::Multiplex.subscribe(op, scope.processor_context) do |result|
+                      event = {
+                        waf_result: result,
+                        trace: scope.trace,
+                        span: scope.service_entry_span,
+                        multiplex: gateway_multiplex,
+                        actions: result.actions
+                      }
 
-                        scope.processor_context.events << event
+                      if scope.service_entry_span
+                        scope.service_entry_span.set_tag('appsec.blocked', 'true') if result.actions.include?('block')
+                        scope.service_entry_span.set_tag('appsec.event', 'true')
                       end
 
-                      block = GraphQL::Reactive::Multiplex.publish(op, gateway_multiplex)
+                      scope.processor_context.events << event
                     end
+
+                    block = GraphQL::Reactive::Multiplex.publish(op, gateway_multiplex)
                   end
 
                   next [nil, [[:block, event]]] if block