contrast-agent 6.6.3 → 6.7.0

data/lib/contrast/api/dtm.pb.rb

@@ -15,36 +15,12 @@ module Contrast
       #
       class Message < ::Protobuf::Message; end
       class Poll < ::Protobuf::Message; end
-      class Noop < ::Protobuf::Message; end
-      class ServerActivity < ::Protobuf::Message
-      end
 
       class AgentStartup < ::Protobuf::Message; end
       class ApplicationCreate < ::Protobuf::Message; end
       class InstrumentationMode < ::Protobuf::Message; end
-      class ApplicationUpdate < ::Protobuf::Message
-      end
-
-      class Activity < ::Protobuf::Message
-      end
-
-      class Finding < ::Protobuf::Message
-      end
-
-      class DynamicSource < ::Protobuf::Message
-      end
-
-      class PossibleSecurityControl < ::Protobuf::Message; end
-      class View < ::Protobuf::Message; end
-      class Platform < ::Protobuf::Message; end
-      class ArchitectureComponent < ::Protobuf::Message; end
-      class Library < ::Protobuf::Message; end
-      class LibraryUsageUpdate < ::Protobuf::Message
-      end
 
       class Address < ::Protobuf::Message; end
-      class RawRequest < ::Protobuf::Message; end
-      class RawResponse < ::Protobuf::Message; end
       class HttpRequest < ::Protobuf::Message
         class Authentication < ::Protobuf::Enum
           define :UNAUTHENTICATED, 0
@@ -62,27 +38,6 @@ module Contrast
 
       end
 
-      class RpcStatus < ::Protobuf::Message
-        class Code < ::Protobuf::Enum
-          define :OK, 0
-          define :UNKNOWN, 1
-        end
-
-      end
-
-      class SqliSinkRequest < ::Protobuf::Message
-        class Dialect < ::Protobuf::Enum
-          define :MYSQL, 0
-          define :POSTGRESQL, 1
-          define :UNKNOWN, 99
-        end
-
-      end
-
-      class SqliSinkResponse < ::Protobuf::Message; end
-      class HttpResponse < ::Protobuf::Message
-      end
-
       class SimplePair < ::Protobuf::Message; end
       class Pair < ::Protobuf::Message; end
       class AttackResult < ::Protobuf::Message
@@ -98,36 +53,13 @@ module Contrast
       end
 
       class RaspRuleSample < ::Protobuf::Message; end
-      class EndpointBanDetails < ::Protobuf::Message; end
-      class ModSecurityDetails < ::Protobuf::Message; end
-      class ModSecurityLog < ::Protobuf::Message
-      end
 
-      class BruteForceDetails < ::Protobuf::Message; end
       class BotBlockerDetails < ::Protobuf::Message; end
       class CmdInjectionDetails < ::Protobuf::Message; end
-      class CmdInjectionSemanticAnalysisDetails < ::Protobuf::Message
-        class Finding < ::Protobuf::Enum
-          define :CHAINING, 0
-          define :BACKDOOR, 1
-          define :DANGEROUS_PATH, 2
-        end
-
-      end
 
-      class CsrfDetails < ::Protobuf::Message; end
-      class CveDetails < ::Protobuf::Message; end
-      class Cve20170898Details < ::Protobuf::Message; end
-      class Cve201714033Details < ::Protobuf::Message; end
-      class Cve201714064Details < ::Protobuf::Message; end
-      class Cve201717405Details < ::Protobuf::Message; end
       class HttpMethodTamperingDetails < ::Protobuf::Message; end
       class UntrustedDeserializationDetails < ::Protobuf::Message; end
-      class ElInjectionDetails < ::Protobuf::Message; end
-      class IpBlacklistDetails < ::Protobuf::Message; end
       class IpDenylistDetails < ::Protobuf::Message; end
-      class MarkOfTheBeastDetails < ::Protobuf::Message; end
-      class PaddingOracleDetails < ::Protobuf::Message; end
       class PathTraversalDetails < ::Protobuf::Message; end
       class PathTraversalSemanticAnalysisDetails < ::Protobuf::Message
         class Finding < ::Protobuf::Enum
