]> granicus.if.org Git - icinga2/commitdiff
Ensure that multiple object handler request methods still work
authorMichael Friedrich <michael.friedrich@netways.de>
Sun, 27 Sep 2015 13:27:08 +0000 (15:27 +0200)
committerMichael Friedrich <michael.friedrich@netways.de>
Sun, 27 Sep 2015 13:27:08 +0000 (15:27 +0200)
refs #10194

lib/remote/createobjecthandler.cpp
lib/remote/deleteobjecthandler.cpp
lib/remote/modifyobjecthandler.cpp

index 0222413e31ca5efb8536bae36107d7b6ea42d00b..fa1c3f2efc0a212ace886698cdc9311dc5250d2f 100644 (file)
@@ -32,8 +32,8 @@ REGISTER_URLHANDLER("/v1", CreateObjectHandler);
 bool CreateObjectHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response)
 {
        if (request.RequestMethod != "PUT") {
-               HttpUtility::SendJsonError(response, 400, "Invalid request type. Must be PUT.");
-               return true;
+               /* there might be other request methods pending */
+               return false;
        }
 
        if (request.RequestUrl->GetPath().size() < 3) {
index 7d797ce7365a7a61c7399226578451a137f79a65..f4b89d28436c1681692bfac51cc4d279785bcdd4 100644 (file)
@@ -35,8 +35,8 @@ REGISTER_URLHANDLER("/v1", DeleteObjectHandler);
 bool DeleteObjectHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response)
 {
        if (request.RequestMethod != "DELETE") {
-               HttpUtility::SendJsonError(response, 400, "Invalid request type. Must be DELETE.");
-               return true;
+               /* there might be other request methods pending */
+               return false;
        }
 
        if (request.RequestUrl->GetPath().size() < 2) {
index 1c3b020639f1185859555cbd7481b63bb6bad955..239578ce32e5bb289e616a5014b9c4677e0fe1c5 100644 (file)
@@ -32,8 +32,10 @@ REGISTER_URLHANDLER("/v1", ModifyObjectHandler);
 
 bool ModifyObjectHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response)
 {
-       if (request.RequestMethod != "POST")
+       if (request.RequestMethod != "POST") {
+               /* there might be other request methods pending */
                return false;
+       }
 
        if (request.RequestUrl->GetPath().size() < 2)
                return false;