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

Exit early on ApiListener SSL errors 

refs #6682
This commit is contained in:
Michael Friedrich 2014-08-05 12:14:24 +02:00
parent 87e63edb93
commit de229f9fec
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/remote/apilistener.cpp
View File

@ -47,14 +47,14 @@ void ApiListener::OnConfigLoaded(void)
cert = GetX509Certificate(GetCertPath()); cert = GetX509Certificate(GetCertPath());
} catch (std::exception&) { } catch (std::exception&) {
Log(LogCritical, "ApiListener", "Cannot get certificate from cert path: '" + GetCertPath() + "'."); Log(LogCritical, "ApiListener", "Cannot get certificate from cert path: '" + GetCertPath() + "'.");
return; Application::Exit(EXIT_FAILURE);
} }
try { try {
SetIdentity(GetCertificateCN(cert)); SetIdentity(GetCertificateCN(cert));
} catch (std::exception&) { } catch (std::exception&) {
Log(LogCritical, "ApiListener", "Cannot get certificate common name from cert path: '" + GetCertPath() + "'."); Log(LogCritical, "ApiListener", "Cannot get certificate common name from cert path: '" + GetCertPath() + "'.");
return; Application::Exit(EXIT_FAILURE);
} }
Log(LogInformation, "ApiListener", "My API identity: " + GetIdentity()); Log(LogInformation, "ApiListener", "My API identity: " + GetIdentity());
@ -63,7 +63,7 @@ void ApiListener::OnConfigLoaded(void)
m_SSLContext = MakeSSLContext(GetCertPath(), GetKeyPath(), GetCaPath()); m_SSLContext = MakeSSLContext(GetCertPath(), GetKeyPath(), GetCaPath());
} catch (std::exception&) { } catch (std::exception&) {
Log(LogCritical, "ApiListener", "Cannot make SSL context for cert path: '" + GetCertPath() + "' key path: '" + GetKeyPath() + "' ca path: '" + GetCaPath() + "'."); Log(LogCritical, "ApiListener", "Cannot make SSL context for cert path: '" + GetCertPath() + "' key path: '" + GetKeyPath() + "' ca path: '" + GetCaPath() + "'.");
return; Application::Exit(EXIT_FAILURE);
} }
if (!GetCrlPath().IsEmpty()) { if (!GetCrlPath().IsEmpty()) {
@ -71,13 +71,13 @@ void ApiListener::OnConfigLoaded(void)
AddCRLToSSLContext(m_SSLContext, GetCrlPath()); AddCRLToSSLContext(m_SSLContext, GetCrlPath());
} catch (std::exception&) { } catch (std::exception&) {
Log(LogCritical, "ApiListener", "Cannot add certificate revocation list to SSL context for crl path: '" + GetCrlPath() + "'."); Log(LogCritical, "ApiListener", "Cannot add certificate revocation list to SSL context for crl path: '" + GetCrlPath() + "'.");
return; Application::Exit(EXIT_FAILURE);
} }
} }
if (!Endpoint::GetByName(GetIdentity())) { if (!Endpoint::GetByName(GetIdentity())) {
Log(LogCritical, "ApiListener", "Endpoint object for '" + GetIdentity() + "' is missing."); Log(LogCritical, "ApiListener", "Endpoint object for '" + GetIdentity() + "' is missing.");
return; Application::Exit(EXIT_FAILURE);
} }
SyncZoneDirs(); SyncZoneDirs();