@@ -138,17 +70,7 @@ module Contrast
       end
 
       class ReDosDetails < ::Protobuf::Message; end
-      class SsjsInjectionDetails < ::Protobuf::Message; end
       class SqlInjectionDetails < ::Protobuf::Message; end
-      class SqlInjectionSemanticAnalysisDetails < ::Protobuf::Message
-        class Finding < ::Protobuf::Enum
-          define :CHAINING, 0
-          define :SUSPICIOUS_UNION, 1
-          define :DANGEROUS_FUNCTION, 2
-          define :TAUTOLOGY, 3
-        end
-
-      end
 
       class NoSqlInjectionDetails < ::Protobuf::Message; end
       class SsrfDetails < ::Protobuf::Message; end
@@ -187,47 +109,6 @@ module Contrast
       end
 
       class StackTraceElement < ::Protobuf::Message; end
-      class TraceEvent < ::Protobuf::Message
-        class Action < ::Protobuf::Enum
-          define :CREATION, 0
-          define :PROPAGATION, 1
-          define :TRIGGER, 2
-          define :TAG, 3
-          define :A2A, 4
-          define :A2P, 5
-          define :A2O, 6
-          define :A2R, 7
-          define :O2A, 8
-          define :O2P, 9
-          define :O2O, 10
-          define :O2R, 11
-          define :P2A, 12
-          define :P2P, 13
-          define :P2O, 14
-          define :P2R, 15
-        end
-
-        class EventType < ::Protobuf::Enum
-          define :TYPE_METHOD, 0
-          define :TYPE_PROPAGATION, 1
-          define :TYPE_TAG, 2
-        end
-
-      end
-
-      class TraceEventSignature < ::Protobuf::Message; end
-      class TraceEventSource < ::Protobuf::Message; end
-      class TraceEventObject < ::Protobuf::Message; end
-      class TraceTaintRange < ::Protobuf::Message; end
-      class ParentObjectId < ::Protobuf::Message; end
-      class TraceStack < ::Protobuf::Message; end
-      class RouteCoverage < ::Protobuf::Message; end
-      class ObservedRoute < ::Protobuf::Message; end
-      class CmdiSinkRequest < ::Protobuf::Message; end
-      class CmdiSinkResponse < ::Protobuf::Message; end
-      class PtSinkRequest < ::Protobuf::Message; end
-      class PtSinkResponse < ::Protobuf::Message; end
-
 
       ##
       # File Options
@@ -251,30 +132,8 @@ module Contrast
         optional :string, :app_path, 28
         optional ::Contrast::Api::Dtm::AgentStartup, :agent_startup, 11
         optional ::Contrast::Api::Dtm::ApplicationCreate, :application_create, 12
-        optional ::Contrast::Api::Dtm::ServerActivity, :server_activity, 10
-        optional ::Contrast::Api::Dtm::ApplicationUpdate, :application_update, 13
-        optional ::Contrast::Api::Dtm::Activity, :activity, 14
-        optional ::Contrast::Api::Dtm::ObservedRoute, :observed_route, 26
-        optional ::Contrast::Api::Dtm::RawRequest, :request, 19
         optional ::Contrast::Api::Dtm::HttpRequest, :prefilter, 20
-        optional ::Contrast::Api::Dtm::HttpResponse, :postfilter, 22
-        optional ::Contrast::Api::Dtm::RawResponse, :response, 23
-        optional ::Contrast::Api::Dtm::SqliSinkRequest, :sqli_sink, 25
         optional ::Contrast::Api::Dtm::Poll, :poll, 27
-        optional ::Contrast::Api::Dtm::Noop, :noop, 24, :deprecated => true
-      end
-
-      class Noop
-        # Message Options
-        set_option :deprecated, true
-
-        optional :int32, :flag, 1
-      end
-
-      class ServerActivity
-        map :string, :int32, :log_enhancers, 16
-        map :string, :int32, :ip_blacklists, 17, :deprecated => true
-        map :string, :int32, :ip_denylists, 18
       end
 
       class AgentStartup
