Call valid_encoding? before scrub (#2646)

Co-authored-by: Daniel (dB.) Doubrovkine <dblock@dblock.org>

Author: ericproulx

CHANGELOG.md

@@ -10,6 +10,7 @@
 * [#2639](https://github.com/ruby-grape/grape/pull/2639): Refactor mime_types_for - [@ericproulx](https://github.com/ericproulx).
 * [#2638](https://github.com/ruby-grape/grape/pull/2638): Remove unnecessary path string duplication - [@ericproulx](https://github.com/ericproulx).
 * [#2643](https://github.com/ruby-grape/grape/pull/2638): Remove `try` method in codebase - [@ericproulx](https://github.com/ericproulx).
+* [#2646](https://github.com/ruby-grape/grape/pull/2646): Call `valid_encoding?` before scrub - [@ericproulx](https://github.com/ericproulx).
 * [#2644](https://github.com/ruby-grape/grape/pull/2644): Clean useless/not valuable dependencies - [@ericproulx](https://github.com/ericproulx).
 * Your contribution here.
 

lib/grape/middleware/base.rb

@@ -111,7 +111,7 @@ def merge_default_options(options)
       end
 
       def try_scrub(obj)
-        (obj.respond_to?(:scrub) && obj.scrub) || obj
+        obj.respond_to?(:valid_encoding?) && !obj.valid_encoding? ? obj.scrub : obj
       end
     end
   end

lib/grape/validations/validators/allow_blank_validator.rb

@@ -8,7 +8,7 @@ def validate_param!(attr_name, params)
           return if (options_key?(:value) ? @option[:value] : @option) || !params.is_a?(Hash)
 
           value = params[attr_name]
-          value = value.scrub if value.respond_to?(:scrub)
+          value = value.scrub if value.respond_to?(:valid_encoding?) && !value.valid_encoding?
 
           return if value == false || value.present?
 

lib/grape/validations/validators/regexp_validator.rb

@@ -6,10 +6,20 @@ module Validators
       class RegexpValidator < Base
         def validate_param!(attr_name, params)
           return unless params.respond_to?(:key) && params.key?(attr_name)
-          return if Array.wrap(params[attr_name]).all? { |param| param.nil? || param.to_s.scrub.match?((options_key?(:value) ? @option[:value] : @option)) }
+
+          value = options_key?(:value) ? @option[:value] : @option
+          return if Array.wrap(params[attr_name]).all? { |param| param.nil? || scrub(param.to_s).match?(value) }
 
           raise Grape::Exceptions::Validation.new(params: [@scope.full_name(attr_name)], message: message(:regexp))
         end
+
+        private
+
+        def scrub(param)
+          return param if param.valid_encoding?
+
+          param.scrub
+        end
       end
     end
   end

lib/grape/validations/validators/values_validator.rb

@@ -16,7 +16,7 @@ def validate_param!(attr_name, params)
 
           return if val.nil? && !required_for_root_scope?
 
-          val = val.scrub if val.respond_to?(:scrub)
+          val = val.scrub if val.respond_to?(:valid_encoding?) && !val.valid_encoding?
 
           # don't forget that +false.blank?+ is true
           return if val != false && val.blank? && @allow_blank