timber 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39440c7ae6a4d416b54191200b5a406681750be5
-  data.tar.gz: 04de3467c2bc3bdc363d1816ea892a74b4b237cc
+  metadata.gz: 77cca27158a28ec9275818a2efaba37229e2d121
+  data.tar.gz: 5423ac901328f3c57811bfc1a7855970d798b55c
 SHA512:
-  metadata.gz: c2d65105138fa4e900262dc15274c4a4dbc79b1ecb89a91ffedefcdc64371933d12e5157cb16ffe8999e48375255d2186f7e0cd62ab30efafe13ee9074d2d2a8
-  data.tar.gz: 9e1562e6465a72a7e491841617d58ec5dd1dd10d6174a34a92fba8817fcd80e9d8433555c7e1ead74022fd0bb90b314dc3b3ea8cbb78b61c31c92dba8dcda6a7
+  metadata.gz: b58fb47529e061305c0d178458bf2a5bc170610986492fd4a9573f1fae52ad85b5809f12ec2e2dea7b6553441d10a5d849c63cdfff0ae1cc573bf27e3a0f0d4b
+  data.tar.gz: 7a9d4dcde4b68e23b15a62a2e607c76fb371dd313dd28a9d650607be12d3af3fb97e0f6e3ad273ae2ac46762025541d918c7ca065fd3ee045483b65ba75c5fb9

data/lib/timber/events/controller_call.rb

@@ -49,15 +49,7 @@ module Timber
 
         def sanitize_params(params)
           if params.is_a?(::Hash)
-            params.each_with_object({}) do |(k, v), h|
-              k = k.to_s.downcase
-              case k
-              when PASSWORD_NAME
-                h[k] = SANITIZED_VALUE
-              else
-                h[k] = v
-              end
-            end
+            Util::Hash.sanitize(params, [PASSWORD_NAME])
           else
             params
           end

data/lib/timber/events/exception.rb

@@ -37,8 +37,9 @@ module Timber
         def parse_backtrace_line(line)
           # using split for performance reasons
           file, line, function_part = line.split(":", 3)
-          _prefix, function = function_part.split("`", 2)
-          {file: file, line: line.to_i, function: function.chomp("'")}
+          _prefix, function_pre = function_part.split("`", 2)
+          function = Util::Object.try(function_pre, :chomp, "'")
+          {file: file, line: line.to_i, function: function}
         end
     end
   end

data/lib/timber/util/hash.rb

@@ -2,6 +2,8 @@ module Timber
   module Util
     # @private
     module Hash
+      SANITIZED_VALUE = '[sanitized]'.freeze
+
       extend self
 
       def deep_compact(hash)
@@ -21,6 +23,17 @@ module Timber
 
         new_hash
       end
+
+      def sanitize(hash, keys_to_sanitize)
+        hash.each_with_object({}) do |(k, v), h|
+          k = k.to_s.downcase
+          if keys_to_sanitize.include?(k)
+            h[k] = SANITIZED_VALUE
+          else
+            h[k] = v
+          end
+        end
+      end
     end
   end
 end

data/lib/timber/util/http_event.rb

@@ -3,7 +3,6 @@ module Timber
     module HTTPEvent
       AUTHORIZATION_HEADER = 'authorization'.freeze
       QUERY_STRING_LIMIT = 5_000.freeze
-      SANITIZED_VALUE = '[sanitized]'.freeze
 
       extend self
 
@@ -25,22 +24,15 @@ module Timber
 
       def normalize_headers(headers)
         if headers.is_a?(::Hash)
-          headers.each_with_object({}) do |(k, v), h|
-            k = k.to_s.downcase
-            case k
-            when AUTHORIZATION_HEADER
-              h[k] = SANITIZED_VALUE
-            else
-              if Config.instance.header_filters && Config.instance.header_filters.include?(k)
-                h[k] = SANITIZED_VALUE
-              else
-                # Force the header into a valid UTF-8 string, otherwise we will encounter
-                # encoding issues when we convert this data to json. Moreoever, if the
-                # data is already valid UTF-8 we don't pay a penalty.
-                h[k] = Timber::Util::String.normalize_to_utf8(v)
-              end
-            end
+          h = headers.each_with_object({}) do |(k, v), h|
+            # Force the header into a valid UTF-8 string, otherwise we will encounter
+            # encoding issues when we convert this data to json. Moreoever, if the
+            # data is already valid UTF-8 we don't pay a penalty.
+            h[k] = Timber::Util::String.normalize_to_utf8(v)
           end
+
+          keys_to_sanitize = [AUTHORIZATION_HEADER] + (Config.instance.header_filters || [])
+          Util::Hash.sanitize(h, keys_to_sanitize)
         else
           headers
         end

data/lib/timber/util/object.rb

@@ -3,11 +3,11 @@ module Timber
     # @private
     module Object
       # @private
-      def self.try(object, method)
+      def self.try(object, method, *args)
         if object == nil
           nil
         else
-          object.send(method) rescue object
+          object.send(method, *args) rescue object
         end
       end
     end

data/lib/timber/version.rb

@@ -1,3 +1,3 @@
 module Timber
-  VERSION = "2.0.8"
+  VERSION = "2.0.9"
 end

data/spec/timber/events/controller_call_spec.rb

@@ -0,0 +1,12 @@
+# encoding: UTF-8
+
+require "spec_helper"
+
+describe Timber::Events::ControllerCall, :rails_23 => true do
+  describe ".initialize" do
+    it "sanitizes the password param" do
+      event = described_class.new(controller: 'controller', action: 'action', params: {password: 'password'})
+      expect(event.params).to eq({'password' => '[sanitized]'})
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timber
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Timber Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -230,6 +230,7 @@ files:
 - spec/timber/contexts_spec.rb
 - spec/timber/current_context_spec.rb
 - spec/timber/event_spec.rb
+- spec/timber/events/controller_call_spec.rb
 - spec/timber/events/custom_spec.rb
 - spec/timber/events/http_server_request_spec.rb
 - spec/timber/events_spec.rb
@@ -285,6 +286,7 @@ test_files:
 - spec/timber/contexts_spec.rb
 - spec/timber/current_context_spec.rb
 - spec/timber/event_spec.rb
+- spec/timber/events/controller_call_spec.rb
 - spec/timber/events/custom_spec.rb
 - spec/timber/events/http_server_request_spec.rb
 - spec/timber/events_spec.rb