test/drogon
1
0
Fork 0
mirror of https://gitee.com/an-tao/drogon.git synced 2024-12-01 19:27:53 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Valivate certificate in HttpClient (#726)

Browse Source 
Co-authored-by: an-tao <antao2002@gmail.com>
This commit is contained in:
Martin Chang 2021-02-22 11:45:33 +08:00 committed by GitHub
parent 0f5721119c
commit cde19a1f57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/simple_example_test/main.cc
View File

@ -1390,10 +1390,8 @@ int main(int argc, char *argv[])
if (app().supportSSL())
{
std::promise<int> pro2;
auto sslClient = HttpClient::newHttpClient("127.0.0.1",
8849,
true,
loop[1].getLoop());
auto sslClient = HttpClient::newHttpClient(
"127.0.0.1", 8849, true, loop[1].getLoop(), false, false);
if (sessionID)
sslClient->addCookie(sessionID);
doTest(sslClient, pro2, true);

6
lib/inc/drogon/HttpClient.h
View File

@ -217,7 +217,8 @@ class HttpClient : public trantor::NonCopyable
uint16_t port,
bool useSSL = false,
trantor::EventLoop *loop = nullptr,
bool useOldTLS = false);
bool useOldTLS = false,
bool validateCert = true);
/// Get the event loop of the client;
virtual trantor::EventLoop *getLoop() = 0;
@ -255,7 +256,8 @@ class HttpClient : public trantor::NonCopyable
*/
static HttpClientPtr newHttpClient(const std::string &hostString,
trantor::EventLoop *loop = nullptr,
bool useOldTLS = false);
bool useOldTLS = false,
bool validateCert = true);
virtual ~HttpClient()
{

4
lib/inc/drogon/HttpTypes.h
View File

@ -131,7 +131,9 @@ enum class ReqResult
BadResponse,
NetworkFailure,
BadServerAddress,
Timeout
Timeout,
HandshakeError,
InvalidCertificate,
};
enum class WebSocketMessageType

42
lib/src/HttpClientImpl.cc
View File

@ -39,7 +39,7 @@ void HttpClientImpl::createTcpClient()
{
LOG_TRACE << "useOldTLS=" << useOldTLS_;
LOG_TRACE << "domain=" << domain_;
tcpClientPtr_->enableSSL(useOldTLS_, domain_);
tcpClientPtr_->enableSSL(useOldTLS_, validateCert_, domain_);
}
#endif
auto thisPtr = shared_from_this();
@ -107,21 +107,41 @@ void HttpClientImpl::createTcpClient()
thisPtr->onRecvMessage(connPtr, msg);
}
});
tcpClientPtr_->setSSLErrorCallback([weakPtr](SSLError err) {
auto thisPtr = weakPtr.lock();
if (!thisPtr)
return;
if (err == trantor::SSLError::kSSLHandshakeError)
thisPtr->onError(ReqResult::HandshakeError);
else if (err == trantor::SSLError::kSSLInvalidCertificate)
thisPtr->onError(ReqResult::InvalidCertificate);
else
{
LOG_FATAL << "Invalid value for SSLError";
abort();
}
});
tcpClientPtr_->connect();
}
HttpClientImpl::HttpClientImpl(trantor::EventLoop *loop,
const trantor::InetAddress &addr,
bool useSSL,
bool useOldTLS)
: loop_(loop), serverAddr_(addr), useSSL_(useSSL), useOldTLS_(useOldTLS)
bool useOldTLS,
bool validateCert)
: loop_(loop),
serverAddr_(addr),
useSSL_(useSSL),
validateCert_(validateCert),
useOldTLS_(useOldTLS)
{
}
HttpClientImpl::HttpClientImpl(trantor::EventLoop *loop,
const std::string &hostString,
bool useOldTLS)
: loop_(loop), useOldTLS_(useOldTLS)
bool useOldTLS,
bool validateCert)
: loop_(loop), validateCert_(validateCert), useOldTLS_(useOldTLS)
{
auto lowerHost = hostString;
std::transform(lowerHost.begin(),
@ -559,24 +579,28 @@ HttpClientPtr HttpClient::newHttpClient(const std::string &ip,
uint16_t port,
bool useSSL,
trantor::EventLoop *loop,
bool useOldTLS)
bool useOldTLS,
bool validateCert)
{
bool isIpv6 = ip.find(':') == std::string::npos ? false : true;
return std::make_shared<HttpClientImpl>(
loop == nullptr ? HttpAppFrameworkImpl::instance().getLoop() : loop,
trantor::InetAddress(ip, port, isIpv6),
useSSL,
useOldTLS);
useOldTLS,
validateCert);
}
HttpClientPtr HttpClient::newHttpClient(const std::string &hostString,
trantor::EventLoop *loop,
bool useOldTLS)
bool useOldTLS,
bool validateCert)
{
return std::make_shared<HttpClientImpl>(
loop == nullptr ? HttpAppFrameworkImpl::instance().getLoop() : loop,
hostString,
useOldTLS);
useOldTLS,
validateCert);
}
void HttpClientImpl::onError(ReqResult result)

7
lib/src/HttpClientImpl.h
View File

@ -33,10 +33,12 @@ class HttpClientImpl : public HttpClient,
HttpClientImpl(trantor::EventLoop *loop,
const trantor::InetAddress &addr,
bool useSSL = false,
bool useOldTLS = false);
bool useOldTLS = false,
bool validateCert = true);
HttpClientImpl(trantor::EventLoop *loop,
const std::string &hostString,
bool useOldTLS = false);
bool useOldTLS = false,
bool validateCert = true);
virtual void sendRequest(const HttpRequestPtr &req,
const HttpReqCallback &callback,
double timeout = 0) override;
@ -83,6 +85,7 @@ class HttpClientImpl : public HttpClient,
trantor::EventLoop *loop_;
trantor::InetAddress serverAddr_;
bool useSSL_;
bool validateCert_;
void sendReq(const trantor::TcpConnectionPtr &connPtr,
const HttpRequestPtr &req);
void sendRequestInLoop(const HttpRequestPtr &req,

2
trantor

@ -1 +1 @@
Subproject commit 59f857cd061ee295c3a5cfa69b5a857935382025
Subproject commit 4791f76335b0bf49fb6a43e9ff2053cdbb41515a