tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

API: Fix error handling for invalid JSON request body 

fixes #11757
This commit is contained in:
Michael Friedrich 2016-05-10 15:16:35 +02:00 committed by Gunnar Beutner
parent 06f97c87ed
commit 7f915dbfaf
28 changed files with 75 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/remote/actionshandler.cpp
View File

@ -31,7 +31,7 @@ using namespace icinga;
REGISTER_URLHANDLER("/v1/actions", ActionsHandler); REGISTER_URLHANDLER("/v1/actions", ActionsHandler);
bool ActionsHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) bool ActionsHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params)
{ {
if (request.RequestUrl->GetPath().size() != 3) if (request.RequestUrl->GetPath().size() != 3)
return false; return false;
@ -50,8 +50,6 @@ bool ActionsHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& reques
QueryDescription qd; QueryDescription qd;
Dictionary::Ptr params = HttpUtility::FetchRequestParameters(request);
const std::vector<String>& types = action->GetTypes(); const std::vector<String>& types = action->GetTypes();
std::vector<Value> objs; std::vector<Value> objs;

3
lib/remote/actionshandler.hpp
View File

@ -30,7 +30,8 @@ class I2_REMOTE_API ActionsHandler : public HttpHandler
public: public:
DECLARE_PTR_TYPEDEFS(ActionsHandler); DECLARE_PTR_TYPEDEFS(ActionsHandler);
virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request,
HttpResponse& response, const Dictionary::Ptr& params) override;
}; };
} }

4
lib/remote/configfileshandler.cpp
View File

@ -29,13 +29,11 @@ using namespace icinga;
REGISTER_URLHANDLER("/v1/config/files", ConfigFilesHandler); REGISTER_URLHANDLER("/v1/config/files", ConfigFilesHandler);
bool ConfigFilesHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) bool ConfigFilesHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params)
{ {
if (request.RequestMethod != "GET") if (request.RequestMethod != "GET")
return false; return false;
Dictionary::Ptr params = HttpUtility::FetchRequestParameters(request);
const std::vector<String>& urlPath = request.RequestUrl->GetPath(); const std::vector<String>& urlPath = request.RequestUrl->GetPath();
if (urlPath.size() >= 4) if (urlPath.size() >= 4)

3
lib/remote/configfileshandler.hpp
View File

@ -30,7 +30,8 @@ class I2_REMOTE_API ConfigFilesHandler : public HttpHandler
public: public:
DECLARE_PTR_TYPEDEFS(ConfigFilesHandler); DECLARE_PTR_TYPEDEFS(ConfigFilesHandler);
virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request,
HttpResponse& response, const Dictionary::Ptr& params) override;
}; };
} }

14
lib/remote/configpackageshandler.cpp
View File

