bugsnag 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3feeeeef834abcd2676f54ed08468f35d2e61cec
-  data.tar.gz: fa7ff7ef9f2e1619d3d00142f6e7eb1c241c514e
+  metadata.gz: a229f778796995938a5bc4d2e1f6260e8b5ad975
+  data.tar.gz: 2bf93ba3af00b2aa7e1038b2863c0dcab591dbc4
 SHA512:
-  metadata.gz: 08264576a36649e2850368e7f6d6c2190d9fe44d4489c963c464f7abcb4201a45a72b9d773a1d26eff2c98be41a0b18e953e295f06156ffe6e56de28a2601625
-  data.tar.gz: cd2424431cae73dea1e41f0b570e241834a063be6cf9c4a59964031467c77ed9089ab8ee312de9a11570a55de019e4bd109eae6e544f2355b1b09fa761948ea5
+  metadata.gz: d84f962040e273a06bcc392df1b157445ef31db06772e998fb005f9477e64f5d7ebe89cd96184cc45315cb51bfb1183c84e41ca1104b39db8cc2207f1a9a3356
+  data.tar.gz: 4ebd9be31fe102764c9b9eec6920e8d51685b02669be624470187ee4f3b42884cee2a188a05cfbbe4445c350969169fb52556f0580779093cf4c2a7942bf3748

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+## 4.0.2 (13 Apr 2016)
+
+### Fixes
+
+* Fix payload rejection due to truncating duplicate stacktrace frames
+  | [#284](https://github.com/bugsnag/bugsnag-ruby/issues/284)
+  | [#291](https://github.com/bugsnag/bugsnag-ruby/pull/291)
+
 ## 4.0.1 (5 Apr 2016)
 
 ### Fixes

data/VERSION

@@ -1 +1 @@
-4.0.1
+4.0.2

data/lib/bugsnag/cleaner.rb

@@ -17,7 +17,7 @@ module Bugsnag
     end
 
     def traverse_object(obj, seen, scope)
-      return nil unless obj
+      return nil if obj.nil?
 
       # Protect against recursion of recursable items
       protection = if obj.is_a?(Hash) || obj.is_a?(Array) || obj.is_a?(Set)

data/lib/bugsnag/helpers.rb

@@ -8,12 +8,14 @@ module Bugsnag
     MAX_STRING_LENGTH = 4096
     MAX_PAYLOAD_LENGTH = 128000
     MAX_ARRAY_LENGTH = 400
+    RAW_DATA_TYPES = [Numeric, TrueClass, FalseClass]
 
     # Trim the size of value if the serialized JSON value is longer than is
     # accepted by Bugsnag
     def self.trim_if_needed(value)
-      return value unless payload_too_long?(value)
-      reduced_value = trim_strings_in_value(value)
+      sanitized_value = Bugsnag::Cleaner.clean_object_encoding(value)
+      return sanitized_value unless payload_too_long?(sanitized_value)
+      reduced_value = trim_strings_in_value(sanitized_value)
       return reduced_value unless payload_too_long?(reduced_value)
       truncate_arrays_in_value(reduced_value)
     end
@@ -29,10 +31,15 @@ module Bugsnag
       end
     end
 
+    # Check if a value is a raw type which should not be trimmed, truncated
+    # or converted to a string
+    def self.is_json_raw_type?(value)
+      RAW_DATA_TYPES.detect {|klass| value.is_a?(klass)} != nil
+    end
+
     private
 
     TRUNCATION_INFO = '[TRUNCATED]'
-    RAW_DATA_TYPES = [Numeric, TrueClass, FalseClass]
 
     # Shorten array until it fits within the payload size limit when serialized
     def self.truncate_arrays(array)
@@ -45,13 +52,13 @@ module Bugsnag
     end
 
     # Trim all strings to be less than the maximum allowed string length
-    def self.trim_strings_in_value(value, seen=[])
+    def self.trim_strings_in_value(value)
       return value if is_json_raw_type?(value)
       case value
       when Hash
-        trim_strings_in_hash(value, seen)
+        trim_strings_in_hash(value)
       when Array, Set
-        trim_strings_in_array(value, seen)
+        trim_strings_in_array(value)
       else
         trim_as_string(value)
       end
@@ -63,21 +70,13 @@ module Bugsnag
       ::JSON.dump(value).length >= MAX_PAYLOAD_LENGTH
     end
 
-    # Check if a value is a raw type which should not be trimmed, truncated
-    # or converted to a string
-    def self.is_json_raw_type?(value)
-      RAW_DATA_TYPES.detect {|klass| value.is_a?(klass)} != nil
-    end
-
-    def self.trim_strings_in_hash(hash, seen=[])
-      return {} if seen.include?(hash) || !hash.is_a?(Hash)
-      result = hash.each_with_object({}) do |(key, value), reduced_hash|
-        if reduced_value = trim_strings_in_value(value, seen)
+    def self.trim_strings_in_hash(hash)
+      return {} unless hash.is_a?(Hash)
+      hash.each_with_object({}) do |(key, value), reduced_hash|
+        if reduced_value = trim_strings_in_value(value)
           reduced_hash[key] = reduced_value
         end
       end
-      seen << hash
-      result
     end
 
     # If possible, convert the provided object to a string and trim to the
@@ -92,11 +91,9 @@ module Bugsnag
       text
     end
 
-    def self.trim_strings_in_array(collection, seen=[])
-      return [] if seen.include?(collection) || !collection.respond_to?(:map)
-      result = collection.map {|value| trim_strings_in_value(value, seen)}
-      seen << collection
-      result
+    def self.trim_strings_in_array(collection)
+      return [] unless collection.respond_to?(:map)
+      collection.map {|value| trim_strings_in_value(value)}
     end
 
     def self.truncate_arrays_in_value(value)

data/spec/helper_spec.rb

@@ -7,21 +7,53 @@ describe Bugsnag::Helpers do
 
   describe "trim_if_needed" do
 
+    it "breaks recursion" do
+      a = [1, 2, 3]
+      b = [2, a]
+      a << b
+      value = Bugsnag::Helpers.trim_if_needed(a)
+      expect(value).to eq([1, 2, 3, [2, "[RECURSION]"]])
+    end
+
+    it "does not break equal objects without recursion" do
+      data = [1, [1, 2], [1, 2], "a"]
+      value = Bugsnag::Helpers.trim_if_needed(data)
+      expect(value).to eq data
+    end
+
+    it "preserves bool types" do
+      value = Bugsnag::Helpers.trim_if_needed([1, 3, true, "NO", "2", false])
+      expect(value[2]).to be_a(TrueClass)
+      expect(value[5]).to be_a(FalseClass)
+    end
+
+    it "preserves Numeric types" do
+      value = Bugsnag::Helpers.trim_if_needed([1, 3.445, true, "NO", "2", false])
+      expect(value[0]).to be_a(Numeric)
+      expect(value[1]).to be_a(Numeric)
+    end
+
+    it "preserves String types" do
+      value = Bugsnag::Helpers.trim_if_needed([1, 3, true, "NO", "2", false])
+      expect(value[3]).to be_a(String)
+      expect(value[4]).to be_a(String)
+    end
+
     context "payload length is less than allowed" do
 
       it "does not change strings" do
         value = SecureRandom.hex(4096)
-        expect(Bugsnag::Helpers.trim_if_needed(value)).to be value
+        expect(Bugsnag::Helpers.trim_if_needed(value)).to eq value
       end
 
       it "does not change arrays" do
         value = 1000.times.map {|i| "#{i} - #{i + 1}" }
-        expect(Bugsnag::Helpers.trim_if_needed(value)).to be value
+        expect(Bugsnag::Helpers.trim_if_needed(value)).to eq value
       end
 
       it "does not change hashes" do
         value = Hash[*1000.times.map{|i| ["#{i}", i]}.flatten]
-        expect(Bugsnag::Helpers.trim_if_needed(value)).to be value
+        expect(Bugsnag::Helpers.trim_if_needed(value)).to eq value
       end
     end
 

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: bugsnag
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - James Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.8
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby notifier for bugsnag.com
@@ -103,10 +103,10 @@ extra_rdoc_files:
 - README.md
 - CHANGELOG.md
 files:
-- ".document"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .document
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -181,17 +181,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Ruby notifier for bugsnag.com