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

Include IP address and port in the "New connection" log message

Browse Source 
fixes #12215
This commit is contained in:
Gunnar Beutner 2016-07-25 09:31:38 +02:00
parent be21a5aad3
commit 45dd027101
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/remote/apilistener.cpp
View File

@ -330,6 +330,15 @@ void ApiListener::NewClientHandlerInternal(const Socket::Ptr& client, const Stri
Endpoint::Ptr endpoint; Endpoint::Ptr endpoint;
bool verify_ok = false; bool verify_ok = false;
String conninfo;
if (role == RoleClient)
conninfo = "to";
else
conninfo = "from";
conninfo += " " + client->GetPeerAddress();
if (cert) { if (cert) {
try { try {
identity = GetCertificateCN(cert); identity = GetCertificateCN(cert);
@ -360,7 +369,7 @@ void ApiListener::NewClientHandlerInternal(const Socket::Ptr& client, const Stri
{ {
Log log(LogInformation, "ApiListener"); Log log(LogInformation, "ApiListener");
log << "New client connection for identity '" << identity << "'"; log << "New client connection for identity '" << identity << "' " << conninfo;
if (!verify_ok) if (!verify_ok)
log << " (certificate validation failed: " << tlsStream->GetVerifyError() << ")"; log << " (certificate validation failed: " << tlsStream->GetVerifyError() << ")";
@ -369,7 +378,7 @@ void ApiListener::NewClientHandlerInternal(const Socket::Ptr& client, const Stri
} }
} else { } else {
Log(LogInformation, "ApiListener") Log(LogInformation, "ApiListener")
<< "New client connection (no client certificate)"; << "New client connection " << conninfo << " (no client certificate)";
} }
ClientType ctype; ClientType ctype;