kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 07:48:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_ari.c: Prefer exact handler match over wildcard" into 16

Browse Source
This commit is contained in:
Friendly Automation
2019-08-21 07:56:12 -05:00
committed by Gerrit Code Review
parent 51fd43206b f82d0b74fd
commit ad63cb7cef
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
res/res_ari.c
View File

@@ -495,6 +495,7 @@ void ast_ari_invoke(struct ast_tcptls_session_instance *ser,
{ {
RAII_VAR(struct stasis_rest_handlers *, root, NULL, ao2_cleanup); RAII_VAR(struct stasis_rest_handlers *, root, NULL, ao2_cleanup);
struct stasis_rest_handlers *handler; struct stasis_rest_handlers *handler;
struct stasis_rest_handlers *wildcard_handler = NULL;
RAII_VAR(struct ast_variable *, path_vars, NULL, ast_variables_destroy); RAII_VAR(struct ast_variable *, path_vars, NULL, ast_variables_destroy);
char *path = ast_strdupa(uri); char *path = ast_strdupa(uri);
char *path_segment; char *path_segment;
@@ -503,37 +504,49 @@ void ast_ari_invoke(struct ast_tcptls_session_instance *ser,
root = handler = get_root_handler(); root = handler = get_root_handler();
ast_assert(root != NULL); ast_assert(root != NULL);
ast_debug(3, "Finding handler for %s\n", path);
while ((path_segment = strsep(&path, "/")) && (strlen(path_segment) > 0)) { while ((path_segment = strsep(&path, "/")) && (strlen(path_segment) > 0)) {
struct stasis_rest_handlers *found_handler = NULL; struct stasis_rest_handlers *found_handler = NULL;
int i; int i;
ast_uri_decode(path_segment, ast_uri_http_legacy); ast_uri_decode(path_segment, ast_uri_http_legacy);
ast_debug(3, "Finding handler for %s\n", path_segment); ast_debug(3, " Finding handler for %s\n", path_segment);
for (i = 0; found_handler == NULL && i < handler->num_children; ++i) { for (i = 0; found_handler == NULL && i < handler->num_children; ++i) {
struct stasis_rest_handlers *child = handler->children[i]; struct stasis_rest_handlers *child = handler->children[i];
ast_debug(3, " Checking %s\n", child->path_segment);
if (child->is_wildcard) { if (child->is_wildcard) {
/* Record the path variable */ /* Record the path variable */
struct ast_variable *path_var = ast_variable_new(child->path_segment, path_segment, __FILE__); struct ast_variable *path_var = ast_variable_new(child->path_segment, path_segment, __FILE__);
path_var->next = path_vars; path_var->next = path_vars;
path_vars = path_var; path_vars = path_var;
found_handler = child; wildcard_handler = child;
ast_debug(3, " Checking %s %s: Matched wildcard.\n", handler->path_segment, child->path_segment);
} else if (strcmp(child->path_segment, path_segment) == 0) { } else if (strcmp(child->path_segment, path_segment) == 0) {
found_handler = child; found_handler = child;
ast_debug(3, " Checking %s %s: Explicit match with %s\n", handler->path_segment, child->path_segment, path_segment);
} else {
ast_debug(3, " Checking %s %s: Didn't match %s\n", handler->path_segment, child->path_segment, path_segment);
} }
} }
if (!found_handler && wildcard_handler) {
ast_debug(3, " No explicit handler found for %s. Using wildcard %s.\n",
path_segment, wildcard_handler->path_segment);
found_handler = wildcard_handler;
wildcard_handler = NULL;
}
if (found_handler == NULL) { if (found_handler == NULL) {
/* resource not found */ /* resource not found */
ast_debug(3, " Handler not found\n"); ast_debug(3, " Handler not found for %s\n", path_segment);
ast_ari_response_error( ast_ari_response_error(
response, 404, "Not Found", response, 404, "Not Found",
"Resource not found"); "Resource not found");
return; return;
} else { } else {
ast_debug(3, " Got it!\n");
handler = found_handler; handler = found_handler;
} }
} }