clean_room 0.2.1 → 0.2.2

data/lib/clean_room/air_lock.rb

@@ -3,20 +3,21 @@ module CleanRoom
     module Parameters
       def self.included(base)
         base.extend ClassMethods
-        base.clean_room_rules = {}
       end
 
       def params
-        @_params ||= HashWithIndifferentAccess.new(CleanRoom::Filter.clean(request.parameters, nested_rules: self.class.clean_room_rules))
+        @_params ||= HashWithIndifferentAccess.new(CleanRoom::Filter.clean(request.parameters, nested_rules: self.class.cr_rules))
       end
 
       def params=(val)
-        @_params = val.is_a?(Hash) ? HashWithIndifferentAccess.new(CleanRoom::Filter.clean(val, nested_rules: self.class.clean_room_rules)) : val
+        @_params = val.is_a?(Hash) ? HashWithIndifferentAccess.new(CleanRoom::Filter.clean(val, nested_rules: self.class.cr_rules)) : val
       end
 
-      class << self
+      module ClassMethods
+        attr_accessor :cr_rules
+
         def clean_room_rules(rules = {})
-          clean_room_rules = rules
+          cr_rules = rules
         end
       end
     end

data/lib/clean_room/filter.rb

@@ -8,19 +8,13 @@ module CleanRoom
       include SanitizeUrl
 
       def clean(dirty_value, rules = {})
-        determine_and_filter(dirty_value, rules)
-      end
-
-      private
-
-      def determine_and_filter(dirty_value, rules)
         nested_rules = rules[:nested_rules] || {}
 
         case dirty_value
         when Array
-          dirty_value.map{ |dv| determine_and_filter(dv, rules) }
+          dirty_value.map{ |dv| clean(dv, rules) }
         when Hash
-          Hash[dirty_value.map {|k,dv| [determine_and_filter(k, allow: (k.is_a?(Symbol) ? :symbol : :string)),determine_and_filter(dv, nested_rules[k] ? nested_rules[k] : rules)]}]
+          Hash[dirty_value.map {|k,dv| [clean(k, allow: (k.is_a?(Symbol) ? :symbol : :string)),clean(dv, nested_rules[k] ? nested_rules[k] : rules)]}]
         when Fixnum
           dirty_value
         when Symbol
@@ -30,10 +24,16 @@ module CleanRoom
         when NilClass
           nil
         else
-          filter(dirty_value, rules)
+          if dirty_value.class.to_s == "ActionDispatch::Http::UploadedFile"        
+            dirty_value
+          else
+            filter(dirty_value, rules)
+          end
         end
       end
 
+      private
+
       def filter(dirty_value, rules)
         dirty_value = dirty_value.to_s
         intermediate_value = case (rules[:rule] || :plain_text)

data/lib/clean_room/version.rb

@@ -1,3 +1,3 @@
 module CleanRoom
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/test/clean_room_test.rb

@@ -41,6 +41,9 @@ class CleanRoomTest < MiniTest::Unit::TestCase
     assert_equal [123, 456, 789], CleanRoom::Filter.clean(["<b>123.</b>","456.3", 789.8], rule: :fixnum)
     assert_equal [123.0, 456.3, 789.8], CleanRoom::Filter.clean(["<b>123.</b>","456.3", 789.8], rule: :float)
 
+    # Errors
+    assert_equal({"action"=>"new", "controller"=>"devise/sessions"}, CleanRoom::Filter.clean({"action"=>"new", "controller"=>"devise/sessions"}))
+
     # SQL injection
     assert_equal "test", CleanRoom::Filter.clean("test'   ; DROP TABLE ")
     assert_equal "test", CleanRoom::Filter.clean("test'DROP TABLE `sdfdsf`")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clean_room
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sanitize
-  requirement: &70210935928440 !ruby/object:Gem::Requirement
+  requirement: &70093767202980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70210935928440
+  version_requirements: *70093767202980
 - !ruby/object:Gem::Dependency
   name: sanitize-url
-  requirement: &70210935927900 !ruby/object:Gem::Requirement
+  requirement: &70093767202480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70210935927900
+  version_requirements: *70093767202480
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70210935927440 !ruby/object:Gem::Requirement
+  requirement: &70093767202080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70210935927440
+  version_requirements: *70093767202080
 description: Work in progress, this will be a generic attribute sanitizer which can
   be used for sanitizing models and other objects holding data
 email: