technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Handling routing errors.

Browse Source
This commit is contained in:
Igor Sysoev
2019-05-30 15:33:51 +03:00
parent 0ba7cfce75
commit 16273cf1c6
3 changed files with 51 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/nxt_http_request.c
View File

@@ -295,27 +295,24 @@ nxt_http_request_pass(nxt_task_t *task, void *obj, void *data)
pass = r->conf->socket_conf->pass; pass = r->conf->socket_conf->pass;
if (nxt_slow_path(pass == NULL)) { if (nxt_fast_path(pass != NULL)) {
goto fail;
do {
nxt_debug(task, "http request route: %V", &pass->name);
pass = pass->handler(task, r, pass);
if (pass == NULL) {
return;
}
if (pass == NXT_HTTP_PASS_ERROR) {
break;
}
} while (r->pass_count++ < 255);
} }
for ( ;; ) {
nxt_debug(task, "http request route: %V", &pass->name);
pass = pass->handler(task, r, pass);
if (pass == NULL) {
break;
}
if (nxt_slow_path(r->pass_count++ == 255)) {
goto fail;
}
}
return;
fail:
nxt_http_request_error(task, r, NXT_HTTP_INTERNAL_SERVER_ERROR); nxt_http_request_error(task, r, NXT_HTTP_INTERNAL_SERVER_ERROR);
} }

59
src/nxt_http_route.c
View File

