Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Treat missing CRLF separator after headers as an EOFError #142

Merged
merged 1 commit into from
Jul 11, 2024
Merged

Treat missing CRLF separator after headers as an EOFError #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion lib/webrick/httprequest.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,8 +470,13 @@ def read_request_line(socket)

def read_header(socket)
if socket
end_of_headers = false

while line = read_line(socket)
break if /\A#{CRLF}\z/om =~ line
if line == CRLF
end_of_headers = true
break
end
if (@request_bytes += line.bytesize) > MAX_HEADER_LENGTH
raise HTTPStatus::RequestEntityTooLarge, 'headers too large'
end
Expand All @@ -480,6 +485,9 @@ def read_header(socket)
end
@raw_header << line
end

# Allow if @header already set to support chunked trailers
raise HTTPStatus::EOFError unless end_of_headers || @header
end
@header = HTTPUtils::parse_header(@raw_header.join)

Expand Down
23 changes: 22 additions & 1 deletion test/webrick/test_httprequest.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ def test_invalid_content_length_header
msg = <<~HTTP.gsub("\n", "\r\n")
GET / HTTP/1.1
Content-Length:#{cl}

HTTP
req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
assert_raise(WEBrick::HTTPStatus::BadRequest){
Expand All @@ -101,7 +102,7 @@ def test_bare_lf_request_line
\r
HTTP
req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
assert_raise(WEBrick::HTTPStatus::BadRequest){
assert_raise(WEBrick::HTTPStatus::EOFError){
req.parse(StringIO.new(msg))
}
end
Expand Down Expand Up @@ -210,6 +211,7 @@ def test_duplicate_content_length_header
GET / HTTP/1.1
Content-Length: 1
Content-Length: 2

HTTP
req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
assert_raise(WEBrick::HTTPStatus::BadRequest){
Expand Down Expand Up @@ -633,6 +635,25 @@ def test_eof_raised_when_line_is_nil
}
end

def test_eof_raised_with_missing_line_between_headers_and_body
msg = <<~HTTP.gsub("\n", "\r\n")
GET / HTTP/1.0
HTTP
req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
assert_raise(WEBrick::HTTPStatus::EOFError) {
req.parse(StringIO.new(msg))
}

msg = <<~HTTP.gsub("\n", "\r\n")
GET / HTTP/1.0
Foo: 1
HTTP
req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
assert_raise(WEBrick::HTTPStatus::EOFError) {
req.parse(StringIO.new(msg))
}
end

def test_cookie_join
req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
req.parse(StringIO.new("GET / HTTP/1.1\r\ncookie: a=1\r\ncookie: b=2\r\n\r\n"))
Expand Down