contrast-agent 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa7aa416c6a15843424449814734c462a46e2951cbe41f010bd2570c03717cc5
-  data.tar.gz: ade4eac9f0f32d9aa339d6429a30728f0b7950a68db8b8b1aad2e0e5cfe52d71
+  metadata.gz: bfca6df4def9f2366f7a92651aa9cd2fc40f3ced6784228844d8025cee5a4850
+  data.tar.gz: b66b10e1d892adee985f070963e08945fd9dd4faf641f4f06a8372683129facd
 SHA512:
-  metadata.gz: fd24331e49a9d2826628613ccc3f1bcf5c3ba337ba866ea321fd5a795d9b585507d935b92e64bffca5d70f83d4dbac7a978b484b372ae9c590c2d82ca3a57e91
-  data.tar.gz: cc3b03f3b101658f74006af2b4ef4c81256c2890372727fcd6f5d300926ca6454a6da64be5500cd0d5cc103e36d92a5c8f24495677558e33856fe5e8f99e71f9
+  metadata.gz: '08a6989482a82249d3fb906b2f79788e03d5c5ffa03973beabe591292fa780cd2bd3a6f459e8b7eedf58181a729720da0e95b1afa069e8869511b6ff4338625d'
+  data.tar.gz: b460cad0b10b3355bfafa3be8c49ba41d0174e5a5d0524bbab273cf51c3d9fed6348027b9658dd3dadddcace9012f0ce119566f46899ee71f8712aebf56a98bf

data/lib/contrast/agent/assess/rule/response/framework/rails_support.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 'rails'
-
 module Contrast
   module Agent
     module Assess
@@ -10,11 +8,13 @@ module Contrast
         module Response
           module Framework
             # Rails 7 supports managing potential unsafe Headers
-            # this module contains methods for checking if Rails 7 supercedes our rules
+            # this module contains methods for checking if Rails 7 supersedes our rules
             module RailsSupport
               RAILS_VERSION = Gem::Version.new('7.0.0')
 
               def framework_supported?
+                return false unless defined?(::Rails)
+
                 rails_version = ::Rails.version
                 return false unless !!rails_version
 

data/lib/contrast/agent/assess/rule/response/x_xss_protection_header_rule.rb

@@ -1,10 +1,9 @@
 # Copyright (c) 2022 Contrast Security, Inc. See https://www.contrastsecurity.com/enduser-terms-0317a for more details.
 # frozen_string_literal: true
 
+require 'contrast/agent/assess/rule/response/framework/rails_support'
 require 'contrast/agent/assess/rule/response/header_rule'
 require 'contrast/utils/string_utils'
-require 'contrast/agent/assess/rule/response/framework/rails_support'
-require 'rails'
 
 module Contrast
   module Agent

data/lib/contrast/agent/version.rb

@@ -3,6 +3,6 @@
 
 module Contrast
   module Agent
-    VERSION = '5.2.0'
+    VERSION = '5.3.0'
   end
 end

data/lib/contrast/config/service_configuration.rb

@@ -13,17 +13,72 @@ module Contrast
       DEFAULT_HOST       = '127.0.0.1'
       DEFAULT_PORT       = '30555'
 
-      KEYS = {
-          enable: EMPTY_VALUE,
-          host: EMPTY_VALUE,
-          port: EMPTY_VALUE,
-          socket: EMPTY_VALUE,
-          logger: Contrast::Config::LoggerConfiguration,
-          bypass: false
-      }.cs__freeze
-
-      def initialize hsh
-        super(hsh, KEYS)
+      attr_writer :enable, :logger, :bypass
+      # @return [String, nil]
+      attr_accessor :socket
+      # @return [String, nil]
+      attr_accessor :port
+      # @return [String, nil]
+      attr_accessor :host
+
+      def initialize hsh = {}
+        @enable = traverse_config(hsh, :enable)
+        @host = traverse_config(hsh, :host)
+        @port = traverse_config(hsh, :port)
+        @socket = traverse_config(hsh, :socket)
+        @logger = Contrast::Config::LoggerConfiguration.new(traverse_config(hsh, :logger))
+        @bypass = traverse_config(hsh, :bypass)
+        @configuration_map = {}
+        build_configuration_map
+      end
+
+      # @return [Boolean, false]
+      def enable
+        !!@enable
+      end
+
+      # @return [Contrast::Config::LoggerConfiguration]
+      def logger
+        @logger ||= Contrast::Config::LoggerConfiguration.new
+      end
+
+      # @return [Boolean, false]
+      def bypass
+        !!@bypass
+      end
+
+      # TODO: RUBY-1493 MOVE TO BASE CONFIG
+
+      def []= key, value
+        instance_variable_set("@#{ key }".to_sym, value)
+        @configuration_map[key] = value
+      end
+
+      def [] key
+        send(key.to_sym)
+      end
+
+      # Traverse the given entity to build out the configuration graph.
+      #
+      # The values will be either a hash, indicating internal nodes to
+      # traverse, or a value to set or the EMPTY_VALUE symbol, indicating a
+      # leaf node.
+      #
+      # The spec_key are the Contrast defined keys based on the instance variables of
+      # a given configuration.
+      def traverse_config values, spec_key
+        internal_nodes = values.cs__respond_to?(:has_key?)
+        val = internal_nodes ? value_from_key_config(spec_key, values) : nil
+        val == EMPTY_VALUE ? nil : val
+      end
+
+      def build_configuration_map
+        instance_variables.each do |key|
+          str_key = key.to_s.tr('@', '')
+          next if str_key == 'configuration_map'
+
+          @configuration_map[str_key] = send(str_key.to_sym)
+        end
       end
     end
   end

data/service_executables/VERSION

@@ -1 +1 @@
-2.28.6
+2.28.14

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contrast-agent
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - galen.palmer@contrastsecurity.com
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler