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

Ignore all input after calling session_terminate_session

This commit is contained in:
Tatsuhiro Tsujikawa 2018-04-22 13:48:56 +09:00
parent 06379b2861
commit a5c408c5e3
1 changed files with 87 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
lib/nghttp2_session.c
View File

@ -219,6 +219,10 @@ static int session_terminate_session(nghttp2_session *session,
return 0; return 0;
} }
/* Ignore all incoming frames because we are going to tear down the
session. */
session->iframe.state = NGHTTP2_IB_IGN_ALL;
if (reason == NULL) { if (reason == NULL) {
debug_data = NULL; debug_data = NULL;
debug_datalen = 0; debug_datalen = 0;
@ -5346,9 +5350,6 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
if (iframe->sbuf.pos[3] != NGHTTP2_SETTINGS || if (iframe->sbuf.pos[3] != NGHTTP2_SETTINGS ||
(iframe->sbuf.pos[4] & NGHTTP2_FLAG_ACK)) { (iframe->sbuf.pos[4] & NGHTTP2_FLAG_ACK)) {
iframe->state = NGHTTP2_IB_IGN_ALL;
rv = session_call_error_callback( rv = session_call_error_callback(
session, NGHTTP2_ERR_SETTINGS_EXPECTED, session, NGHTTP2_ERR_SETTINGS_EXPECTED,
"Remote peer returned unexpected data while we expected " "Remote peer returned unexpected data while we expected "
@ -5395,10 +5396,6 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
DEBUGF("recv: length is too large %zu > %u\n", iframe->frame.hd.length, DEBUGF("recv: length is too large %zu > %u\n", iframe->frame.hd.length,
session->local_settings.max_frame_size); session->local_settings.max_frame_size);
busy = 1;
iframe->state = NGHTTP2_IB_IGN_PAYLOAD;
rv = nghttp2_session_terminate_session_with_reason( rv = nghttp2_session_terminate_session_with_reason(
session, NGHTTP2_FRAME_SIZE_ERROR, "too large frame size"); session, NGHTTP2_FRAME_SIZE_ERROR, "too large frame size");
@ -5406,7 +5403,7 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
return rv; return rv;
} }
break; return (ssize_t)inlen;
} }
switch (iframe->frame.hd.type) { switch (iframe->frame.hd.type) {
@ -5420,6 +5417,9 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
busy = 1; busy = 1;
rv = session_on_data_received_fail_fast(session); rv = session_on_data_received_fail_fast(session);
if (iframe->state == NGHTTP2_IB_IGN_ALL) {
return (ssize_t)inlen;
}
if (rv == NGHTTP2_ERR_IGN_PAYLOAD) { if (rv == NGHTTP2_ERR_IGN_PAYLOAD) {
DEBUGF("recv: DATA not allowed stream_id=%d\n", DEBUGF("recv: DATA not allowed stream_id=%d\n",
iframe->frame.hd.stream_id); iframe->frame.hd.stream_id);
@ -5433,7 +5433,6 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
rv = inbound_frame_handle_pad(iframe, &iframe->frame.hd); rv = inbound_frame_handle_pad(iframe, &iframe->frame.hd);
if (rv < 0) { if (rv < 0) {
iframe->state = NGHTTP2_IB_IGN_DATA;
rv = nghttp2_session_terminate_session_with_reason( rv = nghttp2_session_terminate_session_with_reason(
session, NGHTTP2_PROTOCOL_ERROR, session, NGHTTP2_PROTOCOL_ERROR,
"DATA: insufficient padding space"); "DATA: insufficient padding space");
@ -5441,7 +5440,7 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
if (nghttp2_is_fatal(rv)) { if (nghttp2_is_fatal(rv)) {
return rv; return rv;
} }
break; return (ssize_t)inlen;
} }
if (rv == 1) { if (rv == 1) {
@ -5462,17 +5461,13 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
rv = inbound_frame_handle_pad(iframe, &iframe->frame.hd); rv = inbound_frame_handle_pad(iframe, &iframe->frame.hd);
if (rv < 0) { if (rv < 0) {
busy = 1;
iframe->state = NGHTTP2_IB_IGN_PAYLOAD;
rv = nghttp2_session_terminate_session_with_reason( rv = nghttp2_session_terminate_session_with_reason(
session, NGHTTP2_PROTOCOL_ERROR, session, NGHTTP2_PROTOCOL_ERROR,
"HEADERS: insufficient padding space"); "HEADERS: insufficient padding space");
if (nghttp2_is_fatal(rv)) { if (nghttp2_is_fatal(rv)) {
return rv; return rv;
} }
break; return (ssize_t)inlen;
} }
if (rv == 1) { if (rv == 1) {
@ -5514,6 +5509,10 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
busy = 1; busy = 1;
if (iframe->state == NGHTTP2_IB_IGN_ALL) {
return (ssize_t)inlen;
}
if (rv == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) { if (rv == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) {
rv = nghttp2_session_add_rst_stream( rv = nghttp2_session_add_rst_stream(
session, iframe->frame.hd.stream_id, NGHTTP2_INTERNAL_ERROR); session, iframe->frame.hd.stream_id, NGHTTP2_INTERNAL_ERROR);
@ -5628,15 +5627,13 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
rv = inbound_frame_handle_pad(iframe, &iframe->frame.hd); rv = inbound_frame_handle_pad(iframe, &iframe->frame.hd);
if (rv < 0) { if (rv < 0) {
busy = 1;
iframe->state = NGHTTP2_IB_IGN_PAYLOAD;
rv = nghttp2_session_terminate_session_with_reason( rv = nghttp2_session_terminate_session_with_reason(
session, NGHTTP2_PROTOCOL_ERROR, session, NGHTTP2_PROTOCOL_ERROR,
"PUSH_PROMISE: insufficient padding space"); "PUSH_PROMISE: insufficient padding space");
if (nghttp2_is_fatal(rv)) { if (nghttp2_is_fatal(rv)) {
return rv; return rv;
} }
break; return (ssize_t)inlen;
} }
if (rv == 1) { if (rv == 1) {
@ -5696,11 +5693,7 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
return rv; return rv;
} }
busy = 1; return (ssize_t)inlen;
iframe->state = NGHTTP2_IB_IGN_PAYLOAD;
break;
default: default:
DEBUGF("recv: extension frame\n"); DEBUGF("recv: extension frame\n");
@ -5770,6 +5763,7 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
case NGHTTP2_IB_IGN_PAYLOAD: case NGHTTP2_IB_IGN_PAYLOAD:
case NGHTTP2_IB_FRAME_SIZE_ERROR: case NGHTTP2_IB_FRAME_SIZE_ERROR:
case NGHTTP2_IB_IGN_DATA: case NGHTTP2_IB_IGN_DATA:
case NGHTTP2_IB_IGN_ALL:
break; break;
default: default:
rv = session_call_on_begin_frame(session, &iframe->frame.hd); rv = session_call_on_begin_frame(session, &iframe->frame.hd);
@ -5804,14 +5798,12 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
padlen = inbound_frame_compute_pad(iframe); padlen = inbound_frame_compute_pad(iframe);
if (padlen < 0 || if (padlen < 0 ||
(size_t)padlen + pri_fieldlen > 1 + iframe->payloadleft) { (size_t)padlen + pri_fieldlen > 1 + iframe->payloadleft) {
busy = 1;
rv = nghttp2_session_terminate_session_with_reason( rv = nghttp2_session_terminate_session_with_reason(
session, NGHTTP2_PROTOCOL_ERROR, "HEADERS: invalid padding"); session, NGHTTP2_PROTOCOL_ERROR, "HEADERS: invalid padding");
if (nghttp2_is_fatal(rv)) { if (nghttp2_is_fatal(rv)) {
return rv; return rv;
} }
iframe->state = NGHTTP2_IB_IGN_PAYLOAD; return (ssize_t)inlen;
break;
} }
iframe->frame.headers.padlen = (size_t)padlen; iframe->frame.headers.padlen = (size_t)padlen;
@ -5837,6 +5829,10 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
busy = 1; busy = 1;
if (iframe->state == NGHTTP2_IB_IGN_ALL) {
return (ssize_t)inlen;
}
if (rv == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) { if (rv == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) {
rv = nghttp2_session_add_rst_stream( rv = nghttp2_session_add_rst_stream(
session, iframe->frame.hd.stream_id, NGHTTP2_INTERNAL_ERROR); session, iframe->frame.hd.stream_id, NGHTTP2_INTERNAL_ERROR);
@ -5861,6 +5857,10 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
return rv; return rv;
} }
if (iframe->state == NGHTTP2_IB_IGN_ALL) {
return (ssize_t)inlen;
}
session_inbound_frame_reset(session); session_inbound_frame_reset(session);
break; break;
@ -5870,6 +5870,10 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
return rv; return rv;
} }
if (iframe->state == NGHTTP2_IB_IGN_ALL) {
return (ssize_t)inlen;
}
session_inbound_frame_reset(session); session_inbound_frame_reset(session);
break; break;
@ -5879,16 +5883,13 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
padlen = inbound_frame_compute_pad(iframe); padlen = inbound_frame_compute_pad(iframe);
if (padlen < 0 || (size_t)padlen + 4 /* promised stream id */ if (padlen < 0 || (size_t)padlen + 4 /* promised stream id */
> 1 + iframe->payloadleft) { > 1 + iframe->payloadleft) {
busy = 1;
rv = nghttp2_session_terminate_session_with_reason( rv = nghttp2_session_terminate_session_with_reason(
session, NGHTTP2_PROTOCOL_ERROR, session, NGHTTP2_PROTOCOL_ERROR,
"PUSH_PROMISE: invalid padding"); "PUSH_PROMISE: invalid padding");
if (nghttp2_is_fatal(rv)) { if (nghttp2_is_fatal(rv)) {
return rv; return rv;
} }
iframe->state = NGHTTP2_IB_IGN_PAYLOAD; return (ssize_t)inlen;
break;
} }
iframe->frame.push_promise.padlen = (size_t)padlen; iframe->frame.push_promise.padlen = (size_t)padlen;
@ -5913,6 +5914,10 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
busy = 1; busy = 1;
if (iframe->state == NGHTTP2_IB_IGN_ALL) {
return (ssize_t)inlen;
}
if (rv == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) { if (rv == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) {
rv = nghttp2_session_add_rst_stream( rv = nghttp2_session_add_rst_stream(
session, iframe->frame.push_promise.promised_stream_id, session, iframe->frame.push_promise.promised_stream_id,
@ -5938,6 +5943,10 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
return rv; return rv;
} }
if (iframe->state == NGHTTP2_IB_IGN_ALL) {
return (ssize_t)inlen;
}
session_inbound_frame_reset(session); session_inbound_frame_reset(session);
break; break;
@ -5969,6 +5978,10 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
return rv; return rv;
} }
if (iframe->state == NGHTTP2_IB_IGN_ALL) {
return (ssize_t)inlen;
}
session_inbound_frame_reset(session); session_inbound_frame_reset(session);
break; break;
@ -6055,6 +6068,10 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
return rv; return rv;
} }
if (iframe->state == NGHTTP2_IB_IGN_ALL) {
return (ssize_t)inlen;
}
if (rv == NGHTTP2_ERR_PAUSE) { if (rv == NGHTTP2_ERR_PAUSE) {
in += hd_proclen; in += hd_proclen;
iframe->payloadleft -= hd_proclen; iframe->payloadleft -= hd_proclen;
@ -6164,11 +6181,9 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
return rv; return rv;
} }
busy = 1; assert(iframe->state == NGHTTP2_IB_IGN_ALL);
iframe->state = NGHTTP2_IB_IGN_PAYLOAD; return (ssize_t)inlen;
break;
case NGHTTP2_IB_READ_SETTINGS: case NGHTTP2_IB_READ_SETTINGS:
DEBUGF("recv: [IB_READ_SETTINGS]\n"); DEBUGF("recv: [IB_READ_SETTINGS]\n");
@ -6197,6 +6212,10 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
return rv; return rv;
} }
if (iframe->state == NGHTTP2_IB_IGN_ALL) {
return (ssize_t)inlen;
}
session_inbound_frame_reset(session); session_inbound_frame_reset(session);
break; break;
@ -6227,6 +6246,10 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
return rv; return rv;
} }
if (iframe->state == NGHTTP2_IB_IGN_ALL) {
return (ssize_t)inlen;
}
session_inbound_frame_reset(session); session_inbound_frame_reset(session);
break; break;
@ -6266,11 +6289,7 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
return rv; return rv;
} }
busy = 1; return (ssize_t)inlen;
iframe->state = NGHTTP2_IB_IGN_PAYLOAD;
break;
} }
/* CONTINUATION won't bear NGHTTP2_PADDED flag */ /* CONTINUATION won't bear NGHTTP2_PADDED flag */
@ -6314,6 +6333,10 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
return rv; return rv;
} }
if (iframe->state == NGHTTP2_IB_IGN_ALL) {
return (ssize_t)inlen;
}
/* Pad Length field is consumed immediately */ /* Pad Length field is consumed immediately */
rv = rv =
nghttp2_session_consume(session, iframe->frame.hd.stream_id, readlen); nghttp2_session_consume(session, iframe->frame.hd.stream_id, readlen);
@ -6322,6 +6345,10 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
return rv; return rv;
} }
if (iframe->state == NGHTTP2_IB_IGN_ALL) {
return (ssize_t)inlen;
}
stream = nghttp2_session_get_stream(session, iframe->frame.hd.stream_id); stream = nghttp2_session_get_stream(session, iframe->frame.hd.stream_id);
if (stream) { if (stream) {
rv = session_update_recv_stream_window_size( rv = session_update_recv_stream_window_size(
@ -6342,8 +6369,7 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
if (nghttp2_is_fatal(rv)) { if (nghttp2_is_fatal(rv)) {
return rv; return rv;
} }
iframe->state = NGHTTP2_IB_IGN_DATA; return (ssize_t)inlen;
break;
} }
iframe->frame.data.padlen = (size_t)padlen; iframe->frame.data.padlen = (size_t)padlen;
@ -6377,6 +6403,10 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
return rv; return rv;
} }
if (iframe->state == NGHTTP2_IB_IGN_ALL) {
return (ssize_t)inlen;
}
rv = session_update_recv_stream_window_size( rv = session_update_recv_stream_window_size(
session, stream, readlen, session, stream, readlen,
iframe->payloadleft || iframe->payloadleft ||
@ -6403,6 +6433,10 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
if (nghttp2_is_fatal(rv)) { if (nghttp2_is_fatal(rv)) {
return rv; return rv;
} }
if (iframe->state == NGHTTP2_IB_IGN_ALL) {
return (ssize_t)inlen;
}
} }
DEBUGF("recv: data_readlen=%zd\n", data_readlen); DEBUGF("recv: data_readlen=%zd\n", data_readlen);
@ -6418,6 +6452,10 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
if (nghttp2_is_fatal(rv)) { if (nghttp2_is_fatal(rv)) {
return rv; return rv;
} }
if (iframe->state == NGHTTP2_IB_IGN_DATA) {
return (ssize_t)inlen;
}
} }
rv = nghttp2_session_add_rst_stream( rv = nghttp2_session_add_rst_stream(
@ -6475,6 +6513,10 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
return rv; return rv;
} }
if (iframe->state == NGHTTP2_IB_IGN_ALL) {
return (ssize_t)inlen;
}
if (session->opt_flags & NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE) { if (session->opt_flags & NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE) {
/* Ignored DATA is considered as "consumed" immediately. */ /* Ignored DATA is considered as "consumed" immediately. */
@ -6483,6 +6525,10 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
if (nghttp2_is_fatal(rv)) { if (nghttp2_is_fatal(rv)) {
return rv; return rv;
} }
if (iframe->state == NGHTTP2_IB_IGN_ALL) {
return (ssize_t)inlen;
}
} }
} }