@ -28,7 +28,7 @@ using namespace icinga;
REGISTER_URLHANDLER("/v1/config/packages", ConfigPackagesHandler); REGISTER_URLHANDLER("/v1/config/packages", ConfigPackagesHandler);
bool ConfigPackagesHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) bool ConfigPackagesHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params)
{ {
if (request.RequestUrl->GetPath().size() > 4) if (request.RequestUrl->GetPath().size() > 4)
return false; return false;
@ -36,9 +36,9 @@ bool ConfigPackagesHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest&
if (request.RequestMethod == "GET") if (request.RequestMethod == "GET")
HandleGet(user, request, response); HandleGet(user, request, response);
else if (request.RequestMethod == "POST") else if (request.RequestMethod == "POST")
HandlePost(user, request, response); HandlePost(user, request, response, params);
else if (request.RequestMethod == "DELETE") else if (request.RequestMethod == "DELETE")
HandleDelete(user, request, response); HandleDelete(user, request, response, params);
else else
return false; return false;
@ -68,12 +68,10 @@ void ConfigPackagesHandler::HandleGet(const ApiUser::Ptr& user, HttpRequest& req
HttpUtility::SendJsonBody(response, result); HttpUtility::SendJsonBody(response, result);
} }
void ConfigPackagesHandler::HandlePost(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) void ConfigPackagesHandler::HandlePost(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params)
{ {
FilterUtility::CheckPermission(user, "config/modify"); FilterUtility::CheckPermission(user, "config/modify");
Dictionary::Ptr params = HttpUtility::FetchRequestParameters(request);
if (request.RequestUrl->GetPath().size() >= 4) if (request.RequestUrl->GetPath().size() >= 4)
params->Set("package", request.RequestUrl->GetPath()[3]); params->Set("package", request.RequestUrl->GetPath()[3]);
@ -106,12 +104,10 @@ void ConfigPackagesHandler::HandlePost(const ApiUser::Ptr& user, HttpRequest& re
HttpUtility::SendJsonBody(response, result); HttpUtility::SendJsonBody(response, result);
} }
void ConfigPackagesHandler::HandleDelete(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) void ConfigPackagesHandler::HandleDelete(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params)
{ {
FilterUtility::CheckPermission(user, "config/modify"); FilterUtility::CheckPermission(user, "config/modify");
Dictionary::Ptr params = HttpUtility::FetchRequestParameters(request);
if (request.RequestUrl->GetPath().size() >= 4) if (request.RequestUrl->GetPath().size() >= 4)
params->Set("package", request.RequestUrl->GetPath()[3]); params->Set("package", request.RequestUrl->GetPath()[3]);

12
lib/remote/configpackageshandler.hpp
View File

@ -30,12 +30,16 @@ class I2_REMOTE_API ConfigPackagesHandler : public HttpHandler
public: public:
DECLARE_PTR_TYPEDEFS(ConfigPackagesHandler); DECLARE_PTR_TYPEDEFS(ConfigPackagesHandler);
virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request,
HttpResponse& response, const Dictionary::Ptr& params) override;
private: private:
void HandleGet(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response); void HandleGet(const ApiUser::Ptr& user, HttpRequest& request,
void HandlePost(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response); HttpResponse& response);
void HandleDelete(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response); void HandlePost(const ApiUser::Ptr& user, HttpRequest& request,
HttpResponse& response, const Dictionary::Ptr& params);
void HandleDelete(const ApiUser::Ptr& user, HttpRequest& request,
HttpResponse& response, const Dictionary::Ptr& params);
}; };

20
lib/remote/configstageshandler.cpp
View File

@ -30,29 +30,27 @@ using namespace icinga;
REGISTER_URLHANDLER("/v1/config/stages", ConfigStagesHandler); REGISTER_URLHANDLER("/v1/config/stages", ConfigStagesHandler);
bool ConfigStagesHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) bool ConfigStagesHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params)
{ {
if (request.RequestUrl->GetPath().size() > 5) if (request.RequestUrl->GetPath().size() > 5)
return false; return false;
if (request.RequestMethod == "GET") if (request.RequestMethod == "GET")
HandleGet(user, request, response); HandleGet(user, request, response, params);
else if (request.RequestMethod == "POST") else if (request.RequestMethod == "POST")
HandlePost(user, request, response); HandlePost(user, request, response, params);
else if (request.RequestMethod == "DELETE") else if (request.RequestMethod == "DELETE")
HandleDelete(user, request, response); HandleDelete(user, request, response, params);
else else
return false; return false;
return true; return true;
} }
void ConfigStagesHandler::HandleGet(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) void ConfigStagesHandler::HandleGet(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params)
{ {
FilterUtility::CheckPermission(user, "config/query"); FilterUtility::CheckPermission(user, "config/query");
Dictionary::Ptr params = HttpUtility::FetchRequestParameters(request);
if (request.RequestUrl->GetPath().size() >= 4) if (request.RequestUrl->GetPath().size() >= 4)
params->Set("package", request.RequestUrl->GetPath()[3]); params->Set("package", request.RequestUrl->GetPath()[3]);
@ -89,12 +87,10 @@ void ConfigStagesHandler::HandleGet(const ApiUser::Ptr& user, HttpRequest& reque
HttpUtility::SendJsonBody(response, result); HttpUtility::SendJsonBody(response, result);
} }
void ConfigStagesHandler::HandlePost(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) void ConfigStagesHandler::HandlePost(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params)
{ {
FilterUtility::CheckPermission(user, "config/modify"); FilterUtility::CheckPermission(user, "config/modify");
Dictionary::Ptr params = HttpUtility::FetchRequestParameters(request);
if (request.RequestUrl->GetPath().size() >= 4) if (request.RequestUrl->GetPath().size() >= 4)
params->Set("package", request.RequestUrl->GetPath()[3]); params->Set("package", request.RequestUrl->GetPath()[3]);
@ -138,12 +134,10 @@ void ConfigStagesHandler::HandlePost(const ApiUser::Ptr& user, HttpRequest& requ
HttpUtility::SendJsonBody(response, result); HttpUtility::SendJsonBody(response, result);
} }
void ConfigStagesHandler::HandleDelete(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) void ConfigStagesHandler::HandleDelete(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params)
{ {
FilterUtility::CheckPermission(user, "config/modify"); FilterUtility::CheckPermission(user, "config/modify");
Dictionary::Ptr params = HttpUtility::FetchRequestParameters(request);
if (request.RequestUrl->GetPath().size() >= 4) if (request.RequestUrl->GetPath().size() >= 4)
params->Set("package", request.RequestUrl->GetPath()[3]); params->Set("package", request.RequestUrl->GetPath()[3]);

12
lib/remote/configstageshandler.hpp
View File

@ -30,12 +30,16 @@ class I2_REMOTE_API ConfigStagesHandler : public HttpHandler
public: public:
DECLARE_PTR_TYPEDEFS(ConfigStagesHandler); DECLARE_PTR_TYPEDEFS(ConfigStagesHandler);
virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request,
HttpResponse& response, const Dictionary::Ptr& params) override;
private: private:
void HandleGet(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response); void HandleGet(const ApiUser::Ptr& user, HttpRequest& request,
void HandlePost(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response); HttpResponse& response, const Dictionary::Ptr& params);
void HandleDelete(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response); void HandlePost(const ApiUser::Ptr& user, HttpRequest& request,
HttpResponse& response, const Dictionary::Ptr& params);
void HandleDelete(const ApiUser::Ptr& user, HttpRequest& request,
HttpResponse& response, const Dictionary::Ptr& params);
}; };

3
lib/remote/consolehandler.cpp
View File

@ -67,7 +67,7 @@ static void InitScriptFrameCleanup(void)
INITIALIZE_ONCE(InitScriptFrameCleanup); INITIALIZE_ONCE(InitScriptFrameCleanup);
bool ConsoleHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) bool ConsoleHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params)
{ {
if (request.RequestUrl->GetPath().size() > 3) if (request.RequestUrl->GetPath().size() > 3)
return false; return false;
@ -76,7 +76,6 @@ bool ConsoleHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& reques
return false; return false;
QueryDescription qd; QueryDescription qd;
Dictionary::Ptr params = HttpUtility::FetchRequestParameters(request);
String methodName = request.RequestUrl->GetPath()[2]; String methodName = request.RequestUrl->GetPath()[2];

3
lib/remote/consolehandler.hpp
View File

@ -43,7 +43,8 @@ class I2_REMOTE_API ConsoleHandler : public HttpHandler
public: public:
DECLARE_PTR_TYPEDEFS(ConsoleHandler); DECLARE_PTR_TYPEDEFS(ConsoleHandler);
virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request,
HttpResponse& response, const Dictionary::Ptr& params) override;
static std::vector<String> GetAutocompletionSuggestions(const String& word, ScriptFrame& frame); static std::vector<String> GetAutocompletionSuggestions(const String& word, ScriptFrame& frame);

3
lib/remote/createobjecthandler.cpp
View File

@ -30,7 +30,7 @@ using namespace icinga;
REGISTER_URLHANDLER("/v1/objects", CreateObjectHandler); REGISTER_URLHANDLER("/v1/objects", CreateObjectHandler);
bool CreateObjectHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) bool CreateObjectHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params)
{ {
if (request.RequestUrl->GetPath().size() != 4) if (request.RequestUrl->GetPath().size() != 4)
return false; return false;
@ -48,7 +48,6 @@ bool CreateObjectHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& r
FilterUtility::CheckPermission(user, "objects/create/" + type->GetName()); FilterUtility::CheckPermission(user, "objects/create/" + type->GetName());
String name = request.RequestUrl->GetPath()[3]; String name = request.RequestUrl->GetPath()[3];
Dictionary::Ptr params = HttpUtility::FetchRequestParameters(request);
Array::Ptr templates = params->Get("templates"); Array::Ptr templates = params->Get("templates");
Dictionary::Ptr attrs = params->Get("attrs"); Dictionary::Ptr attrs = params->Get("attrs");

3
lib/remote/createobjecthandler.hpp
View File

@ -30,7 +30,8 @@ class I2_REMOTE_API CreateObjectHandler : public HttpHandler
public: public:
DECLARE_PTR_TYPEDEFS(CreateObjectHandler); DECLARE_PTR_TYPEDEFS(CreateObjectHandler);
virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request,
HttpResponse& response, const Dictionary::Ptr& params) override;
}; };
} }

