timber 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59d540abaf18455d2ed3bb663a6b8755992bdc88
-  data.tar.gz: fd29e089bb551f04526b552e45e0e339f1e95cd1
+  metadata.gz: 373352a84897146620f309326fc062b02878325a
+  data.tar.gz: 96e89b0e9e0fed80d606e24878f8913e57e41905
 SHA512:
-  metadata.gz: 2df3da2bf20cff199711dc7f4ea0fd39dadb1e0f633eb09ce8ad5a227f29bde610bfa088b886a246146dfebc930ae17508a54483c5a78873397f48fe29725268
-  data.tar.gz: 900064525472d70003a8345ef73c08b31d51386c561658aaedee4e4236cfc0534fb79ba63f3a0b0ca5351340be1582ccce3b33b2ec74c05f20ebe65493a50dc4
+  metadata.gz: 2d51f28a5d9a87976411f2b72ccfc20ab2048df76f97fed76a0529aa96950e971d7dff8b62dc6f5a83e5f92a0acf9572a148e6ef8e9ee83dae2872bdb54c2efc
+  data.tar.gz: b5b37925111a637b8eae96901660f15801b94501f191a4100d65e15539f6115bf4e1bc823be695d98ffff2f462918aeb1fc2fb8661e0550e3f303096588ab80c

data/.travis.yml

@@ -5,8 +5,9 @@ rvm:
 - 1.9.3
 - 2.2.6
 - 2.3.3
-- 2.4.1
-- jruby
+- 2.4.2
+- jruby-1.7.26
+- jruby-9.1.9.0
 gemfile:
 - gemfiles/rails-3.0.gemfile
 - gemfiles/rails-3.1.gemfile
@@ -14,7 +15,6 @@ gemfile:
 - gemfiles/rails-4.0.gemfile
 - gemfiles/rails-4.1.gemfile
 - gemfiles/rails-4.2.gemfile
-- gemfiles/rails-4.2.gemfile
 - gemfiles/rails-5.0.gemfile
 - gemfiles/rails-5.1.gemfile
 - gemfiles/rails-edge.gemfile
@@ -38,15 +38,10 @@ matrix:
       gemfile: "gemfiles/rails-3.2.gemfile"
   allow_failures:
   - rvm: 1.9.3 # bundler wont install the gems
-  - rvm: 2.4.1
-  - rvm: jruby
-    gemfile: gemfiles/rails-3.0.gemfile
-  - rvm: jruby
-    gemfile: gemfiles/rails-5.0.gemfile
-  - rvm: jruby
-    gemfile: gemfiles/rails-5.1.gemfile
-  - rvm: jruby
-    gemfile: gemfiles/rails-edge.gemfile
+  - rvm: 2.4.2
+    gemfile: gemfiles/rails-4.0.gemfile
+  - rvm: 2.4.2
+    gemfile: gemfiles/rails-4.1.gemfile
 notifications:
   email: false
   slack:

data/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.3.2] - 2017-09-27
+
+### Fixed
+
+  - Drop ASCII-8BIT (binary) data before encoding to JSON. This resolves encoding errors during
+    this process.
+
 ## [2.3.1] - 2017-09-26
 
 ### Fixed
@@ -52,7 +59,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
     instead of applying back pressure.
 
 
-[Unreleased]: https://github.com/timberio/timber-ruby/compare/v2.3.1...HEAD
+[Unreleased]: https://github.com/timberio/timber-ruby/compare/v2.3.2...HEAD
+[2.3.2]: https://github.com/timberio/timber-ruby/compare/v2.3.1...v2.3.2
 [2.3.1]: https://github.com/timberio/timber-ruby/compare/v2.3.0...v2.3.1
 [2.3.0]: https://github.com/timberio/timber-ruby/compare/v2.2.2...v2.3.0
 [2.2.2]: https://github.com/timberio/timber-ruby/compare/v2.2.2...v2.2.3

data/lib/timber/log_entry.rb

@@ -8,6 +8,7 @@ module Timber
   # Represents a new log entry into the log. This is an intermediary class between
   # `Logger` and the log device that you set it up with.
   class LogEntry #:nodoc:
+    BINARY_LIMIT_THRESHOLD = 1_000.freeze
     DT_PRECISION = 6.freeze
     MESSAGE_MAX_BYTES = 8192.freeze
     SCHEMA = "https://raw.githubusercontent.com/timberio/log-event-json-schema/v3.1.1/schema.json".freeze
@@ -73,7 +74,30 @@ module Timber
         hash
       end
 
