failbot 2.3.1 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 556ca34093cb33fc4db100a530b407cd4ed38282d615ecffbea2050a6479121d
-  data.tar.gz: b885163eaefde6ef987f7b4340dcd98f1a2c45c34cfda1352fd9c490eb866a35
+  metadata.gz: 3d59eaaa4b282ed08208605e95c1016cf129cc2bc8d8a877d9be047aac0a7a98
+  data.tar.gz: 08e20096fdc2ca17e6decb2a0528d0170d4dd836f627f1ef79de5062ff972684
 SHA512:
-  metadata.gz: 303221221b3f2426e21fcee2bd4398ed0975fe68ba68d82938a495fc1654ec8476fef153fa617b33a8034f42babc4617ea0c5b48ab94d2121ba3e1da4eb29a92
-  data.tar.gz: d38ba8d750531eac9f6ee1359c0ec30aa6165ad9d64f3f7fda3454a18cbe818242d50a4e524827ea1c37b79dc2db66ea3e558294b352d4a2db4fbe2ce00c9315
+  metadata.gz: 26da2ec068e6e273b984bf9c8ff5d231182914bff9a3bb0861e13854f1a43a8bab3587ea8b12531b4d2d41c2f98e71fa94e7880fa1ca0237fca4634eb46f04d0
+  data.tar.gz: ca25afcbfd0e45c8cf23218b4cc695347f9f39294e943a6402f4b698ff3dbeb22f0179276f7d691e323c9a6b733de034f88c9e9b3d3c57582ec1688be81c606b

data/lib/failbot.rb

@@ -117,7 +117,7 @@ module Failbot
   #
   # Returns the value returned by the block when given; otherwise, returns nil.
   def push(info={})
-    context.push(scrub(info))
+    context.push(info)
     yield if block_given?
   ensure
     pop if block_given?
@@ -226,12 +226,11 @@ module Failbot
   #
   # Returns nothing.
   def report(e, other = {})
-    scrubbed_other = scrub(other)
     if @raise_errors
-      squash_contexts(context, exception_info(e), scrubbed_other) # surface problems squashing
+      squash_contexts(context, exception_info(e), other) # surface problems squashing
       raise e
     else
-      report!(e, scrubbed_other)
+      report!(e, other)
     end
   end
 
@@ -261,7 +260,7 @@ module Failbot
         data = data.merge("app" => @app_override)
       end
 
-      data = sanitize(data)
+      data = scrub(sanitize(data))
 
       backend.report(data)
       instrument("report.failbot", data)

data/lib/failbot/sensitive_data_scrubber.rb

@@ -1,7 +1,9 @@
 module Failbot
   module SensitiveDataScrubber
-    FILTERED = '****'.freeze
-    BASIC_AUTH_REGEX = /:\/\/(.+:.*)(?=@)/
+    FILTERED = '[FILTERED]'.freeze
+    BASIC_AUTH_REGEX = /https?:\/{2}([\w%\-!]*:[\w%\-!]*)@/
+    SENSITIVE_KEYWORDS = %w{ secret key access_token token password api_key oauth oauth_nonce }
+    QUERY_STRING_REGEX = Regexp.new("(?<key>#{SENSITIVE_KEYWORDS.join("|")})=[\\-\\w%]+")
     MAX_DEPTH = 100
 
     def scrub(hash)
@@ -30,11 +32,13 @@ module Failbot
     end
 
     def scrub_url(url)
-      uri = URI(url)
-
-      uri.query = scrub_request_params(uri.query) if uri.query
+      filtered_url = url.gsub(QUERY_STRING_REGEX) do |_|
+        "#{$~[:key]}=#{FILTERED}"
+      end
 
-      uri.to_s.gsub(BASIC_AUTH_REGEX, "://#{FILTERED}:#{FILTERED}")
+      filtered_url.gsub(BASIC_AUTH_REGEX) do |m|
+        ($1 && m.gsub($1, "#{FILTERED}:#{FILTERED}")) || m
+      end
     rescue
       url
     end
@@ -50,19 +54,5 @@ module Failbot
       end
       result
     end
-
-    def scrub_request_params(query)
-      # We can do this with Rack query builder but we do not want to have a dependency on Rack
-      params = Hash[query.split('&').map { |el| el.split('=') }]
-
-      params.each do |attr, _|
-        if attr.include?('token') ||
-          attr.include?('oauth')
-          params[attr] = FILTERED
-        end
-      end
-
-      params.map { |el| el.join('=') }.join('&')
-    end
   end
 end

data/lib/failbot/version.rb

@@ -1,3 +1,3 @@
 module Failbot
-  VERSION = "2.3.1"
+  VERSION = "2.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: failbot
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.3
 platform: ruby
 authors:
 - "@rtomayko"
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2020-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Deliver exceptions to Haystack