instana 1.199.0 → 1.199.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86a3e023781d52d3b5efd25c9b5d304520dd3c88aecde954c326bd736abae787
-  data.tar.gz: b6c7bf11431925b9a48b827b5adbb52d93cb1f1f44bde1ebef98bd89f2188cb0
+  metadata.gz: 5bfc77f8ea09bd4e8c493e97261b962a4b4f6227de513806b7b41beacea46118
+  data.tar.gz: 3ab9bc87d33895f4df52ba02bb9f9dfd14364547fb9ebe4b4ef47ab1a2ef1aa0
 SHA512:
-  metadata.gz: e2045faa632b6edc00e4dba26feb69d5249c755698a0dac2adeaa0e2b1cbe65f7f37682f7b59a1d3d000f8908dbee85c4f0356da333f02e874361b5861cfcc3f
-  data.tar.gz: e1b3983ace1be9653732b033902c7f59a74dce020ebfb585e02cf3dfdd1c2e7eb50df4cff9ff4eb8467df3a57b3208165efe659d97073bd6bc97f9e2bdd62fa0
+  metadata.gz: 2cfcd49b02a42fd0160c50584cd62c2b98664f7d416dc7935a53d72e092d96dfeead989fc58ab66f95acdde4ef48acdf7179e4dbcbe4a58906c41d6380ec700e
+  data.tar.gz: 7d6265faff1cad2ae597f66397d192d9ed1dbbe5634d1c3aeeb1d05ac2a8548061a8023990b296bb9a23934b1d0fc396ff267eb282a265415c56e1d986dbd9af

data/lib/instana/secrets.rb

@@ -13,21 +13,31 @@ module Instana
     def remove_from_query(str, secret_values = Instana.agent.secret_values)
       return str unless secret_values
 
-      url = URI(str)
-      params = url.scheme ? CGI.parse(url.query || '') : CGI.parse(url.to_s)
+      begin
+        url = URI(str)
+        params = url.scheme ? CGI.parse(url.query || '') : CGI.parse(url.to_s)
+
+        redacted = redact(params, secret_values)
+
+        url.query = URI.encode_www_form(redacted)
+        url.scheme ? CGI.unescape(url.to_s) : CGI.unescape(url.query)
+      rescue URI::InvalidURIError => _e
+        params = CGI.parse(str || '')
+        redacted = redact(params, secret_values)
+        CGI.unescape(URI.encode_www_form(redacted))
+      end
+    end
+
+    private
 
-      redacted = params.map do |k, v|
+    def redact(params, secret_values)
+      params.map do |k, v|
         needs_redaction = secret_values['list']
           .any? { |t| matcher(secret_values['matcher']).(t,k) }
         [k, needs_redaction ? '<redacted>' : v]
       end
-
-      url.query = URI.encode_www_form(redacted)
-      url.scheme ? CGI.unescape(url.to_s) : CGI.unescape(url.query)
     end
 
-    private
-
     def matcher(name)
       case name
       when 'equals-ignore-case'

data/lib/instana/version.rb

@@ -2,6 +2,6 @@
 # (c) Copyright Instana Inc. 2016
 
 module Instana
-  VERSION = "1.199.0"
+  VERSION = "1.199.1"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/test/secrets_test.rb

@@ -78,6 +78,16 @@ class SecretsTest < Minitest::Test
     assert_redacted @subject.remove_from_query(url, sample_config), %w(instantiate)
   end
 
+  def test_without_url
+    sample_config = {
+      "matcher"=>"contains",
+      "list"=>["stan"]
+    }
+
+    url = 'filter[instantiate]=true'
+    assert_redacted @subject.remove_from_query(url, sample_config), %w(filter[instantiate]), raw_str: true
+  end
+
   private
 
   def url_for(keys)
@@ -86,9 +96,9 @@ class SecretsTest < Minitest::Test
     url.to_s
   end
 
-  def assert_redacted(str, keys)
-    url = URI(str)
-    params = CGI.parse(url.query)
+  def assert_redacted(str, keys, raw_str: false)
+    params = raw_str ? CGI.parse(str) : CGI.parse(URI(str).query)
+    pp params
 
     assert_equal keys, params.select { |_, v| v == %w(<redacted>) }.keys, 'to be redacted'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.199.0
+  version: 1.199.1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler