contrast-agent 6.7.0 → 6.9.0

data/lib/contrast/agent/reporting/reporting_events/application_activity.rb

@@ -71,18 +71,21 @@ module Contrast
         def attack_results_for rule_id, response_type = nil
           results = []
           defend.attackers.each do |attacker|
-            results << case response_type
-                       when BLOCKED, BLOCK_AT_PERIMETER
-                         attacker.protection_rules[rule_id].blocked
-                       when MONITORED
-                         attacker.protection_rules[rule_id].exploited
-                       when PROBED
-                         attacker.protection_rules[rule_id].ineffective
-                       when SUSPICIOUS
-                         attacker.protection_rules[rule_id].suspicious
-                       else
-                         attacker.protection_rules[rule_id]
-                       end
+            next unless attacker.protection_rules[rule_id]
+
+            result = case response_type
+                     when BLOCKED, BLOCKED_AT_PERIMETER
+                       attacker.protection_rules[rule_id].blocked
+                     when EXPLOITED
+                       attacker.protection_rules[rule_id].exploited
+                     when PROBED
+                       attacker.protection_rules[rule_id].ineffective
+                     when SUSPICIOUS
+                       attacker.protection_rules[rule_id].suspicious
+                     else
+                       attacker.protection_rules[rule_id]
+                     end
+            results << result if result
           end
           results
         end
@@ -107,7 +110,7 @@ module Contrast
 
         # This is primary used for attaching new inventory reporting
         #
-        # @param architecture [Contrast::Agent::Reporting::AttackResult]
+        # @param architecture [Contrast::Agent::Reporting::ArchitectureComponent]
         def attach_inventory architecture
           inventory.attach_data(architecture)
         end

data/lib/contrast/agent/reporting/reporting_events/application_defend_activity.rb

@@ -28,18 +28,23 @@ module Contrast
         def attach_data attack_result
           attacker_activity = Contrast::Agent::Reporting::ApplicationDefendAttackerActivity.new
           attacker_activity.attach_data(attack_result)
-          existing_attacker_activity = attackers.find do |existing|
-            existing.source_forwarded_for == attacker_activity.source_forwarded_for &&
-                existing.source_ip == attacker_activity.source_ip
-          end
-          rule = attack_result.rule_id
-          if existing_attacker_activity
-            attach_existing(existing_attacker_activity, attacker_activity, rule)
+
+          if (existing_attacker_activity = find_existing_attacker_activity(attacker_activity))
+            attach_existing(existing_attacker_activity, attacker_activity, attack_result.rule_id)
           else
             attackers << attacker_activity
           end
         end
 
+        # Find an existing attacker if it matches on source details
+        # @param attacker_activity [Contrast::Agent::Reporting::ApplicationDefendAttackerActivity]
+        def find_existing_attacker_activity new_attacker_activity
+          attackers.find do |existing|
+            existing.source_forwarded_for == new_attacker_activity.source_forwarded_for &&
+                existing.source_ip == new_attacker_activity.source_ip
+          end
+        end
+
         # @param existing_attacker_activity [Contrast::Agent::Reporting::ApplicationDefendAttackerActivity]
         # @param attacker_activity [Contrast::Agent::Reporting::ApplicationDefendAttackerActivity]
         # @param rule [String]

data/lib/contrast/agent/reporting/reporting_events/application_defend_attack_activity.rb

@@ -1,8 +1,6 @@
 # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
-require 'contrast/api/dtm.pb'
-require 'contrast/api/decorators/response_type'
 require 'contrast/components/logger'
 require 'contrast/agent/reporting/reporting_events/application_defend_attack_sample_activity'
 
@@ -45,7 +43,9 @@ module Contrast
           attack_sample_activity.attach_data(attack_result)
           @response_type = attack_result.response
           case response_type
-          when ::Contrast::Agent::Reporting::ResponseType::BLOCKED
+          when ::Contrast::Agent::Reporting::ResponseType::BLOCKED,
+              ::Contrast::Agent::Reporting::ResponseType::BLOCKED_AT_PERIMETER
+
             @blocked = attack_sample_activity
           when ::Contrast::Agent::Reporting::ResponseType::MONITORED
             @exploited = attack_sample_activity

data/lib/contrast/agent/reporting/reporting_events/application_defend_attack_sample.rb

@@ -5,7 +5,6 @@ require 'contrast/agent/protect/rule/cmd_injection'
 require 'contrast/agent/protect/rule/deserialization'
 require 'contrast/agent/protect/rule/http_method_tampering'
 require 'contrast/agent/protect/rule/no_sqli'
-require 'contrast/api/dtm.pb'
 require 'contrast/agent/reporting/attack_result/user_input'
 require 'contrast/agent/reporting/attack_result/response_type'
 require 'contrast/components/logger'
