Skip to content

Normalize repeated carriage returns in headers #13595

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

Open
RajaMuhammadAwais wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −1
Open

Normalize repeated carriage returns in headers #13595

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
3 changes: 2 additions & 1 deletion src/proxy/hdrs/MIME.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2509,7 +2509,8 @@ mime_parser_parse(MIMEParser *parser, HdrHeap *heap, MIMEHdrImpl *mh, const char
}
field_name.rtrim_if(&ParseRules::is_ws);
raw_print_field = false;
} else if (parsed.suffix(2) != "\r\n") {
} else if (parsed.suffix(2) != "\r\n" || (parsed.size() > 2 && parsed[parsed.size() - 3] == '\r')) {
// Do not preserve malformed line endings when forwarding the field.
raw_print_field = false;
}

Expand Down
26 changes: 26 additions & 0 deletions src/proxy/hdrs/unit_tests/test_Hdrs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2983,6 +2983,32 @@ TEST_CASE("HTTP parser tolerates high-bit bytes without UB", "[proxy][hdrtest]")
req_hdr.destroy();
}

TEST_CASE("HTTP parser normalizes repeated carriage returns in header line endings", "[proxy][hdrtest]")
{
constexpr std::string_view message = "GET / HTTP/1.1\r\nHost: example.com\r\nExtra-CRs: \r\r\r\r\n\r\n"sv;

HTTPParser parser;
http_parser_init(&parser);

HTTPHdr req_hdr;
HdrHeap *heap = new_HdrHeap(HdrHeap::DEFAULT_SIZE + 64);
req_hdr.create(HTTPType::REQUEST, HTTP_1_1, heap);

auto start = message.data();
REQUIRE(req_hdr.parse_req(&parser, &start, message.data() + message.size(), true) == ParseResult::DONE);

std::string serialized(static_cast<size_t>(req_hdr.length_get()), '\0');
int index = 0;
int offset = 0;
req_hdr.print(serialized.data(), static_cast<int>(serialized.size()), &index, &offset);
serialized.resize(static_cast<size_t>(index));

CHECK(serialized.find("Extra-CRs: \r\n") != std::string::npos);
CHECK(serialized.find("Extra-CRs: \r\r") == std::string::npos);

req_hdr.destroy();
}

TEST_CASE("HTTP response parser tolerates high-bit bytes without UB", "[proxy][hdrtest]")
{
struct Test {
Expand Down