@@ -309,133 +168,12 @@ module Contrast
         optional :bool, :assess, 2
       end
 
-      class ApplicationUpdate
-        optional :int32, :coverage_loc, 2
-        optional ::Contrast::Api::Dtm::Platform, :platform, 4
-        optional ::Contrast::Api::Dtm::View, :view, 5
-        map :string, :bool, :technologies, 6
-        repeated ::Contrast::Api::Dtm::ArchitectureComponent, :components, 7
-        map :string, ::Contrast::Api::Dtm::Library, :libraries, 8
-        repeated ::Contrast::Api::Dtm::RouteCoverage, :routes, 9
-      end
-
-      class Activity
-        optional ::Contrast::Api::Dtm::HttpRequest, :http_request, 1
-        optional ::Contrast::Api::Dtm::HttpResponse, :http_response, 2
-        optional :int64, :duration_ms, 3
-        optional :int32, :query_count, 5
-        map :string, :bool, :technologies, 7
-        map :string, ::Contrast::Api::Dtm::LibraryUsageUpdate, :library_usages, 8
-        repeated ::Contrast::Api::Dtm::ArchitectureComponent, :architectures, 9
-        repeated ::Contrast::Api::Dtm::RouteCoverage, :routes, 19
-        repeated ::Contrast::Api::Dtm::AttackResult, :results, 12
-        repeated ::Contrast::Api::Dtm::Finding, :findings, 15
-        repeated ::Contrast::Api::Dtm::PossibleSecurityControl, :controls, 16
-        optional :string, :finding_tags, 17, :deprecated => true
-        map :string, ::Contrast::Api::Dtm::DynamicSource, :dynamic_sources, 18
-      end
-
-      class Finding
-        optional :string, :hash_code, 1
-        optional :string, :platform, 2
-        optional :string, :rule_id, 3
-        optional :string, :evidence, 4
-        map :string, :string, :properties, 6
-        repeated ::Contrast::Api::Dtm::TraceEvent, :events, 7
-        optional :string, :preflight, 8
-        optional :string, :tags, 9, :deprecated => true
-        optional :int64, :version, 10
-        repeated ::Contrast::Api::Dtm::RouteCoverage, :routes, 11
-        optional :string, :session_id, 12, :deprecated => true
-      end
-
-      class DynamicSource
-        optional :string, :class_name, 1
-        optional :string, :method_name, 2
-        optional :bool, :instance_method, 3
-        optional :string, :target, 4
-        repeated ::Contrast::Api::Dtm::TraceEvent, :events, 5
-        map :string, :string, :properties, 6
-      end
-
-      class PossibleSecurityControl
-        optional :string, :api, 1
-        optional :string, :type, 2
-        optional :int64, :traits, 3
-      end
-
-      class View
-        optional :int32, :accessible, 1
-        optional :int32, :total_view_fields, 2
-        optional :int32, :line_count, 3
-      end
-
-      class Platform
-        optional :string, :major, 1
-        optional :string, :minor, 2
-        optional :string, :build, 3
-        optional :string, :service_pack, 4
-        repeated :string, :updates, 5
-      end
-
-      class ArchitectureComponent
-        optional :string, :type, 1
-        optional :string, :vendor, 2
-        optional :string, :url, 3
-        optional :string, :remote_host, 4
-        optional :int32, :remote_port, 5
-      end
-
-      class Library
-        optional :string, :hash_code, 1
-        optional :string, :file_path, 2
-        optional :string, :url, 3
-        optional :string, :version, 4
-        optional :int32, :tloc, 5
-        optional :int32, :class_count, 6
-        optional :int32, :used_class_count, 7
-        optional :int64, :internal_ms, 8
-        optional :int64, :external_ms, 9
-        optional :string, :manifest, 10
-        optional :string, :tags, 11, :deprecated => true
-      end
-
-      class LibraryUsageUpdate
-        optional :int32, :count, 1
-        optional :string, :hash_code, 2
-        map :string, :bool, :class_names, 3
-      end
-
       class Address
         optional :string, :ip, 1
         optional :string, :host, 2
         optional :int32, :port, 3
       end
 
