rack 2.0.4 → 2.1.0

data/test/spec_deflater.rb

@@ -1,375 +0,0 @@
-require 'minitest/autorun'
-require 'stringio'
-require 'time'  # for Time#httpdate
-require 'rack/deflater'
-require 'rack/lint'
-require 'rack/mock'
-require 'zlib'
-
-describe Rack::Deflater do
-
-  def build_response(status, body, accept_encoding, options = {})
-    body = [body] if body.respond_to? :to_str
-    app = lambda do |env|
-      res = [status, options['response_headers'] || {}, body]
-      res[1]['Content-Type'] = 'text/plain' unless res[0] == 304
-      res
-    end
-
-    request = Rack::MockRequest.env_for('', (options['request_headers'] || {}).merge('HTTP_ACCEPT_ENCODING' => accept_encoding))
-    deflater = Rack::Lint.new Rack::Deflater.new(app, options['deflater_options'] || {})
-
-    deflater.call(request)
-  end
-
-  ##
-  # Constructs response object and verifies if it yields right results
-  #
-  # [expected_status] expected response status, e.g. 200, 304
-  # [expected_body] expected response body
-  # [accept_encoing] what Accept-Encoding header to send and expect, e.g.
-  #                  'deflate' - accepts and expects deflate encoding in response
-  #                  { 'gzip' => nil } - accepts gzip but expects no encoding in response
-  # [options] hash of request options, i.e.
-  #           'app_status' - what status dummy app should return (may be changed by deflater at some point)
-  #           'app_body' - what body dummy app should return (may be changed by deflater at some point)
-  #           'request_headers' - extra request headers to be sent
-  #           'response_headers' - extra response headers to be returned
-  #           'deflater_options' - options passed to deflater middleware
-  # [block] useful for doing some extra verification
-  def verify(expected_status, expected_body, accept_encoding, options = {}, &block)
-    accept_encoding, expected_encoding = if accept_encoding.kind_of?(Hash)
-      [accept_encoding.keys.first, accept_encoding.values.first]
-    else
-      [accept_encoding, accept_encoding.dup]
-    end
-
-    # build response
-    status, headers, body = build_response(
-      options['app_status'] || expected_status,
-      options['app_body'] || expected_body,
-      accept_encoding,
-      options
-    )
-
-    # verify status
-    status.must_equal expected_status
-
-    # verify body
-    unless options['skip_body_verify']
-      body_text = ''
-      body.each { |part| body_text << part }
-
-      deflated_body = case expected_encoding
-      when 'deflate'
-        inflater = Zlib::Inflate.new(-Zlib::MAX_WBITS)
-        inflater.inflate(body_text) << inflater.finish
-      when 'gzip'
-        io = StringIO.new(body_text)
-        gz = Zlib::GzipReader.new(io)
-        tmp = gz.read
-        gz.close
-        tmp
-      else
-        body_text
-      end
-
-      deflated_body.must_equal expected_body
-    end
-
-    # yield full response verification
-    yield(status, headers, body) if block_given?
-  end
-
-  # automatic gzip detection (streamable)
-  def auto_inflater
-    Zlib::Inflate.new(32 + Zlib::MAX_WBITS)
-  end
-
-  def deflate_or_gzip
-    {'deflate, gzip' => 'gzip'}
-  end
-
-  it 'be able to deflate bodies that respond to each' do
-    app_body = Object.new
-    class << app_body; def each; yield('foo'); yield('bar'); end; end
-
-    verify(200, 'foobar', deflate_or_gzip, { 'app_body' => app_body }) do |status, headers, body|
-      headers.must_equal({
-        'Content-Encoding' => 'gzip',
-        'Vary' => 'Accept-Encoding',
-        'Content-Type' => 'text/plain'
-      })
-    end
-  end
-
-  it 'flush deflated chunks to the client as they become ready' do
-    app_body = Object.new
-    class << app_body; def each; yield('foo'); yield('bar'); end; end
-
-    verify(200, app_body, deflate_or_gzip, { 'skip_body_verify' => true }) do |status, headers, body|
-      headers.must_equal({
-        'Content-Encoding' => 'gzip',
-        'Vary' => 'Accept-Encoding',
-        'Content-Type' => 'text/plain'
-      })
-
-      buf = []
-      inflater = auto_inflater
-      body.each { |part| buf << inflater.inflate(part) }
-      buf << inflater.finish
-
-      buf.delete_if { |part| part.empty? }.join.must_equal 'foobar'
-    end
-  end
-
-  it 'does not raise when a client aborts reading' do
-    app_body = Object.new
-    class << app_body; def each; yield('foo'); yield('bar'); end; end
-    opts = { 'skip_body_verify' => true }
-    verify(200, app_body, 'gzip', opts) do |status, headers, body|
-      headers.must_equal({
-        'Content-Encoding' => 'gzip',
-        'Vary' => 'Accept-Encoding',
-        'Content-Type' => 'text/plain'
-      })
-
-      buf = []
-      inflater = auto_inflater
-      FakeDisconnect = Class.new(RuntimeError)
-      assert_raises(FakeDisconnect, "not Zlib::DataError not raised") do
-        body.each do |part|
-          tmp = inflater.inflate(part)
-          buf << tmp if tmp.bytesize > 0
-          raise FakeDisconnect
-        end
-      end
-      inflater.finish
-      buf.must_equal(%w(foo))
-    end
-  end
-
-  # TODO: This is really just a special case of the above...
-  it 'be able to deflate String bodies' do
-    verify(200, 'Hello world!', deflate_or_gzip) do |status, headers, body|
-      headers.must_equal({
-        'Content-Encoding' => 'gzip',
-        'Vary' => 'Accept-Encoding',
-        'Content-Type' => 'text/plain'
-      })
-    end
-  end
-
-  it 'be able to gzip bodies that respond to each' do
-    app_body = Object.new
-    class << app_body; def each; yield('foo'); yield('bar'); end; end
-
-    verify(200, 'foobar', 'gzip', { 'app_body' => app_body }) do |status, headers, body|
-      headers.must_equal({
-        'Content-Encoding' => 'gzip',
-        'Vary' => 'Accept-Encoding',
-        'Content-Type' => 'text/plain'
-      })
-    end
-  end
-
-  it 'flush gzipped chunks to the client as they become ready' do
-    app_body = Object.new
-    class << app_body; def each; yield('foo'); yield('bar'); end; end
-
-    verify(200, app_body, 'gzip', { 'skip_body_verify' => true }) do |status, headers, body|
-      headers.must_equal({
-        'Content-Encoding' => 'gzip',
-        'Vary' => 'Accept-Encoding',
-        'Content-Type' => 'text/plain'
-      })
-
-      buf = []
-      inflater = Zlib::Inflate.new(Zlib::MAX_WBITS + 32)
-      body.each { |part| buf << inflater.inflate(part) }
-      buf << inflater.finish
-
-      buf.delete_if { |part| part.empty? }.join.must_equal 'foobar'
-    end
-  end
-
-  it 'be able to fallback to no deflation' do
-    verify(200, 'Hello world!', 'superzip') do |status, headers, body|
-      headers.must_equal({
-        'Vary' => 'Accept-Encoding',
-        'Content-Type' => 'text/plain'
-      })
-    end
-  end
-
-  it 'be able to skip when there is no response entity body' do
-    verify(304, '', { 'gzip' => nil }, { 'app_body' => [] }) do |status, headers, body|
-      headers.must_equal({})
-    end
-  end
-
-  it 'handle the lack of an acceptable encoding' do
-    app_body = 'Hello world!'
-    not_found_body1 = 'An acceptable encoding for the requested resource / could not be found.'
-    not_found_body2 = 'An acceptable encoding for the requested resource /foo/bar could not be found.'
-    options1 = {
-      'app_status' => 200,
-      'app_body' => app_body,
-      'request_headers' => {
-        'PATH_INFO' => '/'
-      }
-    }
-    options2 = {
-      'app_status' => 200,
-      'app_body' => app_body,
-      'request_headers' => {
-        'PATH_INFO' => '/foo/bar'
-      }
-    }
-
-    verify(406, not_found_body1, 'identity;q=0', options1) do |status, headers, body|
-      headers.must_equal({
-        'Content-Type' => 'text/plain',
-        'Content-Length' => not_found_body1.length.to_s
-      })
-    end
-
-    verify(406, not_found_body2, 'identity;q=0', options2) do |status, headers, body|
-      headers.must_equal({
-        'Content-Type' => 'text/plain',
-        'Content-Length' => not_found_body2.length.to_s
-      })
-    end
-  end
-
-  it 'handle gzip response with Last-Modified header' do
-    last_modified = Time.now.httpdate
-    options = {
-      'response_headers' => {
-        'Content-Type' => 'text/plain',
-        'Last-Modified' => last_modified
-      }
-    }
-
-    verify(200, 'Hello World!', 'gzip', options) do |status, headers, body|
-      headers.must_equal({
-        'Content-Encoding' => 'gzip',
-        'Vary' => 'Accept-Encoding',
-        'Last-Modified' => last_modified,
-        'Content-Type' => 'text/plain'
-      })
-    end
-  end
-
-  it 'do nothing when no-transform Cache-Control directive present' do
-    options = {
-      'response_headers' => {
-        'Content-Type' => 'text/plain',
-        'Cache-Control' => 'no-transform'
-      }
-    }
-    verify(200, 'Hello World!', { 'gzip' => nil }, options) do |status, headers, body|
-      headers.wont_include 'Content-Encoding'
-    end
-  end
-
-  it 'do nothing when Content-Encoding already present' do
-    options = {
-      'response_headers' => {
-        'Content-Type' => 'text/plain',
-        'Content-Encoding' => 'gzip'
-      }
-    }
-    verify(200, 'Hello World!', { 'gzip' => nil }, options)
-  end
-
-  it 'deflate when Content-Encoding is identity' do
-    options = {
-      'response_headers' => {
-        'Content-Type' => 'text/plain',
-        'Content-Encoding' => 'identity'
-      }
-    }
-    verify(200, 'Hello World!', deflate_or_gzip, options)
-  end
-
-  it "deflate if content-type matches :include" do
-    options = {
-      'response_headers' => {
-        'Content-Type' => 'text/plain'
-      },
-      'deflater_options' => {
-        :include => %w(text/plain)
-      }
-    }
-    verify(200, 'Hello World!', 'gzip', options)
-  end
-
-  it "deflate if content-type is included it :include" do
-    options = {
-      'response_headers' => {
-        'Content-Type' => 'text/plain; charset=us-ascii'
-      },
-      'deflater_options' => {
-        :include => %w(text/plain)
-      }
-    }
-    verify(200, 'Hello World!', 'gzip', options)
-  end
-
-  it "not deflate if content-type is not set but given in :include" do
-    options = {
-      'deflater_options' => {
-        :include => %w(text/plain)
-      }
-    }
-    verify(304, 'Hello World!', { 'gzip' => nil }, options)
-  end
-
-  it "not deflate if content-type do not match :include" do
-    options = {
-      'response_headers' => {
-        'Content-Type' => 'text/plain'
-      },
-      'deflater_options' => {
-        :include => %w(text/json)
-      }
-    }
-    verify(200, 'Hello World!', { 'gzip' => nil }, options)
-  end
-
-  it "deflate response if :if lambda evaluates to true" do
-    options = {
-      'deflater_options' => {
-        :if => lambda { |env, status, headers, body| true }
-      }
-    }
-    verify(200, 'Hello World!', deflate_or_gzip, options)
-  end
-
-  it "not deflate if :if lambda evaluates to false" do
-    options = {
-      'deflater_options' => {
-        :if => lambda { |env, status, headers, body| false }
-      }
-    }
-    verify(200, 'Hello World!', { 'gzip' => nil }, options)
-  end
-
-  it "check for Content-Length via :if" do
-    response = 'Hello World!'
-    response_len = response.length
-    options = {
-      'response_headers' => {
-        'Content-Length' => response_len.to_s
-      },
-      'deflater_options' => {
-        :if => lambda { |env, status, headers, body|
-          headers['Content-Length'].to_i >= response_len
-        }
-      }
-    }
-
-    verify(200, response, 'gzip', options)
-  end
-end

