aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-12-04 14:46:30 -05:00
Code

Fix: Send correct <iceresponse> for admin command manageauth

Browse Source 
Note: This is only done in operation mode strict and for JSON output
      to avoid breaking older clients.
This commit is contained in:
Philipp Schafft 2020-10-11 10:03:22 +00:00
parent 5ca6747db0
commit d388ef1feb
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/admin.c
View File

@ -949,11 +949,10 @@ xmlNodePtr admin_add_role_to_authentication(auth_t *auth, xmlNodePtr parent)
static void command_manageauth(client_t *client, source_t *source, admin_format_t response) static void command_manageauth(client_t *client, source_t *source, admin_format_t response)
{ {
xmlDocPtr doc; xmlDocPtr doc;
xmlNodePtr node, rolenode, usersnode, msgnode; xmlNodePtr node, rolenode, usersnode;
const char *action = NULL; const char *action = NULL;
const char *username = NULL; const char *username = NULL;
const char *idstring = NULL; const char *idstring = NULL;
char *message = NULL;
int ret = AUTH_OK; int ret = AUTH_OK;
int error_id = ICECAST_ERROR_ADMIN_missing_parameter; int error_id = ICECAST_ERROR_ADMIN_missing_parameter;
long unsigned int id; long unsigned int id;
@ -1007,12 +1006,17 @@ static void command_manageauth(client_t *client, source_t *source, admin_format_
} }
ret = auth->adduser(auth, username, password); ret = auth->adduser(auth, username, password);
if (ret == AUTH_FAILED) { if (response == ADMIN_FORMAT_JSON || client->mode == OMODE_STRICT) {
message = strdup("User add failed - check the icecast error log"); if (ret == AUTH_FAILED) {
} else if (ret == AUTH_USERADDED) { admin_send_response_simple(client, source, response, "User add failed - check the icecast error log", 0);
message = strdup("User added"); } else if (ret == AUTH_USERADDED) {
} else if (ret == AUTH_USEREXISTS) { admin_send_response_simple(client, source, response, "User added", 1);
message = strdup("User already exists - not added"); } else if (ret == AUTH_USEREXISTS) {
admin_send_response_simple(client, source, response, "User already exists - not added", 0);
}
config_release_config();
auth_release(auth);
return;
} }
} }
if (!strcmp(action, "delete")) { if (!strcmp(action, "delete")) {
@ -1027,10 +1031,15 @@ static void command_manageauth(client_t *client, source_t *source, admin_format_
} }
ret = auth->deleteuser(auth, username); ret = auth->deleteuser(auth, username);
if (ret == AUTH_FAILED) { if (response == ADMIN_FORMAT_JSON || client->mode == OMODE_STRICT) {
message = strdup("User delete failed - check the icecast error log"); if (ret == AUTH_FAILED) {
} else if (ret == AUTH_USERDELETED) { admin_send_response_simple(client, source, response, "User delete failed - check the icecast error log", 0);
message = strdup("User deleted"); } else if (ret == AUTH_USERDELETED) {
admin_send_response_simple(client, source, response, "User deleted", 1);
}
config_release_config();
auth_release(auth);
return;
} }
} }
@ -1039,11 +1048,6 @@ static void command_manageauth(client_t *client, source_t *source, admin_format_
rolenode = admin_add_role_to_authentication(auth, node); rolenode = admin_add_role_to_authentication(auth, node);
if (message) {
msgnode = admin_build_rootnode(doc, "iceresponse");
xmlNewTextChild(msgnode, NULL, XMLSTR("message"), XMLSTR(message));
}
xmlDocSetRootElement(doc, node); xmlDocSetRootElement(doc, node);
if (auth->listuser) { if (auth->listuser) {
@ -1056,7 +1060,6 @@ static void command_manageauth(client_t *client, source_t *source, admin_format_
admin_send_response(doc, client, response, admin_send_response(doc, client, response,
MANAGEAUTH_HTML_REQUEST); MANAGEAUTH_HTML_REQUEST);
free(message);
xmlFreeDoc(doc); xmlFreeDoc(doc);
return; return;
} while (0); } while (0);