mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-11 17:59:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SPDY: improved error handling of header block decompression.

Browse Source 
Now cases when decompression failed due to internal error
and when a client sent corrupted data are distinguished.
This commit is contained in:
Valentin Bartenev 2014-04-30 20:34:20 +04:00
parent ba890408bd
commit cf770ddd82
1 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/http/ngx_http_spdy.c
View File

@ -123,6 +123,9 @@ static u_char *ngx_http_spdy_state_complete(ngx_http_spdy_connection_t *sc,
u_char *pos, u_char *end); u_char *pos, u_char *end);
static u_char *ngx_http_spdy_state_save(ngx_http_spdy_connection_t *sc, static u_char *ngx_http_spdy_state_save(ngx_http_spdy_connection_t *sc,
u_char *pos, u_char *end, ngx_http_spdy_handler_pt handler); u_char *pos, u_char *end, ngx_http_spdy_handler_pt handler);
static u_char *ngx_http_spdy_state_inflate_error(
ngx_http_spdy_connection_t *sc, int rc);
static u_char *ngx_http_spdy_state_protocol_error( static u_char *ngx_http_spdy_state_protocol_error(
ngx_http_spdy_connection_t *sc); ngx_http_spdy_connection_t *sc);
static u_char *ngx_http_spdy_state_internal_error( static u_char *ngx_http_spdy_state_internal_error(
@ -1036,11 +1039,21 @@ ngx_http_spdy_state_headers(ngx_http_spdy_connection_t *sc, u_char *pos,
if (z == Z_NEED_DICT) { if (z == Z_NEED_DICT) {
z = inflateSetDictionary(&sc->zstream_in, ngx_http_spdy_dict, z = inflateSetDictionary(&sc->zstream_in, ngx_http_spdy_dict,
sizeof(ngx_http_spdy_dict)); sizeof(ngx_http_spdy_dict));
if (z != Z_OK) {
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
"spdy inflateSetDictionary() failed: %d", z);
return ngx_http_spdy_state_protocol_error(sc); if (z != Z_OK) {
if (z == Z_DATA_ERROR) {
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
"client sent SYN_STREAM frame with header "
"block encoded using wrong dictionary: %ul",
(u_long) sc->zstream_in.adler);
return ngx_http_spdy_state_protocol_error(sc);
}
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"inflateSetDictionary() failed: %d", z);
return ngx_http_spdy_state_internal_error(sc);
} }
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
@ -1051,10 +1064,7 @@ ngx_http_spdy_state_headers(ngx_http_spdy_connection_t *sc, u_char *pos,
} }
if (z != Z_OK) { if (z != Z_OK) {
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0, return ngx_http_spdy_state_inflate_error(sc, z);
"spdy inflate() failed: %d", z);
return ngx_http_spdy_state_protocol_error(sc);
} }
ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
@ -1155,10 +1165,7 @@ ngx_http_spdy_state_headers(ngx_http_spdy_connection_t *sc, u_char *pos,
z = inflate(&sc->zstream_in, Z_NO_FLUSH); z = inflate(&sc->zstream_in, Z_NO_FLUSH);
if (z != Z_OK) { if (z != Z_OK) {
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0, return ngx_http_spdy_state_inflate_error(sc, z);
"spdy inflate() failed: %d", z);
return ngx_http_spdy_state_protocol_error(sc);
} }
sc->length -= sc->zstream_in.next_in - pos; sc->length -= sc->zstream_in.next_in - pos;
@ -1268,12 +1275,8 @@ ngx_http_spdy_state_headers_skip(ngx_http_spdy_connection_t *sc, u_char *pos,
n = inflate(&sc->zstream_in, Z_NO_FLUSH); n = inflate(&sc->zstream_in, Z_NO_FLUSH);
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
"spdy inflate(): %d", n);
if (n != Z_OK) { if (n != Z_OK) {
/* TODO: logging */ return ngx_http_spdy_state_inflate_error(sc, n);
return ngx_http_spdy_state_protocol_error(sc);
} }
} }
@ -1911,6 +1914,24 @@ ngx_http_spdy_state_save(ngx_http_spdy_connection_t *sc,
} }
static u_char *
ngx_http_spdy_state_inflate_error(ngx_http_spdy_connection_t *sc, int rc)
{
if (rc == Z_DATA_ERROR || rc == Z_STREAM_END) {
ngx_log_error(NGX_LOG_INFO, sc->connection->log, 0,
"client sent SYN_STREAM frame with "
"corrupted header block, inflate() failed: %d", rc);
return ngx_http_spdy_state_protocol_error(sc);
}
ngx_log_error(NGX_LOG_ERR, sc->connection->log, 0,
"inflate() failed: %d", rc);
return ngx_http_spdy_state_internal_error(sc);
}
static u_char * static u_char *
ngx_http_spdy_state_protocol_error(ngx_http_spdy_connection_t *sc) ngx_http_spdy_state_protocol_error(ngx_http_spdy_connection_t *sc)
{ {
@ -1934,8 +1955,13 @@ ngx_http_spdy_state_internal_error(ngx_http_spdy_connection_t *sc)
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0, ngx_log_debug0(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
"spdy state internal error"); "spdy state internal error");
/* TODO */ if (sc->stream) {
sc->stream->out_closed = 1;
ngx_http_spdy_close_stream(sc->stream, NGX_HTTP_INTERNAL_SERVER_ERROR);
}
ngx_http_spdy_finalize_connection(sc, NGX_HTTP_INTERNAL_SERVER_ERROR); ngx_http_spdy_finalize_connection(sc, NGX_HTTP_INTERNAL_SERVER_ERROR);
return NULL; return NULL;
} }