Include client IP address and port in HTTP requests

fixes #11706

diff --git a/lib/base/tlsstream.cpp b/lib/base/tlsstream.cpp
index d0a1e442a4467eb278ee26934d7e14a61a98d87b..b281203334112b04f3943a98da2b3b0a7faea8de 100644 (file)
--- a/lib/base/tlsstream.cpp
+++ b/lib/base/tlsstream.cpp
@@ -391,3 +391,8 @@ bool TlsStream::IsDataAvailable(void) const
 
        return m_RecvQ->GetAvailableBytes() > 0;
 }
+
+Socket::Ptr TlsStream::GetSocket(void) const
+{
+       return m_Socket;
+}

diff --git a/lib/base/tlsstream.hpp b/lib/base/tlsstream.hpp
index bfd4d2a230a4632b7610e47ad99b2a8eb3272380..5fa06d319eb9b5b40e1b58f99087188dc80cbd44 100644 (file)
--- a/lib/base/tlsstream.hpp
+++ b/lib/base/tlsstream.hpp
@@ -51,6 +51,8 @@ public:
        TlsStream(const Socket::Ptr& socket, const String& hostname, ConnectionRole role, const boost::shared_ptr<SSL_CTX>& sslContext = MakeSSLContext());
        ~TlsStream(void);
 
+       Socket::Ptr GetSocket(void) const;
+
        boost::shared_ptr<X509> GetClientCertificate(void) const;
        boost::shared_ptr<X509> GetPeerCertificate(void) const;
 

diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp
index be3dec15aafdd5cbc2f0cdc425a6e2654cc8b1e0..6498dd511f76464090b7767760b5ea61590d55fb 100644 (file)
--- a/lib/remote/httpserverconnection.cpp
+++ b/lib/remote/httpserverconnection.cpp
@@ -163,7 +163,7 @@ void HttpServerConnection::ProcessMessageAsync(HttpRequest& request)
 
        Log(LogInformation, "HttpServerConnection")
            << "Request: " << request.RequestMethod << " " << requestUrl
-           << " (" << (user ? user->GetName() : "<unauthenticated>") << ")";
+           << " (from " << m_Stream->GetSocket()->GetPeerAddress() << ", user: " << (user ? user->GetName() : "<unauthenticated>") << ")";
 
        HttpResponse response(m_Stream, request);