4
lib/remote/deleteobjecthandler.cpp
View File

@ -32,7 +32,7 @@ using namespace icinga;
REGISTER_URLHANDLER("/v1/objects", DeleteObjectHandler); REGISTER_URLHANDLER("/v1/objects", DeleteObjectHandler);
bool DeleteObjectHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) bool DeleteObjectHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params)
{ {
if (request.RequestUrl->GetPath().size() < 3 || request.RequestUrl->GetPath().size() > 4) if (request.RequestUrl->GetPath().size() < 3 || request.RequestUrl->GetPath().size() > 4)
return false; return false;
@ -51,8 +51,6 @@ bool DeleteObjectHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& r
qd.Types.insert(type->GetName()); qd.Types.insert(type->GetName());
qd.Permission = "objects/delete/" + type->GetName(); qd.Permission = "objects/delete/" + type->GetName();
Dictionary::Ptr params = HttpUtility::FetchRequestParameters(request);
params->Set("type", type->GetName()); params->Set("type", type->GetName());
if (request.RequestUrl->GetPath().size() >= 4) { if (request.RequestUrl->GetPath().size() >= 4) {

3
lib/remote/deleteobjecthandler.hpp
View File

@ -30,7 +30,8 @@ class I2_REMOTE_API DeleteObjectHandler : public HttpHandler
public: public:
DECLARE_PTR_TYPEDEFS(DeleteObjectHandler); DECLARE_PTR_TYPEDEFS(DeleteObjectHandler);
virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request,
HttpResponse& response, const Dictionary::Ptr& params) override;
}; };
} }

