contrast-agent 3.10.1 → 3.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dac320eaefdcac8df279a6eadaf45867ca88bba6b4b794b26bf0c88866876bf
-  data.tar.gz: 97d23d3733959386ed7c5c4a5d4258e59a0685addf81eebbf667d5eee9dc8f44
+  metadata.gz: 820720cd5c39b14ced3612d327179d48901c63fc196a9f8c99716d35f53115e4
+  data.tar.gz: b7a25f4bb481df7bade588d2d7cf7cc70024176d48b9c76a0b65bed99bc49e78
 SHA512:
-  metadata.gz: fb4fb1a3360742a868705b906fd6cc6479d4a7ca4568456d1a0bda1f18736f54554a393afdbe6aa678570be936a4181c3ba744796f94d6d110d40bb0c8e30620
-  data.tar.gz: d68db12785d7bdf50e49b1fe6df5022f8eca35f60c66fcea3c5572452188f4d8ab757129ca31b1e530c80f56f4f7e6cbc25ee04f404927f89dbe5264c7fa06ae
+  metadata.gz: 24a2efa0ed4aab95794c773220f90895a584fc60c8eac499d9789e1e0c9138d4ea12cc33a482227ceb7226e03a9b98801b37070d60f93dc92f84f54636b3ff43
+  data.tar.gz: 5d7ee9d12c77e0c5242b31f0b4f09efec75b969ef02b9c6ec915d9ae06dc393824b9de1f0cbb40ea7aef1aa4b9793550564e70a4d7448ba8f5485930ccd1fbeb

data/funchook/autom4te.cache/requests

@@ -14,64 +14,64 @@
                         'configure.ac'
                       ],
                       {
-                        'AM_PROG_AR' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AM_NLS' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
-                        'AM_PATH_GUILE' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1,
-                        '_m4_warn' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        'AC_INIT' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
+                        'AC_SUBST' => 1,
+                        'AC_CONFIG_HEADERS' => 1,
+                        'AC_SUBST_TRACE' => 1,
+                        'AM_PROG_F77_C_O' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
                         'm4_include' => 1,
-                        'AC_FC_SRCEXT' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AM_CONDITIONAL' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'm4_pattern_forbid' => 1,
                         '_AM_COND_ENDIF' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
-                        'AC_FC_PP_DEFINE' => 1,
+                        'AM_GNU_GETTEXT' => 1,
                         'AH_OUTPUT' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        '_AM_COND_IF' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        'AC_CONFIG_LINKS' => 1,
                         '_AM_COND_ELSE' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
+                        '_m4_warn' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'AM_PATH_GUILE' => 1,
+                        'AC_CONFIG_LINKS' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AM_NLS' => 1,
+                        'm4_sinclude' => 1,
                         '_LT_AC_TAGCONFIG' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'AC_FC_FREEFORM' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        'AM_PROG_MOC' => 1,
                         'AC_LIBSOURCE' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        'AM_SILENT_RULES' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
                         'LT_INIT' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
+                        'AM_PROG_AR' => 1,
+                        '_AM_COND_IF' => 1,
+                        'AM_PROG_FC_C_O' => 1,
+                        'AC_CONFIG_FILES' => 1,
                         'AC_CANONICAL_HOST' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
-                        'm4_sinclude' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_FC_SRCEXT' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
+                        'AM_PROG_MOC' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
+                        'AC_FC_FREEFORM' => 1,
+                        'AM_POT_TOOLS' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
+                        'sinclude' => 1,
                         'AM_PROG_CC_C_O' => 1,
+                        'AC_INIT' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'AC_CONFIG_HEADERS' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'include' => 1,
-                        'sinclude' => 1,
-                        'AM_POT_TOOLS' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
+                        'AM_CONDITIONAL' => 1,
                         'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
-                        'AM_PROG_FC_C_O' => 1,
-                        'AM_PROG_F77_C_O' => 1,
-                        'AC_SUBST_TRACE' => 1,
-                        'AC_SUBST' => 1
+                        'AC_FC_PP_DEFINE' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'include' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1
                       }
                     ], 'Autom4te::Request' )
            );

