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 message handling for invalid attributes in PUT requests 

refs #11396
This commit is contained in:
Michael Friedrich 2016-05-10 13:42:05 +02:00
parent ba82d2eb20
commit 1c6f09f44e
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/remote/createobjecthandler.cpp
View File

@ -62,14 +62,29 @@ bool CreateObjectHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& r
if (params->Contains("ignore_on_error")) if (params->Contains("ignore_on_error"))
ignoreOnError = HttpUtility::GetLastParameter(params, "ignore_on_error"); ignoreOnError = HttpUtility::GetLastParameter(params, "ignore_on_error");
String config = ConfigObjectUtility::CreateObjectConfig(type, name, ignoreOnError, templates, attrs);
Array::Ptr results = new Array(); Array::Ptr results = new Array();
results->Add(result1); results->Add(result1);
Dictionary::Ptr result = new Dictionary(); Dictionary::Ptr result = new Dictionary();
result->Set("results", results); result->Set("results", results);
String config;
try {
config = ConfigObjectUtility::CreateObjectConfig(type, name, ignoreOnError, templates, attrs);
} catch (const std::exception& ex) {
errors->Add(DiagnosticInformation(ex));
result1->Set("errors", errors);
result1->Set("code", 500);
result1->Set("status", "Object could not be created.");
response.SetStatus(500, "Object could not be created");
HttpUtility::SendJsonBody(response, result);
return true;
}
if (!ConfigObjectUtility::CreateObject(type, name, config, errors)) { if (!ConfigObjectUtility::CreateObject(type, name, config, errors)) {
result1->Set("errors", errors); result1->Set("errors", errors);
result1->Set("code", 500); result1->Set("code", 500);