4
lib/remote/eventshandler.cpp
View File

@ -31,7 +31,7 @@ using namespace icinga;
REGISTER_URLHANDLER("/v1/events", EventsHandler); REGISTER_URLHANDLER("/v1/events", EventsHandler);
bool EventsHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) bool EventsHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params)
{ {
if (request.RequestUrl->GetPath().size() != 2) if (request.RequestUrl->GetPath().size() != 2)
return false; return false;
@ -44,8 +44,6 @@ bool EventsHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request
return true; return true;
} }
Dictionary::Ptr params = HttpUtility::FetchRequestParameters(request);
Array::Ptr types = params->Get("types"); Array::Ptr types = params->Get("types");
if (!types) { if (!types) {

3
lib/remote/eventshandler.hpp
View File

@ -31,7 +31,8 @@ class I2_REMOTE_API EventsHandler : public HttpHandler
public: public:
DECLARE_PTR_TYPEDEFS(EventsHandler); DECLARE_PTR_TYPEDEFS(EventsHandler);
virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request,
HttpResponse& response, const Dictionary::Ptr& params) override;
}; };
} }

13
lib/remote/httphandler.cpp
View File

@ -20,6 +20,7 @@
#include "remote/httphandler.hpp" #include "remote/httphandler.hpp"
#include "remote/httputility.hpp" #include "remote/httputility.hpp"
#include "base/singleton.hpp" #include "base/singleton.hpp"
#include "base/exception.hpp"
#include <boost/algorithm/string/join.hpp> #include <boost/algorithm/string/join.hpp>
using namespace icinga; using namespace icinga;
@ -94,13 +95,23 @@ void HttpHandler::ProcessRequest(const ApiUser::Ptr& user, HttpRequest& request,
std::reverse(handlers.begin(), handlers.end()); std::reverse(handlers.begin(), handlers.end());
Dictionary::Ptr params;
try {
params = HttpUtility::FetchRequestParameters(request);
} catch (const std::exception& ex) {
HttpUtility::SendJsonError(response, 400, "Invalid request body: " + DiagnosticInformation(ex, false));
return;
}
bool processed = false; bool processed = false;
BOOST_FOREACH(const HttpHandler::Ptr& handler, handlers) { BOOST_FOREACH(const HttpHandler::Ptr& handler, handlers) {
if (handler->HandleRequest(user, request, response)) { if (handler->HandleRequest(user, request, response, params)) {
processed = true; processed = true;
break; break;
} }
} }
if (!processed) { if (!processed) {
String path = boost::algorithm::join(request.RequestUrl->GetPath(), "/"); String path = boost::algorithm::join(request.RequestUrl->GetPath(), "/");
HttpUtility::SendJsonError(response, 404, "The requested path '" + path + HttpUtility::SendJsonError(response, 404, "The requested path '" + path +

2
lib/remote/httphandler.hpp
View File

@ -40,7 +40,7 @@ class I2_REMOTE_API HttpHandler : public Object
public: public:
DECLARE_PTR_TYPEDEFS(HttpHandler); DECLARE_PTR_TYPEDEFS(HttpHandler);
virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) = 0; virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params) = 0;
static void Register(const Url::Ptr& url, const HttpHandler::Ptr& handler); static void Register(const Url::Ptr& url, const HttpHandler::Ptr& handler);
static void ProcessRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response); static void ProcessRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response);

2
lib/remote/infohandler.cpp
View File

@ -24,7 +24,7 @@ using namespace icinga;
REGISTER_URLHANDLER("/", InfoHandler); REGISTER_URLHANDLER("/", InfoHandler);
bool InfoHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) bool InfoHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params)
{ {
if (request.RequestUrl->GetPath().size() > 2) if (request.RequestUrl->GetPath().size() > 2)
return false; return false;

3
lib/remote/infohandler.hpp
View File

@ -30,7 +30,8 @@ class I2_REMOTE_API InfoHandler : public HttpHandler
public: public:
DECLARE_PTR_TYPEDEFS(InfoHandler); DECLARE_PTR_TYPEDEFS(InfoHandler);
virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request,
HttpResponse& response, const Dictionary::Ptr& params) override;
}; };
} }