data/funchook/config.log

@@ -10,7 +10,7 @@ generated by GNU Autoconf 2.69.  Invocation command line was
 ## Platform. ##
 ## --------- ##
 
-hostname = cc581e4e-56c0-47a6-adc9-1640568f2129-b5bh6
+hostname = 4130b02c-90d4-4e19-922d-61e69e36360b-fj5m5
 uname -m = x86_64
 uname -r = 4.19.95-flatcar
 uname -s = Linux
@@ -326,7 +326,7 @@ generated by GNU Autoconf 2.69.  Invocation command line was
   CONFIG_COMMANDS = 
   $ ./config.status 
 
-on cc581e4e-56c0-47a6-adc9-1640568f2129-b5bh6
+on 4130b02c-90d4-4e19-922d-61e69e36360b-fj5m5
 
 config.status:822: creating Makefile
 config.status:822: creating src/Makefile

data/lib/contrast/agent/feature_state.rb

@@ -59,7 +59,7 @@ module Contrast
           end
 
           def scan_response?
-            true?(CONFIG.root.assess.enable_scan_response)
+            !false?(CONFIG.root.assess.enable_scan_response)
           end
 
           def omit_body?
@@ -254,7 +254,7 @@ module Contrast
           cas = CONFIG.root.assess&.sampling
 
           {
-              enabled: [cas&.enable, settings&.enabled, DEFAULT_SAMPLING_ENABLED] .reject(&:nil?).first,
+              enabled: true?([cas&.enable, settings&.enabled, DEFAULT_SAMPLING_ENABLED] .reject(&:nil?).first),
               baseline: [cas&.baseline, settings&.baseline, DEFAULT_SAMPLING_BASELINE] .map(&:to_i).find(&:positive?),
               request_frequency: [cas&.request_frequency, settings&.request_frequency, DEFAULT_SAMPLING_REQUEST_FREQUENCY] .map(&:to_i).find(&:positive?),
               response_frequency: [cas&.response_frequency, settings&.response_frequency, DEFAULT_SAMPLING_RESPONSE_FREQUENCY].map(&:to_i).find(&:positive?),

data/lib/contrast/agent/response.rb

@@ -51,8 +51,8 @@ module Contrast
         end
         context_response.parsed_response_headers = true
 
-        context_response.response_body = Contrast::Utils::StringUtils.force_utf8(body)
-        context_response.parsed_response_body = true
+        context_response.response_body_binary = Contrast::Utils::StringUtils.force_utf8(body)
+        context_response.parsed_response_body = false
 
         doc_type = document_type
         context_response.document_type = doc_type if doc_type
@@ -120,15 +120,12 @@ module Contrast
 
       # The response body can change during the request lifecycle
       # We should not extract it out as a variable here, or we'll miss those
-      # changes. (headdesk)
+      # changes.
       def body
         return unless @rack_response
 
-        if @is_array
-          extract_body(@rack_response[2])
-        elsif Contrast::Utils::DuckUtils.quacks_to?(@rack_response, :body)
-          extract_body(@rack_response.body)
-        end
+        body_content = @is_array ? @rack_response[2] : @rack_response.body
+        extract_body(body_content)
       end
 
       def update_body body_string
@@ -184,16 +181,38 @@ module Contrast
         true
       end
 
+      # Given some holder of the content of the response's body, extract that
+      # content and return it as a String
+      #
+      # @param body [String, Rack::File, Rack::BodyProxy,
+      #   ActionDispatch::Response::RackBody, Rack::Response] Something that
+      #   holds, wraps, or is the body of the Response
+      # @return [nil, String] the content of the body
       def extract_body body
         return nil unless body
 
         if defined?(Rack::File) && body.is_a?(Rack::File)
           # not sure what to do in this situation, so don't do anything.
           nil
+        elsif body.is_a?(Rack::BodyProxy)
+          next_body = body.instance_variable_get(:@body)
+          case next_body
+          when Array
+            extract_body(next_body[0])
+          else
+            extract_body(next_body)
+          end
+        elsif defined?(ActionDispatch::Response::RackBody) && body.is_a?(ActionDispatch::Response::RackBody)
+          extract_body(body.body)
+        elsif body.is_a?(Rack::Response)
+          extract_body(body.body)
         elsif Contrast::Utils::DuckUtils.quacks_to?(body, :each)
           acc = []
           body.each { |tmp| acc << read_or_string(tmp) }
           acc.compact.join(Contrast::Utils::ObjectShare::NEW_LINE)
+        elsif ActionView::OutputBuffer
+          # https://stackoverflow.com/questions/15654676/how-to-convert-activesupportsafebuffer-to-string
+          body.to_str
         else
           read_or_string(body)
         end

data/lib/contrast/agent/version.rb

@@ -3,6 +3,6 @@
 
 module Contrast
   module Agent
-    VERSION = '3.10.1'
+    VERSION = '3.10.2'
   end
 end

data/lib/contrast/components/sampling.rb

@@ -23,7 +23,7 @@ module Contrast
           cas = CONFIG.root.assess&.sampling
 
           {
-              enabled: [cas&.enable, settings&.enabled, DEFAULT_SAMPLING_ENABLED] .reject(&:nil?).first,
+              enabled: true?([cas&.enable, settings&.enabled, DEFAULT_SAMPLING_ENABLED] .reject(&:nil?).first),
               baseline: [cas&.baseline, settings&.baseline, DEFAULT_SAMPLING_BASELINE] .map(&:to_i).find(&:positive?),
               request_frequency: [cas&.request_frequency, settings&.request_frequency, DEFAULT_SAMPLING_REQUEST_FREQUENCY] .map(&:to_i).find(&:positive?),
               response_frequency: [cas&.response_frequency, settings&.response_frequency, DEFAULT_SAMPLING_RESPONSE_FREQUENCY].map(&:to_i).find(&:positive?),

data/service_executables/VERSION

@@ -1 +1 @@
-2.6.2
+2.6.4

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contrast-agent
 version: !ruby/object:Gem::Version
-  version: 3.10.1
+  version: 3.10.2
 platform: ruby
 authors:
 - galen.palmer@contrastsecurity.com
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -420,21 +420,21 @@ executables:
 - contrast_service
 extensions:
 - ext/cs__common/extconf.rb
-- ext/cs__assess_yield_track/extconf.rb
-- ext/cs__assess_string_interpolation26/extconf.rb
-- ext/cs__contrast_patch/extconf.rb
-- ext/cs__assess_hash/extconf.rb
-- ext/cs__assess_basic_object/extconf.rb
-- ext/cs__assess_regexp/extconf.rb
-- ext/cs__assess_array/extconf.rb
 - ext/cs__assess_fiber_track/extconf.rb
+- ext/cs__assess_active_record_named/extconf.rb
 - ext/cs__protect_kernel/extconf.rb
+- ext/cs__assess_string_interpolation26/extconf.rb
+- ext/cs__contrast_patch/extconf.rb
 - ext/cs__assess_kernel/extconf.rb
-- ext/cs__assess_regexp_track/extconf.rb
-- ext/cs__assess_active_record_named/extconf.rb
+- ext/cs__assess_regexp/extconf.rb
 - ext/cs__assess_module/extconf.rb
+- ext/cs__assess_array/extconf.rb
 - ext/cs__assess_string/extconf.rb
+- ext/cs__assess_basic_object/extconf.rb
 - ext/cs__assess_marshal_module/extconf.rb
+- ext/cs__assess_yield_track/extconf.rb
+- ext/cs__assess_regexp_track/extconf.rb
+- ext/cs__assess_hash/extconf.rb
 extra_rdoc_files: []
 files:
 - ".clang-format"