Fix JSON::ParserError when image data is an invalid json string (#37)

* Fix JSON::ParserError when image data is an invalid json string * Fix the test description for invalid json strings * Uniformize test descriptions for empty strings * Use more complete example of invalid JSON strings in tests * Rescue JSON::ParserError strictly around parse_values methods * Return earlier from the validate_each methods
musaffa · Apr 4, 2020 · 7572767 · 7572767
1 parent 74d9a59
commit 7572767
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/lib/file_validators/validators/file_content_type_validator.rb b/lib/file_validators/validators/file_content_type_validator.rb
@@ -10,7 +10,13 @@ def self.helper_method_name
       end
 
       def validate_each(record, attribute, value)
-        values = parse_values(value)
+        begin
+          values = parse_values(value)
+        rescue JSON::ParserError
+          record.errors.add attribute, :invalid
+          return
+        end
+
         return if values.empty?
 
         mode = option_value(record, :mode)

diff --git a/lib/file_validators/validators/file_size_validator.rb b/lib/file_validators/validators/file_size_validator.rb
@@ -14,7 +14,13 @@ def self.helper_method_name
       end
 
       def validate_each(record, attribute, value)
-        values = parse_values(value)
+        begin
+          values = parse_values(value)
+        rescue JSON::ParserError
+          record.errors.add attribute, :invalid
+          return
+        end
+
         return if values.empty?
 
         options.slice(*CHECKS.keys).each do |option, option_value|

diff --git a/spec/integration/file_content_type_validation_integration_spec.rb b/spec/integration/file_content_type_validation_integration_spec.rb
@@ -364,6 +364,11 @@ class Person
       before { subject.avatar = '' }
       it { is_expected.to be_valid }
     end
+
+    context 'invalid json string' do
+      before { subject.avatar = '{filename":"img140910_88338.jpg","content_type":"image/jpeg","size":13150}' }
+      it { is_expected.not_to be_valid }
+    end
   end
 
   context 'image data as hash' do

diff --git a/spec/integration/file_size_validator_integration_spec.rb b/spec/integration/file_size_validator_integration_spec.rb
@@ -240,10 +240,15 @@ class Person
       it { is_expected.to be_valid }
     end
 
-    context 'empty json string' do
+    context 'empty string' do
       before { subject.avatar = '' }
       it { is_expected.to be_valid }
     end
+
+    context 'invalid json string' do
+      before { subject.avatar = '{filename":"img140910_88338.GIF","content_type":"image/gif","size":33150}' }
+      it { is_expected.not_to be_valid }
+    end
   end
 
   context 'image data as hash' do