-      class RawRequest
-        optional :string, :uuid, 1
-        optional :int64, :timestamp_ms, 2
-        optional :string, :request_line, 4
-        optional :string, :normalized_uri, 5
-        optional :string, :client_ip, 6
-        optional :int32, :client_ip_version, 7
-        optional :int32, :client_port, 8
-        optional :string, :server_ip, 10
-        optional :int32, :server_ip_version, 11
-        optional :int32, :server_port, 12
-        repeated ::Contrast::Api::Dtm::SimplePair, :request_headers, 14
-        repeated ::Contrast::Api::Dtm::SimplePair, :multipart_headers, 17
-        optional :bytes, :request_body, 16
-      end
-
-      class RawResponse
-        optional :string, :uuid, 1
-        optional :int64, :timestamp_ms, 2
-        optional :int32, :response_code, 3
-        repeated ::Contrast::Api::Dtm::SimplePair, :response_headers, 14
-        optional :bytes, :response_body, 16
-      end
-
       class HttpRequest
         optional :string, :uuid, 1
         optional :int64, :timestamp_ms, 2
@@ -466,37 +204,6 @@ module Contrast
         optional :string, :server_info, 50
       end
 
-      class RpcStatus
-        optional ::Contrast::Api::Dtm::RpcStatus::Code, :code, 1
-        optional :string, :msg, 2
-      end
-
-      class SqliSinkRequest
-        optional :string, :uuid, 1
-        optional ::Contrast::Api::Dtm::SqliSinkRequest::Dialect, :dialect, 2
-        optional :string, :query, 3
-      end
-
-      class SqliSinkResponse
-        optional ::Contrast::Api::Dtm::RpcStatus, :status, 1
-        optional ::Contrast::Api::Dtm::UserInput, :user_input, 3
-        optional ::Contrast::Api::Dtm::SqlInjectionDetails, :sqli, 10
-        optional ::Contrast::Api::Dtm::SqlInjectionSemanticAnalysisDetails, :sqli_semantic, 11
-      end
-
-      class HttpResponse
-        optional :string, :uuid, 1
-        optional :int64, :timestamp_ms, 2
-        optional :int32, :response_code, 3
-        map :string, :string, :response_headers, 4, :deprecated => true
-        optional :bool, :parsed_response_headers, 5, :deprecated => true
-        map :string, ::Contrast::Api::Dtm::Pair, :normalized_response_headers, 6
-        optional :string, :response_body, 10, :deprecated => true
-        optional :bool, :parsed_response_body, 11
-        optional ::Contrast::Api::Dtm::HttpRequest::DocumentType, :document_type, 12
-        optional :bytes, :response_body_binary, 13
-      end
-
       class SimplePair
         optional :string, :key, 1
         optional :string, :value, 2
@@ -524,17 +231,10 @@ module Contrast
         optional :int64, :timestamp_ms, 2
         repeated ::Contrast::Api::Dtm::StackTraceElement, :stack_trace_elements, 4
         optional ::Contrast::Api::Dtm::UserInput, :user_input, 5
-        optional ::Contrast::Api::Dtm::BruteForceDetails, :brute_force, 16
         optional ::Contrast::Api::Dtm::BotBlockerDetails, :bot_blocker, 17
         optional ::Contrast::Api::Dtm::CmdInjectionDetails, :cmdi, 18
-        optional ::Contrast::Api::Dtm::CsrfDetails, :csrf, 19
-        optional ::Contrast::Api::Dtm::CveDetails, :cve, 20, :deprecated => true
         optional ::Contrast::Api::Dtm::UntrustedDeserializationDetails, :untrusted_deserialization, 21
-        optional ::Contrast::Api::Dtm::ElInjectionDetails, :el_injection, 22
-        optional ::Contrast::Api::Dtm::IpBlacklistDetails, :ip_blacklist, 23, :deprecated => true
         optional ::Contrast::Api::Dtm::IpDenylistDetails, :ip_denylist, 45
