[svn-commits] file: trunk r408958 - in /trunk: ./ res/res_ari.c

[SVN commits to the Digium repositories]

Author: file
Date: Wed Feb 26 11:04:38 2014
New Revision: 408958

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=408958
Log:
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/
........

Merged revisions 408957 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/res_ari.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/res/res_ari.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_ari.c?view=diff&rev=408958&r1=408957&r2=408958
==============================================================================
--- trunk/res/res_ari.c (original)
+++ trunk/res/res_ari.c Wed Feb 26 11:04:38 2014
@@ -908,8 +908,7 @@
 		 * 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 @@
 		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);