From: Joshua Colp <jcolp@digium.com>
Date: Wed, 26 Feb 2014 17:03:47 +0000 (+0000)
Subject: res_ari: Make some additional error responses consistent with the rest of the system.
X-Git-Tag: 12.2.0-rc1~126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccfa79d2baf33717790f32f2ef5dcab0a4ac3f50;p=thirdparty%2Fasterisk.git

res_ari: Make some additional error responses consistent with the rest of the system.

This change makes some error cases use ast_ari_response_error to construct their
error responses instead of manually doing it. This ensures they are consistent
with the other error responses.

Based on the original patch as done by Paul Belanger on the associated review.

Review: https://reviewboard.asterisk.org/r/2904/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@408957 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_ari.c b/res/res_ari.c
index f36b829352..66bc4280ae 100644
--- a/res/res_ari.c
+++ b/res/res_ari.c
@@ -908,8 +908,7 @@ static int ast_ari_callback(struct ast_tcptls_session_instance *ser,
 		 * WWW-Authenticate header field containing at least one
 		 * challenge applicable to the requested resource.
 		 */
-		response.response_code = 401;
-		response.response_text = "Unauthorized";
+		ast_ari_response_error(&response, 401, "Unauthorized", "Authentication required");
 
 		/* Section 1.2:
 		 *   realm       = "realm" "=" realm-value
@@ -920,28 +919,16 @@ static int ast_ari_callback(struct ast_tcptls_session_instance *ser,
 		ast_str_append(&response.headers, 0,
 			"WWW-Authenticate: Basic realm=\"%s\"\r\n",
 			conf->general->auth_realm);
-		response.message = ast_json_pack("{s: s}",
-			"error", "Authentication required");
 	} else if (!ast_fully_booted) {
-		response.response_code = 503;
-		response.response_text = "Service Unavailable";
-		response.message = ast_json_pack("{s: s}",
-			"error", "Asterisk not booted");
+		ast_ari_response_error(&response, 503, "Service Unavailable", "Asterisk not booted");
 	} else if (user->read_only && method != AST_HTTP_GET && method != AST_HTTP_OPTIONS) {
-		response.message = ast_json_pack("{s: s}",
-			"error", "Write access denied");
-		response.response_code = 403;
-		response.response_text = "Forbidden";
+		ast_ari_response_error(&response, 403, "Forbidden", "Write access denied");
 	} else if (ast_ends_with(uri, "/")) {
 		remove_trailing_slash(uri, &response);
 	} else if (ast_begins_with(uri, "api-docs/")) {
 		/* Serving up API docs */
 		if (method != AST_HTTP_GET) {
-			response.message =
-				ast_json_pack("{s: s}",
-					      "message", "Unsupported method");
-			response.response_code = 405;
-			response.response_text = "Method Not Allowed";
+			ast_ari_response_error(&response, 405, "Method Not Allowed", "Unsupported method");
 		} else {
 			/* Skip the api-docs prefix */
 			ast_ari_get_docs(strchr(uri, '/') + 1, headers, &response);