Skip to content
This repository has been archived by the owner on Nov 6, 2022. It is now read-only.

http: unset F_CHUNKED on new Transfer-Encoding (Fixes CVE-2020-8287) #530

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions http_parser.c
Original file line number Diff line number Diff line change
Expand Up @@ -1344,6 +1344,13 @@ size_t http_parser_execute (http_parser *parser,
} else if (parser->index == sizeof(TRANSFER_ENCODING)-2) {
parser->header_state = h_transfer_encoding;
parser->uses_transfer_encoding = 1;

/* Multiple `Transfer-Encoding` headers should be treated as
* one, but with values separate by a comma.
*
* See: https://tools.ietf.org/html/rfc7230#section-3.2.2
*/
parser->flags &= ~F_CHUNKED;
}
break;

Expand Down
26 changes: 26 additions & 0 deletions test.c
Original file line number Diff line number Diff line change
Expand Up @@ -2154,6 +2154,32 @@ const struct message responses[] =
,.body= "2\r\nOK\r\n0\r\n\r\n"
,.num_chunks_complete= 0
}
#define HTTP_200_DUPLICATE_TE_NOT_LAST_CHUNKED 30
, {.name= "HTTP 200 response with `chunked` and duplicate Transfer-Encoding"
,.type= HTTP_RESPONSE
,.raw= "HTTP/1.1 200 OK\r\n"
"Transfer-Encoding: chunked\r\n"
"Transfer-Encoding: identity\r\n"
"\r\n"
"2\r\n"
"OK\r\n"
"0\r\n"
"\r\n"
,.should_keep_alive= FALSE
,.message_complete_on_eof= TRUE
,.http_major= 1
,.http_minor= 1
,.status_code= 200
,.response_status= "OK"
,.content_length= -1
,.num_headers= 2
,.headers=
{ { "Transfer-Encoding", "chunked" }
, { "Transfer-Encoding", "identity" }
}
,.body= "2\r\nOK\r\n0\r\n\r\n"
,.num_chunks_complete= 0
}
};

/* strnlen() is a POSIX.2008 addition. Can't rely on it being available so
Expand Down