4
lib/remote/modifyobjecthandler.cpp
View File

@ -30,7 +30,7 @@ using namespace icinga;
REGISTER_URLHANDLER("/v1/objects", ModifyObjectHandler); REGISTER_URLHANDLER("/v1/objects", ModifyObjectHandler);
bool ModifyObjectHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) bool ModifyObjectHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params)
{ {
if (request.RequestUrl->GetPath().size() < 3 || request.RequestUrl->GetPath().size() > 4) if (request.RequestUrl->GetPath().size() < 3 || request.RequestUrl->GetPath().size() > 4)
return false; return false;
@ -49,8 +49,6 @@ bool ModifyObjectHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& r
qd.Types.insert(type->GetName()); qd.Types.insert(type->GetName());
qd.Permission = "objects/modify/" + type->GetName(); qd.Permission = "objects/modify/" + type->GetName();
Dictionary::Ptr params = HttpUtility::FetchRequestParameters(request);
params->Set("type", type->GetName()); params->Set("type", type->GetName());
if (request.RequestUrl->GetPath().size() >= 4) { if (request.RequestUrl->GetPath().size() >= 4) {

3
lib/remote/modifyobjecthandler.hpp
View File

@ -30,7 +30,8 @@ class I2_REMOTE_API ModifyObjectHandler : public HttpHandler
public: public:
DECLARE_PTR_TYPEDEFS(ModifyObjectHandler); DECLARE_PTR_TYPEDEFS(ModifyObjectHandler);
virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request,
HttpResponse& response, const Dictionary::Ptr& params) override;
}; };
} }

4
lib/remote/objectqueryhandler.cpp
View File

