walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Don't allow partial PROXY protocol line

This commit is contained in:
Tatsuhiro Tsujikawa 2015-09-09 00:21:54 +09:00
parent 510dff4c39
commit aba2dbddc2
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/shrpx_client_handler.cc
View File

@ -903,17 +903,7 @@ int ClientHandler::proxy_protocol_read() {
auto end = auto end =
std::find_first_of(rb_.pos, bufend, std::begin(chrs), std::end(chrs)); std::find_first_of(rb_.pos, bufend, std::begin(chrs), std::end(chrs));
if (end == bufend) { if (end == bufend || *end == '\0' || end == rb_.pos || *(end - 1) != '\r') {
if (rb_.rleft() >= MAX_PROXY_LINELEN) {
if (LOG_ENABLED(INFO)) {
CLOG(INFO, this) << "PROXY-protocol-v1: No ending CR LF sequence found";
}
return -1;
}
return 0;
}
if (*end == '\0' || end == rb_.pos || *(end - 1) != '\r') {
if (LOG_ENABLED(INFO)) { if (LOG_ENABLED(INFO)) {
CLOG(INFO, this) << "PROXY-protocol-v1: No ending CR LF sequence found"; CLOG(INFO, this) << "PROXY-protocol-v1: No ending CR LF sequence found";
} }