hoptoad_notifier 2.4.7 → 2.4.8

data/CHANGELOG

@@ -1,3 +1,9 @@
+Version 2.4.8 - Mon Mar 21 11:11:16 -0400 2011
+===============================================================================
+
+Jonathan Yurek(1):
+      Prevent infinite loops from recursive data structures.
+
 Version 2.4.7 - Thu Mar 10 16:21:31 -0500 2011
 ===============================================================================
 
@@ -416,5 +422,6 @@ Nick Quaranto (3):
 
 
 
+
 
 

data/lib/hoptoad_notifier/notice.rb

@@ -226,14 +226,16 @@ module HoptoadNotifier
     # Removes non-serializable data. Allowed data types are strings, arrays,
     # and hashes. All other types are converted to strings.
     # TODO: move this onto Hash
-    def clean_unserializable_data(data)
+    def clean_unserializable_data(data, stack = [])
+      return "[possible infinite recursion halted]" if stack.any?{|item| item == data.object_id }
+
       if data.respond_to?(:to_hash)
         data.to_hash.inject({}) do |result, (key, value)|
-          result.merge(key => clean_unserializable_data(value))
+          result.merge(key => clean_unserializable_data(value, stack + [data.object_id]))
         end
       elsif data.respond_to?(:to_ary)
         data.collect do |value|
-          clean_unserializable_data(value)
+          clean_unserializable_data(value, stack + [data.object_id])
         end
       else
         data.to_s

data/lib/hoptoad_notifier/version.rb

@@ -1,3 +1,3 @@
 module HoptoadNotifier
-  VERSION = "2.4.7".freeze
+  VERSION = "2.4.8".freeze
 end

data/test/recursion_test.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/helper'
+
+class RecursionTest < Test::Unit::TestCase
+  should "not allow infinite recursion" do
+    hash = {:a => :a}
+    hash[:hash] = hash
+    notice = HoptoadNotifier::Notice.new(:parameters => hash)
+    assert_equal "[possible infinite recursion halted]", notice.parameters[:hash]
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hoptoad_notifier
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 2
   - 4
-  - 7
-  version: 2.4.7
+  - 8
+  version: 2.4.8
 platform: ruby
 authors: 
 - thoughtbot, inc
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 -05:00
+date: 2011-03-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -170,6 +170,7 @@ files:
 - test/notifier_test.rb
 - test/rack_test.rb
 - test/rails_initializer_test.rb
+- test/recursion_test.rb
 - test/sender_test.rb
 - test/user_informer_test.rb
 - rails/init.rb
@@ -221,5 +222,6 @@ test_files:
 - test/notifier_test.rb
 - test/rack_test.rb
 - test/rails_initializer_test.rb
+- test/recursion_test.rb
 - test/sender_test.rb
 - test/user_informer_test.rb