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

Strictly follow Content-Length header ABNF rule #10144

Merged
merged 1 commit into from
Aug 7, 2023
Merged

Strictly follow Content-Length header ABNF rule #10144

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
26 changes: 14 additions & 12 deletions proxy/hdrs/HTTP.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <cassert>
#include <cstdio>
#include <cstring>
#include <string_view>
#include "HTTP.h"
#include "HdrToken.h"
#include "tscore/Diags.h"
Expand Down Expand Up @@ -1261,26 +1262,27 @@ validate_hdr_content_length(HdrHeap *heap, HTTPHdrImpl *hh)
// recipient MUST treat it as an unrecoverable error. If this is a
// request message, the server MUST respond with a 400 (Bad Request)
// status code and then close the connection
int content_length_len = 0;
const char *content_length_val = content_length_field->value_get(&content_length_len);
std::string_view value = content_length_field->value_get();

// RFC 7230 section 3.3.2
// RFC 9110 section 8.6.
// Content-Length = 1*DIGIT
//
if (value.empty()) {
Debug("http", "Content-Length headers don't match the ABNF, returning parse error");
return PARSE_RESULT_ERROR;
}

// If the content-length value contains a non-numeric value, the header is invalid
for (int i = 0; i < content_length_len; i++) {
if (!isdigit(content_length_val[i])) {
Debug("http", "Content-Length value contains non-digit, returning parse error");
return PARSE_RESULT_ERROR;
}
if (std::find_if(value.cbegin(), value.cend(), [](std::string_view::value_type c) { return !std::isdigit(c); }) !=
value.cend()) {
Debug("http", "Content-Length value contains non-digit, returning parse error");
return PARSE_RESULT_ERROR;
}

while (content_length_field->has_dups()) {
int content_length_len_2 = 0;
const char *content_length_val_2 = content_length_field->m_next_dup->value_get(&content_length_len_2);
std::string_view value_dup = content_length_field->m_next_dup->value_get();

if ((content_length_len != content_length_len_2) ||
(memcmp(content_length_val, content_length_val_2, content_length_len) != 0)) {
if ((value.length() != value_dup.length()) || value.compare(value_dup) != 0) {
// Values are different, parse error
Debug("http", "Content-Length headers don't match, returning parse error");
return PARSE_RESULT_ERROR;
Expand Down
5 changes: 4 additions & 1 deletion proxy/hdrs/unit_tests/test_Hdrs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ TEST_CASE("HdrTestHttpParse", "[proxy][hdrtest]")
int expected_result;
int expected_bytes_consumed;
};
static const std::array<Test, 23> tests = {
static const std::array<Test, 26> tests = {
{
{"GET /index.html HTTP/1.0\r\n", PARSE_RESULT_DONE, 26},
{"GET /index.html HTTP/1.0\r\n\r\n***BODY****", PARSE_RESULT_DONE, 28},
Expand All @@ -68,6 +68,9 @@ TEST_CASE("HdrTestHttpParse", "[proxy][hdrtest]")
{"GET /index.html HTTP/1.0\r\nUser-Agent: foobar\r\n", PARSE_RESULT_DONE, 46},
{"GET /index.html HTTP/1.0\r\n", PARSE_RESULT_DONE, 26},
{"GET /index.html hTTP/1.0\r\n", PARSE_RESULT_ERROR, 26},
{"POST /index.html HTTP/1.0\r\nContent-Length: 0\r\n\r\n", PARSE_RESULT_DONE, 48},
{"POST /index.html HTTP/1.0\r\nContent-Length: \r\n\r\n", PARSE_RESULT_ERROR, 47},
{"POST /index.html HTTP/1.0\r\nContent-Length:\r\n\r\n", PARSE_RESULT_ERROR, 46},
{"CONNECT foo.example HTTP/1.1\r\n", PARSE_RESULT_DONE, 30},
{"GET foo.example HTTP/1.1\r\n", PARSE_RESULT_ERROR, 26},
{"", PARSE_RESULT_ERROR, 0},
Expand Down