Fix: API queries on non-existant objects cause exception

fixes #11088

diff --git a/lib/remote/actionshandler.cpp b/lib/remote/actionshandler.cpp
index 9b8968a7d1377c85c4c573246bb6b930560133ff..1ab952327fd88c81672e99a410256d7d2e2c5061 100644 (file)
--- a/lib/remote/actionshandler.cpp
+++ b/lib/remote/actionshandler.cpp
@@ -64,8 +64,8 @@ bool ActionsHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& reques
                try {
                        objs = FilterUtility::GetFilterTargets(qd, params, user);
                } catch (const std::exception& ex) {
-                       HttpUtility::SendJsonError(response, 400,
-                           "Type/Filter was required but not provided or was invalid.",
+                       HttpUtility::SendJsonError(response, 404,
+                           "No objects found.",
                            HttpUtility::GetLastParameter(params, "verboseErrors") ? DiagnosticInformation(ex) : "");
                        return true;
                }

diff --git a/lib/remote/deleteobjecthandler.cpp b/lib/remote/deleteobjecthandler.cpp
index 0e9c39ad185c6bdb85f42d63ab7d9adb7ab53292..efdeb1facb0ec890c5627cef7f11730af6320a7e 100644 (file)
--- a/lib/remote/deleteobjecthandler.cpp
+++ b/lib/remote/deleteobjecthandler.cpp
@@ -61,7 +61,16 @@ bool DeleteObjectHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& r
                params->Set(attr, request.RequestUrl->GetPath()[3]);
        }
 
-       std::vector<Value> objs = FilterUtility::GetFilterTargets(qd, params, user);
+       std::vector<Value> objs;
+
+       try {
+               objs = FilterUtility::GetFilterTargets(qd, params, user);
+       } catch (const std::exception& ex) {
+               HttpUtility::SendJsonError(response, 404,
+                   "No objects found.",
+                   HttpUtility::GetLastParameter(params, "verboseErrors") ? DiagnosticInformation(ex) : "");
+               return true;
+       }
 
        bool cascade = HttpUtility::GetLastParameter(params, "cascade");
 

diff --git a/lib/remote/modifyobjecthandler.cpp b/lib/remote/modifyobjecthandler.cpp
index a91fdb33664807ca4ebaea1bcb9f50cb06a18e5e..f648a19f23090a55d7c8f95e5727639557e3c73e 100644 (file)
--- a/lib/remote/modifyobjecthandler.cpp
+++ b/lib/remote/modifyobjecthandler.cpp
@@ -59,7 +59,16 @@ bool ModifyObjectHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& r
                params->Set(attr, request.RequestUrl->GetPath()[3]);
        }
 
-       std::vector<Value> objs = FilterUtility::GetFilterTargets(qd, params, user);
+       std::vector<Value> objs;
+
+       try {
+               objs = FilterUtility::GetFilterTargets(qd, params, user);
+       } catch (const std::exception& ex) {
+               HttpUtility::SendJsonError(response, 404,
+                   "No objects found.",
+                   HttpUtility::GetLastParameter(params, "verboseErrors") ? DiagnosticInformation(ex) : "");
+               return true;
+       }
 
        Dictionary::Ptr attrs = params->Get("attrs");
 

diff --git a/lib/remote/objectqueryhandler.cpp b/lib/remote/objectqueryhandler.cpp
index e19d7f29c5d7d9acaead75ac7108fc358a2753d0..ef6c937a48f237d700ab754739f60f31c86e2526 100644 (file)
--- a/lib/remote/objectqueryhandler.cpp
+++ b/lib/remote/objectqueryhandler.cpp
@@ -142,7 +142,16 @@ bool ObjectQueryHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& re
                params->Set(attr, request.RequestUrl->GetPath()[3]);
        }
 
-       std::vector<Value> objs = FilterUtility::GetFilterTargets(qd, params, user);
+       std::vector<Value> objs;
+
+       try {
+               objs = FilterUtility::GetFilterTargets(qd, params, user);
+       } catch (const std::exception& ex) {
+               HttpUtility::SendJsonError(response, 404,
+                   "No objects found.",
+                   HttpUtility::GetLastParameter(params, "verboseErrors") ? DiagnosticInformation(ex) : "");
+               return true;
+       }
 
        Array::Ptr results = new Array();
        results->Reserve(objs.size());

diff --git a/lib/remote/statushandler.cpp b/lib/remote/statushandler.cpp
index 08a293ee092f383bfc0e042470356a0f97f0e173..cce71fbef25c11a53fe112d4256e116499bb8705 100644 (file)
--- a/lib/remote/statushandler.cpp
+++ b/lib/remote/statushandler.cpp
@@ -92,7 +92,16 @@ bool StatusHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request
        if (request.RequestUrl->GetPath().size() >= 3)
                params->Set("status", request.RequestUrl->GetPath()[2]);
 
-       std::vector<Value> objs = FilterUtility::GetFilterTargets(qd, params, user);
+       std::vector<Value> objs;
+
+       try {
+               objs = FilterUtility::GetFilterTargets(qd, params, user);
+       } catch (const std::exception& ex) {
+               HttpUtility::SendJsonError(response, 404,
+                   "No objects found.",
+                   HttpUtility::GetLastParameter(params, "verboseErrors") ? DiagnosticInformation(ex) : "");
+               return true;
+       }
 
        Array::Ptr results = Array::FromVector(objs);
 

diff --git a/lib/remote/typequeryhandler.cpp b/lib/remote/typequeryhandler.cpp
index 12931639eaa4dc9b40695e54d1dac44abaee7098..ba8e5225c71567fd88329685e4bf598746aef00f 100644 (file)
--- a/lib/remote/typequeryhandler.cpp
+++ b/lib/remote/typequeryhandler.cpp
@@ -97,7 +97,16 @@ bool TypeQueryHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& requ
        if (request.RequestUrl->GetPath().size() >= 3)
                params->Set("name", request.RequestUrl->GetPath()[2]);
 
-       std::vector<Value> objs = FilterUtility::GetFilterTargets(qd, params, user);
+       std::vector<Value> objs;
+
+       try {
+               objs = FilterUtility::GetFilterTargets(qd, params, user);
+       } catch (const std::exception& ex) {
+               HttpUtility::SendJsonError(response, 404,
+                   "No objects found.",
+                   HttpUtility::GetLastParameter(params, "verboseErrors") ? DiagnosticInformation(ex) : "");
+               return true;
+       }
 
        Array::Ptr results = new Array();