generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-21 07:45:01 +02:00
Code Issues Projects Releases Wiki Activity

fix(HTTPSClientSession): There is no way to resolve host in advance and connect to HTTPS server with SNI. #4395 (#4751)

Browse Source
This commit is contained in:
Aleksandar Fabijanic
2024-11-05 13:46:42 -06:00
committed by GitHub
parent ca63bf0db9
commit c156f0b357
6 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NetSSL_OpenSSL/include/Poco/Net/HTTPSClientSession.h
View File

@@ -78,10 +78,12 @@ public:
HTTPSClientSession();
/// Creates an unconnected HTTPSClientSession.
explicit HTTPSClientSession(const SecureStreamSocket& socket);
explicit HTTPSClientSession(const SecureStreamSocket& socket, const std::string& host, Poco::UInt16 port = HTTPS_PORT);
/// Creates a HTTPSClientSession using the given socket.
/// The socket must not be connected. The session
/// takes ownership of the socket.
///
/// The given host name is used for certificate verification.
HTTPSClientSession(const SecureStreamSocket& socket, Session::Ptr pSession);
/// Creates a HTTPSClientSession using the given socket.

12
NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocket.h
View File

@@ -108,6 +108,12 @@ public:
///
/// The given host name is used for certificate verification.
SecureStreamSocket(const std::string& hostName);
/// Creates a secure stream socket using the default
/// client SSL context. The created socket is not connected.
///
/// The given host name is used for certificate verification.
SecureStreamSocket(const SocketAddress& address, const std::string& hostName, Context::Ptr pContext);
/// Creates a secure stream socket using the given
/// client SSL context and connects it to
@@ -115,6 +121,12 @@ public:
///
/// The given host name is used for certificate verification.
SecureStreamSocket(const std::string& hostName, Context::Ptr pContext);
/// Creates a secure stream socket using the given
/// client SSL context. The created socket is not connected.
///
/// The given host name is used for certificate verification.
SecureStreamSocket(const SocketAddress& address, const std::string& hostName, Context::Ptr pContext, Session::Ptr pSession);
/// Creates a secure stream socket using the given
/// client SSL context and connects it to

5
NetSSL_OpenSSL/src/HTTPSClientSession.cpp
View File

@@ -39,11 +39,12 @@ HTTPSClientSession::HTTPSClientSession():
}
HTTPSClientSession::HTTPSClientSession(const SecureStreamSocket& socket):
HTTPSClientSession::HTTPSClientSession(const SecureStreamSocket& socket, const std::string& host, Poco::UInt16 port):
HTTPClientSession(socket),
_pContext(socket.context())
{
setPort(HTTPS_PORT);
setHost(host);
setPort(port);
}

14
NetSSL_OpenSSL/src/SecureStreamSocket.cpp
View File

@@ -60,6 +60,13 @@ SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::
}
SecureStreamSocket::SecureStreamSocket(const std::string& hostName):
StreamSocket(new SecureStreamSocketImpl(SSLManager::instance().defaultClientContext()))
{
static_cast<SecureStreamSocketImpl*>(impl())->setPeerHostName(hostName);
}
SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, Context::Ptr pContext):
StreamSocket(new SecureStreamSocketImpl(pContext))
{
@@ -83,6 +90,13 @@ SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::
}
SecureStreamSocket::SecureStreamSocket(const std::string& hostName, Context::Ptr pContext):
StreamSocket(new SecureStreamSocketImpl(pContext))
{
static_cast<SecureStreamSocketImpl*>(impl())->setPeerHostName(hostName);
}
SecureStreamSocket::SecureStreamSocket(const SocketAddress& address, const std::string& hostName, Context::Ptr pContext, Session::Ptr pSession):
StreamSocket(new SecureStreamSocketImpl(pContext))
{

21
NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.cpp
View File

@@ -88,6 +88,23 @@ HTTPSClientSessionTest::~HTTPSClientSessionTest()
}
void HTTPSClientSessionTest::testFromSocket()
{
HTTPSTestServer srv;
SecureStreamSocket sss("localhost");
HTTPSClientSession s(sss, "127.0.0.1", srv.port());
HTTPRequest request(HTTPRequest::HTTP_GET, "/small");
s.sendRequest(request);
HTTPResponse response;
std::istream& rs = s.receiveResponse(response);
assertTrue (response.getContentLength() == HTTPSTestServer::SMALL_BODY.length());
assertTrue (response.getContentType() == "text/plain");
std::ostringstream ostr;
StreamCopier::copyStream(rs, ostr);
assertTrue (ostr.str() == HTTPSTestServer::SMALL_BODY);
}
void HTTPSClientSessionTest::testGetSmall()
{
HTTPSTestServer srv;
@@ -458,6 +475,7 @@ void HTTPSClientSessionTest::testUnknownContentLength()
assertTrue (ostr.str() == HTTPSTestServer::SMALL_BODY);
}
void HTTPSClientSessionTest::testServerAbort()
{
HTTPSTestServer srv;
@@ -471,7 +489,7 @@ void HTTPSClientSessionTest::testServerAbort()
std::ostringstream ostr;
StreamCopier::copyStream(rs, ostr);
assertTrue (ostr.str() == HTTPSTestServer::SMALL_BODY);
assertTrue ( dynamic_cast<const Poco::Net::SSLConnectionUnexpectedlyClosedException*>(
assertTrue (dynamic_cast<const Poco::Net::SSLConnectionUnexpectedlyClosedException*>(
s.networkException()) != NULL );
}
@@ -490,6 +508,7 @@ CppUnit::Test* HTTPSClientSessionTest::suite()
{
CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("HTTPSClientSessionTest");
CppUnit_addTest(pSuite, HTTPSClientSessionTest, testFromSocket);
CppUnit_addTest(pSuite, HTTPSClientSessionTest, testGetSmall);
CppUnit_addTest(pSuite, HTTPSClientSessionTest, testGetLarge);
CppUnit_addTest(pSuite, HTTPSClientSessionTest, testHead);

1
NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.h
View File

@@ -24,6 +24,7 @@ public:
HTTPSClientSessionTest(const std::string& name);
~HTTPSClientSessionTest();
void testFromSocket();
void testGetSmall();
void testGetLarge();
void testHead();