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

Introduce UnbufferedAsioTlsStream#GetPeerCertificate()

Browse Source
This commit is contained in:
Alexander A. Klimov 2019-02-25 17:22:00 +01:00
parent d1e87bdc45
commit f2d9d91e83
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/base/tlsstream.cpp
View File

@ -465,6 +465,11 @@ String UnbufferedAsioTlsStream::GetVerifyError() const
return m_VerifyError; return m_VerifyError;
} }
std::shared_ptr<X509> UnbufferedAsioTlsStream::GetPeerCertificate()
{
return std::shared_ptr<X509>(SSL_get_peer_certificate(native_handle()), X509_free);
}
void UnbufferedAsioTlsStream::BeforeHandshake(handshake_type type) void UnbufferedAsioTlsStream::BeforeHandshake(handshake_type type)
{ {
namespace ssl = boost::asio::ssl; namespace ssl = boost::asio::ssl;

1
lib/base/tlsstream.hpp
View File

@ -119,6 +119,7 @@ public:
bool IsVerifyOK() const; bool IsVerifyOK() const;
String GetVerifyError() const; String GetVerifyError() const;
std::shared_ptr<X509> GetPeerCertificate();
template<class... Args> template<class... Args>
inline inline

2
lib/remote/apilistener.cpp
View File

@ -523,7 +523,7 @@ void ApiListener::NewClientHandlerInternal(boost::asio::yield_context yc, const
} }
}); });
std::shared_ptr<X509> cert (SSL_get_peer_certificate(sslConn.native_handle()), X509_free); std::shared_ptr<X509> cert (sslConn.GetPeerCertificate());
bool verify_ok = false; bool verify_ok = false;
String identity; String identity;
Endpoint::Ptr endpoint; Endpoint::Ptr endpoint;

2
lib/remote/jsonrpcconnection-pki.cpp
View File

@ -34,7 +34,7 @@ Value RequestCertificateHandler(const MessageOrigin::Ptr& origin, const Dictiona
/* Use the presented client certificate if not provided. */ /* Use the presented client certificate if not provided. */
if (certText.IsEmpty()) { if (certText.IsEmpty()) {
auto stream (origin->FromClient->GetStream()); auto stream (origin->FromClient->GetStream());
cert = std::shared_ptr<X509>(SSL_get_peer_certificate(stream->next_layer().native_handle()), X509_free); cert = stream->next_layer().GetPeerCertificate();
} else { } else {
cert = StringToCertificate(certText); cert = StringToCertificate(certText);
} }