-        optional ::Contrast::Api::Dtm::MarkOfTheBeastDetails, :mark_of_the_beast, 24
-        optional ::Contrast::Api::Dtm::PaddingOracleDetails, :padding_oracle, 25
         optional ::Contrast::Api::Dtm::PathTraversalDetails, :path_traversal, 26
         optional ::Contrast::Api::Dtm::ReDosDetails, :re_dos, 27
         optional ::Contrast::Api::Dtm::SqlInjectionDetails, :sqli, 28
@@ -544,37 +244,7 @@ module Contrast
         optional ::Contrast::Api::Dtm::XxeDetails, :xxe, 32
         optional ::Contrast::Api::Dtm::NoSqlInjectionDetails, :no_sqli, 33
         optional ::Contrast::Api::Dtm::HttpMethodTamperingDetails, :method_tampering, 34
-        optional ::Contrast::Api::Dtm::Cve20170898Details, :cve_2017_0898, 35, :deprecated => true
-        optional ::Contrast::Api::Dtm::Cve201714033Details, :cve_2017_14033, 36, :deprecated => true
-        optional ::Contrast::Api::Dtm::Cve201714064Details, :cve_2017_14064, 37, :deprecated => true
-        optional ::Contrast::Api::Dtm::Cve201717405Details, :cve_2017_17405, 38, :deprecated => true
-        optional ::Contrast::Api::Dtm::ModSecurityDetails, :mod_security, 39
-        optional ::Contrast::Api::Dtm::EndpointBanDetails, :endpoint, 40
-        optional ::Contrast::Api::Dtm::SqlInjectionSemanticAnalysisDetails, :sqli_semantic, 41
-        optional ::Contrast::Api::Dtm::CmdInjectionSemanticAnalysisDetails, :cmdi_semantic, 42
         optional ::Contrast::Api::Dtm::PathTraversalSemanticAnalysisDetails, :path_traversal_semantic, 43
-        optional ::Contrast::Api::Dtm::SsjsInjectionDetails, :ssjs, 44
-      end
-
-      class EndpointBanDetails
-        optional :string, :ip, 1
-        optional :string, :request_uri, 2
-        optional :int32, :response_code, 3
-      end
-
-      class ModSecurityDetails
-        optional :string, :transaction_id, 1
-        optional :int32, :status, 2
-        repeated ::Contrast::Api::Dtm::ModSecurityLog, :logs, 3
-      end
-
-      class ModSecurityLog
-        optional :string, :message, 2
-        map :string, :string, :params, 3
-      end
-
-      class BruteForceDetails
-        optional :int32, :count, 1
       end
 
       class BotBlockerDetails
@@ -588,50 +258,6 @@ module Contrast
         optional :int32, :end_idx, 3
       end
 
-      class CmdInjectionSemanticAnalysisDetails
-        optional :string, :command, 1
-        repeated ::Contrast::Api::Dtm::CmdInjectionSemanticAnalysisDetails::Finding, :findings, 2
-      end
-
-      class CsrfDetails
-        optional :string, :name, 1
-        optional :string, :expected, 2
-        optional :string, :presented, 3
-      end
-
-      class CveDetails
-        optional :string, :name, 1
-        optional :string, :value, 2
-        optional :string, :cve, 3
-        optional :string, :library, 4
-      end
-
-      class Cve20170898Details
-        optional :string, :format_string, 1
-        optional :string, :malicious_format_group, 2
-        optional :string, :precision_argument, 3
-        optional :string, :value_argument, 4
-        optional :string, :arguments, 5
-        optional :string, :ruby_version, 6
-      end
-
-      class Cve201714033Details
-        optional :string, :asn1, 1
-        optional :string, :ruby_version, 2
-      end
-
-      class Cve201714064Details
-        optional :string, :space, 1
-        optional :string, :ruby_version, 2
-        optional :string, :json_version, 3
-      end
-
-      class Cve201717405Details
-        optional :string, :method, 1
-        optional :string, :file_name, 2
-        optional :string, :ruby_version, 3
-      end
-
       class HttpMethodTamperingDetails
         optional :string, :method, 1
         optional :int32, :response_code, 2
