Compare commits
10 Commits
quic
...
stable-1.1
Author | SHA1 | Date |
---|---|---|
Maxim Dounin | 883015b3bf | |
Maxim Dounin | f3d80cff65 | |
Ruslan Ermilov | 29303436bf | |
Ruslan Ermilov | 8bcbe0db87 | |
Sergey Kandaurov | dcde2f075b | |
Maxim Dounin | 2baaba10f8 | |
Maxim Dounin | f1d14f5518 | |
Maxim Dounin | 7d5bf85113 | |
Maxim Dounin | d9666f5ff3 | |
Maxim Dounin | 7df8977172 |
|
@ -5,6 +5,38 @@
|
|||
<change_log title="nginx">
|
||||
|
||||
|
||||
<changes ver="1.16.1" date="2019-08-13">
|
||||
|
||||
<change type="security">
|
||||
<para lang="ru">
|
||||
при использовании HTTP/2 клиент мог вызвать
|
||||
чрезмерное потребление памяти и ресурсов процессора
|
||||
(CVE-2019-9511, CVE-2019-9513, CVE-2019-9516).
|
||||
</para>
|
||||
<para lang="en">
|
||||
when using HTTP/2 a client might cause
|
||||
excessive memory consumption and CPU usage
|
||||
(CVE-2019-9511, CVE-2019-9513, CVE-2019-9516).
|
||||
</para>
|
||||
</change>
|
||||
|
||||
</changes>
|
||||
|
||||
|
||||
<changes ver="1.16.0" date="2019-04-23">
|
||||
|
||||
<change>
|
||||
<para lang="ru">
|
||||
Стабильная ветка 1.16.x.
|
||||
</para>
|
||||
<para lang="en">
|
||||
1.16.x stable branch.
|
||||
</para>
|
||||
</change>
|
||||
|
||||
</changes>
|
||||
|
||||
|
||||
<changes ver="1.15.12" date="2019-04-16">
|
||||
|
||||
<change type="bugfix">
|
||||
|
|
|
@ -6,7 +6,7 @@ TEMP = tmp
|
|||
|
||||
CC = cl
|
||||
OBJS = objs.msvc8
|
||||
OPENSSL = openssl-1.1.1b
|
||||
OPENSSL = openssl-1.1.1c
|
||||
ZLIB = zlib-1.2.11
|
||||
PCRE = pcre-8.43
|
||||
|
||||
|
|
|
@ -9,8 +9,8 @@
|
|||
#define _NGINX_H_INCLUDED_
|
||||
|
||||
|
||||
#define nginx_version 1015012
|
||||
#define NGINX_VERSION "1.15.12"
|
||||
#define nginx_version 1016001
|
||||
#define NGINX_VERSION "1.16.1"
|
||||
#define NGINX_VER "nginx/" NGINX_VERSION
|
||||
|
||||
#ifdef NGX_BUILD
|
||||
|
|
|
@ -273,6 +273,7 @@ ngx_http_v2_init(ngx_event_t *rev)
|
|||
h2scf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_v2_module);
|
||||
|
||||
h2c->concurrent_pushes = h2scf->concurrent_pushes;
|
||||
h2c->priority_limit = h2scf->concurrent_streams;
|
||||
|
||||
h2c->pool = ngx_create_pool(h2scf->pool_size, h2c->connection->log);
|
||||
if (h2c->pool == NULL) {
|
||||
|
@ -1546,6 +1547,14 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos,
|
|||
header->name.len = h2c->state.field_end - h2c->state.field_start;
|
||||
header->name.data = h2c->state.field_start;
|
||||
|
||||
if (header->name.len == 0) {
|
||||
ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
|
||||
"client sent zero header name length");
|
||||
|
||||
return ngx_http_v2_connection_error(h2c,
|
||||
NGX_HTTP_V2_PROTOCOL_ERROR);
|
||||
}
|
||||
|
||||
return ngx_http_v2_state_field_len(h2c, pos, end);
|
||||
}
|
||||
|
||||
|
@ -1796,6 +1805,13 @@ ngx_http_v2_state_priority(ngx_http_v2_connection_t *h2c, u_char *pos,
|
|||
return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
|
||||
}
|
||||
|
||||
if (--h2c->priority_limit == 0) {
|
||||
ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
|
||||
"client sent too many PRIORITY frames");
|
||||
|
||||
return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_ENHANCE_YOUR_CALM);
|
||||
}
|
||||
|
||||
if (end - pos < NGX_HTTP_V2_PRIORITY_SIZE) {
|
||||
return ngx_http_v2_state_save(h2c, pos, end,
|
||||
ngx_http_v2_state_priority);
|
||||
|
@ -3112,6 +3128,8 @@ ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c, ngx_uint_t push)
|
|||
h2c->processing++;
|
||||
}
|
||||
|
||||
h2c->priority_limit += h2scf->concurrent_streams;
|
||||
|
||||
return stream;
|
||||
}
|
||||
|
||||
|
@ -3249,10 +3267,6 @@ ngx_http_v2_validate_header(ngx_http_request_t *r, ngx_http_v2_header_t *header)
|
|||
ngx_uint_t i;
|
||||
ngx_http_core_srv_conf_t *cscf;
|
||||
|
||||
if (header->name.len == 0) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
r->invalid_header = 0;
|
||||
|
||||
cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
|
||||
|
@ -4365,6 +4379,8 @@ ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
|
|||
*/
|
||||
pool = stream->pool;
|
||||
|
||||
h2c->frames -= stream->frames;
|
||||
|
||||
ngx_http_free_request(stream->request, rc);
|
||||
|
||||
if (pool != h2c->state.pool) {
|
||||
|
|
|
@ -122,6 +122,7 @@ struct ngx_http_v2_connection_s {
|
|||
ngx_uint_t processing;
|
||||
ngx_uint_t frames;
|
||||
ngx_uint_t idle;
|
||||
ngx_uint_t priority_limit;
|
||||
|
||||
ngx_uint_t pushing;
|
||||
ngx_uint_t concurrent_pushes;
|
||||
|
@ -192,6 +193,8 @@ struct ngx_http_v2_stream_s {
|
|||
|
||||
ngx_buf_t *preread;
|
||||
|
||||
ngx_uint_t frames;
|
||||
|
||||
ngx_http_v2_out_frame_t *free_frames;
|
||||
ngx_chain_t *free_frame_headers;
|
||||
ngx_chain_t *free_bufs;
|
||||
|
|
|
@ -1667,18 +1667,30 @@ ngx_http_v2_filter_get_data_frame(ngx_http_v2_stream_t *stream,
|
|||
ngx_buf_t *buf;
|
||||
ngx_chain_t *cl;
|
||||
ngx_http_v2_out_frame_t *frame;
|
||||
ngx_http_v2_connection_t *h2c;
|
||||
|
||||
frame = stream->free_frames;
|
||||
h2c = stream->connection;
|
||||
|
||||
if (frame) {
|
||||
stream->free_frames = frame->next;
|
||||
|
||||
} else {
|
||||
} else if (h2c->frames < 10000) {
|
||||
frame = ngx_palloc(stream->request->pool,
|
||||
sizeof(ngx_http_v2_out_frame_t));
|
||||
if (frame == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
stream->frames++;
|
||||
h2c->frames++;
|
||||
|
||||
} else {
|
||||
ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
|
||||
"http2 flood detected");
|
||||
|
||||
h2c->connection->error = 1;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
flags = last->buf->last_buf ? NGX_HTTP_V2_END_STREAM_FLAG : 0;
|
||||
|
|
Loading…
Reference in New Issue