From 5c696bde67411848e4bbbc2cc18c2f881a0a7ead Mon Sep 17 00:00:00 2001
From: Jonathan Rose <jrose@digium.com>
Date: Fri, 25 Oct 2013 22:01:43 +0000
Subject: ARI: channel/bridge recording errors when invalid format specified

Asterisk will now issue 422 if recording is requested against channels
or bridges with an unknown format

(closes issue ASTERISK-22626)
Reported by: Joshua Colp
Review: https://reviewboard.asterisk.org/r/2939/
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@402002 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 res/ari/resource_bridges.c  | 21 +++++++++++++++++++++
 res/ari/resource_channels.c |  7 +++++++
 res/res_ari_bridges.c       |  1 +
 res/res_ari_channels.c      |  1 +
 4 files changed, 30 insertions(+)

(limited to 'res')

diff --git a/res/ari/resource_bridges.c b/res/ari/resource_bridges.c
index a036ce0f3..919171139 100644
--- a/res/ari/resource_bridges.c
+++ b/res/ari/resource_bridges.c
@@ -439,6 +439,27 @@ void ast_ari_record_bridge(struct ast_variable *headers, struct ast_record_bridg
 		stasis_app_recording_if_exists_parse(args->if_exists);
 	options->beep = args->beep;
 
+	if (options->terminate_on == STASIS_APP_RECORDING_TERMINATE_INVALID) {
+		ast_ari_response_error(
+			response, 400, "Bad Request",
+			"terminateOn invalid");
+		return;
+	}
+
+	if (options->if_exists == -1) {
+		ast_ari_response_error(
+			response, 400, "Bad Request",
+			"ifExists invalid");
+		return;
+	}
+
+	if (!ast_get_format_for_file_ext(options->format)) {
+		ast_ari_response_error(
+			response, 422, "Unprocessable Entity",
+			"specified format is unknown on this system");
+		return;
+	}
+
 	recording = stasis_app_control_record(control, options);
 	if (recording == NULL) {
 		switch(errno) {
diff --git a/res/ari/resource_channels.c b/res/ari/resource_channels.c
index b8d59d38b..f1a9217af 100644
--- a/res/ari/resource_channels.c
+++ b/res/ari/resource_channels.c
@@ -407,6 +407,13 @@ void ast_ari_record_channel(struct ast_variable *headers,
 		return;
 	}
 
+	if (!ast_get_format_for_file_ext(options->format)) {
+		ast_ari_response_error(
+			response, 422, "Unprocessable Entity",
+			"specified format is unknown on this system");
+		return;
+	}
+
 	recording = stasis_app_control_record(control, options);
 	if (recording == NULL) {
 		switch(errno) {
diff --git a/res/res_ari_bridges.c b/res/res_ari_bridges.c
index f6a3c1c1a..d34505e2b 100644
--- a/res/res_ari_bridges.c
+++ b/res/res_ari_bridges.c
@@ -745,6 +745,7 @@ static void ast_ari_record_bridge_cb(
 	case 400: /* Invalid parameters */
 	case 404: /* Bridge not found */
 	case 409: /* Bridge is not in a Stasis application; A recording with the same name already exists on the system and can not be overwritten because it is in progress or ifExists=fail */
+	case 422: /* The format specified is unknown on this system */
 		is_valid = 1;
 		break;
 	default:
diff --git a/res/res_ari_channels.c b/res/res_ari_channels.c
index 8ff4c065c..79aa88492 100644
--- a/res/res_ari_channels.c
+++ b/res/res_ari_channels.c
@@ -993,6 +993,7 @@ static void ast_ari_record_channel_cb(
 	case 400: /* Invalid parameters */
 	case 404: /* Channel not found */
 	case 409: /* Channel is not in a Stasis application; the channel is currently bridged with other hcannels; A recording with the same name already exists on the system and can not be overwritten because it is in progress or ifExists=fail */
+	case 422: /* The format specified is unknown on this system */
 		is_valid = 1;
 		break;
 	default:
-- 
cgit v1.2.3