nil check for event processor and disable security on websocket close

newrelic · Dec 26, 2024 · 50c1d71 · 50c1d71
1 parent 6967292
commit 50c1d71
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/newrelic_security/agent/control/collector.rb b/lib/newrelic_security/agent/control/collector.rb
@@ -60,7 +60,7 @@ def collect(case_type, args, event_category = nil, **keyword_args)
             event.lineNumber = stk[0].lineno
           end
           event.stacktrace = stk[0..user_frame_index].map(&:to_s)
-          NewRelic::Security::Agent.agent.event_processor.send_event(event)
+          NewRelic::Security::Agent.agent.event_processor&.send_event(event)
           if event.httpRequest[:headers].key?(NR_CSEC_FUZZ_REQUEST_ID) && event.apiId == event.httpRequest[:headers][NR_CSEC_FUZZ_REQUEST_ID].split(COLON_IAST_COLON)[0] && NewRelic::Security::Agent.agent.iast_client.completed_requests[event.parentId]
             NewRelic::Security::Agent.agent.iast_client.completed_requests[event.parentId] << event.id
           end

diff --git a/lib/newrelic_security/agent/control/websocket_client.rb b/lib/newrelic_security/agent/control/websocket_client.rb
@@ -141,6 +141,7 @@ def send(message)
         end
 
         def close(reconnect = true)
+          NewRelic::Security::Agent.config.disable_security
           NewRelic::Security::Agent.logger.info "Flushing eventQ (#{NewRelic::Security::Agent.agent.event_processor.eventQ.size} events) and closing websocket connection"
           NewRelic::Security::Agent.agent.event_processor&.eventQ&.clear
           @iast_client&.iast_data_transfer_request_processor_thread&.kill