@@ -60,7 +59,7 @@ module Contrast
           }
         end
 
-        # @param response_type [Contrast::Api::Dtm::AttackResult::ResponseType]
+        # @param response_type [Contrast::Agent::Reporting::ResponseType]
         # @return [Boolean] check if response type is blocked
         def blocked? response_type
           @blocked = response_type == Contrast::Agent::Reporting::ResponseType::BLOCKED

data/lib/contrast/agent/reporting/reporting_events/application_inventory_activity.rb

@@ -13,7 +13,7 @@ module Contrast
       # about the inventory of the application which was discovered during exercise of the application
       # during this activity period.
       class ApplicationInventoryActivity < Contrast::Agent::Reporting::ApplicationReportingEvent
-        # return [Contrast::Agent::Reporting::ArchitectureComponent]
+        # return [Array<Contrast::Agent::Reporting::ArchitectureComponent>]
         attr_reader :components
         # @ return [Array<String>, nil] - User-Agent Header value
         attr_reader :browsers
@@ -46,6 +46,11 @@ module Contrast
         def duration
           Contrast::Utils::Timer.now_ms - (Contrast::Agent::REQUEST_TRACKER.current&.timer&.start_ms || 0)
         end
+
+        # Helper method to determine if InventoryActivity has no data
+        def empty?
+          @browsers.empty? && @components.empty?
+        end
       end
     end
   end

data/lib/contrast/agent/reporting/reporting_events/application_update.rb

@@ -6,9 +6,7 @@ require 'contrast/agent/reporting/reporting_events/application_reporting_event'
 require 'contrast/agent/reporting/reporting_events/library_discovery'
 require 'contrast/agent/reporting/reporting_events/reporting_event'
 require 'contrast/agent/reporting/reporting_events/route_discovery'
-require 'contrast/api/dtm.pb'
 require 'contrast/components/logger'
-require 'json'
 
 module Contrast
   module Agent

data/lib/contrast/agent/reporting/reporting_events/architecture_component.rb

@@ -1,7 +1,6 @@
 # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
-require 'contrast/api/dtm.pb'
 require 'contrast/components/logger'
 
 module Contrast

data/lib/contrast/agent/reporting/reporting_events/finding.rb

@@ -88,8 +88,8 @@ module Contrast
           event_messages = Contrast::Agent::Reporting::FindingEvent.from_source(source)
           events.concat(event_messages) if event_messages&.any?
           event_data = Contrast::Agent::Assess::Events::EventData.new(trigger_node, source, object, ret, args)
-          contrast_event = Contrast::Agent::Assess::ContrastEvent.new(event_data)
-          events << Contrast::Agent::Reporting::FindingEvent.convert(contrast_event)
+          contrast_event = Contrast::Agent::Reporting::FindingEvent.new(event_data)
+          events << contrast_event
           return unless request
 
           @request = Contrast::Agent::Reporting::FindingRequest.convert(request)
@@ -162,7 +162,7 @@ module Contrast
         # Rules which are event based must have an event to be sent to TeamServer. They include the Trigger, Regexp,
         # and Data flow type Rules, meaning all those which are not Properties based. Eventually, we may have
         # validation for each of those types; however, that's a refactor for after we've translated all rules from the
-        # Service and have had time to build proper child structure.
+        # TeamServer and have had time to build proper child structure.
         #
         # @return [Boolean]
         def event_based?
@@ -171,7 +171,7 @@ module Contrast
 
         # Rules which are property based must have a property to be sent to TeamServer. Eventually, each rule may own
         # its own validation, as the properties each needs are different; however, that's a refactor for after we've
-        # translated all rules from the Service and have had time to build proper child structure.
+        # translated all rules from TeamServer and have had time to build proper child structure.
         #
         # @return [Boolean]
         def property_based?
@@ -180,7 +180,7 @@ module Contrast
 
         # Rules which are config based must have a configuration to be sent to TeamServer. Eventually, each rule may own
         # its own validation, as the properties each needs are different; however, that's a refactor for after we've
-        # translated all rules from the Service and have had time to build proper child structure.
+        # translated all rules from TeamServer and have had time to build proper child structure.
         #
         # @return [Boolean]
         def config_based?
@@ -189,7 +189,7 @@ module Contrast
 
         # Rules which are hardcode based send properties to TeamServer. Eventually, each rule may own its own
         # validation, as the properties each needs are different; however, that's a refactor for after we've
-        # translated all rules from the Service and have had time to build proper child structure.
+        # translated all rules from TeamServer and have had time to build proper child structure.
         #
         # @return [Boolean]
         def hardcoded?