lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-04-20 11:47:43 +03:00
Code

Fix #1172 (#1173)

Browse Source 
This change is based on RFC7230, § 3.5 'Message Parsing Robustness': "Although the line terminator for the start-line and header fields is the sequence CRLF, a recipient MAY recognize a single LF as a line terminator and ignore any preceding CR."
This commit is contained in:
yhirose 2022-01-26 13:34:23 -05:00 committed by GitHub
parent ee8371f753
commit e5cacb465d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
httplib.h
View File

@ -3217,17 +3217,26 @@ inline bool read_headers(Stream &strm, Headers &headers) {
if (!line_reader.getline()) { return false; } if (!line_reader.getline()) { return false; }
// Check if the line ends with CRLF. // Check if the line ends with CRLF.
auto line_terminator_len = 2;
if (line_reader.end_with_crlf()) { if (line_reader.end_with_crlf()) {
// Blank line indicates end of headers. // Blank line indicates end of headers.
if (line_reader.size() == 2) { break; } if (line_reader.size() == 2) { break; }
#ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
} else {
// Blank line indicates end of headers.
if (line_reader.size() == 1) { break; }
line_terminator_len = 1;
}
#else
} else { } else {
continue; // Skip invalid line. continue; // Skip invalid line.
} }
#endif
if (line_reader.size() > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; } if (line_reader.size() > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; }
// Exclude CRLF // Exclude line terminator
auto end = line_reader.ptr() + line_reader.size() - 2; auto end = line_reader.ptr() + line_reader.size() - line_terminator_len;
parse_header(line_reader.ptr(), end, parse_header(line_reader.ptr(), end,
[&](std::string &&key, std::string &&val) { [&](std::string &&key, std::string &&val) {
@ -5837,7 +5846,11 @@ inline bool ClientImpl::read_response_line(Stream &strm, const Request &req,
if (!line_reader.getline()) { return false; } if (!line_reader.getline()) { return false; }
#ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
const static std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r\n"); const static std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r\n");
#else
const static std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r?\n");
#endif
std::cmatch m; std::cmatch m;
if (!std::regex_match(line_reader.ptr(), m, re)) { if (!std::regex_match(line_reader.ptr(), m, re)) {