manager: Fix GetConfigJSON returning invalid JSON
authorIvan Poddubny <ivan.poddubny@gmail.com>
Sat, 3 Oct 2015 11:27:27 +0000 (14:27 +0300)
committerIvan Poddubny <ivan.poddubny@gmail.com>
Sat, 3 Oct 2015 12:15:52 +0000 (15:15 +0300)
When GetConfigJSON was introduced back in 1.6, it returned each
section as an array of strings: ["key=value", "key2=value2"].
Afterwards, it was changed a few times and became
["key": "value", "key2": "value2"], which is not a correct JSON.
This patch fixes that by constructing a JSON object {} instead of
an array [].

Also, the keys "istemplate" and "tempates" that are used to
indicate templates and their inherited categories are now wrapped in
quotes.

ASTERISK-25391 #close
Reported by: Bojan Nemčić

Change-Id: Ibbe93c6a227dff14d4a54b0d152341857bcf6ad8

main/manager.c

index 60e185b..2ea6fae 100644 (file)
@@ -3477,18 +3477,18 @@ static int action_getconfigjson(struct mansession *s, const struct message *m)
                category_name = ast_category_get_name(cur_category);
                astman_append(s, "%s\"", comma1 ? "," : "");
                astman_append_json(s, category_name);
-               astman_append(s, "\":[");
+               astman_append(s, "\":{");
                comma1 = 1;
 
                if (ast_category_is_template(cur_category)) {
-                       astman_append(s, "istemplate:1");
+                       astman_append(s, "\"istemplate\":1");
                        comma2 = 1;
                }
 
                if ((templates = ast_category_get_templates(cur_category))
                        && ast_str_strlen(templates) > 0) {
                        astman_append(s, "%s", comma2 ? "," : "");
-                       astman_append(s, "templates:\"%s\"", ast_str_buffer(templates));
+                       astman_append(s, "\"templates\":\"%s\"", ast_str_buffer(templates));
                        ast_free(templates);
                        comma2 = 1;
                }
@@ -3502,7 +3502,7 @@ static int action_getconfigjson(struct mansession *s, const struct message *m)
                        comma2 = 1;
                }
 
-               astman_append(s, "]");
+               astman_append(s, "}");
        }
        astman_append(s, "}\r\n\r\n");