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

Fix crash in api user command

This commit is contained in:
Jean Flach 2018-02-20 09:45:55 +01:00
parent 8a8d42b154
commit 54384528ed
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/cli/apiusercommand.cpp
View File

@ -56,19 +56,18 @@ void ApiUserCommand::InitParameters(boost::program_options::options_description&
*/ */
int ApiUserCommand::Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const int ApiUserCommand::Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const
{ {
String user, passwd, salt; String passwd, salt;
if (!vm.count("user") && !vm.count("oneline")) { if (!vm.count("user") && !vm.count("oneline")) {
Log(LogCritical, "cli", "Username (--user) must be specified."); Log(LogCritical, "cli", "Username (--user) must be specified.");
return 1; return 1;
} else }
user = vm["user"].as<std::string>();
if (!vm.count("password")) { if (!vm.count("password")) {
Log(LogCritical, "cli", "Password (--password) must be specified."); Log(LogCritical, "cli", "Password (--password) must be specified.");
return 1; return 1;
} }
passwd = vm["passwd"].as<std::string>(); passwd = vm["password"].as<std::string>();
salt = vm.count("salt") ? String(vm["salt"].as<std::string>()) : RandomString(8); salt = vm.count("salt") ? String(vm["salt"].as<std::string>()) : RandomString(8);
if (salt.FindFirstOf('$') != String::NPos) { if (salt.FindFirstOf('$') != String::NPos) {
@ -83,11 +82,11 @@ int ApiUserCommand::Run(const boost::program_options::variables_map& vm, const s
} }
if (vm.count("oneline")) if (vm.count("oneline"))
std::cout << '"' << hashedPassword << "\"\n"; std::cout << hashedPassword << std::endl;
else { else {
std::cout << "object ApiUser "; std::cout << "object ApiUser ";
ConfigWriter::EmitString(std::cout, user); ConfigWriter::EmitString(std::cout, vm["user"].as<std::string>());
std::cout << "{\n" std::cout << "{\n"
<< " password_hash = "; << " password_hash = ";