mirror of
https://github.com/nginx/nginx.git
synced 2025-06-07 17:52:38 +08:00
Merge 481d7e3214 into 5b8a5c08ce
This commit is contained in:
Demi Marie Obenour
GitHub
commit
38be9b1241
@ -68,6 +68,17 @@ static ngx_int_t ngx_http_add_addrs6(ngx_conf_t *cf, ngx_http_port_t *hport,
|
||||
ngx_http_conf_addr_t *addr);
|
||||
#endif
|
||||
|
||||
#if (NGX_HTTP_V2 || NGX_HTTP_V3)
|
||||
static ngx_int_t ngx_http_v23_parse_path(ngx_http_request_t *r,
|
||||
ngx_str_t *value);
|
||||
static ngx_int_t ngx_http_v23_parse_method(ngx_http_request_t *r,
|
||||
ngx_str_t *value);
|
||||
static ngx_int_t ngx_http_v23_parse_scheme(ngx_http_request_t *r,
|
||||
ngx_str_t *value);
|
||||
static ngx_int_t ngx_http_v23_parse_authority(ngx_http_request_t *r,
|
||||
ngx_str_t *value);
|
||||
#endif
|
||||
|
||||
ngx_uint_t ngx_http_max_module;
|
||||
|
||||
|
||||
@ -1227,6 +1238,295 @@ ngx_http_add_listen(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
|
||||
return ngx_http_add_address(cf, cscf, port, lsopt);
|
||||
}
|
||||
|
||||
#if (NGX_HTTP_V2 || NGX_HTTP_V3)
|
||||
|
||||
ngx_int_t
|
||||
ngx_http_v23_pseudo_header(ngx_http_request_t *r, ngx_str_t *name,
|
||||
ngx_str_t *value)
|
||||
{
|
||||
ngx_int_t rc;
|
||||
|
||||
name->len--;
|
||||
name->data++;
|
||||
|
||||
switch (name->len) {
|
||||
case 4:
|
||||
if (ngx_memcmp(name->data, "path", sizeof("path") - 1)
|
||||
== 0)
|
||||
{
|
||||
rc = ngx_http_v23_parse_path(r, value);
|
||||
goto known;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 6:
|
||||
if (ngx_memcmp(name->data, "method", sizeof("method") - 1)
|
||||
== 0)
|
||||
{
|
||||
rc = ngx_http_v23_parse_method(r, value);
|
||||
goto known;
|
||||
}
|
||||
|
||||
if (ngx_memcmp(name->data, "scheme", sizeof("scheme") - 1)
|
||||
== 0)
|
||||
{
|
||||
rc = ngx_http_v23_parse_scheme(r, value);
|
||||
goto known;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 9:
|
||||
if (ngx_memcmp(name->data, "authority", sizeof("authority") - 1)
|
||||
== 0)
|
||||
{
|
||||
rc = ngx_http_v23_parse_authority(r, value);
|
||||
goto known;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent unknown pseudo-header \":%V\"",
|
||||
name);
|
||||
rc = NGX_DECLINED;
|
||||
known:
|
||||
if (rc == NGX_DECLINED) {
|
||||
ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
|
||||
rc = NGX_ABORT;
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_http_v23_parse_path(ngx_http_request_t *r, ngx_str_t *value)
|
||||
{
|
||||
if (r->unparsed_uri.len) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent duplicate :path header");
|
||||
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
|
||||
if (value->len == 0) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent empty :path header");
|
||||
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
|
||||
r->uri_start = value->data;
|
||||
r->uri_end = value->data + value->len;
|
||||
|
||||
if (ngx_http_parse_uri(r) != NGX_OK) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent invalid :path header: \"%V\"", value);
|
||||
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
|
||||
if (ngx_http_process_request_uri(r) != NGX_OK) {
|
||||
/*
|
||||
* request has been finalized already
|
||||
* in ngx_http_process_request_uri()
|
||||
*/
|
||||
return NGX_ABORT;
|
||||
}
|
||||
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_http_v23_parse_method(ngx_http_request_t *r, ngx_str_t *value)
|
||||
{
|
||||
size_t k, len;
|
||||
ngx_uint_t n;
|
||||
const u_char *p, *m;
|
||||
|
||||
/*
|
||||
* This array takes less than 256 sequential bytes,
|
||||
* and if typical CPU cache line size is 64 bytes,
|
||||
* it is prefetched for 4 load operations.
|
||||
*/
|
||||
static const struct {
|
||||
u_char len;
|
||||
const u_char method[11];
|
||||
uint32_t value;
|
||||
} tests[] = {
|
||||
{ 3, "GET", NGX_HTTP_GET },
|
||||
{ 4, "POST", NGX_HTTP_POST },
|
||||
{ 4, "HEAD", NGX_HTTP_HEAD },
|
||||
{ 7, "OPTIONS", NGX_HTTP_OPTIONS },
|
||||
{ 8, "PROPFIND", NGX_HTTP_PROPFIND },
|
||||
{ 3, "PUT", NGX_HTTP_PUT },
|
||||
{ 5, "MKCOL", NGX_HTTP_MKCOL },
|
||||
{ 6, "DELETE", NGX_HTTP_DELETE },
|
||||
{ 4, "COPY", NGX_HTTP_COPY },
|
||||
{ 4, "MOVE", NGX_HTTP_MOVE },
|
||||
{ 9, "PROPPATCH", NGX_HTTP_PROPPATCH },
|
||||
{ 4, "LOCK", NGX_HTTP_LOCK },
|
||||
{ 6, "UNLOCK", NGX_HTTP_UNLOCK },
|
||||
{ 5, "PATCH", NGX_HTTP_PATCH },
|
||||
{ 5, "TRACE", NGX_HTTP_TRACE },
|
||||
{ 7, "CONNECT", NGX_HTTP_CONNECT }
|
||||
}, *test;
|
||||
|
||||
if (r->method_name.len) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent duplicate :method header");
|
||||
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
|
||||
if (value->len == 0) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent empty :method header");
|
||||
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
|
||||
r->method_name.len = value->len;
|
||||
r->method_name.data = value->data;
|
||||
|
||||
len = r->method_name.len;
|
||||
n = sizeof(tests) / sizeof(tests[0]);
|
||||
test = tests;
|
||||
|
||||
do {
|
||||
if (len == test->len) {
|
||||
p = r->method_name.data;
|
||||
m = test->method;
|
||||
k = len;
|
||||
|
||||
do {
|
||||
if (*p++ != *m++) {
|
||||
goto next;
|
||||
}
|
||||
} while (--k);
|
||||
|
||||
r->method = test->value;
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
next:
|
||||
test++;
|
||||
|
||||
} while (--n);
|
||||
|
||||
p = r->method_name.data;
|
||||
|
||||
do {
|
||||
if ((*p < 'A' || *p > 'Z') && *p != '_' && *p != '-') {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent invalid method: \"%V\"",
|
||||
&r->method_name);
|
||||
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
|
||||
p++;
|
||||
|
||||
} while (--len);
|
||||
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_http_v23_parse_scheme(ngx_http_request_t *r, ngx_str_t *value)
|
||||
{
|
||||
u_char c, ch;
|
||||
ngx_uint_t i;
|
||||
|
||||
if (r->schema.len) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent duplicate :scheme header");
|
||||
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
|
||||
if (value->len == 0) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent empty :scheme header");
|
||||
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
|
||||
for (i = 0; i < value->len; i++) {
|
||||
ch = value->data[i];
|
||||
|
||||
c = (u_char) (ch | 0x20);
|
||||
if (c >= 'a' && c <= 'z') {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (((ch >= '0' && ch <= '9') || ch == '+' || ch == '-' || ch == '.')
|
||||
&& i > 0)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent invalid :scheme header: \"%V\"", value);
|
||||
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
|
||||
r->schema = *value;
|
||||
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_http_v23_parse_authority(ngx_http_request_t *r, ngx_str_t *value)
|
||||
{
|
||||
ngx_table_elt_t *h;
|
||||
ngx_http_header_t *hh;
|
||||
ngx_http_core_main_conf_t *cmcf;
|
||||
|
||||
static ngx_str_t host = ngx_string("host");
|
||||
|
||||
h = ngx_list_push(&r->headers_in.headers);
|
||||
if (h == NULL) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
h->hash = ngx_hash(ngx_hash(ngx_hash('h', 'o'), 's'), 't');
|
||||
|
||||
h->key.len = host.len;
|
||||
h->key.data = host.data;
|
||||
|
||||
h->value.len = value->len;
|
||||
h->value.data = value->data;
|
||||
|
||||
h->lowcase_key = host.data;
|
||||
|
||||
cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
|
||||
|
||||
hh = ngx_hash_find(&cmcf->headers_in_hash, h->hash,
|
||||
h->lowcase_key, h->key.len);
|
||||
|
||||
if (hh == NULL) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
if (hh->handler(r, h, hh->offset) != NGX_OK) {
|
||||
/*
|
||||
* request has been finalized already
|
||||
* in ngx_http_process_host()
|
||||
*/
|
||||
return NGX_ABORT;
|
||||
}
|
||||
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
static ngx_int_t
|
||||
ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
|
||||
|
||||
@ -182,6 +182,14 @@ ngx_int_t ngx_http_huff_decode(u_char *state, u_char *src, size_t len,
|
||||
u_char **dst, ngx_uint_t last, ngx_log_t *log);
|
||||
size_t ngx_http_huff_encode(u_char *src, size_t len, u_char *dst,
|
||||
ngx_uint_t lower);
|
||||
/*
|
||||
* Check if a header name and/or value is valid. If the value is valid,
|
||||
* strip leading and trailing space from it.
|
||||
*/
|
||||
ngx_int_t ngx_http_v23_fixup_header(ngx_http_request_t *r,
|
||||
ngx_str_t *name, ngx_str_t *value);
|
||||
ngx_int_t ngx_http_v23_pseudo_header(ngx_http_request_t *r,
|
||||
ngx_str_t *name, ngx_str_t *value);
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
@ -10,6 +10,11 @@
|
||||
#include <ngx_http.h>
|
||||
|
||||
|
||||
#if (NGX_HTTP_V2 || NGX_HTTP_V3)
|
||||
static inline ngx_int_t ngx_isspace(u_char ch);
|
||||
#endif
|
||||
|
||||
|
||||
static uint32_t usual[] = {
|
||||
0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */
|
||||
|
||||
@ -972,6 +977,7 @@ ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b,
|
||||
case sw_space_before_value:
|
||||
switch (ch) {
|
||||
case ' ':
|
||||
case '\t':
|
||||
break;
|
||||
case CR:
|
||||
r->header_start = p;
|
||||
@ -996,6 +1002,7 @@ ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b,
|
||||
case sw_value:
|
||||
switch (ch) {
|
||||
case ' ':
|
||||
case '\t':
|
||||
r->header_end = p;
|
||||
state = sw_space_after_value;
|
||||
break;
|
||||
@ -1016,6 +1023,7 @@ ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b,
|
||||
case sw_space_after_value:
|
||||
switch (ch) {
|
||||
case ' ':
|
||||
case '\t':
|
||||
break;
|
||||
case CR:
|
||||
state = sw_almost_done;
|
||||
@ -1090,6 +1098,129 @@ header_done:
|
||||
}
|
||||
|
||||
|
||||
#if (NGX_HTTP_V2 || NGX_HTTP_V3)
|
||||
|
||||
|
||||
static inline ngx_int_t
|
||||
ngx_isspace(u_char ch)
|
||||
{
|
||||
return ch == ' ' || ch == '\t';
|
||||
}
|
||||
|
||||
|
||||
ngx_int_t
|
||||
ngx_http_v23_fixup_header(ngx_http_request_t *r, ngx_str_t *name,
|
||||
ngx_str_t *value)
|
||||
{
|
||||
u_char ch;
|
||||
ngx_str_t tmp;
|
||||
ngx_uint_t i;
|
||||
ngx_http_core_srv_conf_t *cscf;
|
||||
|
||||
r->invalid_header = 0;
|
||||
|
||||
cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
|
||||
|
||||
if (name->len < 1) {
|
||||
ngx_log_error(NGX_LOG_EMERG, r->connection->log, 0,
|
||||
"BUG: internal zero-length header name");
|
||||
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
for (i = (name->data[0] == ':'); i != name->len; i++) {
|
||||
ch = name->data[i];
|
||||
|
||||
if ((ch >= 'a' && ch <= 'z')
|
||||
|| (ch == '-')
|
||||
|| (ch >= '0' && ch <= '9')
|
||||
|| (ch == '_' && cscf->underscores_in_headers))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (ch <= 0x20 || ch == 0x7f || ch == ':'
|
||||
|| (ch >= 'A' && ch <= 'Z'))
|
||||
{
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent invalid header name: \"%V\"",
|
||||
name);
|
||||
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
r->invalid_header = 1;
|
||||
}
|
||||
|
||||
/* Keep subsequent code from having to special-case empty strings. */
|
||||
if (value->len == 0) {
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
for (i = 0; i != value->len; i++) {
|
||||
ch = value->data[i];
|
||||
|
||||
if (ch == '\0' || ch == LF || ch == CR) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent header \"%V\" with "
|
||||
"invalid value: \"%V\"",
|
||||
name, value);
|
||||
|
||||
return NGX_ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
tmp = *value;
|
||||
|
||||
if (!ngx_isspace(tmp.data[0])
|
||||
&& !ngx_isspace(tmp.data[tmp.len - 1])) {
|
||||
/* Fast path: nothing to strip. */
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
/*
|
||||
* Strip trailing whitespace. Do this first so that
|
||||
* if the string is all whitespace, tmp.data is not a
|
||||
* past-the-end pointer, which cannot be safely passed
|
||||
* to memmove(). After the loop, the string is either
|
||||
* empty or ends with a non-whitespace character.
|
||||
*/
|
||||
while (tmp.len && ngx_isspace(tmp.data[tmp.len - 1])) {
|
||||
tmp.len--;
|
||||
}
|
||||
|
||||
/* Strip leading whitespace */
|
||||
if (tmp.len && ngx_isspace(tmp.data[0])) {
|
||||
/*
|
||||
* Last loop guaranteed that 'tmp' does not end with whitespace, and
|
||||
* this check guarantees it is not empty and starts with whitespace.
|
||||
* Therefore, 'tmp' must end with a non-whitespace character, and must
|
||||
* be of length at least 2. This means that it is safe to keep going
|
||||
* until a non-whitespace character is found.
|
||||
*/
|
||||
do {
|
||||
tmp.len--;
|
||||
tmp.data++;
|
||||
} while (ngx_isspace(tmp.data[0]));
|
||||
|
||||
/* Move remaining string to start of buffer. */
|
||||
memmove(value->data, tmp.data, tmp.len);
|
||||
}
|
||||
|
||||
/*
|
||||
* NUL-pad the data, so that if it was NUL-terminated before, it stil is.
|
||||
* At least one byte will have been stripped, so value->data + tmp.len
|
||||
* is not a past-the-end pointer.
|
||||
*/
|
||||
memset(value->data + tmp.len, '\0', value->len - tmp.len);
|
||||
|
||||
/* Fix up length and return. */
|
||||
value->len = tmp.len;
|
||||
return NGX_OK;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
ngx_int_t
|
||||
ngx_http_parse_uri(ngx_http_request_t *r)
|
||||
{
|
||||
|
||||
@ -2015,9 +2015,9 @@ ngx_http_process_request_header(ngx_http_request_t *r)
|
||||
}
|
||||
|
||||
if (r->headers_in.transfer_encoding) {
|
||||
if (r->http_version < NGX_HTTP_VERSION_11) {
|
||||
if (r->http_version != NGX_HTTP_VERSION_11) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent HTTP/1.0 request with "
|
||||
"client sent non-HTTP/1.1 request with "
|
||||
"\"Transfer-Encoding\" header");
|
||||
ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
|
||||
return NGX_ERROR;
|
||||
|
||||
@ -142,18 +142,6 @@ static ngx_http_v2_out_frame_t *ngx_http_v2_get_frame(
|
||||
static ngx_int_t ngx_http_v2_frame_handler(ngx_http_v2_connection_t *h2c,
|
||||
ngx_http_v2_out_frame_t *frame);
|
||||
|
||||
static ngx_int_t ngx_http_v2_validate_header(ngx_http_request_t *r,
|
||||
ngx_http_v2_header_t *header);
|
||||
static ngx_int_t ngx_http_v2_pseudo_header(ngx_http_request_t *r,
|
||||
ngx_http_v2_header_t *header);
|
||||
static ngx_int_t ngx_http_v2_parse_path(ngx_http_request_t *r,
|
||||
ngx_str_t *value);
|
||||
static ngx_int_t ngx_http_v2_parse_method(ngx_http_request_t *r,
|
||||
ngx_str_t *value);
|
||||
static ngx_int_t ngx_http_v2_parse_scheme(ngx_http_request_t *r,
|
||||
ngx_str_t *value);
|
||||
static ngx_int_t ngx_http_v2_parse_authority(ngx_http_request_t *r,
|
||||
ngx_str_t *value);
|
||||
static ngx_int_t ngx_http_v2_construct_request_line(ngx_http_request_t *r);
|
||||
static ngx_int_t ngx_http_v2_cookie(ngx_http_request_t *r,
|
||||
ngx_http_v2_header_t *header);
|
||||
@ -1774,13 +1762,13 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos,
|
||||
fc = r->connection;
|
||||
|
||||
/* TODO Optimization: validate headers while parsing. */
|
||||
if (ngx_http_v2_validate_header(r, header) != NGX_OK) {
|
||||
if (ngx_http_v23_fixup_header(r, &header->name, &header->value) != NGX_OK) {
|
||||
ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (header->name.data[0] == ':') {
|
||||
rc = ngx_http_v2_pseudo_header(r, header);
|
||||
rc = ngx_http_v23_pseudo_header(r, &header->name, &header->value);
|
||||
|
||||
if (rc == NGX_OK) {
|
||||
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
|
||||
@ -1794,11 +1782,6 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos,
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (rc == NGX_DECLINED) {
|
||||
ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
|
||||
goto error;
|
||||
}
|
||||
|
||||
return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
|
||||
}
|
||||
|
||||
@ -3231,334 +3214,6 @@ ngx_http_v2_get_closed_node(ngx_http_v2_connection_t *h2c)
|
||||
return node;
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_http_v2_validate_header(ngx_http_request_t *r, ngx_http_v2_header_t *header)
|
||||
{
|
||||
u_char ch;
|
||||
ngx_uint_t i;
|
||||
ngx_http_core_srv_conf_t *cscf;
|
||||
|
||||
r->invalid_header = 0;
|
||||
|
||||
cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
|
||||
|
||||
for (i = (header->name.data[0] == ':'); i != header->name.len; i++) {
|
||||
ch = header->name.data[i];
|
||||
|
||||
if ((ch >= 'a' && ch <= 'z')
|
||||
|| (ch == '-')
|
||||
|| (ch >= '0' && ch <= '9')
|
||||
|| (ch == '_' && cscf->underscores_in_headers))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (ch <= 0x20 || ch == 0x7f || ch == ':'
|
||||
|| (ch >= 'A' && ch <= 'Z'))
|
||||
{
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent invalid header name: \"%V\"",
|
||||
&header->name);
|
||||
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
r->invalid_header = 1;
|
||||
}
|
||||
|
||||
for (i = 0; i != header->value.len; i++) {
|
||||
ch = header->value.data[i];
|
||||
|
||||
if (ch == '\0' || ch == LF || ch == CR) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent header \"%V\" with "
|
||||
"invalid value: \"%V\"",
|
||||
&header->name, &header->value);
|
||||
|
||||
return NGX_ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_http_v2_pseudo_header(ngx_http_request_t *r, ngx_http_v2_header_t *header)
|
||||
{
|
||||
header->name.len--;
|
||||
header->name.data++;
|
||||
|
||||
switch (header->name.len) {
|
||||
case 4:
|
||||
if (ngx_memcmp(header->name.data, "path", sizeof("path") - 1)
|
||||
== 0)
|
||||
{
|
||||
return ngx_http_v2_parse_path(r, &header->value);
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 6:
|
||||
if (ngx_memcmp(header->name.data, "method", sizeof("method") - 1)
|
||||
== 0)
|
||||
{
|
||||
return ngx_http_v2_parse_method(r, &header->value);
|
||||
}
|
||||
|
||||
if (ngx_memcmp(header->name.data, "scheme", sizeof("scheme") - 1)
|
||||
== 0)
|
||||
{
|
||||
return ngx_http_v2_parse_scheme(r, &header->value);
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 9:
|
||||
if (ngx_memcmp(header->name.data, "authority", sizeof("authority") - 1)
|
||||
== 0)
|
||||
{
|
||||
return ngx_http_v2_parse_authority(r, &header->value);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent unknown pseudo-header \":%V\"",
|
||||
&header->name);
|
||||
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_http_v2_parse_path(ngx_http_request_t *r, ngx_str_t *value)
|
||||
{
|
||||
if (r->unparsed_uri.len) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent duplicate :path header");
|
||||
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
|
||||
if (value->len == 0) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent empty :path header");
|
||||
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
|
||||
r->uri_start = value->data;
|
||||
r->uri_end = value->data + value->len;
|
||||
|
||||
if (ngx_http_parse_uri(r) != NGX_OK) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent invalid :path header: \"%V\"", value);
|
||||
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
|
||||
if (ngx_http_process_request_uri(r) != NGX_OK) {
|
||||
/*
|
||||
* request has been finalized already
|
||||
* in ngx_http_process_request_uri()
|
||||
*/
|
||||
return NGX_ABORT;
|
||||
}
|
||||
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_http_v2_parse_method(ngx_http_request_t *r, ngx_str_t *value)
|
||||
{
|
||||
size_t k, len;
|
||||
ngx_uint_t n;
|
||||
const u_char *p, *m;
|
||||
|
||||
/*
|
||||
* This array takes less than 256 sequential bytes,
|
||||
* and if typical CPU cache line size is 64 bytes,
|
||||
* it is prefetched for 4 load operations.
|
||||
*/
|
||||
static const struct {
|
||||
u_char len;
|
||||
const u_char method[11];
|
||||
uint32_t value;
|
||||
} tests[] = {
|
||||
{ 3, "GET", NGX_HTTP_GET },
|
||||
{ 4, "POST", NGX_HTTP_POST },
|
||||
{ 4, "HEAD", NGX_HTTP_HEAD },
|
||||
{ 7, "OPTIONS", NGX_HTTP_OPTIONS },
|
||||
{ 8, "PROPFIND", NGX_HTTP_PROPFIND },
|
||||
{ 3, "PUT", NGX_HTTP_PUT },
|
||||
{ 5, "MKCOL", NGX_HTTP_MKCOL },
|
||||
{ 6, "DELETE", NGX_HTTP_DELETE },
|
||||
{ 4, "COPY", NGX_HTTP_COPY },
|
||||
{ 4, "MOVE", NGX_HTTP_MOVE },
|
||||
{ 9, "PROPPATCH", NGX_HTTP_PROPPATCH },
|
||||
{ 4, "LOCK", NGX_HTTP_LOCK },
|
||||
{ 6, "UNLOCK", NGX_HTTP_UNLOCK },
|
||||
{ 5, "PATCH", NGX_HTTP_PATCH },
|
||||
{ 5, "TRACE", NGX_HTTP_TRACE },
|
||||
{ 7, "CONNECT", NGX_HTTP_CONNECT }
|
||||
}, *test;
|
||||
|
||||
if (r->method_name.len) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent duplicate :method header");
|
||||
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
|
||||
if (value->len == 0) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent empty :method header");
|
||||
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
|
||||
r->method_name.len = value->len;
|
||||
r->method_name.data = value->data;
|
||||
|
||||
len = r->method_name.len;
|
||||
n = sizeof(tests) / sizeof(tests[0]);
|
||||
test = tests;
|
||||
|
||||
do {
|
||||
if (len == test->len) {
|
||||
p = r->method_name.data;
|
||||
m = test->method;
|
||||
k = len;
|
||||
|
||||
do {
|
||||
if (*p++ != *m++) {
|
||||
goto next;
|
||||
}
|
||||
} while (--k);
|
||||
|
||||
r->method = test->value;
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
next:
|
||||
test++;
|
||||
|
||||
} while (--n);
|
||||
|
||||
p = r->method_name.data;
|
||||
|
||||
do {
|
||||
if ((*p < 'A' || *p > 'Z') && *p != '_' && *p != '-') {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent invalid method: \"%V\"",
|
||||
&r->method_name);
|
||||
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
|
||||
p++;
|
||||
|
||||
} while (--len);
|
||||
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_http_v2_parse_scheme(ngx_http_request_t *r, ngx_str_t *value)
|
||||
{
|
||||
u_char c, ch;
|
||||
ngx_uint_t i;
|
||||
|
||||
if (r->schema.len) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent duplicate :scheme header");
|
||||
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
|
||||
if (value->len == 0) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent empty :scheme header");
|
||||
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
|
||||
for (i = 0; i < value->len; i++) {
|
||||
ch = value->data[i];
|
||||
|
||||
c = (u_char) (ch | 0x20);
|
||||
if (c >= 'a' && c <= 'z') {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (((ch >= '0' && ch <= '9') || ch == '+' || ch == '-' || ch == '.')
|
||||
&& i > 0)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent invalid :scheme header: \"%V\"", value);
|
||||
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
|
||||
r->schema = *value;
|
||||
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_http_v2_parse_authority(ngx_http_request_t *r, ngx_str_t *value)
|
||||
{
|
||||
ngx_table_elt_t *h;
|
||||
ngx_http_header_t *hh;
|
||||
ngx_http_core_main_conf_t *cmcf;
|
||||
|
||||
static ngx_str_t host = ngx_string("host");
|
||||
|
||||
h = ngx_list_push(&r->headers_in.headers);
|
||||
if (h == NULL) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
h->hash = ngx_hash(ngx_hash(ngx_hash('h', 'o'), 's'), 't');
|
||||
|
||||
h->key.len = host.len;
|
||||
h->key.data = host.data;
|
||||
|
||||
h->value.len = value->len;
|
||||
h->value.data = value->data;
|
||||
|
||||
h->lowcase_key = host.data;
|
||||
|
||||
cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
|
||||
|
||||
hh = ngx_hash_find(&cmcf->headers_in_hash, h->hash,
|
||||
h->lowcase_key, h->key.len);
|
||||
|
||||
if (hh == NULL) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
if (hh->handler(r, h, hh->offset) != NGX_OK) {
|
||||
/*
|
||||
* request has been finalized already
|
||||
* in ngx_http_process_host()
|
||||
*/
|
||||
return NGX_ABORT;
|
||||
}
|
||||
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_http_v2_construct_request_line(ngx_http_request_t *r)
|
||||
{
|
||||
|
||||
@ -17,8 +17,6 @@ static void ngx_http_v3_cleanup_request(void *data);
|
||||
static void ngx_http_v3_process_request(ngx_event_t *rev);
|
||||
static ngx_int_t ngx_http_v3_process_header(ngx_http_request_t *r,
|
||||
ngx_str_t *name, ngx_str_t *value);
|
||||
static ngx_int_t ngx_http_v3_validate_header(ngx_http_request_t *r,
|
||||
ngx_str_t *name, ngx_str_t *value);
|
||||
static ngx_int_t ngx_http_v3_process_pseudo_header(ngx_http_request_t *r,
|
||||
ngx_str_t *name, ngx_str_t *value);
|
||||
static ngx_int_t ngx_http_v3_init_pseudo_headers(ngx_http_request_t *r);
|
||||
@ -30,31 +28,6 @@ static ngx_int_t ngx_http_v3_do_read_client_request_body(ngx_http_request_t *r);
|
||||
static ngx_int_t ngx_http_v3_request_body_filter(ngx_http_request_t *r,
|
||||
ngx_chain_t *in);
|
||||
|
||||
|
||||
static const struct {
|
||||
ngx_str_t name;
|
||||
ngx_uint_t method;
|
||||
} ngx_http_v3_methods[] = {
|
||||
|
||||
{ ngx_string("GET"), NGX_HTTP_GET },
|
||||
{ ngx_string("POST"), NGX_HTTP_POST },
|
||||
{ ngx_string("HEAD"), NGX_HTTP_HEAD },
|
||||
{ ngx_string("OPTIONS"), NGX_HTTP_OPTIONS },
|
||||
{ ngx_string("PROPFIND"), NGX_HTTP_PROPFIND },
|
||||
{ ngx_string("PUT"), NGX_HTTP_PUT },
|
||||
{ ngx_string("MKCOL"), NGX_HTTP_MKCOL },
|
||||
{ ngx_string("DELETE"), NGX_HTTP_DELETE },
|
||||
{ ngx_string("COPY"), NGX_HTTP_COPY },
|
||||
{ ngx_string("MOVE"), NGX_HTTP_MOVE },
|
||||
{ ngx_string("PROPPATCH"), NGX_HTTP_PROPPATCH },
|
||||
{ ngx_string("LOCK"), NGX_HTTP_LOCK },
|
||||
{ ngx_string("UNLOCK"), NGX_HTTP_UNLOCK },
|
||||
{ ngx_string("PATCH"), NGX_HTTP_PATCH },
|
||||
{ ngx_string("TRACE"), NGX_HTTP_TRACE },
|
||||
{ ngx_string("CONNECT"), NGX_HTTP_CONNECT }
|
||||
};
|
||||
|
||||
|
||||
void
|
||||
ngx_http_v3_init_stream(ngx_connection_t *c)
|
||||
{
|
||||
@ -391,6 +364,14 @@ ngx_http_v3_wait_request_handler(ngx_event_t *rev)
|
||||
c->data = r;
|
||||
c->requests = (c->quic->id >> 2) + 1;
|
||||
|
||||
if (ngx_list_init(&r->headers_in.headers, r->pool, 20,
|
||||
sizeof(ngx_table_elt_t))
|
||||
!= NGX_OK)
|
||||
{
|
||||
ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
|
||||
return;
|
||||
}
|
||||
|
||||
cln = ngx_pool_cleanup_add(r->pool, 0);
|
||||
if (cln == NULL) {
|
||||
ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
|
||||
@ -632,11 +613,15 @@ ngx_http_v3_process_header(ngx_http_request_t *r, ngx_str_t *name,
|
||||
|
||||
r->v3_parse->header_limit -= len;
|
||||
|
||||
if (ngx_http_v3_validate_header(r, name, value) != NGX_OK) {
|
||||
if (ngx_http_v23_fixup_header(r, name, value) != NGX_OK) {
|
||||
ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
if (name->len && name->data[0] == ':') {
|
||||
return ngx_http_v3_process_pseudo_header(r, name, value);
|
||||
}
|
||||
|
||||
if (r->invalid_header) {
|
||||
cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
|
||||
|
||||
@ -648,10 +633,6 @@ ngx_http_v3_process_header(ngx_http_request_t *r, ngx_str_t *name,
|
||||
}
|
||||
}
|
||||
|
||||
if (name->len && name->data[0] == ':') {
|
||||
return ngx_http_v3_process_pseudo_header(r, name, value);
|
||||
}
|
||||
|
||||
if (ngx_http_v3_init_pseudo_headers(r) != NGX_OK) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
@ -692,210 +673,23 @@ ngx_http_v3_process_header(ngx_http_request_t *r, ngx_str_t *name,
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_http_v3_validate_header(ngx_http_request_t *r, ngx_str_t *name,
|
||||
ngx_str_t *value)
|
||||
{
|
||||
u_char ch;
|
||||
ngx_uint_t i;
|
||||
ngx_http_core_srv_conf_t *cscf;
|
||||
|
||||
r->invalid_header = 0;
|
||||
|
||||
cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
|
||||
|
||||
for (i = (name->data[0] == ':'); i != name->len; i++) {
|
||||
ch = name->data[i];
|
||||
|
||||
if ((ch >= 'a' && ch <= 'z')
|
||||
|| (ch == '-')
|
||||
|| (ch >= '0' && ch <= '9')
|
||||
|| (ch == '_' && cscf->underscores_in_headers))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (ch <= 0x20 || ch == 0x7f || ch == ':'
|
||||
|| (ch >= 'A' && ch <= 'Z'))
|
||||
{
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent invalid header name: \"%V\"", name);
|
||||
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
r->invalid_header = 1;
|
||||
}
|
||||
|
||||
for (i = 0; i != value->len; i++) {
|
||||
ch = value->data[i];
|
||||
|
||||
if (ch == '\0' || ch == LF || ch == CR) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent header \"%V\" with "
|
||||
"invalid value: \"%V\"", name, value);
|
||||
|
||||
return NGX_ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_http_v3_process_pseudo_header(ngx_http_request_t *r, ngx_str_t *name,
|
||||
ngx_str_t *value)
|
||||
{
|
||||
u_char ch, c;
|
||||
ngx_uint_t i;
|
||||
|
||||
if (r->request_line.len) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent out of order pseudo-headers");
|
||||
goto failed;
|
||||
}
|
||||
|
||||
if (name->len == 7 && ngx_strncmp(name->data, ":method", 7) == 0) {
|
||||
|
||||
if (r->method_name.len) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent duplicate \":method\" header");
|
||||
goto failed;
|
||||
}
|
||||
|
||||
if (value->len == 0) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent empty \":method\" header");
|
||||
goto failed;
|
||||
}
|
||||
|
||||
r->method_name = *value;
|
||||
|
||||
for (i = 0; i < sizeof(ngx_http_v3_methods)
|
||||
/ sizeof(ngx_http_v3_methods[0]); i++)
|
||||
{
|
||||
if (value->len == ngx_http_v3_methods[i].name.len
|
||||
&& ngx_strncmp(value->data,
|
||||
ngx_http_v3_methods[i].name.data, value->len)
|
||||
== 0)
|
||||
{
|
||||
r->method = ngx_http_v3_methods[i].method;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < value->len; i++) {
|
||||
ch = value->data[i];
|
||||
|
||||
if ((ch < 'A' || ch > 'Z') && ch != '_' && ch != '-') {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent invalid method: \"%V\"", value);
|
||||
goto failed;
|
||||
}
|
||||
}
|
||||
|
||||
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
|
||||
"http3 method \"%V\" %ui", value, r->method);
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
if (name->len == 5 && ngx_strncmp(name->data, ":path", 5) == 0) {
|
||||
|
||||
if (r->uri_start) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent duplicate \":path\" header");
|
||||
goto failed;
|
||||
}
|
||||
|
||||
if (value->len == 0) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent empty \":path\" header");
|
||||
goto failed;
|
||||
}
|
||||
|
||||
r->uri_start = value->data;
|
||||
r->uri_end = value->data + value->len;
|
||||
|
||||
if (ngx_http_parse_uri(r) != NGX_OK) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent invalid \":path\" header: \"%V\"",
|
||||
value);
|
||||
goto failed;
|
||||
}
|
||||
|
||||
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
|
||||
"http3 path \"%V\"", value);
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
if (name->len == 7 && ngx_strncmp(name->data, ":scheme", 7) == 0) {
|
||||
|
||||
if (r->schema.len) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent duplicate \":scheme\" header");
|
||||
goto failed;
|
||||
}
|
||||
|
||||
if (value->len == 0) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent empty \":scheme\" header");
|
||||
goto failed;
|
||||
}
|
||||
|
||||
for (i = 0; i < value->len; i++) {
|
||||
ch = value->data[i];
|
||||
|
||||
c = (u_char) (ch | 0x20);
|
||||
if (c >= 'a' && c <= 'z') {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (((ch >= '0' && ch <= '9')
|
||||
|| ch == '+' || ch == '-' || ch == '.')
|
||||
&& i > 0)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent invalid \":scheme\" header: \"%V\"",
|
||||
value);
|
||||
goto failed;
|
||||
}
|
||||
|
||||
r->schema = *value;
|
||||
|
||||
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
|
||||
"http3 schema \"%V\"", value);
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
if (name->len == 10 && ngx_strncmp(name->data, ":authority", 10) == 0) {
|
||||
|
||||
if (r->host_start) {
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent duplicate \":authority\" header");
|
||||
goto failed;
|
||||
}
|
||||
|
||||
r->host_start = value->data;
|
||||
r->host_end = value->data + value->len;
|
||||
|
||||
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
|
||||
"http3 authority \"%V\"", value);
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||
"client sent unknown pseudo-header \"%V\"", name);
|
||||
|
||||
failed:
|
||||
|
||||
ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
if (ngx_http_v23_pseudo_header(r, name, value) != NGX_OK) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_http_v3_init_pseudo_headers(ngx_http_request_t *r)
|
||||
@ -981,14 +775,6 @@ ngx_http_v3_init_pseudo_headers(ngx_http_request_t *r)
|
||||
r->headers_in.server = host;
|
||||
}
|
||||
|
||||
if (ngx_list_init(&r->headers_in.headers, r->pool, 20,
|
||||
sizeof(ngx_table_elt_t))
|
||||
!= NGX_OK)
|
||||
{
|
||||
ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
return NGX_OK;
|
||||
|
||||
failed:
|
||||
@ -1028,38 +814,11 @@ ngx_http_v3_process_request_header(ngx_http_request_t *r)
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
if (r->headers_in.server.len == 0) {
|
||||
ngx_log_error(NGX_LOG_INFO, c->log, 0,
|
||||
"client sent neither \":authority\" nor \"Host\" header");
|
||||
goto failed;
|
||||
if (ngx_http_process_request_header(r) != NGX_OK) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
if (r->headers_in.host) {
|
||||
if (r->headers_in.host->value.len != r->headers_in.server.len
|
||||
|| ngx_memcmp(r->headers_in.host->value.data,
|
||||
r->headers_in.server.data,
|
||||
r->headers_in.server.len)
|
||||
!= 0)
|
||||
{
|
||||
ngx_log_error(NGX_LOG_INFO, c->log, 0,
|
||||
"client sent \":authority\" and \"Host\" headers "
|
||||
"with different values");
|
||||
goto failed;
|
||||
}
|
||||
}
|
||||
|
||||
if (r->headers_in.content_length) {
|
||||
r->headers_in.content_length_n =
|
||||
ngx_atoof(r->headers_in.content_length->value.data,
|
||||
r->headers_in.content_length->value.len);
|
||||
|
||||
if (r->headers_in.content_length_n == NGX_ERROR) {
|
||||
ngx_log_error(NGX_LOG_INFO, c->log, 0,
|
||||
"client sent invalid \"Content-Length\" header");
|
||||
goto failed;
|
||||
}
|
||||
|
||||
} else {
|
||||
if (!r->headers_in.content_length) {
|
||||
b = r->header_in;
|
||||
n = b->last - b->pos;
|
||||
|
||||
@ -1082,24 +841,7 @@ ngx_http_v3_process_request_header(ngx_http_request_t *r)
|
||||
}
|
||||
}
|
||||
|
||||
if (r->method == NGX_HTTP_CONNECT) {
|
||||
ngx_log_error(NGX_LOG_INFO, c->log, 0, "client sent CONNECT method");
|
||||
ngx_http_finalize_request(r, NGX_HTTP_NOT_ALLOWED);
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
if (r->method == NGX_HTTP_TRACE) {
|
||||
ngx_log_error(NGX_LOG_INFO, c->log, 0, "client sent TRACE method");
|
||||
ngx_http_finalize_request(r, NGX_HTTP_NOT_ALLOWED);
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
return NGX_OK;
|
||||
|
||||
failed:
|
||||
|
||||
ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user