data/test/spec_directory.rb

@@ -1,148 +0,0 @@
-require 'minitest/autorun'
-require 'rack/directory'
-require 'rack/lint'
-require 'rack/mock'
-require 'tempfile'
-require 'fileutils'
-
-describe Rack::Directory do
-  DOCROOT = File.expand_path(File.dirname(__FILE__)) unless defined? DOCROOT
-  FILE_CATCH = proc{|env| [200, {'Content-Type'=>'text/plain', "Content-Length" => "7"}, ['passed!']] }
-
-  attr_reader :app
-
-  def setup
-    @app = Rack::Lint.new(Rack::Directory.new(DOCROOT, FILE_CATCH))
-  end
-
-  it 'serves directories with + in the name' do
-    Dir.mktmpdir do |dir|
-      plus_dir = "foo+bar"
-      full_dir = File.join(dir, plus_dir)
-      FileUtils.mkdir full_dir
-      FileUtils.touch File.join(full_dir, "omg.txt")
-      app = Rack::Directory.new(dir, FILE_CATCH)
-      env = Rack::MockRequest.env_for("/#{plus_dir}/")
-      status,_,body = app.call env
-
-      assert_equal 200, status
-
-      str = ''
-      body.each { |x| str << x }
-      assert_match "foo+bar", str
-    end
-  end
-
-  it "serve directory indices" do
-    res = Rack::MockRequest.new(Rack::Lint.new(app)).
-      get("/cgi/")
-
-    res.must_be :ok?
-    assert_match(res, /<html><head>/)
-  end
-
-  it "pass to app if file found" do
-    res = Rack::MockRequest.new(Rack::Lint.new(app)).
-      get("/cgi/test")
-
-    res.must_be :ok?
-    assert_match(res, /passed!/)
-  end
-
-  it "serve uri with URL encoded filenames" do
-    res = Rack::MockRequest.new(Rack::Lint.new(app)).
-      get("/%63%67%69/") # "/cgi/test"
-
-    res.must_be :ok?
-    assert_match(res, /<html><head>/)
-
-    res = Rack::MockRequest.new(Rack::Lint.new(app)).
-      get("/cgi/%74%65%73%74") # "/cgi/test"
-
-    res.must_be :ok?
-    assert_match(res, /passed!/)
-  end
-
-  it "serve uri with URL encoded null byte (%00) in filenames" do
-    res = Rack::MockRequest.new(Rack::Lint.new(app))
-      .get("/cgi/test%00")
-
-    res.must_be :bad_request?
-  end
-
-  it "not allow directory traversal" do
-    res = Rack::MockRequest.new(Rack::Lint.new(app)).
-      get("/cgi/../test")
-
-    res.must_be :forbidden?
-
-    res = Rack::MockRequest.new(Rack::Lint.new(app)).
-      get("/cgi/%2E%2E/test")
-
-    res.must_be :forbidden?
-  end
-
-  it "404 if it can't find the file" do
-    res = Rack::MockRequest.new(Rack::Lint.new(app)).
-      get("/cgi/blubb")
-
-    res.must_be :not_found?
-  end
-
-  it "uri escape path parts" do # #265, properly escape file names
-    mr = Rack::MockRequest.new(Rack::Lint.new(app))
-
-    res = mr.get("/cgi/test%2bdirectory")
-
-    res.must_be :ok?
-    res.body.must_match(%r[/cgi/test\+directory/test\+file])
-
-    res = mr.get("/cgi/test%2bdirectory/test%2bfile")
-    res.must_be :ok?
-  end
-
-  it "correctly escape script name with spaces" do
-    Dir.mktmpdir do |dir|
-      space_dir = "foo bar"
-      full_dir = File.join(dir, space_dir)
-      FileUtils.mkdir full_dir
-      FileUtils.touch File.join(full_dir, "omg omg.txt")
-      app = Rack::Directory.new(dir, FILE_CATCH)
-      env = Rack::MockRequest.env_for(Rack::Utils.escape_path("/#{space_dir}/"))
-      status,_,body = app.call env
-
-      assert_equal 200, status
-
-      str = ''
-      body.each { |x| str << x }
-      assert_match "/foo%20bar/omg%20omg.txt", str
-    end
-  end
-
-  it "correctly escape script name" do
-    _app = app
-    app2 = Rack::Builder.new do
-      map '/script-path' do
-        run _app
-      end
-    end
-
-    mr = Rack::MockRequest.new(Rack::Lint.new(app2))
-
-    res = mr.get("/script-path/cgi/test%2bdirectory")
-
-    res.must_be :ok?
-    res.body.must_match(%r[/script-path/cgi/test\+directory/test\+file])
-
-    res = mr.get("/script-path/cgi/test+directory/test+file")
-    res.must_be :ok?
-  end
-
-  it "return error when file not found for head request" do
-    res = Rack::MockRequest.new(Rack::Lint.new(app)).
-      head("/cgi/missing")
-
-    res.must_be :not_found?
-    res.body.must_be :empty?
-  end
-end