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

Merge pull request #5539 from transitiv/fix/checp_nscp_api-args-5537 

check_nscp_api: Allow arguments containing spaces
This commit is contained in:
Michael Friedrich 2017-09-18 16:46:02 +02:00 committed by GitHub
parent 532f779f50 ec28c56943
commit 2437ffecce
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/check_nscp_api.cpp
View File

@ -239,11 +239,11 @@ int main(int argc, char **argv)
("help,h", "Print usage message and exit") ("help,h", "Print usage message and exit")
("version,V", "Print version and exit") ("version,V", "Print version and exit")
("debug,d", "Verbose/Debug output") ("debug,d", "Verbose/Debug output")
("host,H", po::value<String>()->required(), "REQUIRED: NSCP API Host") ("host,H", po::value<std::string>()->required(), "REQUIRED: NSCP API Host")
("port,P", po::value<String>()->default_value("8443"), "NSCP API Port (Default: 8443)") ("port,P", po::value<std::string>()->default_value("8443"), "NSCP API Port (Default: 8443)")
("password", po::value<String>()->required(), "REQUIRED: NSCP API Password") ("password", po::value<std::string>()->required(), "REQUIRED: NSCP API Password")
("query,q", po::value<String>()->required(), "REQUIRED: NSCP API Query endpoint") ("query,q", po::value<std::string>()->required(), "REQUIRED: NSCP API Query endpoint")
("arguments,a", po::value<std::vector<String>>()->multitoken(), "NSCP API Query arguments for the endpoint"); ("arguments,a", po::value<std::vector<std::string>>()->multitoken(), "NSCP API Query arguments for the endpoint");
po::basic_command_line_parser<char> parser(argc, argv); po::basic_command_line_parser<char> parser(argc, argv);
@ -281,12 +281,12 @@ int main(int argc, char **argv)
} }
// Create the URL string and escape certain characters since Url() follows RFC 3986 // Create the URL string and escape certain characters since Url() follows RFC 3986
String endpoint = "/query/" + vm["query"].as<String>(); String endpoint = "/query/" + vm["query"].as<std::string>();
if (!vm.count("arguments")) if (!vm.count("arguments"))
endpoint += '/'; endpoint += '/';
else { else {
endpoint += '?'; endpoint += '?';
for (String argument : vm["arguments"].as<std::vector<String>>()) { for (const String& argument : vm["arguments"].as<std::vector<std::string>>()) {
String::SizeType pos = argument.FindFirstOf("="); String::SizeType pos = argument.FindFirstOf("=");
if (pos == String::NPos) if (pos == String::NPos)
endpoint += Utility::EscapeString(argument, ACQUERY_ENCODE, false); endpoint += Utility::EscapeString(argument, ACQUERY_ENCODE, false);
@ -302,8 +302,8 @@ int main(int argc, char **argv)
// This needs to happen for HttpRequest to work // This needs to happen for HttpRequest to work
Application::InitializeBase(); Application::InitializeBase();
Dictionary::Ptr result = QueryEndpoint(vm["host"].as<String>(), vm["port"].as<String>(), Dictionary::Ptr result = QueryEndpoint(vm["host"].as<std::string>(), vm["port"].as<std::string>(),
vm["password"].as<String>(), endpoint); vm["password"].as<std::string>(), endpoint);
// Application::Exit() is the clean way to exit after calling InitializeBase() // Application::Exit() is the clean way to exit after calling InitializeBase()
Application::Exit(FormatOutput(result)); Application::Exit(FormatOutput(result));