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

Uniform command_type strings

Browse Source
This commit is contained in:
Mattia Codato 2020-07-10 16:51:13 +02:00
parent 39479b666f
commit b6c84982f2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/icinga/apiactions.cpp
View File

@ -588,12 +588,12 @@ Dictionary::Ptr ApiActions::ExecuteCommand(const ConfigObject::Ptr& object,
BOOST_THROW_EXCEPTION(std::invalid_argument("No ApiListener instance configured.")); BOOST_THROW_EXCEPTION(std::invalid_argument("No ApiListener instance configured."));
/* Get command_type */ /* Get command_type */
String command_type = "EventCommand"; String command_type = "event_command";
if (params->Contains("command_type")) if (params->Contains("command_type"))
command_type = HttpUtility::GetLastParameter(params, "command_type"); command_type = HttpUtility::GetLastParameter(params, "command_type");
/* Validate command_type */ /* Validate command_type */
if (command_type != "EventCommand" && command_type != "CheckCommand" && command_type != "NotificationCommand") if (command_type != "event_command" && command_type != "check_command" && command_type != "notification_command")
return ApiActions::CreateResult(400, "Invalid command_type '" + command_type + "'."); return ApiActions::CreateResult(400, "Invalid command_type '" + command_type + "'.");
Checkable::Ptr checkable = dynamic_pointer_cast<Checkable>(object); Checkable::Ptr checkable = dynamic_pointer_cast<Checkable>(object);
@ -649,11 +649,11 @@ Dictionary::Ptr ApiActions::ExecuteCommand(const ConfigObject::Ptr& object,
/* Get command */ /* Get command */
String command; String command;
if (!params->Contains("command")) { if (!params->Contains("command")) {
if (command_type == "CheckCommand" ) { if (command_type == "check_command" ) {
command = "$check_command$"; command = "$check_command$";
} else if (command_type == "EventCommand") { } else if (command_type == "event_command") {
command = "$event_command$"; command = "$event_command$";
} else if (command_type == "NotificationCommand") { } else if (command_type == "notification_command") {
command = "$notification_command$"; command = "$notification_command$";
} }
} else { } else {
@ -676,19 +676,19 @@ Dictionary::Ptr ApiActions::ExecuteCommand(const ConfigObject::Ptr& object,
MacroResolver::OverrideMacros = nullptr; MacroResolver::OverrideMacros = nullptr;
}); });
if (command_type == "CheckCommand") { if (command_type == "check_command") {
CheckCommand::Ptr cmd = GetSingleObjectByNameUsingPermissions(CheckCommand::GetTypeName(), resolved_command, ActionsHandler::AuthenticatedApiUser); CheckCommand::Ptr cmd = GetSingleObjectByNameUsingPermissions(CheckCommand::GetTypeName(), resolved_command, ActionsHandler::AuthenticatedApiUser);
if (!cmd) if (!cmd)
return ApiActions::CreateResult(404, "Can't find a valid " + command_type + " for '" + resolved_command + "'."); return ApiActions::CreateResult(404, "Can't find a valid " + command_type + " for '" + resolved_command + "'.");
else else
cmd->Execute(checkable, cr, execMacros, false); cmd->Execute(checkable, cr, execMacros, false);
} else if (command_type == "EventCommand") { } else if (command_type == "event_command") {
EventCommand::Ptr cmd = GetSingleObjectByNameUsingPermissions(EventCommand::GetTypeName(), resolved_command, ActionsHandler::AuthenticatedApiUser); EventCommand::Ptr cmd = GetSingleObjectByNameUsingPermissions(EventCommand::GetTypeName(), resolved_command, ActionsHandler::AuthenticatedApiUser);
if (!cmd) if (!cmd)
return ApiActions::CreateResult(404, "Can't find a valid " + command_type + " for '" + resolved_command + "'."); return ApiActions::CreateResult(404, "Can't find a valid " + command_type + " for '" + resolved_command + "'.");
else else
cmd->Execute(checkable, execMacros, false); cmd->Execute(checkable, execMacros, false);
} else if (command_type == "NotificationCommand") { } else if (command_type == "notification_command") {
NotificationCommand::Ptr cmd = GetSingleObjectByNameUsingPermissions(NotificationCommand::GetTypeName(), resolved_command, ActionsHandler::AuthenticatedApiUser); NotificationCommand::Ptr cmd = GetSingleObjectByNameUsingPermissions(NotificationCommand::GetTypeName(), resolved_command, ActionsHandler::AuthenticatedApiUser);
if (!cmd) if (!cmd)
return ApiActions::CreateResult(404, "Can't find a valid " + command_type + " for '" + resolved_command + "'."); return ApiActions::CreateResult(404, "Can't find a valid " + command_type + " for '" + resolved_command + "'.");