diff options
Diffstat (limited to 'test/unit/test_request.rb')
| -rw-r--r-- | test/unit/test_request.rb | 54 |
1 files changed, 40 insertions, 14 deletions
diff --git a/test/unit/test_request.rb b/test/unit/test_request.rb index 0613326..7c438da 100644 --- a/test/unit/test_request.rb +++ b/test/unit/test_request.rb @@ -19,11 +19,7 @@ include Unicorn class RequestTest < Test::Unit::TestCase - class MockRequest < StringIO - def unicorn_peeraddr - '666.666.666.666' - end - end + class MockRequest < StringIO; end def setup @request = HttpRequest.new(Logger.new($stderr)) @@ -38,23 +34,56 @@ class RequestTest < Test::Unit::TestCase "Host: foo\r\n\r\n") res = env = nil assert_nothing_raised { env = @request.read(client) } - assert_equal '*', env['REQUEST_PATH'] - assert_equal '*', env['PATH_INFO'] + assert_equal '', env['REQUEST_PATH'] + assert_equal '', env['PATH_INFO'] assert_equal '*', env['REQUEST_URI'] - - # assert_nothing_raised { res = @lint.call(env) } # fails Rack lint + assert_nothing_raised { res = @lint.call(env) } end - def test_full_url_path + def test_absolute_uri_with_query client = MockRequest.new("GET http://e:3/x?y=z HTTP/1.1\r\n" \ "Host: foo\r\n\r\n") res = env = nil assert_nothing_raised { env = @request.read(client) } assert_equal '/x', env['REQUEST_PATH'] assert_equal '/x', env['PATH_INFO'] + assert_equal 'y=z', env['QUERY_STRING'] + assert_nothing_raised { res = @lint.call(env) } + end + + def test_absolute_uri_with_fragment + client = MockRequest.new("GET http://e:3/x#frag HTTP/1.1\r\n" \ + "Host: foo\r\n\r\n") + res = env = nil + assert_nothing_raised { env = @request.read(client) } + assert_equal '/x', env['REQUEST_PATH'] + assert_equal '/x', env['PATH_INFO'] + assert_equal '', env['QUERY_STRING'] + assert_equal 'frag', env['FRAGMENT'] assert_nothing_raised { res = @lint.call(env) } end + def test_absolute_uri_with_query_and_fragment + client = MockRequest.new("GET http://e:3/x?a=b#frag HTTP/1.1\r\n" \ + "Host: foo\r\n\r\n") + res = env = nil + assert_nothing_raised { env = @request.read(client) } + assert_equal '/x', env['REQUEST_PATH'] + assert_equal '/x', env['PATH_INFO'] + assert_equal 'a=b', env['QUERY_STRING'] + assert_equal 'frag', env['FRAGMENT'] + assert_nothing_raised { res = @lint.call(env) } + end + + def test_absolute_uri_unsupported_schemes + %w(ssh+http://e/ ftp://e/x http+ssh://e/x).each do |abs_uri| + client = MockRequest.new("GET #{abs_uri} HTTP/1.1\r\n" \ + "Host: foo\r\n\r\n") + assert_raises(HttpParserError) { @request.read(client) } + @request.reset + end + end + def test_x_forwarded_proto_https res = env = nil client = MockRequest.new("GET / HTTP/1.1\r\n" \ @@ -90,7 +119,7 @@ class RequestTest < Test::Unit::TestCase res = env = nil assert_nothing_raised { env = @request.read(client) } assert_equal "http", env['rack.url_scheme'] - assert_equal '666.666.666.666', env['REMOTE_ADDR'] + assert_equal '127.0.0.1', env['REMOTE_ADDR'] assert_nothing_raised { res = @lint.call(env) } end @@ -113,9 +142,6 @@ class RequestTest < Test::Unit::TestCase buf = (' ' * bs).freeze length = bs * count client = Tempfile.new('big_put') - def client.unicorn_peeraddr - '1.1.1.1' - end client.syswrite( "PUT / HTTP/1.1\r\n" \ "Host: foo\r\n" \ |