-      Util::Hash.deep_compact(hash)
+      # Preparing a log event for JSON should remove any blank values. Timber strictly
+      # validates incoming data, including message size. Blank values will fail validation.
+      # Moreover, binary data (ASCII-8BIT) generally cannot be encoded into JSON because it
+      # contains characters outside of the valid UTF-8 space.
+      Util::Hash.deep_reduce(hash) do |k, v, h|
+        # Discard blank values
+        if !v.nil? && (!v.respond_to?(:length) || v.length > 0)
+          # If the value is a binary string, give it special treatment
+          if v.respond_to?(:encoding) && v.encoding == ::Encoding::ASCII_8BIT
+            # Only keep binary values less than a certain size. Sizes larger than this
+            # are almost always file uploads and data we do not want to log.
+            if v.length < BINARY_LIMIT_THRESHOLD
+              # Attempt to safely encode the data to UTF-8
+              encoded_value = encode_string(v)
+              if !encoded_value.nil?
+                h[k] = encoded_value
+              end
+            end
+          else
+            # Keep all other values
+            h[k] = v
+          end
+        end
+      end
     end
 
     def inspect
@@ -112,5 +136,17 @@ module Timber
       def formatted_dt
         @formatted_dt ||= time.iso8601(DT_PRECISION)
       end
+
+      # Attempts to encode a non UTF-8 string into UTF-8, discarding invalid characters.
+      # If it fails, a nil is returned.
+      def encode_string(string)
+        string.encode('UTF-8', {
+          :invalid => :replace,
+          :undef   => :replace,
+          :replace => '?'
+        })
+      rescue Exception
+        nil
+      end
   end
 end

data/lib/timber/util/hash.rb

@@ -6,19 +6,20 @@ module Timber
 
       extend self
 
-      def deep_compact(hash)
+      # Deeply reduces a hash into a new hash, passing the current key, value,
+      # and accumulated map up to that point. This allows the caller to
+      # conditionally rebuild the hash.
+      def deep_reduce(hash, &block)
         new_hash = {}
 
         hash.each do |k, v|
           v = if v.is_a?(::Hash)
-            deep_compact(v)
+            deep_reduce(v, &block)
           else
             v
           end
 
-          if v != nil && (!v.respond_to?(:length) || v.length > 0)
-            new_hash[k] = v
-          end
+          block.call(k, v, new_hash)
         end
 
         new_hash

data/lib/timber/version.rb

@@ -1,3 +1,3 @@
 module Timber
-  VERSION = "2.3.1"
+  VERSION = "2.3.2"
 end

data/spec/spec_helper.rb

@@ -20,6 +20,8 @@ if !ENV["RAILS_23"]
   require File.join(File.dirname(__FILE__), 'support', 'active_record')
 end
 
+RSpec::Support::ObjectFormatter.default_instance.max_formatted_output_length = 5_000
+
 RSpec.configure do |config|
   config.color = true
   config.order = :random

data/spec/timber/log_entry_spec.rb

@@ -3,6 +3,45 @@ require "spec_helper"
 describe Timber::LogEntry, :rails_23 => true do
   let(:time) { Time.utc(2016, 9, 1, 12, 0, 0) }
 
+  describe "#as_json" do
+    it "should drop nil value keys" do
+      event = Timber::Events::Custom.new(type: :event_type, message: "event_message", data: {a: nil})
+      log_entry = described_class.new("INFO", time, nil, "log message", {}, event)
+      hash = log_entry.as_json
+      expect(hash.key?(:event)).to be false
+    end
+
+    it "should drop blank string value keys" do
+      event = Timber::Events::Custom.new(type: :event_type, message: "event_message", data: {a: ""})
+      log_entry = described_class.new("INFO", time, nil, "log message", {}, event)
+      hash = log_entry.as_json
+      expect(hash.key?(:event)).to be false
+    end
+
+    it "should drop empty array value keys" do
+      event = Timber::Events::Custom.new(type: :event_type, message: "event_message", data: {a: []})
+      log_entry = described_class.new("INFO", time, nil, "log message", {}, event)
+      hash = log_entry.as_json
+      expect(hash.key?(:event)).to be false
+    end
+
+    it "should drop ascii-8bit (binary) value keys" do
+      binary = ("a" * 1001).force_encoding("ASCII-8BIT")
+      event = Timber::Events::Custom.new(type: :event_type, message: "event_message", data: {a: binary})
+      log_entry = described_class.new("INFO", time, nil, "log message", {}, event)
+      hash = log_entry.as_json
+      expect(hash.key?(:event)).to be false
+    end
+
+    it "should keep ascii-8bit (binary) values below the threshold" do
+      binary = "test".force_encoding("ASCII-8BIT")
+      event = Timber::Events::Custom.new(type: :event_type, message: "event_message", data: {a: binary})
+      log_entry = described_class.new("INFO", time, nil, "log message", {}, event)
+      hash = log_entry.as_json
+      expect(hash[:event][:custom][:event_type][:a].encoding).to eq(::Encoding::UTF_8)
+    end
+  end
+
   describe "#to_msgpack" do
     it "should encode properly with an event and context" do
       event = Timber::Events::Custom.new(type: :event_type, message: "event_message", data: {a: 1})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timber
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Timber Technologies, Inc.