contrast-agent 5.3.0 → 6.1.1

data/lib/contrast/utils/telemetry_identifier.rb

@@ -1,8 +1,8 @@
 # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
-require 'contrast/agent/telemetry'
 require 'contrast/utils/os'
+require 'digest'
 require 'socket'
 
 module Contrast
@@ -38,6 +38,21 @@ module Contrast
           @_mac = find_mac(primary) || find_mac
         end
 
+        def self.application_id
+          @_application_id ||= begin
+            id = nil
+            mac = Contrast::Utils::Telemetry::Identifier.mac
+            app_name = Contrast::Utils::Telemetry::Identifier.app_name
+            id = mac + app_name if mac && app_name
+            Digest::SHA2.new(256).hexdigest(id || "_#{ SecureRandom.uuid }")
+          end
+        end
+
+        def self.instance_id
+          @_instance_id ||= Digest::SHA2.new(256).hexdigest(Contrast::Utils::Telemetry::Identifier.mac ||
+                                                              "_#{ SecureRandom.uuid }")
+        end
+
         class << self
           private
 
@@ -61,10 +76,10 @@ module Contrast
               next if primary && !name.include?(primary)
 
               # retrieving MAC address from primary network interface or first available
-              mac = retrieve_mac addr
+              mac = retrieve_mac(addr)
               next unless mac
 
-              result = mac if mac && (mac.match? MAC_REGEX)
+              result = mac if mac&.match?(MAC_REGEX)
               break if result
             end
             result

data/lib/contrast/utils/timer.rb

@@ -4,7 +4,7 @@
 module Contrast
   module Utils
     # Timer is class that can track state about when an event starts and how long it takes
-    # Also containes utility methods to get time values in milliseconds
+    # Also contains utility methods to get time values in milliseconds
     class Timer
       attr_reader :start_ms, :events
 

data/lib/contrast.rb

@@ -47,6 +47,9 @@ require 'contrast/components/protect'
 require 'contrast/components/sampling'
 require 'contrast/components/scope'
 require 'contrast/components/settings'
+require 'contrast/utils/telemetry_hash'
+require 'contrast/utils/telemetry'
+require 'contrast/agent/telemetry/events/exceptions/telemetry_exception_event'
 
 module Contrast
   API = Contrast::Components::Api::Interface.new
@@ -62,6 +65,12 @@ module Contrast
   APP_CONTEXT = Contrast::Components::AppContext::Interface.new
 end
 
+module Contrast
+  TELEMETRY_EXCEPTIONS = if Contrast::Utils::Telemetry.exceptions_enabled?
+                           Contrast::Utils::TelemetryHash.new(Contrast::Agent::Telemetry::TelemetryException::Event)
+                         end
+end
+
 # This needs to be required very early, after component interfaces, and before instrumentation attempts
 require 'contrast/funchook/funchook'
 

data/resources/assess/policy.json

@@ -790,6 +790,16 @@
       "patch_method": "select_tagger",
       "source": "O",
       "target": "R"
+    },{
+      "class_name": "String",
+      "instance_method": true,
+      "method_visibility": "public",
+      "method_name": "slice",
+      "action": "CUSTOM",
+      "patch_class": "Contrast::Agent::Assess::Policy::Propagator::Select",
+      "patch_method": "select_tagger",
+      "source": "O",
+      "target": "R"
     },{
       "class_name":"CGI::Util",
       "method_name":"unescape",
@@ -1112,6 +1122,67 @@
       "target":"O",
       "action":"SPLAT"
     },