@@ -642,37 +268,11 @@ module Contrast
         optional :string, :deserializer, 2
       end
 
-      class ElInjectionDetails
-        optional :string, :attr_value, 1
-        optional :string, :version, 2
-        optional :string, :library_filename, 3
-      end
-
-      class IpBlacklistDetails
-        # Message Options
-        set_option :deprecated, true
-
-        optional :string, :ip, 1
-        optional :string, :uuid, 2
-      end
-
       class IpDenylistDetails
         optional :string, :ip, 1
         optional :string, :uuid, 2
       end
 
-      class MarkOfTheBeastDetails
-        optional :string, :number, 1
-        optional :string, :vendor, 2
-        optional :string, :version, 3
-      end
-
-      class PaddingOracleDetails
-        optional :string, :message, 1
-        optional :int32, :period, 2
-        optional :int32, :hits, 3
-      end
-
       class PathTraversalDetails
         optional :string, :path, 1
       end
@@ -689,13 +289,6 @@ module Contrast
         optional :string, :offending_string, 4
       end
 
-      class SsjsInjectionDetails
-        optional :string, :code_string, 1
-        optional :int32, :start_idx, 2
-        optional :int32, :end_idx, 3
-        optional :int32, :boundary_overrun_idx, 4
-      end
-
       class SqlInjectionDetails
         optional :int32, :start_idx, 1
         optional :int32, :end_idx, 2
@@ -704,11 +297,6 @@ module Contrast
         optional :string, :query, 5
       end
 
-      class SqlInjectionSemanticAnalysisDetails
-        optional :string, :query, 1
-        optional ::Contrast::Api::Dtm::SqlInjectionSemanticAnalysisDetails::Finding, :finding, 2
-      end
-
       class NoSqlInjectionDetails
         optional :int32, :start_idx, 1
         optional :int32, :end_idx, 2
@@ -767,83 +355,6 @@ module Contrast
         optional :string, :file_name, 3
         optional :int32, :line_number, 4
       end
-
-      class TraceEvent
-        optional ::Contrast::Api::Dtm::TraceEvent::Action, :action, 1
-        optional ::Contrast::Api::Dtm::TraceEvent::EventType, :type, 2
-        optional :int64, :timestamp_ms, 3
-        optional :string, :thread, 4
-        optional ::Contrast::Api::Dtm::TraceEventSignature, :signature, 6
-        optional :string, :field_name, 7
-        optional :string, :context, 8
-        optional :string, :code, 9
-        optional ::Contrast::Api::Dtm::TraceEventObject, :object, 16
-        optional ::Contrast::Api::Dtm::TraceEventObject, :ret, 17
-        repeated ::Contrast::Api::Dtm::TraceEventObject, :args, 18
-        repeated ::Contrast::Api::Dtm::TraceStack, :stack, 19
-        repeated ::Contrast::Api::Dtm::TraceEventSource, :event_sources, 20
-        optional :string, :source, 21
-        optional :string, :target, 22
-        repeated ::Contrast::Api::Dtm::TraceTaintRange, :taint_ranges, 23
-        optional :int64, :object_id, 24
-        repeated ::Contrast::Api::Dtm::ParentObjectId, :parent_object_ids, 25
-      end
-
-      class TraceEventSignature
-        optional :string, :return_type, 1
-        optional :string, :class_name, 2
-        optional :string, :method_name, 3
-        repeated :string, :arg_types, 4
-        optional :bool, :constructor, 5
-        optional :bool, :void_method, 6
-        optional :int32, :flags, 7
-      end
-
-      class TraceEventSource
-        optional :string, :type, 1
-        optional :string, :name, 2
-      end
-
-      class TraceEventObject
-        optional :bool, :tracked, 1
-        optional :string, :value, 2
-        repeated ::Contrast::Api::Dtm::TraceTaintRange, :ranges, 3
-      end
-
-      class TraceTaintRange
-        optional :string, :tag, 1
-        optional :string, :range, 2
-      end
-
-      class ParentObjectId
-        optional :int64, :id, 1
-      end
-
-      class TraceStack
-        optional :string, :signature, 1
-        optional :string, :declaring_class, 2
-        optional :string, :method_name, 3
-        optional :string, :file_name, 4
-        optional :int32, :line_number, 5
-        optional :string, :type, 6
-        optional :string, :eval, 7
-      end
-
-      class RouteCoverage
-        optional :string, :verb, 1
-        optional :string, :url, 2
-        optional :string, :route, 3
-        optional :int32, :count, 4
-      end
-
-      class ObservedRoute
-        optional :string, :signature, 1
-        optional :string, :url, 2
-        optional :string, :verb, 3
-        optional :string, :session_id, 4, :deprecated => true
-        repeated ::Contrast::Api::Dtm::TraceEventSource, :sources, 5
-      end
-
     end
 
   end

