From: Kevin Harwell <kharwell@digium.com>
Date: Tue, 12 Nov 2013 23:16:58 +0000 (+0000)
Subject: ari endpoints: GET /ari/endpoints/{invalid-tech} should return a 404
X-Git-Tag: 12.0.0-beta2~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=129cd55355970fcd8e67fc18ec7058cd6c7665a1;p=thirdparty%2Fasterisk.git

ari endpoints: GET /ari/endpoints/{invalid-tech} should return a 404

Was returning a 404 on a valid technology with an empty list of endpoints.
Now checking against the channel tech to make sure the tech itself is valid
and not just an empty list of endpoints.

(issue ASTERISK-22803)
Reported by: David M. Lee


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

diff --git a/res/ari/resource_endpoints.c b/res/ari/resource_endpoints.c
index e08f6e5594..14f9e05769 100644
--- a/res/ari/resource_endpoints.c
+++ b/res/ari/resource_endpoints.c
@@ -32,6 +32,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/astobj2.h"
 #include "asterisk/stasis.h"
 #include "asterisk/stasis_endpoints.h"
+#include "asterisk/channel.h"
 
 void ast_ari_endpoints_list(struct ast_variable *headers,
 	struct ast_ari_endpoints_list_args *args,
@@ -89,6 +90,12 @@ void ast_ari_endpoints_list_by_tech(struct ast_variable *headers,
 	struct ao2_iterator i;
 	void *obj;
 
+	if (!ast_get_channel_tech(args->tech)) {
+		ast_ari_response_error(response, 404, "Not Found",
+				       "No Endpoints found - invalid tech %s", args->tech);
+		return;
+	}
+
 	cache = ast_endpoint_cache();
 	if (!cache) {
 		ast_ari_response_error(
@@ -116,7 +123,7 @@ void ast_ari_endpoints_list_by_tech(struct ast_variable *headers,
 		struct ast_endpoint_snapshot *snapshot = stasis_message_data(msg);
 		int r;
 
-		if (strcmp(args->tech, snapshot->tech) != 0) {
+		if (strcasecmp(args->tech, snapshot->tech) != 0) {
 			continue;
 		}
 
@@ -128,13 +135,7 @@ void ast_ari_endpoints_list_by_tech(struct ast_variable *headers,
 		}
 	}
 	ao2_iterator_destroy(&i);
-
-	if (ast_json_array_size(json)) {
-		ast_ari_response_ok(response, ast_json_ref(json));
-	} else {
-		ast_ari_response_error(response, 404, "Not Found",
-				       "No Endpoints found with tech %s", args->tech);
-	}
+	ast_ari_response_ok(response, ast_json_ref(json));
 }
 void ast_ari_endpoints_get(struct ast_variable *headers,
 	struct ast_ari_endpoints_get_args *args,