IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

HTTP/3: fixed pushed request finalization in case of error.

Browse Source 
Previously request could be finalized twice.  For example, this could happen
if "Host" header was invalid.
This commit is contained in:
Roman Arutyunyan 2021-09-17 15:28:31 +03:00
parent 4e2e70b16c
commit 3ae914c837
1 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/http/v3/ngx_http_v3_filter_module.c
View File

@ -880,7 +880,6 @@ static ngx_int_t
ngx_http_v3_create_push_request(ngx_http_request_t *pr, ngx_str_t *path, ngx_http_v3_create_push_request(ngx_http_request_t *pr, ngx_str_t *path,
uint64_t push_id) uint64_t push_id)
{ {
ngx_pool_t *pool;
ngx_connection_t *c, *pc; ngx_connection_t *c, *pc;
ngx_http_request_t *r; ngx_http_request_t *r;
ngx_http_log_ctx_t *ctx; ngx_http_log_ctx_t *ctx;
@ -889,8 +888,6 @@ ngx_http_v3_create_push_request(ngx_http_request_t *pr, ngx_str_t *path,
pc = pr->connection; pc = pr->connection;
r = NULL;
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
"http3 create push request id:%uL", push_id); "http3 create push request id:%uL", push_id);
@ -901,7 +898,8 @@ ngx_http_v3_create_push_request(ngx_http_request_t *pr, ngx_str_t *path,
hc = ngx_palloc(c->pool, sizeof(ngx_http_connection_t)); hc = ngx_palloc(c->pool, sizeof(ngx_http_connection_t));
if (hc == NULL) { if (hc == NULL) {
goto failed; ngx_http_close_connection(c);
return NGX_ERROR;
} }
phc = ngx_http_quic_get_connection(pc); phc = ngx_http_quic_get_connection(pc);
@ -910,7 +908,8 @@ ngx_http_v3_create_push_request(ngx_http_request_t *pr, ngx_str_t *path,
ctx = ngx_palloc(c->pool, sizeof(ngx_http_log_ctx_t)); ctx = ngx_palloc(c->pool, sizeof(ngx_http_log_ctx_t));
if (ctx == NULL) { if (ctx == NULL) {
goto failed; ngx_http_close_connection(c);
return NGX_ERROR;
} }
ctx->connection = c; ctx->connection = c;
@ -925,7 +924,8 @@ ngx_http_v3_create_push_request(ngx_http_request_t *pr, ngx_str_t *path,
r = ngx_http_create_request(c); r = ngx_http_create_request(c);
if (r == NULL) { if (r == NULL) {
goto failed; ngx_http_close_connection(c);
return NGX_ERROR;
} }
c->data = r; c->data = r;
@ -941,44 +941,49 @@ ngx_http_v3_create_push_request(ngx_http_request_t *pr, ngx_str_t *path,
r->header_in = ngx_create_temp_buf(r->pool, r->header_in = ngx_create_temp_buf(r->pool,
cscf->client_header_buffer_size); cscf->client_header_buffer_size);
if (r->header_in == NULL) { if (r->header_in == NULL) {
goto failed; ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
return NGX_ERROR;
} }
if (ngx_list_init(&r->headers_in.headers, r->pool, 4, if (ngx_list_init(&r->headers_in.headers, r->pool, 4,
sizeof(ngx_table_elt_t)) sizeof(ngx_table_elt_t))
!= NGX_OK) != NGX_OK)
{ {
goto failed; ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
return NGX_ERROR;
} }
r->headers_in.connection_type = NGX_HTTP_CONNECTION_CLOSE; r->headers_in.connection_type = NGX_HTTP_CONNECTION_CLOSE;
r->schema.data = ngx_pstrdup(r->pool, &pr->schema); r->schema.data = ngx_pstrdup(r->pool, &pr->schema);
if (r->schema.data == NULL) { if (r->schema.data == NULL) {
goto failed; ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
return NGX_ERROR;
} }
r->schema.len = pr->schema.len; r->schema.len = pr->schema.len;
r->uri_start = ngx_pstrdup(r->pool, path); r->uri_start = ngx_pstrdup(r->pool, path);
if (r->uri_start == NULL) { if (r->uri_start == NULL) {
goto failed; ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
return NGX_ERROR;
} }
r->uri_end = r->uri_start + path->len; r->uri_end = r->uri_start + path->len;
if (ngx_http_parse_uri(r) != NGX_OK) { if (ngx_http_parse_uri(r) != NGX_OK) {
goto failed; ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
return NGX_ERROR;
} }
if (ngx_http_process_request_uri(r) != NGX_OK) { if (ngx_http_process_request_uri(r) != NGX_OK) {
goto failed; return NGX_ERROR;
} }
if (ngx_http_v3_set_push_header(r, "host", &pr->headers_in.server) if (ngx_http_v3_set_push_header(r, "host", &pr->headers_in.server)
!= NGX_OK) != NGX_OK)
{ {
goto failed; return NGX_ERROR;
} }
if (pr->headers_in.accept_encoding) { if (pr->headers_in.accept_encoding) {
@ -986,7 +991,7 @@ ngx_http_v3_create_push_request(ngx_http_request_t *pr, ngx_str_t *path,
&pr->headers_in.accept_encoding->value) &pr->headers_in.accept_encoding->value)
!= NGX_OK) != NGX_OK)
{ {
goto failed; return NGX_ERROR;
} }
} }
@ -995,7 +1000,7 @@ ngx_http_v3_create_push_request(ngx_http_request_t *pr, ngx_str_t *path,
&pr->headers_in.accept_language->value) &pr->headers_in.accept_language->value)
!= NGX_OK) != NGX_OK)
{ {
goto failed; return NGX_ERROR;
} }
} }
@ -1004,7 +1009,7 @@ ngx_http_v3_create_push_request(ngx_http_request_t *pr, ngx_str_t *path,
&pr->headers_in.user_agent->value) &pr->headers_in.user_agent->value)
!= NGX_OK) != NGX_OK)
{ {
goto failed; return NGX_ERROR;
} }
} }
@ -1014,22 +1019,6 @@ ngx_http_v3_create_push_request(ngx_http_request_t *pr, ngx_str_t *path,
ngx_post_event(c->read, &ngx_posted_events); ngx_post_event(c->read, &ngx_posted_events);
return NGX_OK; return NGX_OK;
failed:
if (r) {
ngx_http_free_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
}
c->destroyed = 1;
pool = c->pool;
ngx_close_connection(c);
ngx_destroy_pool(pool);
return NGX_ERROR;
} }
@ -1049,6 +1038,7 @@ ngx_http_v3_set_push_header(ngx_http_request_t *r, const char *name,
p = ngx_pnalloc(r->pool, value->len + 1); p = ngx_pnalloc(r->pool, value->len + 1);
if (p == NULL) { if (p == NULL) {
ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
return NGX_ERROR; return NGX_ERROR;
} }
@ -1057,6 +1047,7 @@ ngx_http_v3_set_push_header(ngx_http_request_t *r, const char *name,
h = ngx_list_push(&r->headers_in.headers); h = ngx_list_push(&r->headers_in.headers);
if (h == NULL) { if (h == NULL) {
ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
return NGX_ERROR; return NGX_ERROR;
} }