+    {
+      "class_name": "IO::Buffer",
+      "instance_method": true,
+      "method_visibility": "public",
+      "method_name": "get_string",
+      "source": "O",
+      "target": "R",
+      "action": "CUSTOM",
+      "patch_class": "Contrast::Agent::Assess::Policy::Propagator::Buffer",
+      "patch_method": "propagate_keep_select"
+    },
+    {
+      "class_name": "IO::Buffer",
+      "instance_method": true,
+      "method_visibility": "public",
+      "method_name": "slice",
+      "source": "O",
+      "target": "R",
+      "action": "CUSTOM",
+      "patch_class": "Contrast::Agent::Assess::Policy::Propagator::Buffer",
+      "patch_method": "propagate_keep_select"
+    },
+    {
+      "class_name": "IO::Buffer",
+      "instance_method": true,
+      "method_visibility": "public",
+      "method_name": "set_string",
+      "source":"P0,O",
+      "target":"O",
+      "action": "BUFFER",
+      "patch_method": "propagate_insert"
+    },
+    {
+      "class_name": "IO::Buffer",
+      "instance_method": false,
+      "method_visibility": "public",
+      "method_name": "for",
+      "source":"P0",
+      "target":"R",
+      "action": "KEEP"
+    },
+    {
+      "class_name": "IO::Buffer",
+      "instance_method": true,
+      "method_visibility": "public",
+      "method_name": "copy",
+      "source":"P0,O",
+      "target":"O",
+      "action": "BUFFER",
+      "patch_method": "buffer_keep_splat"
+    },
+    {
+      "class_name": "IO::Buffer",
+      "instance_method": true,
+      "method_visibility": "public",
+      "method_name": "pread",
+      "source":"P0,O",
+      "target":"O",
+      "action": "BUFFER",
+      "patch_method": "buffer_keep_splat"
+    },
     {
        "class_name": "ERB",
        "method_name": "result",
@@ -1177,6 +1248,33 @@
       "action": "REMOVE",
       "tags":["HTML_ENCODED"],
       "untags":["HTML_DECODED"]
+    },
+    {
+      "class_name": "IO::Buffer",
+      "instance_method": false,
+      "method_visibility": "public",
+      "method_name": "map",
+      "source": "P0,O",
+      "target": "R",
+      "action": "KEEP"
+    },
+     {
+      "class_name": "IO::Buffer",
+      "method_name": "pwrite",
+      "instance_method": true,
+      "method_visibility": "public",
+      "source": "O",
+      "target": "P0",
+      "action": "KEEP"
+    },
+    {
+      "class_name": "IO::Buffer",
+      "method_name": "write",
+      "instance_method": true,
+      "method_visibility": "public",
+      "source": "O",
+      "target": "P0",
+      "action": "KEEP"
     }
   ],
   "rules":[
@@ -1618,7 +1716,7 @@
           "source":"P0"
         }, {
           "class_name": "BasicObject",
-          "instance_method": false,
+          "instance_method": true,
           "method_visibility": "public",
           "method_name":"instance_eval",
           "source":"P0",

data/resources/deadzone/policy.json

@@ -200,92 +200,6 @@
       "method_visibility": "public",
       "method_name":"exists?",
       "code": "https://github.com/rails/rails/blob/v6.0.3.4/actionpack/lib/action_dispatch/request/session.rb#L201"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::BaseMatcher"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::BeAKindOf"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::BeAnInstanceOf"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::BeBetween"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::Be"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::BeComparedTo"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::BeFalsey"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::BeHelpers"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::BeNil"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::BePredicate"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::BeTruthy"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::BeWithin"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::Change"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::ChangeRelatively"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::SpecificValuesChange"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::Compound"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::Compound::And"
-    }, {
-      "class_name": "RSpec::Matchers::BuiltIn::Compound::Or"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::ContainExactly"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::Cover"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::EndWith"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::Eq"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::Eql"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::Equal"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::Exist"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::Has"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::HaveAttributes"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::All"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::Match"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::NegativeOperatorMatcher"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::OperatorMatcher"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::Output"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::PositiveOperatorMatcher"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::RaiseError"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::RespondTo"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::Satisfy"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::StartWith"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::ThrowSymbol"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::YieldControl"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::YieldSuccessiveArgs"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::YieldWithArgs"
-    },{
-      "class_name": "RSpec::Matchers::BuiltIn::YieldWithNoArgs"
-    },{
-      "class_name": "SimpleCov"
     }
   ]
 }

data/ruby-agent.gemspec

@@ -50,7 +50,7 @@ end
 def self.add_frameworks spec
   spec.add_development_dependency 'grape', '~> 1.5', '>= 1.5.2'
   spec.add_development_dependency 'rack-protection', '>= 2'
-  spec.add_development_dependency 'rails', '6.0.3.5'
+  spec.add_development_dependency 'rails', '~> 7'
   spec.add_development_dependency 'sinatra', '>= 2'
 end
 
@@ -70,6 +70,7 @@ def self.add_specs spec
   add_tested_gems(spec)
 
   spec.add_development_dependency 'benchmark-ips'
+  spec.add_development_dependency 'benchmark-memory', '~> 0.1'
   spec.add_development_dependency 'climate_control' # mock ENV
   spec.add_development_dependency 'factory_bot'
   spec.add_development_dependency 'fake_ftp'
@@ -89,11 +90,11 @@ end
 
 # Dependencies used to run all of our Rubocop during the linting phase.
 def self.add_rubocop spec
-  spec.add_development_dependency 'rubocop', '1.22.3'
-  spec.add_development_dependency 'rubocop-performance', '1.12.0'
-  spec.add_development_dependency 'rubocop-rails', '2.12.4'
+  spec.add_development_dependency 'rubocop', '1.26.1'
+  spec.add_development_dependency 'rubocop-performance', '1.13.3'
+  spec.add_development_dependency 'rubocop-rails', '2.14.2'
   spec.add_development_dependency 'rubocop-rake', '0.6.0'
-  spec.add_development_dependency 'rubocop-rspec', '2.6.0'
+  spec.add_development_dependency 'rubocop-rspec', '2.9.0'
 end
 
 # Dependencies not mocked out during RSpec that we test real code of, beyond just frameworks.
@@ -155,7 +156,7 @@ def self.add_files spec
 end
 
 def self.add_metadata spec
-  spec.metadata['changelog_uri'] =        'https://docs.contrastsecurity.com/release.html'
+  spec.metadata['changelog_uri'] =        'https://docs.contrastsecurity.com/en/ruby-agent-release-notes-and-archive.html'
   spec.metadata['support_uri'] =          'https://support.contrastsecurity.com'
   spec.metadata['trouble_shooting_uri'] = 'https://support.contrastsecurity.com/hc/en-us/search?utf8=%E2%9C%93&query=Ruby'
   spec.metadata['wiki_uri'] =             'https://docs.contrastsecurity.com/'
@@ -169,11 +170,11 @@ Gem::Specification.new do |spec|
 
   spec.summary      = 'Contrast Security\'s agent for rack-based applications.'
   spec.description  = 'This gem instantiates a Rack middleware for rack-based ' \
-    'web applications in order to provide Interactive Application Security ' \
-    'Testing and Protection.'
+                      'web applications in order to provide Interactive Application Security ' \
+                      'Testing and Protection.'
   spec.homepage     = 'https://www.contrastsecurity.com'
   spec.license      = 'CONTRAST SECURITY (see license file)'
-  spec.required_ruby_version = ['>= 2.6.0', '< 3.2.0']
+  spec.required_ruby_version = ['>= 2.7.0', '< 3.2.0']
 
   spec.bindir        = 'exe'
   spec.executables   = ['contrast_service']

data/service_executables/VERSION

@@ -1 +1 @@
-2.28.14
+2.28.20