sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

res_ari: Fix create request body parameter parsing. 

If parameters were passed in the body as JSON to the
create route they were not being parsed before checking
to ensure that required fields were set.

This change moves the parsing so it occurs before
checking.

ASTERISK-28940

Change-Id: I898b4c3c7ae1cde19a6840e59f498822701cf5cf
This commit is contained in:
sungtae kim 2020-06-09 11:57:24 +00:00 committed by Joshua Colp
parent 51f1f78069
commit a8cef78f09
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
res/ari/resource_channels.c
View File

@ -1790,18 +1790,6 @@ void ast_ari_channels_create(struct ast_variable *headers,
struct ast_format_cap *request_cap;
struct ast_channel *originator;
if (!ast_strlen_zero(args->originator) && !ast_strlen_zero(args->formats)) {
ast_ari_response_error(response, 400, "Bad Request",
"Originator and formats can't both be specified");
return;
}
if (ast_strlen_zero(args->endpoint)) {
ast_ari_response_error(response, 400, "Bad Request",
"Endpoint must be specified");
return;
}
/* Parse any query parameters out of the body parameter */
if (args->variables) {
struct ast_json *json_variables;
@ -1814,6 +1802,18 @@ void ast_ari_channels_create(struct ast_variable *headers,
}
}
if (!ast_strlen_zero(args->originator) && !ast_strlen_zero(args->formats)) {
ast_ari_response_error(response, 400, "Bad Request",
"Originator and formats can't both be specified");
return;
}
if (ast_strlen_zero(args->endpoint)) {
ast_ari_response_error(response, 400, "Bad Request",
"Endpoint must be specified");
return;
}
chan_data = ast_calloc(1, sizeof(*chan_data));
if (!chan_data) {
ast_ari_response_alloc_failed(response);