From d388ef1feb18397b5bda7a2f84cd8fa31b8f1aff Mon Sep 17 00:00:00 2001
From: Philipp Schafft <lion@lion.leolix.org>
Date: Sun, 11 Oct 2020 10:03:22 +0000
Subject: [PATCH] Fix: Send correct <iceresponse> for admin command manageauth

Note: This is only done in operation mode strict and for JSON output
      to avoid breaking older clients.
---
 src/admin.c | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/admin.c b/src/admin.c
index aace3423..9232cc57 100644
--- a/src/admin.c
+++ b/src/admin.c
@@ -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)
 {
     xmlDocPtr doc;
-    xmlNodePtr node, rolenode, usersnode, msgnode;
+    xmlNodePtr node, rolenode, usersnode;
     const char *action = NULL;
     const char *username = NULL;
     const char *idstring = NULL;
-    char *message = NULL;
     int ret = AUTH_OK;
     int error_id = ICECAST_ERROR_ADMIN_missing_parameter;
     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);
-            if (ret == AUTH_FAILED) {
-                message = strdup("User add failed - check the icecast error log");
-            } else if (ret == AUTH_USERADDED) {
-                message = strdup("User added");
-            } else if (ret == AUTH_USEREXISTS) {
-                message = strdup("User already exists - not added");
+            if (response == ADMIN_FORMAT_JSON || client->mode == OMODE_STRICT) {
+                if (ret == AUTH_FAILED) {
+                    admin_send_response_simple(client, source, response, "User add failed - check the icecast error log", 0);
+                } else if (ret == AUTH_USERADDED) {
+                    admin_send_response_simple(client, source, response, "User added", 1);
+                } 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")) {
@@ -1027,10 +1031,15 @@ static void command_manageauth(client_t *client, source_t *source, admin_format_
             }
 
             ret = auth->deleteuser(auth, username);
-            if (ret == AUTH_FAILED) {
-                message = strdup("User delete failed - check the icecast error log");
-            } else if (ret == AUTH_USERDELETED) {
-                message = strdup("User deleted");
+            if (response == ADMIN_FORMAT_JSON || client->mode == OMODE_STRICT) {
+                if (ret == AUTH_FAILED) {
+                    admin_send_response_simple(client, source, response, "User delete failed - check the icecast error log", 0);
+                } 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);
 
-        if (message) {
-            msgnode = admin_build_rootnode(doc, "iceresponse");
-            xmlNewTextChild(msgnode, NULL, XMLSTR("message"), XMLSTR(message));
-        }
-
         xmlDocSetRootElement(doc, node);
 
         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,
             MANAGEAUTH_HTML_REQUEST);
-        free(message);
         xmlFreeDoc(doc);
         return;
     } while (0);