@ -104,7 +104,7 @@ Dictionary::Ptr ObjectQueryHandler::SerializeObjectAttrs(const Object::Ptr& obje
return resultAttrs; return resultAttrs;
} }
bool ObjectQueryHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) bool ObjectQueryHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params)
{ {
if (request.RequestUrl->GetPath().size() < 3 || request.RequestUrl->GetPath().size() > 4) if (request.RequestUrl->GetPath().size() < 3 || request.RequestUrl->GetPath().size() > 4)
return false; return false;
@ -123,8 +123,6 @@ bool ObjectQueryHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& re
qd.Types.insert(type->GetName()); qd.Types.insert(type->GetName());
qd.Permission = "objects/query/" + type->GetName(); qd.Permission = "objects/query/" + type->GetName();
Dictionary::Ptr params = HttpUtility::FetchRequestParameters(request);
Array::Ptr uattrs = params->Get("attrs"); Array::Ptr uattrs = params->Get("attrs");
Array::Ptr ujoins = params->Get("joins"); Array::Ptr ujoins = params->Get("joins");
Array::Ptr umetas = params->Get("meta"); Array::Ptr umetas = params->Get("meta");

3
lib/remote/objectqueryhandler.hpp
View File

@ -30,7 +30,8 @@ class I2_REMOTE_API ObjectQueryHandler : public HttpHandler
public: public:
DECLARE_PTR_TYPEDEFS(ObjectQueryHandler); DECLARE_PTR_TYPEDEFS(ObjectQueryHandler);
virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request,
HttpResponse& response, const Dictionary::Ptr& params) override;
private: private:
static Dictionary::Ptr SerializeObjectAttrs(const Object::Ptr& object, const String& attrPrefix, static Dictionary::Ptr SerializeObjectAttrs(const Object::Ptr& object, const String& attrPrefix,

4
lib/remote/statushandler.cpp
View File

@ -72,7 +72,7 @@ public:
} }
}; };
bool StatusHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) bool StatusHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params)
{ {
if (request.RequestUrl->GetPath().size() > 3) if (request.RequestUrl->GetPath().size() > 3)
return false; return false;
@ -85,8 +85,6 @@ bool StatusHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request
qd.Provider = new StatusTargetProvider(); qd.Provider = new StatusTargetProvider();
qd.Permission = "status/query"; qd.Permission = "status/query";
Dictionary::Ptr params = HttpUtility::FetchRequestParameters(request);
params->Set("type", "Status"); params->Set("type", "Status");
if (request.RequestUrl->GetPath().size() >= 3) if (request.RequestUrl->GetPath().size() >= 3)

3
lib/remote/statushandler.hpp
View File

@ -30,7 +30,8 @@ class I2_REMOTE_API StatusHandler : public HttpHandler
public: public:
DECLARE_PTR_TYPEDEFS(StatusHandler); DECLARE_PTR_TYPEDEFS(StatusHandler);
virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request,
HttpResponse& response, const Dictionary::Ptr& params) override;
}; };
} }

4
lib/remote/typequeryhandler.cpp
View File

@ -75,7 +75,7 @@ public:
} }
}; };
bool TypeQueryHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) bool TypeQueryHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params)
{ {
if (request.RequestUrl->GetPath().size() > 3) if (request.RequestUrl->GetPath().size() > 3)
return false; return false;
@ -87,8 +87,6 @@ bool TypeQueryHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& requ
qd.Types.insert("Type"); qd.Types.insert("Type");
qd.Provider = new TypeTargetProvider(); qd.Provider = new TypeTargetProvider();
Dictionary::Ptr params = HttpUtility::FetchRequestParameters(request);
if (params->Contains("type")) if (params->Contains("type"))
params->Set("name", params->Get("type")); params->Set("name", params->Get("type"));

3
lib/remote/typequeryhandler.hpp
View File

@ -30,7 +30,8 @@ class I2_REMOTE_API TypeQueryHandler : public HttpHandler
public: public:
DECLARE_PTR_TYPEDEFS(TypeQueryHandler); DECLARE_PTR_TYPEDEFS(TypeQueryHandler);
virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response) override; virtual bool HandleRequest(const ApiUser::Ptr& user, HttpRequest& request,
HttpResponse& response, const Dictionary::Ptr& params) override;
}; };
} }