@@ -147,19 +147,19 @@ static nxt_http_pass_t *nxt_http_route_pass(nxt_task_t *task,
nxt_http_request_t *r, nxt_http_pass_t *start); nxt_http_request_t *r, nxt_http_pass_t *start);
static nxt_http_pass_t *nxt_http_route_match(nxt_http_request_t *r, static nxt_http_pass_t *nxt_http_route_match(nxt_http_request_t *r,
nxt_http_route_match_t *match); nxt_http_route_match_t *match);
static nxt_bool_t nxt_http_route_table(nxt_http_request_t *r, static nxt_int_t nxt_http_route_table(nxt_http_request_t *r,
nxt_http_route_table_t *table); nxt_http_route_table_t *table);
static nxt_bool_t nxt_http_route_ruleset(nxt_http_request_t *r, static nxt_int_t nxt_http_route_ruleset(nxt_http_request_t *r,
nxt_http_route_ruleset_t *ruleset); nxt_http_route_ruleset_t *ruleset);
static nxt_bool_t nxt_http_route_rule(nxt_http_request_t *r, static nxt_int_t nxt_http_route_rule(nxt_http_request_t *r,
nxt_http_route_rule_t *rule); nxt_http_route_rule_t *rule);
static nxt_bool_t nxt_http_route_header(nxt_http_request_t *r, static nxt_int_t nxt_http_route_header(nxt_http_request_t *r,
nxt_http_route_rule_t *rule); nxt_http_route_rule_t *rule);
static nxt_bool_t nxt_http_route_test_rule(nxt_http_request_t *r, static nxt_int_t nxt_http_route_test_rule(nxt_http_request_t *r,
nxt_http_route_rule_t *rule, u_char *start, size_t length); nxt_http_route_rule_t *rule, u_char *start, size_t length);
static nxt_bool_t nxt_http_route_pattern(nxt_http_request_t *r, static nxt_int_t nxt_http_route_pattern(nxt_http_request_t *r,
nxt_http_route_pattern_t *pattern, u_char *start, size_t length); nxt_http_route_pattern_t *pattern, u_char *start, size_t length);
static nxt_bool_t nxt_http_route_memcmp(u_char *start, u_char *test, static nxt_int_t nxt_http_route_memcmp(u_char *start, u_char *test,
size_t length, nxt_bool_t case_sensitive); size_t length, nxt_bool_t case_sensitive);
@@ -942,7 +942,7 @@ nxt_http_route_pass(nxt_task_t *task, nxt_http_request_t *r,
static nxt_http_pass_t * static nxt_http_pass_t *
nxt_http_route_match(nxt_http_request_t *r, nxt_http_route_match_t *match) nxt_http_route_match(nxt_http_request_t *r, nxt_http_route_match_t *match)
{ {
nxt_bool_t ret; nxt_int_t ret;
nxt_http_route_test_t *test, *end; nxt_http_route_test_t *test, *end;
test = &match->test[0]; test = &match->test[0];
@@ -956,8 +956,9 @@ nxt_http_route_match(nxt_http_request_t *r, nxt_http_route_match_t *match)
ret = nxt_http_route_table(r, test->table); ret = nxt_http_route_table(r, test->table);
} }
if (!ret) { if (ret <= 0) {
return NULL; /* 0 => NULL, -1 => NXT_HTTP_PASS_ERROR. */
return (nxt_http_pass_t *) (intptr_t) ret;
} }
test++; test++;
@@ -967,10 +968,10 @@ nxt_http_route_match(nxt_http_request_t *r, nxt_http_route_match_t *match)
} }
static nxt_bool_t static nxt_int_t
nxt_http_route_table(nxt_http_request_t *r, nxt_http_route_table_t *table) nxt_http_route_table(nxt_http_request_t *r, nxt_http_route_table_t *table)
{ {
nxt_bool_t ret; nxt_int_t ret;
nxt_http_route_ruleset_t **ruleset, **end; nxt_http_route_ruleset_t **ruleset, **end;
ret = 1; ret = 1;
@@ -980,7 +981,7 @@ nxt_http_route_table(nxt_http_request_t *r, nxt_http_route_table_t *table)
while (ruleset < end) { while (ruleset < end) {
ret = nxt_http_route_ruleset(r, *ruleset); ret = nxt_http_route_ruleset(r, *ruleset);
if (ret) { if (ret != 0) {
return ret; return ret;
} }
@@ -991,17 +992,20 @@ nxt_http_route_table(nxt_http_request_t *r, nxt_http_route_table_t *table)
} }
static nxt_bool_t static nxt_int_t
nxt_http_route_ruleset(nxt_http_request_t *r, nxt_http_route_ruleset_t *ruleset) nxt_http_route_ruleset(nxt_http_request_t *r, nxt_http_route_ruleset_t *ruleset)
{ {
nxt_int_t ret;
nxt_http_route_rule_t **rule, **end; nxt_http_route_rule_t **rule, **end;
rule = &ruleset->rule[0]; rule = &ruleset->rule[0];
end = rule + ruleset->items; end = rule + ruleset->items;
while (rule < end) { while (rule < end) {
if (!nxt_http_route_rule(r, *rule)) { ret = nxt_http_route_rule(r, *rule);
return 0;
if (ret <= 0) {
return ret;
} }
rule++; rule++;
@@ -1011,7 +1015,7 @@ nxt_http_route_ruleset(nxt_http_request_t *r, nxt_http_route_ruleset_t *ruleset)
} }
static nxt_bool_t static nxt_int_t
nxt_http_route_rule(nxt_http_request_t *r, nxt_http_route_rule_t *rule) nxt_http_route_rule(nxt_http_request_t *r, nxt_http_route_rule_t *rule)
{ {
void *p, **pp; void *p, **pp;
@@ -1056,10 +1060,10 @@ nxt_http_route_rule(nxt_http_request_t *r, nxt_http_route_rule_t *rule)
} }
static nxt_bool_t static nxt_int_t
nxt_http_route_header(nxt_http_request_t *r, nxt_http_route_rule_t *rule) nxt_http_route_header(nxt_http_request_t *r, nxt_http_route_rule_t *rule)
{ {
nxt_bool_t ret; nxt_int_t ret;
nxt_http_field_t *f; nxt_http_field_t *f;
ret = 0; ret = 0;
@@ -1076,7 +1080,7 @@ nxt_http_route_header(nxt_http_request_t *r, nxt_http_route_rule_t *rule)
ret = nxt_http_route_test_rule(r, rule, f->value, f->value_length); ret = nxt_http_route_test_rule(r, rule, f->value, f->value_length);
if (!ret) { if (ret == 0) {
return ret; return ret;
} }
@@ -1086,11 +1090,11 @@ nxt_http_route_header(nxt_http_request_t *r, nxt_http_route_rule_t *rule)
} }
static nxt_bool_t static nxt_int_t
nxt_http_route_test_rule(nxt_http_request_t *r, nxt_http_route_rule_t *rule, nxt_http_route_test_rule(nxt_http_request_t *r, nxt_http_route_rule_t *rule,
u_char *start, size_t length) u_char *start, size_t length)
{ {
nxt_bool_t ret; nxt_int_t ret;
nxt_http_route_pattern_t *pattern, *end; nxt_http_route_pattern_t *pattern, *end;
ret = 1; ret = 1;
@@ -1100,6 +1104,7 @@ nxt_http_route_test_rule(nxt_http_request_t *r, nxt_http_route_rule_t *rule,
while (pattern < end) { while (pattern < end) {
ret = nxt_http_route_pattern(r, pattern, start, length); ret = nxt_http_route_pattern(r, pattern, start, length);
/* nxt_http_route_pattern() returns either 1 or 0. */
ret ^= pattern->negative; ret ^= pattern->negative;
if (pattern->any == ret) { if (pattern->any == ret) {
@@ -1113,13 +1118,13 @@ nxt_http_route_test_rule(nxt_http_request_t *r, nxt_http_route_rule_t *rule,
} }
static nxt_bool_t static nxt_int_t
nxt_http_route_pattern(nxt_http_request_t *r, nxt_http_route_pattern_t *pattern, nxt_http_route_pattern(nxt_http_request_t *r, nxt_http_route_pattern_t *pattern,
u_char *start, size_t length) u_char *start, size_t length)
{ {
u_char *p, *end, *test; u_char *p, *end, *test;
size_t test_length; size_t test_length;
nxt_bool_t ret; nxt_int_t ret;
if (length < pattern->min_length) { if (length < pattern->min_length) {
return 0; return 0;
@@ -1174,7 +1179,7 @@ nxt_http_route_pattern(nxt_http_request_t *r, nxt_http_route_pattern_t *pattern,
} }
static nxt_bool_t static nxt_int_t
nxt_http_route_memcmp(u_char *start, u_char *test, size_t test_length, nxt_http_route_memcmp(u_char *start, u_char *test, size_t test_length,
nxt_bool_t case_sensitive) nxt_bool_t case_sensitive)
{ {

3
src/nxt_router.h
View File

@@ -21,6 +21,9 @@ typedef struct nxt_http_routes_s nxt_http_routes_t;
typedef struct nxt_router_access_log_s nxt_router_access_log_t; typedef struct nxt_router_access_log_s nxt_router_access_log_t;
#define NXT_HTTP_PASS_ERROR ((nxt_http_pass_t *) -1)
typedef struct { typedef struct {
nxt_thread_spinlock_t lock; nxt_thread_spinlock_t lock;
nxt_queue_t engines; nxt_queue_t engines;