rack_encoding_scrubber 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e0a07bacea98dda1215c58bb28286da356f7779
-  data.tar.gz: 5269737c3ab7c3d90cb7bdd35ce48104502328e4
+  metadata.gz: b97f7ce7430b37a35ccf1053b0900a51397772a9
+  data.tar.gz: 3c703aef6858a77b5881d4daa0b16670b04e5dfe
 SHA512:
-  metadata.gz: 42dbdc7c4021e5f3736ce0e3b5faf80358560051db99ef9a0d8b6ab6a71897c00b40416101690fb2cc88a762a1c65622cdad9a694d45e1675346e460e1ff5f80
-  data.tar.gz: b0872a45d0d414c0d8347d3302c1d34de53c1ec96703e0802467db294ec5135a5d15881d1a3d9aa7e489beec83380de00335bb7cd273c4e0164965ad9d2635f7
+  metadata.gz: 4251eb3439c033c5a7d9fc3937b2b7dde29c4bc93df9228f0140c5cd646841020f3e9dfa6dc3e611f1baa7b475c1a43096365d22849d76f5c03116abbf22c22b
+  data.tar.gz: 19b1e4d7a7bc7edd3b7072cc9bf7bdc6a788e28e3779eae0a2aa4b4215b0183df57a6e75bba95f95458fe6f21fe099798bfa705b48dd39191e6cc3907eb5545f

data/lib/rack_encoding_scrubber.rb

@@ -1,6 +1,8 @@
 require "rack_encoding_scrubber/version"
 
 class RackEncodingScrubber
+  REGEX_UTF = /%u00\h{0,2}/
+  REGEX_MB  = /%[a-fA-F]\h/
   def initialize(app)
     @app = app
   end
@@ -14,9 +16,19 @@ class RackEncodingScrubber
     request_method = env['REQUEST_METHOD']
     if request_method == 'GET'
       %w[QUERY_STRING REQUEST_PATH PATH_INFO QUERY_STRING REQUEST_URI ORIGINAL_FULLPATH].each do |header|
-        if env[header] and env[header]["%u00"]
-          env[header].gsub!(/%u00\h{0,2}/, "")
-          env[header].gsub!(/%\h{0,2}/,"")
+        if h = env[header]
+          if h["%u00"]
+            h.gsub!(REGEX_UTF, "")
+          end
+          if h[REGEX_MB] # check for byte
+            tmp = CGI.unescape(h).force_encoding('utf-8')
+            if !tmp.valid_encoding?
+              env[header] = CGI.escape(tmp.scrub(''))
+              if %w[REQUEST_PATH PATH_INFO REQUEST_URI].include? header
+                env[header].gsub! '%2F', '/'
+              end
+            end
+          end
         end
       end
     end

data/rack_encoding_scrubber.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "rack_encoding_scrubber"
-  spec.version       = '0.2'
+  spec.version       = '0.3'
   spec.authors       = ["Andy Schreiter"]
   spec.email         = ["andy.schreiter@pludoni.de"]
   spec.summary       = %q{Removes invalid %-encoding}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack_encoding_scrubber
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Andy Schreiter