kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix userauth for real

This commit is contained in:
Anthony Minessale 2010-12-29 14:44:05 -06:00
parent 39ff276c1c
commit 534d3bcb29
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/mod/event_handlers/mod_event_socket/mod_event_socket.c
View File

@ -1452,7 +1452,7 @@ static switch_bool_t auth_api_command(listener_t *listener, const char *api_cmd,
switch_bool_t ok = SWITCH_TRUE; switch_bool_t ok = SWITCH_TRUE;
top: top:
if (!switch_core_hash_find(listener->allowed_api_hash, check_cmd)) { if (!switch_core_hash_find(listener->allowed_api_hash, check_cmd)) {
ok = SWITCH_FALSE; ok = SWITCH_FALSE;
goto end; goto end;
@ -1556,12 +1556,16 @@ static switch_status_t parse_command(listener_t *listener, switch_event_t **even
user = cmd + 9; user = cmd + 9;
if ((pass = strchr(user, ':'))) { if ((domain_name = strchr(user, '@'))) {
*domain_name++ = '\0';
}
if ((pass = strchr(domain_name, ':'))) {
*pass++ = '\0'; *pass++ = '\0';
} }
if ((domain_name = strchr(user, '@'))) { if ((pass = strchr(user, ':'))) {
*domain_name++ = '\0'; *pass++ = '\0';
} }
if (zstr(user) || zstr(domain_name)) { if (zstr(user) || zstr(domain_name)) {
@ -2044,21 +2048,31 @@ static switch_status_t parse_command(listener_t *listener, switch_event_t **even
char *arg = NULL; char *arg = NULL;
strip_cr(api_cmd); strip_cr(api_cmd);
if (!(acs.console_execute = switch_true(console_execute))) {
if ((arg = strchr(api_cmd, ' '))) {
*arg++ = '\0';
}
}
if (listener->allowed_api_hash) { if (listener->allowed_api_hash) {
if (!auth_api_command(listener, api_cmd, arg)) { char *api_copy = strdup(api_cmd);
char *arg_copy = NULL;
int ok = 0;
if ((arg_copy = strchr(api_copy, ' '))) {
*arg_copy++ = '\0';
}
ok = auth_api_command(listener, api_copy, arg_copy);
free(api_copy);
if (!ok) {
switch_snprintf(reply, reply_len, "-ERR permission denied"); switch_snprintf(reply, reply_len, "-ERR permission denied");
status = SWITCH_STATUS_SUCCESS; status = SWITCH_STATUS_SUCCESS;
goto done; goto done;
} }
} }
if (!(acs.console_execute = switch_true(console_execute))) {
if ((arg = strchr(api_cmd, ' '))) {
*arg++ = '\0';
}
}
acs.listener = listener; acs.listener = listener;
acs.api_cmd = api_cmd; acs.api_cmd = api_cmd;
acs.arg = arg; acs.arg = arg;