tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-23 05:34:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

API: Fix that /v1 returns html if json is requested

Browse Source 
fixes #10570
This commit is contained in:
Michael Friedrich 2016-05-11 10:28:44 +02:00
parent cdd858a0ec
commit 2b474823f8
1 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
lib/remote/infohandler.cpp
View File

@ -42,43 +42,63 @@ bool InfoHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request,
return false; return false;
response.SetStatus(200, "OK"); response.SetStatus(200, "OK");
response.AddHeader("Content-Type", "text/html");
String body = "<html><head><title>Icinga 2</title></head><h1>Hello from Icinga 2!</h1>";
body += "<p>You are authenticated as <b>" + user->GetName() + "</b>. ";
bool has_permissions = false;
String perm_info;
std::vector<String> permInfo;
Array::Ptr permissions = user->GetPermissions(); Array::Ptr permissions = user->GetPermissions();
if (permissions) { if (permissions) {
ObjectLock olock(permissions); ObjectLock olock(permissions);
BOOST_FOREACH(const Value& permission, permissions) { BOOST_FOREACH(const Value& permission, permissions) {
has_permissions = true;
String name; String name;
bool has_filter = false; bool hasFilter = false;
if (permission.IsObjectType<Dictionary>()) { if (permission.IsObjectType<Dictionary>()) {
Dictionary::Ptr dpermission = permission; Dictionary::Ptr dpermission = permission;
name = dpermission->Get("permission"); name = dpermission->Get("permission");
has_filter = dpermission->Contains("filter"); hasFilter = dpermission->Contains("filter");
} else } else
name = permission; name = permission;
perm_info += "<li>" + name; if (hasFilter)
if (has_filter) name += " (filtered)";
perm_info += " (filtered)";
perm_info += "</li>"; permInfo.push_back(name);
} }
} }
if (has_permissions) if (request.Headers->Get("accept") == "application/json") {
body += "Your user has the following permissions:</p> <ul>" + perm_info + "</ul>"; Dictionary::Ptr result1 = new Dictionary();
else
body += "Your user does not have any permissions.</p>";
body += "<p>More information about API requests is available in the <a href=\"http://docs.icinga.org/icinga2/latest\" target=\"_blank\">documentation</a>.</p></html>"; result1->Set("user", user->GetName());
response.WriteBody(body.CStr(), body.GetLength()); result1->Set("permissions", Array::FromVector(permInfo));
result1->Set("info", "More information about API requests is available in the documentation at http://docs.icinga.org/icinga2/latest.");
Array::Ptr results = new Array();
results->Add(result1);
Dictionary::Ptr result = new Dictionary();
result->Set("results", results);
HttpUtility::SendJsonBody(response, result);
} else {
response.AddHeader("Content-Type", "text/html");
String body = "<html><head><title>Icinga 2</title></head><h1>Hello from Icinga 2!</h1>";
body += "<p>You are authenticated as <b>" + user->GetName() + "</b>. ";
if (!permInfo.empty()) {
body += "Your user has the following permissions:</p> <ul>";
BOOST_FOREACH(const String& perm, permInfo) {
body += "<li>" + perm + "</li>";
}
body += "</ul>";
} else
body += "Your user does not have any permissions.</p>";
body += "<p>More information about API requests is available in the <a href=\"http://docs.icinga.org/icinga2/latest\" target=\"_blank\">documentation</a>.</p></html>";
response.WriteBody(body.CStr(), body.GetLength());
}
return true; return true;
} }