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

Fix #900: Change some comments and add unit tests. #1051

Merged
merged 2 commits into from
Aug 10, 2018
Merged

Fix #900: Change some comments and add unit tests. #1051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae8243d
Fix #900: Change some comments and add unit tests.
aleksostapenko Aug 5, 2018
f68c110
Additional comment added (#900).
aleksostapenko Aug 5, 2018
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
30 changes: 18 additions & 12 deletions tempesta_fw/http_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,13 +938,18 @@ __FSM_STATE(RGen_BodyInit) { \
msg->flags, msg->content_length); \
\
if (!TFW_STR_EMPTY(&tbl[TFW_HTTP_HDR_TRANSFER_ENCODING])) { \
/* The alternative: remove "Content-Length" header. */ \
/* \
* According to RFC 7230 3.3.3 p.3, more strict \
* scenario has been implemented to exclude \
* attempts of HTTP Request Smuggling or HTTP \
* Response Splitting. \
*/ \
if (!TFW_STR_EMPTY(&tbl[TFW_HTTP_HDR_CONTENT_LENGTH])) \
TFW_PARSER_BLOCK(RGen_BodyInit); \
if (msg->flags & TFW_HTTP_F_CHUNKED) \
__FSM_MOVE_nofixup(RGen_BodyStart); \
/* \
* TODO: If "Transfer-Encoding:" header is present and \
* If "Transfer-Encoding:" header is present and \
* there's NO "chunked" coding, then send 400 response \
* (Bad Request) and close the connection. \
*/ \
Expand Down Expand Up @@ -973,7 +978,12 @@ __FSM_STATE(RGen_BodyInit) { \
FSM_EXIT(TFW_PASS); \
} \
if (!TFW_STR_EMPTY(&tbl[TFW_HTTP_HDR_TRANSFER_ENCODING])) { \
/* The alternative: remove "Content-Length" header. */ \
/* \
* According to RFC 7230 3.3.3 p.3, more strict \
* scenario has been implemented to exclude \
* attempts of HTTP Request Smuggling or HTTP \
* Response Splitting. \
*/ \
if (!TFW_STR_EMPTY(&tbl[TFW_HTTP_HDR_CONTENT_LENGTH])) \
TFW_PARSER_BLOCK(RGen_BodyInit); \
if (msg->flags & TFW_HTTP_F_CHUNKED) \
Expand Down Expand Up @@ -1233,17 +1243,13 @@ __parse_content_length(TfwHttpMsg *msg, unsigned char *data, size_t len)
return CSTR_NEQ;
}
/*
* TODO: If a message is received that has multiple Content-Length
* According to RFC 7230 3.3.2, in cases of multiple Content-Length
* header fields with field-values consisting of the same decimal
* value, or a single Content-Length header field with a field
* value containing a list of identical decimal values (e.g.,
* "Content-Length: 42, 42"), indicating that duplicate
* Content-Length header fields have been generated or combined by
* an upstream message processor, then the recipient MUST either
* reject the message as invalid or replace the duplicated
* field-values with a single valid Content-Length field containing
* that decimal value prior to determining the message body length
* or forwarding the message.
* value containing a list of identical decimal values, more strict
* implementation is chosen: message will be rejected as invalid,
* to exclude attempts of HTTP Request Smuggling or HTTP Response
* Splitting.
*/
r = parse_int_ws(data, len, &msg->content_length);
if (r == CSTR_POSTPONE)
Expand Down
10 changes: 10 additions & 0 deletions tempesta_fw/t/unit/test_http_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,11 +899,21 @@ TEST(http_parser, content_length)
"Content-Length: 0\r\n"
"\r\n");

EXPECT_BLOCK_REQ("GET / HTTP/1.1\r\n"
"Content-Length: 10, 10\r\n"
"\r\n"
"0123456789");

EXPECT_BLOCK_RESP("HTTP/1.0 200 OK\r\n"
"Content-Length: 0\r\n"
"Content-Length: 0\r\n"
"\r\n");

EXPECT_BLOCK_RESP("HTTP/1.0 200 OK\r\n"
"Content-Length: 10, 10\r\n"
"\r\n"
"0123456789");

EXPECT_BLOCK_RESP("HTTP/1.0 200 OK\r\n"
"Content-Length: -1\r\n"
"\r\n"
Expand Down