From: Gunnar Beutner <gunnar@beutner.name>
Date: Tue, 28 Jul 2015 12:54:16 +0000 (+0200)
Subject: Fix incorrect URL for status queries
X-Git-Tag: v2.4.0~472
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5fd7c42fafbed7c47fab0d071701f4f768b945d6;p=icinga2

Fix incorrect URL for status queries

refs #9077
---

diff --git a/lib/remote/statusqueryhandler.cpp b/lib/remote/statusqueryhandler.cpp
index ea6c54649..0651b93aa 100644
--- a/lib/remote/statusqueryhandler.cpp
+++ b/lib/remote/statusqueryhandler.cpp
@@ -25,14 +25,14 @@
 
 using namespace icinga;
 
-REGISTER_URLHANDLER("/", StatusQueryHandler);
+REGISTER_URLHANDLER("/v1", StatusQueryHandler);
 
 bool StatusQueryHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response)
 {
-	if (request.RequestUrl->GetPath().empty())
+	if (request.RequestUrl->GetPath().size() < 2)
 		return false;
 
-	Type::Ptr type = FilterUtility::TypeFromPluralName(request.RequestUrl->GetPath()[0]);
+	Type::Ptr type = FilterUtility::TypeFromPluralName(request.RequestUrl->GetPath()[1]);
 
 	if (!type)
 		return false;
@@ -44,10 +44,10 @@ bool StatusQueryHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& re
 
 	params->Set("type", type->GetName());
 
-	if (request.RequestUrl->GetPath().size() > 1) {
+	if (request.RequestUrl->GetPath().size() >= 3) {
 		String attr = type->GetName();
 		boost::algorithm::to_lower(attr);
-		params->Set(attr, request.RequestUrl->GetPath()[1]);
+		params->Set(attr, request.RequestUrl->GetPath()[2]);
 	} else if (!params->Contains("filter")) {
 		params->Set("filter", "true");
 	}