rack-utf8_sanitizer 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aacddbd472d3669a350a888d96b382340503997
-  data.tar.gz: 32941a3fd46aef0de4a1bccc0225d39f2761d745
+  metadata.gz: a21608edab6e71fde026d8c9b5fdf6afaeb831ab
+  data.tar.gz: d3648a488dd74a3ea6357d39cc87b1d486af2c1c
 SHA512:
-  metadata.gz: 2a119e6e461f8e7e86616181dc2853197a7352e06547847c5db200d47d6e362169243d258b85a0ea3adffc0fd662d8ad86f2f8ac3cf1f79fc849e22f90f41c65
-  data.tar.gz: 1c4d8edd9653403602449aee577ff34f2c603d3c920e6f149d728f6dbef4861ff63b92debe1d6be9ba3eb78365afffaa352aaff3f550b3d6b01401f327bc7122
+  metadata.gz: 8c8c7e485b0ca9584951b2689b090feaf4441eb96c1fb5ee3fd8f7c79bddcb4bf4d005b69e56a1fd0675b1e96de07dca21906ccca4b255e3893007278e819afe
+  data.tar.gz: b8dcdd43af94a1277b978184ba8e5b26c782f269f646805839d102cf216f7e8d1e375a4104ace50357c23c3761afd00acaef441ac13bcc05ae1555e719e71079

data/CHANGELOG.md

@@ -10,6 +10,21 @@ Features implemented:
 
 Bugs fixed:
 
+v1.3.1 (2015-07-09)
+-------------------------
+
+Bugs fixed:
+  * Make sure Content-Length is adjusted. (Samuel Cochran, #26)
+
+v1.3.0 (2015-01-26)
+-------------------------
+
+v1.2.4 (2014-11-29)
+-------------------------
+
+v1.2.3 (2014-10-08)
+-------------------------
+
 v1.2.2 (2014-07-10)
 -------------------------
 

data/lib/rack/utf8_sanitizer.rb

@@ -62,7 +62,13 @@ module Rack
       content_type &&= content_type.downcase
       return unless SANITIZABLE_CONTENT_TYPES.any? {|type| content_type == type }
       uri_encoded = URI_ENCODED_CONTENT_TYPES.any? {|type| content_type == type}
-      env['rack.input'] &&= sanitize_io(env['rack.input'], uri_encoded)
+
+      if env["rack.input"]
+        sanitized_input = sanitize_io(env['rack.input'], uri_encoded)
+
+        env['rack.input'] = sanitized_input
+        env['CONTENT_LENGTH'] &&= sanitized_input.size.to_s
+      end
     end
 
     # Modeled after Rack::RewindableInput
@@ -72,18 +78,28 @@ module Rack
         @original_io = original_io
         @sanitized_io = sanitized_io
       end
+
       def gets
         @sanitized_io.gets
       end
+
       def read(*args)
         @sanitized_io.read(*args)
       end
+
       def each(&block)
         @sanitized_io.each(&block)
       end
+
       def rewind
         @sanitized_io.rewind
       end
+
+      def size
+        # StringIO#size is bytesize
+        @sanitized_io.size
+      end
+
       def close
         @sanitized_io.close
         @original_io.close if @original_io.respond_to?(:close)

data/rack-utf8_sanitizer.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "rack-utf8_sanitizer"
-  gem.version       = '1.3.0'
+  gem.version       = '1.3.1'
   gem.authors       = ["Peter Zotov"]
   gem.email         = ["whitequark@whitequark.org"]
   gem.description   = %{Rack::UTF8Sanitizer is a Rack middleware which cleans up } <<

data/test/test_utf8_sanitizer.rb

@@ -178,17 +178,20 @@ describe Rack::UTF8Sanitizer do
          "rack.input" => @rack_input,
       }
     end
+
     def sanitize_form_data(request_env = request_env)
-      @uri_input   = "http://bar/foo+%2F%3A+bar+%D0%BB%D0%BE%D0%BB".force_encoding('UTF-8')
-      env = @app.(request_env)
-      sanitized_input = env['rack.input'].read
+      @uri_input = "http://bar/foo+%2F%3A+bar+%D0%BB%D0%BE%D0%BB".force_encoding('UTF-8')
+      @response_env = @app.(request_env)
+      sanitized_input = @response_env['rack.input'].read
+
       yield sanitized_input if block_given?
-      env['rack.input'].rewind
+
+      @response_env['rack.input'].rewind
       behaves_like :does_sanitize_plain
       behaves_like :does_sanitize_uri
       behaves_like :identity_plain
       behaves_like :identity_uri
-      env['rack.input'].close
+      @response_env['rack.input'].close
     end
 
     it "sanitizes StringIO rack.input" do
@@ -288,5 +291,15 @@ describe Rack::UTF8Sanitizer do
       end
     end
 
+    it "adjusts content-length when replacing input" do
+      input =  "foo=bla&quux=bar\xED"
+      @rack_input = StringIO.new input
+
+      env = request_env.update("CONTENT_LENGTH" => input.bytesize)
+      sanitize_form_data(env) do |sanitized_input|
+        sanitized_input.bytesize.should != input.bytesize
+        @response_env["CONTENT_LENGTH"].should == sanitized_input.bytesize.to_s
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-utf8_sanitizer
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Rack::UTF8Sanitizer is a Rack middleware which cleans up invalid UTF8 characters