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

nghttpx: Improve CONNECT response status handling

This commit is contained in:
Tatsuhiro Tsujikawa 2018-10-04 12:04:15 +09:00
parent 334c439ce0
commit 7c8cb3a0ce
4 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/shrpx_downstream.cc
View File

@ -764,19 +764,11 @@ bool Downstream::validate_response_recv_body_length() const {
} }
void Downstream::check_upgrade_fulfilled_http2() { void Downstream::check_upgrade_fulfilled_http2() {
if (req_.method == HTTP_CONNECT) { // This handles nonzero req_.connect_proto and h1 frontend requests
// This handles nonzero req_.connect_proto as well. // WebSocket upgrade.
upgraded_ = 200 <= resp_.http_status && resp_.http_status < 300; upgraded_ = (req_.method == HTTP_CONNECT ||
req_.connect_proto == CONNECT_PROTO_WEBSOCKET) &&
return; resp_.http_status / 100 == 2;
}
if (req_.connect_proto == CONNECT_PROTO_WEBSOCKET) {
// h1 frontend requests WebSocket upgrade
upgraded_ = resp_.http_status == 200;
return;
}
} }
void Downstream::check_upgrade_fulfilled_http1() { void Downstream::check_upgrade_fulfilled_http1() {
@ -798,7 +790,7 @@ void Downstream::check_upgrade_fulfilled_http1() {
upgraded_ = expected != "" && expected == accept->value; upgraded_ = expected != "" && expected == accept->value;
} else { } else {
upgraded_ = 200 <= resp_.http_status && resp_.http_status < 300; upgraded_ = resp_.http_status / 100 == 2;
} }
return; return;

2
src/shrpx_http2_session.cc
View File

@ -620,7 +620,7 @@ int htp_hdrs_completecb(http_parser *htp) {
http_parser_pause(htp, 1); http_parser_pause(htp, 1);
// We just check status code here // We just check status code here
if (htp->status_code == 200) { if (htp->status_code / 100 == 2) {
if (LOG_ENABLED(INFO)) { if (LOG_ENABLED(INFO)) {
SSLOG(INFO, http2session) << "Tunneling success"; SSLOG(INFO, http2session) << "Tunneling success";
} }

4
src/shrpx_http_downstream_connection.cc
View File

@ -938,7 +938,7 @@ int htp_hdrs_completecb(http_parser *htp) {
// Server MUST NOT send Transfer-Encoding with a status code 1xx or // Server MUST NOT send Transfer-Encoding with a status code 1xx or
// 204. Also server MUST NOT send Transfer-Encoding with a status // 204. Also server MUST NOT send Transfer-Encoding with a status
// code 200 to a CONNECT request. Same holds true with // code 2xx to a CONNECT request. Same holds true with
// Content-Length. // Content-Length.
if (resp.http_status == 204) { if (resp.http_status == 204) {
if (resp.fs.header(http2::HD_TRANSFER_ENCODING)) { if (resp.fs.header(http2::HD_TRANSFER_ENCODING)) {
@ -960,7 +960,7 @@ int htp_hdrs_completecb(http_parser *htp) {
return -1; return -1;
} }
} else if (resp.http_status / 100 == 1 || } else if (resp.http_status / 100 == 1 ||
(resp.http_status == 200 && req.method == HTTP_CONNECT)) { (resp.http_status / 100 == 2 && req.method == HTTP_CONNECT)) {
if (resp.fs.header(http2::HD_CONTENT_LENGTH) || if (resp.fs.header(http2::HD_CONTENT_LENGTH) ||
resp.fs.header(http2::HD_TRANSFER_ENCODING)) { resp.fs.header(http2::HD_TRANSFER_ENCODING)) {
return -1; return -1;

2
src/shrpx_https_upstream.cc
View File

@ -1147,7 +1147,7 @@ int HttpsUpstream::on_downstream_header_complete(Downstream *downstream) {
if (!connect_method && downstream->get_upgraded()) { if (!connect_method && downstream->get_upgraded()) {
if (req.connect_proto == CONNECT_PROTO_WEBSOCKET && if (req.connect_proto == CONNECT_PROTO_WEBSOCKET &&
resp.http_status == 200) { resp.http_status / 100 == 2) {
buf->append("Upgrade: websocket\r\nConnection: Upgrade\r\n"); buf->append("Upgrade: websocket\r\nConnection: Upgrade\r\n");
auto key = req.fs.header(http2::HD_SEC_WEBSOCKET_KEY); auto key = req.fs.header(http2::HD_SEC_WEBSOCKET_KEY);
if (!key || key->value.size() != base64::encode_length(16)) { if (!key || key->value.size() != base64::encode_length(16)) {