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

Improve log messages for the 'pki save-cert' command 

refs #5450
This commit is contained in:
Gunnar Beutner 2017-09-06 13:15:56 +02:00
parent 8040bda2e1
commit a7fe6467ba
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/cli/pkisavecertcommand.cpp
View File

@ -21,6 +21,7 @@
#include "remote/pkiutility.hpp" #include "remote/pkiutility.hpp"
#include "base/logger.hpp" #include "base/logger.hpp"
#include "base/tlsutility.hpp" #include "base/tlsutility.hpp"
#include "base/console.hpp"
using namespace icinga; using namespace icinga;
namespace po = boost::program_options; namespace po = boost::program_options;
@ -77,13 +78,26 @@ int PKISaveCertCommand::Run(const boost::program_options::variables_map& vm, con
return 1; return 1;
} }
boost::shared_ptr<X509> cert = String host = vm["host"].as<std::string>();
PkiUtility::FetchCert(vm["host"].as<std::string>(), vm["port"].as<std::string>()); String port = vm["port"].as<std::string>();
Log(LogInformation, "cli")
<< "Retrieving X.509 certificate for '" << host << ":" << port << "'.";
boost::shared_ptr<X509> cert = PkiUtility::FetchCert(host, port);
if (!cert) { if (!cert) {
Log(LogCritical, "cli", "Failed to fetch certificate from host"); Log(LogCritical, "cli", "Failed to fetch certificate from host.");
return 1; return 1;
} }
std::cout << PkiUtility::GetCertificateInformation(cert) << "\n";
std::cout << ConsoleColorTag(Console_ForegroundRed)
<< "***\n"
<< "*** You have to ensure that this certificate actually matches the parent\n"
<< "*** instance's certificate in order to avoid man-in-the-middle attacks.\n"
<< "***\n\n"
<< ConsoleColorTag(Console_Normal);
return PkiUtility::WriteCert(cert, vm["trustedcert"].as<std::string>()); return PkiUtility::WriteCert(cert, vm["trustedcert"].as<std::string>());
} }