data/lib/contrast/components/agent.rb

@@ -4,7 +4,10 @@
 require 'rubygems/version'
 require 'contrast/agent/rule_set'
 require 'contrast/components/logger'
+require 'contrast/components/security_logger'
 require 'contrast/components/heap_dump'
+require 'contrast/components/service'
+require 'contrast/components/ruby_component'
 
 module Contrast
   module Components
@@ -21,9 +24,10 @@ module Contrast
           @_enable = hsh[:enable]
           @_start_bundled_service = hsh[:start_bundled_service]
           @_omit_body = hsh[:omit_body]
-          @_service = Contrast::Config::ServiceConfiguration.new(hsh[:service])
+          @_service = Contrast::Components::Service::Interface.new(hsh[:service])
           @_logger = Contrast::Components::Logger::Interface.new(hsh[:logger])
-          @_ruby = Contrast::Config::RubyConfiguration.new(hsh[:ruby])
+          @_security_logger = Contrast::Components::SecurityLogger::Interface.new(hsh[:security_logger])
+          @_ruby = Contrast::Components::Ruby::Interface.new(hsh[:ruby])
           @_heap_dump = Contrast::Components::HeapDump::Interface.new(hsh[:heap_dump])
         end
 
@@ -35,7 +39,7 @@ module Contrast
         def service
           return @_service unless @_service.nil?
 
-          @_service = Contrast::Config::ServiceConfiguration.new
+          @_service = Contrast::Components::Service::Interface.new
         end
 
         def logger
@@ -44,10 +48,16 @@ module Contrast
           @_logger = Contrast::Components::Logger::Interface.new
         end
 
+        def security_logger
+          return @_security_logger unless @_security_logger.nil?
+
+          @_security_logger = Contrast::Components::SecurityLogger::Interface.new
+        end
+
         def ruby
           return @_ruby unless @_ruby.nil?
 
-          @_ruby = Contrast::Config::RubyConfiguration.new
+          @_ruby = Contrast::Components::Ruby::Interface.new
         end
 
         def heap_dump
@@ -57,7 +67,7 @@ module Contrast
         end
 
         def enabled?
-          @_enable = !false?(::Contrast::CONFIG.root.enable) if @_enable.nil?
+          @_enable = !false?(::Contrast::CONFIG.enable) if @_enable.nil?
           @_enable
         end
 
@@ -87,12 +97,6 @@ module Contrast
           !false?(ruby.propagate_yield)
         end
 
-        def interpolation_enabled?
-          return @_interpolation_enabled unless @_interpolation_enabled.nil?
-
-          @_interpolation_enabled = !false?(::Contrast::CONFIG.root.agent.ruby.interpolate)
-        end
-
         def omit_body?
           @_omit_body
         end
@@ -108,7 +112,7 @@ module Contrast
         def skip_instrumentation? loaded_module_name
           return true unless loaded_module_name
 
-          loaded_module_name.start_with?(*::Contrast::CONFIG.root.agent.ruby.uninstrument_namespace)
+          loaded_module_name.start_with?(*::Contrast::CONFIG.agent.ruby.uninstrument_namespace)
         end
 
         # Insert ourselves into the application, keeping our middleware at the outermost layer of the onion