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

nghttp2_on_invalid_frame_recv_callback should have lib_error_code as param 

nghttp2_error_code is HTTP/2 standard error code and is too coarse to
know what's going on.
This commit is contained in:
Tatsuhiro Tsujikawa 2015-03-23 21:18:55 +09:00
parent 250ea53e4b
commit ebf214c8fc
6 changed files with 123 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/includes/nghttp2/nghttp2.h
View File

@ -367,6 +367,18 @@ typedef enum {
* closed. * closed.
*/ */
NGHTTP2_ERR_HTTP_HEADER = -531, NGHTTP2_ERR_HTTP_HEADER = -531,
/**
* Violation in HTTP messaging rule.
*/
NGHTTP2_ERR_HTTP_MESSAGING = -532,
/**
* Stream was refused.
*/
NGHTTP2_ERR_REFUSED_STREAM = -533,
/**
* Unexpected internal error, but recovered.
*/
NGHTTP2_ERR_INTERNAL = -534,
/** /**
* The errors < :enum:`NGHTTP2_ERR_FATAL` mean that the library is * The errors < :enum:`NGHTTP2_ERR_FATAL` mean that the library is
* under unexpected condition and processing was terminated (e.g., * under unexpected condition and processing was terminated (e.g.,
@ -1259,12 +1271,12 @@ typedef int (*nghttp2_on_frame_recv_callback)(nghttp2_session *session,
* @functypedef * @functypedef
* *
* Callback function invoked by `nghttp2_session_recv()` when an * Callback function invoked by `nghttp2_session_recv()` when an
* invalid non-DATA frame is received. The |error_code| indicates the * invalid non-DATA frame is received. The error is indicated by the
* error. It is usually one of the :enum:`nghttp2_error_code` but * |lib_error_code|, which is one of the values defined in
* that is not guaranteed. When this callback function is invoked, * :type:`nghttp2_error`. When this callback function is invoked, the
* the library automatically submits either RST_STREAM or GOAWAY * library automatically submits either RST_STREAM or GOAWAY frame.
* frame. The |user_data| pointer is the third argument passed in to * The |user_data| pointer is the third argument passed in to the call
* the call to `nghttp2_session_client_new()` or * to `nghttp2_session_client_new()` or
* `nghttp2_session_server_new()`. * `nghttp2_session_server_new()`.
* *
* If frame is HEADERS or PUSH_PROMISE, the ``nva`` and ``nvlen`` * If frame is HEADERS or PUSH_PROMISE, the ``nva`` and ``nvlen``
@ -1280,7 +1292,7 @@ typedef int (*nghttp2_on_frame_recv_callback)(nghttp2_session *session,
* `nghttp2_session_callbacks_set_on_invalid_frame_recv_callback()`. * `nghttp2_session_callbacks_set_on_invalid_frame_recv_callback()`.
*/ */
typedef int (*nghttp2_on_invalid_frame_recv_callback)( typedef int (*nghttp2_on_invalid_frame_recv_callback)(
nghttp2_session *session, const nghttp2_frame *frame, uint32_t error_code, nghttp2_session *session, const nghttp2_frame *frame, int lib_error_code,
void *user_data); void *user_data);
/** /**
@ -3462,7 +3474,7 @@ NGHTTP2_EXTERN nghttp2_info *nghttp2_version(int least_version);
* Returns nonzero if the :type:`nghttp2_error` library error code * Returns nonzero if the :type:`nghttp2_error` library error code
* |lib_error| is fatal. * |lib_error| is fatal.
*/ */
NGHTTP2_EXTERN int nghttp2_is_fatal(int lib_error); NGHTTP2_EXTERN int nghttp2_is_fatal(int lib_error_code);
/** /**
* @function * @function

6
lib/nghttp2_helper.c
View File

@ -297,6 +297,12 @@ const char *nghttp2_strerror(int error_code) {
return "The current session is closing"; return "The current session is closing";
case NGHTTP2_ERR_HTTP_HEADER: case NGHTTP2_ERR_HTTP_HEADER:
return "Invalid HTTP header field was received"; return "Invalid HTTP header field was received";
case NGHTTP2_ERR_HTTP_MESSAGING:
return "Violation in HTTP messaging rule";
case NGHTTP2_ERR_REFUSED_STREAM:
return "Stream was refused";
case NGHTTP2_ERR_INTERNAL:
return "Internal error";
case NGHTTP2_ERR_NOMEM: case NGHTTP2_ERR_NOMEM:
return "Out of memory"; return "Out of memory";
case NGHTTP2_ERR_CALLBACK_FAILURE: case NGHTTP2_ERR_CALLBACK_FAILURE:

187
lib/nghttp2_session.c
View File

@ -71,11 +71,13 @@ session_is_incoming_concurrent_streams_pending_max(nghttp2_session *session) {
/* /*
* Returns non-zero if |lib_error| is non-fatal error. * Returns non-zero if |lib_error| is non-fatal error.
*/ */
static int is_non_fatal(int lib_error) { static int is_non_fatal(int lib_error_code) {
return lib_error < 0 && lib_error > NGHTTP2_ERR_FATAL; return lib_error_code < 0 && lib_error_code > NGHTTP2_ERR_FATAL;
} }
int nghttp2_is_fatal(int lib_error) { return lib_error < NGHTTP2_ERR_FATAL; } int nghttp2_is_fatal(int lib_error_code) {
return lib_error_code < NGHTTP2_ERR_FATAL;
}
static int session_enforce_http_messaging(nghttp2_session *session) { static int session_enforce_http_messaging(nghttp2_session *session) {
return (session->opt_flags & NGHTTP2_OPTMASK_NO_HTTP_MESSAGING) == 0; return (session->opt_flags & NGHTTP2_OPTMASK_NO_HTTP_MESSAGING) == 0;
@ -3128,18 +3130,38 @@ static int session_handle_frame_size_error(nghttp2_session *session,
return nghttp2_session_terminate_session(session, NGHTTP2_FRAME_SIZE_ERROR); return nghttp2_session_terminate_session(session, NGHTTP2_FRAME_SIZE_ERROR);
} }
static int get_error_code_from_lib_error_code(int lib_error_code) {
switch (lib_error_code) {
case NGHTTP2_ERR_STREAM_CLOSED:
return NGHTTP2_STREAM_CLOSED;
case NGHTTP2_ERR_HEADER_COMP:
return NGHTTP2_COMPRESSION_ERROR;
case NGHTTP2_ERR_FRAME_SIZE_ERROR:
return NGHTTP2_FRAME_SIZE_ERROR;
case NGHTTP2_ERR_FLOW_CONTROL:
return NGHTTP2_FLOW_CONTROL_ERROR;
case NGHTTP2_ERR_REFUSED_STREAM:
return NGHTTP2_REFUSED_STREAM;
case NGHTTP2_ERR_PROTO:
return NGHTTP2_PROTOCOL_ERROR;
default:
return NGHTTP2_INTERNAL_ERROR;
}
}
static int session_handle_invalid_stream2(nghttp2_session *session, static int session_handle_invalid_stream2(nghttp2_session *session,
int32_t stream_id, int32_t stream_id,
nghttp2_frame *frame, nghttp2_frame *frame,
uint32_t error_code) { int lib_error_code) {
int rv; int rv;
rv = nghttp2_session_add_rst_stream(session, stream_id, error_code); rv = nghttp2_session_add_rst_stream(
session, stream_id, get_error_code_from_lib_error_code(lib_error_code));
if (rv != 0) { if (rv != 0) {
return rv; return rv;
} }
if (session->callbacks.on_invalid_frame_recv_callback) { if (session->callbacks.on_invalid_frame_recv_callback) {
if (session->callbacks.on_invalid_frame_recv_callback( if (session->callbacks.on_invalid_frame_recv_callback(
session, frame, error_code, session->user_data) != 0) { session, frame, lib_error_code, session->user_data) != 0) {
return NGHTTP2_ERR_CALLBACK_FAILURE; return NGHTTP2_ERR_CALLBACK_FAILURE;
} }
} }
@ -3148,16 +3170,16 @@ static int session_handle_invalid_stream2(nghttp2_session *session,
static int session_handle_invalid_stream(nghttp2_session *session, static int session_handle_invalid_stream(nghttp2_session *session,
nghttp2_frame *frame, nghttp2_frame *frame,
uint32_t error_code) { int lib_error_code) {
return session_handle_invalid_stream2(session, frame->hd.stream_id, frame, return session_handle_invalid_stream2(session, frame->hd.stream_id, frame,
error_code); lib_error_code);
} }
static int session_inflate_handle_invalid_stream(nghttp2_session *session, static int session_inflate_handle_invalid_stream(nghttp2_session *session,
nghttp2_frame *frame, nghttp2_frame *frame,
uint32_t error_code) { int lib_error_code) {
int rv; int rv;
rv = session_handle_invalid_stream(session, frame, error_code); rv = session_handle_invalid_stream(session, frame, lib_error_code);
if (nghttp2_is_fatal(rv)) { if (nghttp2_is_fatal(rv)) {
return rv; return rv;
} }
@ -3169,24 +3191,25 @@ static int session_inflate_handle_invalid_stream(nghttp2_session *session,
*/ */
static int session_handle_invalid_connection(nghttp2_session *session, static int session_handle_invalid_connection(nghttp2_session *session,
nghttp2_frame *frame, nghttp2_frame *frame,
uint32_t error_code, int lib_error_code,
const char *reason) { const char *reason) {
if (session->callbacks.on_invalid_frame_recv_callback) { if (session->callbacks.on_invalid_frame_recv_callback) {
if (session->callbacks.on_invalid_frame_recv_callback( if (session->callbacks.on_invalid_frame_recv_callback(
session, frame, error_code, session->user_data) != 0) { session, frame, lib_error_code, session->user_data) != 0) {
return NGHTTP2_ERR_CALLBACK_FAILURE; return NGHTTP2_ERR_CALLBACK_FAILURE;
} }
} }
return nghttp2_session_terminate_session_with_reason(session, error_code, return nghttp2_session_terminate_session_with_reason(
reason); session, get_error_code_from_lib_error_code(lib_error_code), reason);
} }
static int session_inflate_handle_invalid_connection(nghttp2_session *session, static int session_inflate_handle_invalid_connection(nghttp2_session *session,
nghttp2_frame *frame, nghttp2_frame *frame,
uint32_t error_code, int lib_error_code,
const char *reason) { const char *reason) {
int rv; int rv;
rv = session_handle_invalid_connection(session, frame, error_code, reason); rv =
session_handle_invalid_connection(session, frame, lib_error_code, reason);
if (nghttp2_is_fatal(rv)) { if (nghttp2_is_fatal(rv)) {
return rv; return rv;
} }
@ -3291,7 +3314,7 @@ static int inflate_header_block(nghttp2_session *session, nghttp2_frame *frame,
rv = rv =
session_handle_invalid_stream2(session, subject_stream->stream_id, session_handle_invalid_stream2(session, subject_stream->stream_id,
frame, NGHTTP2_PROTOCOL_ERROR); frame, NGHTTP2_ERR_HTTP_HEADER);
if (nghttp2_is_fatal(rv)) { if (nghttp2_is_fatal(rv)) {
return rv; return rv;
} }
@ -3466,7 +3489,7 @@ static int session_after_header_block_received(nghttp2_session *session) {
call_cb = 0; call_cb = 0;
rv = session_handle_invalid_stream2(session, stream_id, frame, rv = session_handle_invalid_stream2(session, stream_id, frame,
NGHTTP2_PROTOCOL_ERROR); NGHTTP2_ERR_HTTP_MESSAGING);
if (nghttp2_is_fatal(rv)) { if (nghttp2_is_fatal(rv)) {
return rv; return rv;
} }
@ -3505,8 +3528,7 @@ int nghttp2_session_on_request_headers_received(nghttp2_session *session,
nghttp2_stream *stream; nghttp2_stream *stream;
if (frame->hd.stream_id == 0) { if (frame->hd.stream_id == 0) {
return session_inflate_handle_invalid_connection( return session_inflate_handle_invalid_connection(
session, frame, NGHTTP2_PROTOCOL_ERROR, session, frame, NGHTTP2_ERR_PROTO, "request HEADERS: stream_id == 0");
"request HEADERS: stream_id == 0");
} }
/* If client recieves idle stream from server, it is invalid /* If client recieves idle stream from server, it is invalid
@ -3515,7 +3537,7 @@ int nghttp2_session_on_request_headers_received(nghttp2_session *session,
if (!session->server) { if (!session->server) {
if (session_detect_idle_stream(session, frame->hd.stream_id)) { if (session_detect_idle_stream(session, frame->hd.stream_id)) {
return session_inflate_handle_invalid_connection( return session_inflate_handle_invalid_connection(
session, frame, NGHTTP2_PROTOCOL_ERROR, session, frame, NGHTTP2_ERR_PROTO,
"request HEADERS: client received request"); "request HEADERS: client received request");
} }
@ -3532,7 +3554,7 @@ int nghttp2_session_on_request_headers_received(nghttp2_session *session,
just ignore HEADERS for now. */ just ignore HEADERS for now. */
if (session_detect_idle_stream(session, frame->hd.stream_id)) { if (session_detect_idle_stream(session, frame->hd.stream_id)) {
return session_inflate_handle_invalid_connection( return session_inflate_handle_invalid_connection(
session, frame, NGHTTP2_PROTOCOL_ERROR, session, frame, NGHTTP2_ERR_PROTO,
"request HEADERS: invalid stream_id"); "request HEADERS: invalid stream_id");
} }
@ -3547,19 +3569,18 @@ int nghttp2_session_on_request_headers_received(nghttp2_session *session,
if (session_is_incoming_concurrent_streams_max(session)) { if (session_is_incoming_concurrent_streams_max(session)) {
return session_inflate_handle_invalid_connection( return session_inflate_handle_invalid_connection(
session, frame, NGHTTP2_PROTOCOL_ERROR, session, frame, NGHTTP2_ERR_PROTO,
"request HEADERS: max concurrent streams exceeded"); "request HEADERS: max concurrent streams exceeded");
} }
if (frame->headers.pri_spec.stream_id == frame->hd.stream_id) { if (frame->headers.pri_spec.stream_id == frame->hd.stream_id) {
return session_inflate_handle_invalid_connection( return session_inflate_handle_invalid_connection(
session, frame, NGHTTP2_PROTOCOL_ERROR, session, frame, NGHTTP2_ERR_PROTO, "request HEADERS: depend on itself");
"request HEADERS: depend on itself");
} }
if (session_is_incoming_concurrent_streams_pending_max(session)) { if (session_is_incoming_concurrent_streams_pending_max(session)) {
return session_inflate_handle_invalid_stream(session, frame, return session_inflate_handle_invalid_stream(session, frame,
NGHTTP2_REFUSED_STREAM); NGHTTP2_ERR_REFUSED_STREAM);
} }
stream = nghttp2_session_open_stream( stream = nghttp2_session_open_stream(
@ -3586,8 +3607,7 @@ int nghttp2_session_on_response_headers_received(nghttp2_session *session,
nghttp2_session_is_my_stream_id(session, frame->hd.stream_id)); nghttp2_session_is_my_stream_id(session, frame->hd.stream_id));
if (frame->hd.stream_id == 0) { if (frame->hd.stream_id == 0) {
return session_inflate_handle_invalid_connection( return session_inflate_handle_invalid_connection(
session, frame, NGHTTP2_PROTOCOL_ERROR, session, frame, NGHTTP2_ERR_PROTO, "response HEADERS: stream_id == 0");
"response HEADERS: stream_id == 0");
} }
if (stream->shut_flags & NGHTTP2_SHUT_RD) { if (stream->shut_flags & NGHTTP2_SHUT_RD) {
/* half closed (remote): from the spec: /* half closed (remote): from the spec:
@ -3597,7 +3617,7 @@ int nghttp2_session_on_response_headers_received(nghttp2_session *session,
5.4.2) of type STREAM_CLOSED. 5.4.2) of type STREAM_CLOSED.
*/ */
return session_inflate_handle_invalid_stream(session, frame, return session_inflate_handle_invalid_stream(session, frame,
NGHTTP2_STREAM_CLOSED); NGHTTP2_ERR_STREAM_CLOSED);
} }
stream->state = NGHTTP2_STREAM_OPENED; stream->state = NGHTTP2_STREAM_OPENED;
rv = session_call_on_begin_headers(session, frame); rv = session_call_on_begin_headers(session, frame);
@ -3614,7 +3634,7 @@ int nghttp2_session_on_push_response_headers_received(nghttp2_session *session,
assert(stream->state == NGHTTP2_STREAM_RESERVED); assert(stream->state == NGHTTP2_STREAM_RESERVED);
if (frame->hd.stream_id == 0) { if (frame->hd.stream_id == 0) {
return session_inflate_handle_invalid_connection( return session_inflate_handle_invalid_connection(
session, frame, NGHTTP2_PROTOCOL_ERROR, session, frame, NGHTTP2_ERR_PROTO,
"push response HEADERS: stream_id == 0"); "push response HEADERS: stream_id == 0");
} }
if (session->goaway_flags) { if (session->goaway_flags) {
@ -3624,12 +3644,12 @@ int nghttp2_session_on_push_response_headers_received(nghttp2_session *session,
if (session_is_incoming_concurrent_streams_max(session)) { if (session_is_incoming_concurrent_streams_max(session)) {
return session_inflate_handle_invalid_connection( return session_inflate_handle_invalid_connection(
session, frame, NGHTTP2_PROTOCOL_ERROR, session, frame, NGHTTP2_ERR_PROTO,
"push response HEADERS: max concurrent streams exceeded"); "push response HEADERS: max concurrent streams exceeded");
} }
if (session_is_incoming_concurrent_streams_pending_max(session)) { if (session_is_incoming_concurrent_streams_pending_max(session)) {
return session_inflate_handle_invalid_stream(session, frame, return session_inflate_handle_invalid_stream(session, frame,
NGHTTP2_REFUSED_STREAM); NGHTTP2_ERR_REFUSED_STREAM);
} }
nghttp2_stream_promise_fulfilled(stream); nghttp2_stream_promise_fulfilled(stream);
@ -3647,7 +3667,7 @@ int nghttp2_session_on_headers_received(nghttp2_session *session,
int rv = 0; int rv = 0;
if (frame->hd.stream_id == 0) { if (frame->hd.stream_id == 0) {
return session_inflate_handle_invalid_connection( return session_inflate_handle_invalid_connection(
session, frame, NGHTTP2_PROTOCOL_ERROR, "HEADERS: stream_id == 0"); session, frame, NGHTTP2_ERR_PROTO, "HEADERS: stream_id == 0");
} }
if (stream->state == NGHTTP2_STREAM_RESERVED) { if (stream->state == NGHTTP2_STREAM_RESERVED) {
/* reserved. The valid push response HEADERS is processed by /* reserved. The valid push response HEADERS is processed by
@ -3655,7 +3675,7 @@ int nghttp2_session_on_headers_received(nghttp2_session *session,
generic HEADERS is called invalid cases for HEADERS against generic HEADERS is called invalid cases for HEADERS against
reserved state. */ reserved state. */
return session_inflate_handle_invalid_connection( return session_inflate_handle_invalid_connection(
session, frame, NGHTTP2_PROTOCOL_ERROR, "HEADERS: stream in reserved"); session, frame, NGHTTP2_ERR_PROTO, "HEADERS: stream in reserved");
} }
if ((stream->shut_flags & NGHTTP2_SHUT_RD)) { if ((stream->shut_flags & NGHTTP2_SHUT_RD)) {
/* half closed (remote): from the spec: /* half closed (remote): from the spec:
@ -3665,7 +3685,7 @@ int nghttp2_session_on_headers_received(nghttp2_session *session,
5.4.2) of type STREAM_CLOSED. 5.4.2) of type STREAM_CLOSED.
*/ */
return session_inflate_handle_invalid_stream(session, frame, return session_inflate_handle_invalid_stream(session, frame,
NGHTTP2_STREAM_CLOSED); NGHTTP2_ERR_STREAM_CLOSED);
} }
if (nghttp2_session_is_my_stream_id(session, frame->hd.stream_id)) { if (nghttp2_session_is_my_stream_id(session, frame->hd.stream_id)) {
if (stream->state == NGHTTP2_STREAM_OPENED) { if (stream->state == NGHTTP2_STREAM_OPENED) {
@ -3681,7 +3701,7 @@ int nghttp2_session_on_headers_received(nghttp2_session *session,
return NGHTTP2_ERR_IGN_HEADER_BLOCK; return NGHTTP2_ERR_IGN_HEADER_BLOCK;
} else { } else {
return session_inflate_handle_invalid_stream(session, frame, return session_inflate_handle_invalid_stream(session, frame,
NGHTTP2_PROTOCOL_ERROR); NGHTTP2_ERR_PROTO);
} }
} }
/* If this is remote peer initiated stream, it is OK unless it /* If this is remote peer initiated stream, it is OK unless it
@ -3741,8 +3761,8 @@ int nghttp2_session_on_priority_received(nghttp2_session *session,
nghttp2_stream *stream; nghttp2_stream *stream;
if (frame->hd.stream_id == 0) { if (frame->hd.stream_id == 0) {
return session_handle_invalid_connection( return session_handle_invalid_connection(session, frame, NGHTTP2_ERR_PROTO,
session, frame, NGHTTP2_PROTOCOL_ERROR, "PRIORITY: stream_id == 0"); "PRIORITY: stream_id == 0");
} }
if (!session->server) { if (!session->server) {
@ -3793,14 +3813,14 @@ int nghttp2_session_on_rst_stream_received(nghttp2_session *session,
int rv; int rv;
nghttp2_stream *stream; nghttp2_stream *stream;
if (frame->hd.stream_id == 0) { if (frame->hd.stream_id == 0) {
return session_handle_invalid_connection( return session_handle_invalid_connection(session, frame, NGHTTP2_ERR_PROTO,
session, frame, NGHTTP2_PROTOCOL_ERROR, "RST_STREAM: stream_id == 0"); "RST_STREAM: stream_id == 0");
} }
stream = nghttp2_session_get_stream(session, frame->hd.stream_id); stream = nghttp2_session_get_stream(session, frame->hd.stream_id);
if (!stream) { if (!stream) {
if (session_detect_idle_stream(session, frame->hd.stream_id)) { if (session_detect_idle_stream(session, frame->hd.stream_id)) {
return session_handle_invalid_connection( return session_handle_invalid_connection(
session, frame, NGHTTP2_PROTOCOL_ERROR, "RST_STREAM: stream in idle"); session, frame, NGHTTP2_ERR_PROTO, "RST_STREAM: stream in idle");
} }
} }
@ -4020,18 +4040,18 @@ int nghttp2_session_on_settings_received(nghttp2_session *session,
mem = &session->mem; mem = &session->mem;
if (frame->hd.stream_id != 0) { if (frame->hd.stream_id != 0) {
return session_handle_invalid_connection( return session_handle_invalid_connection(session, frame, NGHTTP2_ERR_PROTO,
session, frame, NGHTTP2_PROTOCOL_ERROR, "SETTINGS: stream_id != 0"); "SETTINGS: stream_id != 0");
} }
if (frame->hd.flags & NGHTTP2_FLAG_ACK) { if (frame->hd.flags & NGHTTP2_FLAG_ACK) {
if (frame->settings.niv != 0) { if (frame->settings.niv != 0) {
return session_handle_invalid_connection( return session_handle_invalid_connection(
session, frame, NGHTTP2_FRAME_SIZE_ERROR, session, frame, NGHTTP2_ERR_FRAME_SIZE_ERROR,
"SETTINGS: ACK and payload != 0"); "SETTINGS: ACK and payload != 0");
} }
if (session->inflight_niv == -1) { if (session->inflight_niv == -1) {
return session_handle_invalid_connection( return session_handle_invalid_connection(
session, frame, NGHTTP2_PROTOCOL_ERROR, "SETTINGS: unexpected ACK"); session, frame, NGHTTP2_ERR_PROTO, "SETTINGS: unexpected ACK");
} }
rv = nghttp2_session_update_local_settings(session, session->inflight_iv, rv = nghttp2_session_update_local_settings(session, session->inflight_iv,
session->inflight_niv); session->inflight_niv);
@ -4039,15 +4059,10 @@ int nghttp2_session_on_settings_received(nghttp2_session *session,
session->inflight_iv = NULL; session->inflight_iv = NULL;
session->inflight_niv = -1; session->inflight_niv = -1;
if (rv != 0) { if (rv != 0) {
uint32_t error_code = NGHTTP2_INTERNAL_ERROR;
if (nghttp2_is_fatal(rv)) { if (nghttp2_is_fatal(rv)) {
return rv; return rv;
} }
if (rv == NGHTTP2_ERR_HEADER_COMP) { return session_handle_invalid_connection(session, frame, rv, NULL);
error_code = NGHTTP2_COMPRESSION_ERROR;
}
return session_handle_invalid_connection(session, frame, error_code,
NULL);
} }
return session_call_on_frame_received(session, frame); return session_call_on_frame_received(session, frame);
} }
@ -4060,7 +4075,7 @@ int nghttp2_session_on_settings_received(nghttp2_session *session,
if (entry->value > NGHTTP2_MAX_HEADER_TABLE_SIZE) { if (entry->value > NGHTTP2_MAX_HEADER_TABLE_SIZE) {
return session_handle_invalid_connection( return session_handle_invalid_connection(
session, frame, NGHTTP2_COMPRESSION_ERROR, session, frame, NGHTTP2_ERR_HEADER_COMP,
"SETTINGS: too large SETTINGS_HEADER_TABLE_SIZE"); "SETTINGS: too large SETTINGS_HEADER_TABLE_SIZE");
} }
@ -4071,7 +4086,7 @@ int nghttp2_session_on_settings_received(nghttp2_session *session,
return rv; return rv;
} else { } else {
return session_handle_invalid_connection( return session_handle_invalid_connection(
session, frame, NGHTTP2_COMPRESSION_ERROR, NULL); session, frame, NGHTTP2_ERR_HEADER_COMP, NULL);
} }
} }
@ -4082,13 +4097,13 @@ int nghttp2_session_on_settings_received(nghttp2_session *session,
if (entry->value != 0 && entry->value != 1) { if (entry->value != 0 && entry->value != 1) {
return session_handle_invalid_connection( return session_handle_invalid_connection(
session, frame, NGHTTP2_PROTOCOL_ERROR, session, frame, NGHTTP2_ERR_PROTO,
"SETTINGS: invalid SETTINGS_ENBLE_PUSH"); "SETTINGS: invalid SETTINGS_ENBLE_PUSH");
} }
if (!session->server && entry->value != 0) { if (!session->server && entry->value != 0) {
return session_handle_invalid_connection( return session_handle_invalid_connection(
session, frame, NGHTTP2_PROTOCOL_ERROR, session, frame, NGHTTP2_ERR_PROTO,
"SETTINGS: server attempted to enable push"); "SETTINGS: server attempted to enable push");
} }
@ -4106,7 +4121,7 @@ int nghttp2_session_on_settings_received(nghttp2_session *session,
/* Check that initial_window_size < (1u << 31) */ /* Check that initial_window_size < (1u << 31) */
if (entry->value > NGHTTP2_MAX_WINDOW_SIZE) { if (entry->value > NGHTTP2_MAX_WINDOW_SIZE) {
return session_handle_invalid_connection( return session_handle_invalid_connection(
session, frame, NGHTTP2_FLOW_CONTROL_ERROR, session, frame, NGHTTP2_ERR_FLOW_CONTROL,
"SETTINGS: too large SETTINGS_INITIAL_WINDOW_SIZE"); "SETTINGS: too large SETTINGS_INITIAL_WINDOW_SIZE");
} }
@ -4118,7 +4133,7 @@ int nghttp2_session_on_settings_received(nghttp2_session *session,
if (rv != 0) { if (rv != 0) {
return session_handle_invalid_connection( return session_handle_invalid_connection(
session, frame, NGHTTP2_FLOW_CONTROL_ERROR, NULL); session, frame, NGHTTP2_ERR_FLOW_CONTROL, NULL);
} }
session->remote_settings.initial_window_size = entry->value; session->remote_settings.initial_window_size = entry->value;
@ -4129,7 +4144,7 @@ int nghttp2_session_on_settings_received(nghttp2_session *session,
if (entry->value < NGHTTP2_MAX_FRAME_SIZE_MIN || if (entry->value < NGHTTP2_MAX_FRAME_SIZE_MIN ||
entry->value > NGHTTP2_MAX_FRAME_SIZE_MAX) { entry->value > NGHTTP2_MAX_FRAME_SIZE_MAX) {
return session_handle_invalid_connection( return session_handle_invalid_connection(
session, frame, NGHTTP2_PROTOCOL_ERROR, session, frame, NGHTTP2_ERR_PROTO,
"SETTINGS: invalid SETTINGS_MAX_FRAME_SIZE"); "SETTINGS: invalid SETTINGS_MAX_FRAME_SIZE");
} }
@ -4153,7 +4168,7 @@ int nghttp2_session_on_settings_received(nghttp2_session *session,
} }
return session_handle_invalid_connection(session, frame, return session_handle_invalid_connection(session, frame,
NGHTTP2_INTERNAL_ERROR, NULL); NGHTTP2_ERR_INTERNAL, NULL);
} }
} }
@ -4206,11 +4221,11 @@ int nghttp2_session_on_push_promise_received(nghttp2_session *session,
if (frame->hd.stream_id == 0) { if (frame->hd.stream_id == 0) {
return session_inflate_handle_invalid_connection( return session_inflate_handle_invalid_connection(
session, frame, NGHTTP2_PROTOCOL_ERROR, "PUSH_PROMISE: stream_id == 0"); session, frame, NGHTTP2_ERR_PROTO, "PUSH_PROMISE: stream_id == 0");
} }
if (session->server || session->local_settings.enable_push == 0) { if (session->server || session->local_settings.enable_push == 0) {
return session_inflate_handle_invalid_connection( return session_inflate_handle_invalid_connection(
session, frame, NGHTTP2_PROTOCOL_ERROR, "PUSH_PROMISE: push disabled"); session, frame, NGHTTP2_ERR_PROTO, "PUSH_PROMISE: push disabled");
} }
if (session->goaway_flags) { if (session->goaway_flags) {
/* We just dicard PUSH_PROMISE after GOAWAY is sent or /* We just dicard PUSH_PROMISE after GOAWAY is sent or
@ -4220,8 +4235,7 @@ int nghttp2_session_on_push_promise_received(nghttp2_session *session,
if (!nghttp2_session_is_my_stream_id(session, frame->hd.stream_id)) { if (!nghttp2_session_is_my_stream_id(session, frame->hd.stream_id)) {
return session_inflate_handle_invalid_connection( return session_inflate_handle_invalid_connection(
session, frame, NGHTTP2_PROTOCOL_ERROR, session, frame, NGHTTP2_ERR_PROTO, "PUSH_PROMISE: invalid stream_id");
"PUSH_PROMISE: invalid stream_id");
} }
if (!session_is_new_peer_stream_id(session, if (!session_is_new_peer_stream_id(session,
@ -4230,7 +4244,7 @@ int nghttp2_session_on_push_promise_received(nghttp2_session *session,
illegal stream ID is subject to a connection error of type illegal stream ID is subject to a connection error of type
PROTOCOL_ERROR. */ PROTOCOL_ERROR. */
return session_inflate_handle_invalid_connection( return session_inflate_handle_invalid_connection(
session, frame, NGHTTP2_PROTOCOL_ERROR, session, frame, NGHTTP2_ERR_PROTO,
"PUSH_PROMISE: invalid promised_stream_id"); "PUSH_PROMISE: invalid promised_stream_id");
} }
session->last_recv_stream_id = frame->push_promise.promised_stream_id; session->last_recv_stream_id = frame->push_promise.promised_stream_id;
@ -4240,8 +4254,7 @@ int nghttp2_session_on_push_promise_received(nghttp2_session *session,
if (!stream) { if (!stream) {
if (session_detect_idle_stream(session, frame->hd.stream_id)) { if (session_detect_idle_stream(session, frame->hd.stream_id)) {
return session_inflate_handle_invalid_connection( return session_inflate_handle_invalid_connection(
session, frame, NGHTTP2_PROTOCOL_ERROR, session, frame, NGHTTP2_ERR_PROTO, "PUSH_PROMISE: stream in idle");
"PUSH_PROMISE: stream in idle");
} }
} }
rv = nghttp2_session_add_rst_stream(session, rv = nghttp2_session_add_rst_stream(session,
@ -4310,8 +4323,8 @@ int nghttp2_session_on_ping_received(nghttp2_session *session,
nghttp2_frame *frame) { nghttp2_frame *frame) {
int rv = 0; int rv = 0;
if (frame->hd.stream_id != 0) { if (frame->hd.stream_id != 0) {
return session_handle_invalid_connection( return session_handle_invalid_connection(session, frame, NGHTTP2_ERR_PROTO,
session, frame, NGHTTP2_PROTOCOL_ERROR, "PING: stream_id != 0"); "PING: stream_id != 0");
} }
if ((frame->hd.flags & NGHTTP2_FLAG_ACK) == 0 && if ((frame->hd.flags & NGHTTP2_FLAG_ACK) == 0 &&
!session_is_closing(session)) { !session_is_closing(session)) {
@ -4340,8 +4353,8 @@ int nghttp2_session_on_goaway_received(nghttp2_session *session,
int rv; int rv;
if (frame->hd.stream_id != 0) { if (frame->hd.stream_id != 0) {
return session_handle_invalid_connection( return session_handle_invalid_connection(session, frame, NGHTTP2_ERR_PROTO,
session, frame, NGHTTP2_PROTOCOL_ERROR, "GOAWAY: stream_id != 0"); "GOAWAY: stream_id != 0");
} }
/* Spec says Endpoints MUST NOT increase the value they send in the /* Spec says Endpoints MUST NOT increase the value they send in the
last stream identifier. */ last stream identifier. */
@ -4349,8 +4362,7 @@ int nghttp2_session_on_goaway_received(nghttp2_session *session,
!nghttp2_session_is_my_stream_id(session, !nghttp2_session_is_my_stream_id(session,
frame->goaway.last_stream_id)) || frame->goaway.last_stream_id)) ||
session->remote_last_stream_id < frame->goaway.last_stream_id) { session->remote_last_stream_id < frame->goaway.last_stream_id) {
return session_handle_invalid_connection(session, frame, return session_handle_invalid_connection(session, frame, NGHTTP2_ERR_PROTO,
NGHTTP2_PROTOCOL_ERROR,
"GOAWAY: invalid last_stream_id"); "GOAWAY: invalid last_stream_id");
} }
@ -4386,14 +4398,14 @@ session_on_connection_window_update_received(nghttp2_session *session,
nghttp2_frame *frame) { nghttp2_frame *frame) {
/* Handle connection-level flow control */ /* Handle connection-level flow control */
if (frame->window_update.window_size_increment == 0) { if (frame->window_update.window_size_increment == 0) {
return session_handle_invalid_connection(session, frame, return session_handle_invalid_connection(session, frame, NGHTTP2_ERR_PROTO,
NGHTTP2_PROTOCOL_ERROR, NULL); NULL);
} }
if (NGHTTP2_MAX_WINDOW_SIZE - frame->window_update.window_size_increment < if (NGHTTP2_MAX_WINDOW_SIZE - frame->window_update.window_size_increment <
session->remote_window_size) { session->remote_window_size) {
return session_handle_invalid_connection(session, frame, return session_handle_invalid_connection(session, frame,
NGHTTP2_FLOW_CONTROL_ERROR, NULL); NGHTTP2_ERR_FLOW_CONTROL, NULL);
} }
session->remote_window_size += frame->window_update.window_size_increment; session->remote_window_size += frame->window_update.window_size_increment;
@ -4407,25 +4419,22 @@ static int session_on_stream_window_update_received(nghttp2_session *session,
stream = nghttp2_session_get_stream(session, frame->hd.stream_id); stream = nghttp2_session_get_stream(session, frame->hd.stream_id);
if (!stream) { if (!stream) {
if (session_detect_idle_stream(session, frame->hd.stream_id)) { if (session_detect_idle_stream(session, frame->hd.stream_id)) {
return session_handle_invalid_connection(session, frame, return session_handle_invalid_connection(
NGHTTP2_PROTOCOL_ERROR, session, frame, NGHTTP2_ERR_PROTO, "WINDOW_UPDATE to idle stream");
"WINDOW_UPDATE to idle stream");
} }
return 0; return 0;
} }
if (state_reserved_remote(session, stream)) { if (state_reserved_remote(session, stream)) {
return session_handle_invalid_connection( return session_handle_invalid_connection(
session, frame, NGHTTP2_PROTOCOL_ERROR, session, frame, NGHTTP2_ERR_PROTO, "WINDOW_UPADATE to reserved stream");
"WINDOW_UPADATE to reserved stream");
} }
if (frame->window_update.window_size_increment == 0) { if (frame->window_update.window_size_increment == 0) {
return session_handle_invalid_stream(session, frame, return session_handle_invalid_stream(session, frame, NGHTTP2_ERR_PROTO);
NGHTTP2_PROTOCOL_ERROR);
} }
if (NGHTTP2_MAX_WINDOW_SIZE - frame->window_update.window_size_increment < if (NGHTTP2_MAX_WINDOW_SIZE - frame->window_update.window_size_increment <
stream->remote_window_size) { stream->remote_window_size) {
return session_handle_invalid_stream(session, frame, return session_handle_invalid_stream(session, frame,
NGHTTP2_FLOW_CONTROL_ERROR); NGHTTP2_ERR_FLOW_CONTROL);
} }
stream->remote_window_size += frame->window_update.window_size_increment; stream->remote_window_size += frame->window_update.window_size_increment;
@ -4461,18 +4470,6 @@ static int session_process_window_update_frame(nghttp2_session *session) {
return nghttp2_session_on_window_update_received(session, frame); return nghttp2_session_on_window_update_received(session, frame);
} }
/* static int get_error_code_from_lib_error_code(int lib_error_code) */
/* { */
/* switch(lib_error_code) { */
/* case NGHTTP2_ERR_HEADER_COMP: */
/* return NGHTTP2_COMPRESSION_ERROR; */
/* case NGHTTP2_ERR_FRAME_SIZE_ERROR: */
/* return NGHTTP2_FRAME_SIZE_ERROR; */
/* default: */
/* return NGHTTP2_PROTOCOL_ERROR; */
/* } */
/* } */
int nghttp2_session_on_data_received(nghttp2_session *session, int nghttp2_session_on_data_received(nghttp2_session *session,
nghttp2_frame *frame) { nghttp2_frame *frame) {
int rv = 0; int rv = 0;

5
src/app_helper.cc
View File

@ -399,10 +399,11 @@ int verbose_on_frame_recv_callback(nghttp2_session *session,
int verbose_on_invalid_frame_recv_callback(nghttp2_session *session, int verbose_on_invalid_frame_recv_callback(nghttp2_session *session,
const nghttp2_frame *frame, const nghttp2_frame *frame,
uint32_t error_code, int lib_error_code,
void *user_data) { void *user_data) {
print_timer(); print_timer();
fprintf(outfile, " [INVALID; status=%s] recv ", strstatus(error_code)); fprintf(outfile, " [INVALID; error=%s] recv ",
nghttp2_strerror(lib_error_code));
print_frame(PRINT_RECV, frame); print_frame(PRINT_RECV, frame);
fflush(outfile); fflush(outfile);
return 0; return 0;

3
src/app_helper.h
View File

@ -49,8 +49,7 @@ int verbose_on_frame_recv_callback(nghttp2_session *session,
int verbose_on_invalid_frame_recv_callback(nghttp2_session *session, int verbose_on_invalid_frame_recv_callback(nghttp2_session *session,
const nghttp2_frame *frame, const nghttp2_frame *frame,
uint32_t error_code, int lib_error_code, void *user_data);
void *user_data);
int verbose_on_frame_send_callback(nghttp2_session *session, int verbose_on_frame_send_callback(nghttp2_session *session,
const nghttp2_frame *frame, void *user_data); const nghttp2_frame *frame, void *user_data);

2
tests/nghttp2_session_test.c
View File

@ -186,7 +186,7 @@ static int on_frame_recv_callback(nghttp2_session *session _U_,
static int on_invalid_frame_recv_callback(nghttp2_session *session _U_, static int on_invalid_frame_recv_callback(nghttp2_session *session _U_,
const nghttp2_frame *frame _U_, const nghttp2_frame *frame _U_,
nghttp2_error_code error_code _U_, int lib_error_code _U_,
void *user_data) { void *user_data) {
my_user_data *ud = (my_user_data *)user_data; my_user_data *ud = (my_user_data *)user_data;
++ud->invalid_frame_recv_cb_called; ++ud->invalid_frame_recv_cb_called;