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

Include client IP address and port in HTTP requests

Browse Source 
fixes #11706
This commit is contained in:
Gunnar Beutner 2016-07-25 09:43:13 +02:00
parent 45dd027101
commit cdda3bad8c
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/base/tlsstream.cpp
View File

@ -391,3 +391,8 @@ bool TlsStream::IsDataAvailable(void) const
return m_RecvQ->GetAvailableBytes() > 0; return m_RecvQ->GetAvailableBytes() > 0;
} }
Socket::Ptr TlsStream::GetSocket(void) const
{
return m_Socket;
}

2
lib/base/tlsstream.hpp
View File

@ -51,6 +51,8 @@ public:
TlsStream(const Socket::Ptr& socket, const String& hostname, ConnectionRole role, const boost::shared_ptr<SSL_CTX>& sslContext = MakeSSLContext()); TlsStream(const Socket::Ptr& socket, const String& hostname, ConnectionRole role, const boost::shared_ptr<SSL_CTX>& sslContext = MakeSSLContext());
~TlsStream(void); ~TlsStream(void);
Socket::Ptr GetSocket(void) const;
boost::shared_ptr<X509> GetClientCertificate(void) const; boost::shared_ptr<X509> GetClientCertificate(void) const;
boost::shared_ptr<X509> GetPeerCertificate(void) const; boost::shared_ptr<X509> GetPeerCertificate(void) const;

2
lib/remote/httpserverconnection.cpp
View File

@ -163,7 +163,7 @@ void HttpServerConnection::ProcessMessageAsync(HttpRequest& request)
Log(LogInformation, "HttpServerConnection") Log(LogInformation, "HttpServerConnection")
<< "Request: " << request.RequestMethod << " " << requestUrl << "Request: " << request.RequestMethod << " " << requestUrl
<< " (" << (user ? user->GetName() : "<unauthenticated>") << ")"; << " (from " << m_Stream->GetSocket()->GetPeerAddress() << ", user: " << (user ? user->GetName() : "<unauthenticated>") << ")";
HttpResponse response(m_Stream, request); HttpResponse response(m_Stream, request);