lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-04-23 09:45:32 +03:00
Code

clangformat

Browse Source
This commit is contained in:
yhirose 2019-06-11 20:57:02 -04:00
parent 92f08b54c4
commit 07d9843b91
2 changed files with 52 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
httplib.h
View File

@ -376,7 +376,8 @@ private:
class SSLServer : public Server { class SSLServer : public Server {
public: public:
SSLServer(const char *cert_path, const char *private_key_path, const char *client_CA_cert_path, const char *trusted_cert_path); SSLServer(const char *cert_path, const char *private_key_path,
const char *client_CA_cert_path, const char *trusted_cert_path);
virtual ~SSLServer(); virtual ~SSLServer();
@ -394,7 +395,8 @@ private:
class SSLClient : public Client { class SSLClient : public Client {
public: public:
SSLClient(const char *host, int port = 443, time_t timeout_sec = 300, SSLClient(const char *host, int port = 443, time_t timeout_sec = 300,
const char *client_cert_path = nullptr, const char *client_key_path = nullptr); const char *client_cert_path = nullptr,
const char *client_key_path = nullptr);
virtual ~SSLClient(); virtual ~SSLClient();
@ -2238,8 +2240,8 @@ read_and_close_socket_ssl(socket_t sock, size_t keep_alive_max_count,
// The upcoming 1.1.0 is going to be thread safe. // The upcoming 1.1.0 is going to be thread safe.
SSL_CTX *ctx, std::mutex &ctx_mutex, SSL_CTX *ctx, std::mutex &ctx_mutex,
U SSL_connect_or_accept, V setup, T callback, U SSL_connect_or_accept, V setup, T callback,
const char* client_CA_cert_path = nullptr, const char *client_CA_cert_path = nullptr,
const char* trusted_cert_path = nullptr) { const char *trusted_cert_path = nullptr) {
SSL *ssl = nullptr; SSL *ssl = nullptr;
{ {
std::lock_guard<std::mutex> guard(ctx_mutex); std::lock_guard<std::mutex> guard(ctx_mutex);
@ -2265,14 +2267,14 @@ read_and_close_socket_ssl(socket_t sock, size_t keep_alive_max_count,
return false; return false;
} }
if(client_CA_cert_path){ if (client_CA_cert_path) {
STACK_OF(X509_NAME)* list; STACK_OF(X509_NAME) * list;
//list of client CAs to request from client // list of client CAs to request from client
list = SSL_load_client_CA_file(client_CA_cert_path); list = SSL_load_client_CA_file(client_CA_cert_path);
SSL_set_client_CA_list(ssl, list); SSL_set_client_CA_list(ssl, list);
//certificate chain to verify received client certificate against // certificate chain to verify received client certificate against
//please run c_rehash in the cert folder first // please run c_rehash in the cert folder first
SSL_CTX_load_verify_locations(ctx,client_CA_cert_path,trusted_cert_path); SSL_CTX_load_verify_locations(ctx, client_CA_cert_path, trusted_cert_path);
} }
bool ret = false; bool ret = false;
@ -2357,12 +2359,11 @@ inline std::string SSLSocketStream::get_remote_addr() const {
} }
// SSL HTTP server implementation // SSL HTTP server implementation
inline SSLServer::SSLServer(const char *cert_path, inline SSLServer::SSLServer(const char *cert_path, const char *private_key_path,
const char *private_key_path,
const char *client_CA_cert_path = nullptr, const char *client_CA_cert_path = nullptr,
const char *trusted_cert_path = nullptr) const char *trusted_cert_path = nullptr)
: client_CA_cert_path_(client_CA_cert_path), : client_CA_cert_path_(client_CA_cert_path),
trusted_cert_path_(trusted_cert_path){ trusted_cert_path_(trusted_cert_path) {
ctx_ = SSL_CTX_new(SSLv23_server_method()); ctx_ = SSL_CTX_new(SSLv23_server_method());
if (ctx_) { if (ctx_) {
@ -2380,11 +2381,12 @@ inline SSLServer::SSLServer(const char *cert_path,
1) { 1) {
SSL_CTX_free(ctx_); SSL_CTX_free(ctx_);
ctx_ = nullptr; ctx_ = nullptr;
} else if(client_CA_cert_path_) { } else if (client_CA_cert_path_) {
SSL_CTX_set_verify(ctx_, SSL_CTX_set_verify(
SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, //SSL_VERIFY_CLIENT_ONCE, ctx_,
nullptr SSL_VERIFY_PEER |
); SSL_VERIFY_FAIL_IF_NO_PEER_CERT, // SSL_VERIFY_CLIENT_ONCE,
nullptr);
} }
} }
} }
@ -2402,13 +2404,13 @@ inline bool SSLServer::read_and_close_socket(socket_t sock) {
[this](Stream &strm, bool last_connection, bool &connection_close) { [this](Stream &strm, bool last_connection, bool &connection_close) {
return process_request(strm, last_connection, connection_close); return process_request(strm, last_connection, connection_close);
}, },
client_CA_cert_path_, client_CA_cert_path_, trusted_cert_path_);
trusted_cert_path_);
} }
// SSL HTTP client implementation // SSL HTTP client implementation
inline SSLClient::SSLClient(const char *host, int port, time_t timeout_sec, inline SSLClient::SSLClient(const char *host, int port, time_t timeout_sec,
const char *client_cert_path, const char *client_key_path) const char *client_cert_path,
const char *client_key_path)
: Client(host, port, timeout_sec) { : Client(host, port, timeout_sec) {
ctx_ = SSL_CTX_new(SSLv23_client_method()); ctx_ = SSL_CTX_new(SSLv23_client_method());
@ -2416,9 +2418,11 @@ inline SSLClient::SSLClient(const char *host, int port, time_t timeout_sec,
[&](const char *b, const char *e) { [&](const char *b, const char *e) {
host_components_.emplace_back(std::string(b, e)); host_components_.emplace_back(std::string(b, e));
}); });
if(client_cert_path && client_key_path) { if (client_cert_path && client_key_path) {
if (SSL_CTX_use_certificate_file(ctx_, client_cert_path, SSL_FILETYPE_PEM) != 1 if (SSL_CTX_use_certificate_file(ctx_, client_cert_path,
||SSL_CTX_use_PrivateKey_file(ctx_, client_key_path, SSL_FILETYPE_PEM) != 1) { SSL_FILETYPE_PEM) != 1 ||
SSL_CTX_use_PrivateKey_file(ctx_, client_key_path, SSL_FILETYPE_PEM) !=
1) {
SSL_CTX_free(ctx_); SSL_CTX_free(ctx_);
ctx_ = nullptr; ctx_ = nullptr;
} }
@ -2532,8 +2536,7 @@ SSLClient::verify_host_with_subject_alt_name(X509 *server_cert) const {
addr_len = sizeof(struct in_addr); addr_len = sizeof(struct in_addr);
} }
auto alt_names = auto alt_names = static_cast<const struct stack_st_GENERAL_NAME *>(
static_cast<const struct stack_st_GENERAL_NAME *>(
X509_get_ext_d2i(server_cert, NID_subject_alt_name, nullptr, nullptr)); X509_get_ext_d2i(server_cert, NID_subject_alt_name, nullptr, nullptr));
if (alt_names) { if (alt_names) {
@ -2587,9 +2590,7 @@ inline bool SSLClient::verify_host_with_common_name(X509 *server_cert) const {
inline bool SSLClient::check_host_name(const char *pattern, inline bool SSLClient::check_host_name(const char *pattern,
size_t pattern_len) const { size_t pattern_len) const {
if (host_.size() == pattern_len && host_ == pattern) { if (host_.size() == pattern_len && host_ == pattern) { return true; }
return true;
}
// Wildcard match // Wildcard match
// https://bugs.launchpad.net/ubuntu/+source/firefox-3.0/+bug/376484 // https://bugs.launchpad.net/ubuntu/+source/firefox-3.0/+bug/376484

37
test/test.cc
View File

@ -1380,17 +1380,19 @@ TEST(SSLClientTest, WildcardHostNameMatch) {
} }
TEST(SSLClientServerTest, ClientCertPresent) { TEST(SSLClientServerTest, ClientCertPresent) {
SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE, CLIENT_CA_CERT_FILE, TRUST_CERT_DIR); SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE, CLIENT_CA_CERT_FILE,
TRUST_CERT_DIR);
ASSERT_TRUE(svr.is_valid()); ASSERT_TRUE(svr.is_valid());
svr.Get("/test", [&](const Request &, Response &res){ svr.Get("/test", [&](const Request &, Response &res) {
res.set_content("test", "text/plain"); res.set_content("test", "text/plain");
svr.stop(); svr.stop();
}); });
thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); }); thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
httplib::SSLClient cli(HOST, PORT, 30, CLIENT_CERT_FILE, CLIENT_PRIVATE_KEY_FILE); httplib::SSLClient cli(HOST, PORT, 30, CLIENT_CERT_FILE,
CLIENT_PRIVATE_KEY_FILE);
auto res = cli.Get("/test"); auto res = cli.Get("/test");
ASSERT_TRUE(res != nullptr); ASSERT_TRUE(res != nullptr);
ASSERT_EQ(200, res->status); ASSERT_EQ(200, res->status);
@ -1399,12 +1401,13 @@ TEST(SSLClientServerTest, ClientCertPresent) {
} }
TEST(SSLClientServerTest, ClientCertMissing) { TEST(SSLClientServerTest, ClientCertMissing) {
SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE, CLIENT_CA_CERT_FILE, TRUST_CERT_DIR); SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE, CLIENT_CA_CERT_FILE,
TRUST_CERT_DIR);
ASSERT_TRUE(svr.is_valid()); ASSERT_TRUE(svr.is_valid());
svr.Get("/test", [&](const Request &, Response &res){ svr.Get("/test", [&](const Request &, Response &res) {
res.set_content("test", "text/plain"); res.set_content("test", "text/plain");
svr.stop(); svr.stop();
}); });
thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); }); thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
@ -1422,14 +1425,15 @@ TEST(SSLClientServerTest, TrustDirOptional) {
SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE, CLIENT_CA_CERT_FILE); SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE, CLIENT_CA_CERT_FILE);
ASSERT_TRUE(svr.is_valid()); ASSERT_TRUE(svr.is_valid());
svr.Get("/test", [&](const Request &, Response &res){ svr.Get("/test", [&](const Request &, Response &res) {
res.set_content("test", "text/plain"); res.set_content("test", "text/plain");
svr.stop(); svr.stop();
}); });
thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); }); thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
httplib::SSLClient cli(HOST, PORT, 30, CLIENT_CERT_FILE, CLIENT_PRIVATE_KEY_FILE); httplib::SSLClient cli(HOST, PORT, 30, CLIENT_CERT_FILE,
CLIENT_PRIVATE_KEY_FILE);
auto res = cli.Get("/test"); auto res = cli.Get("/test");
ASSERT_TRUE(res != nullptr); ASSERT_TRUE(res != nullptr);
ASSERT_EQ(200, res->status); ASSERT_EQ(200, res->status);
@ -1437,9 +1441,10 @@ TEST(SSLClientServerTest, TrustDirOptional) {
t.join(); t.join();
} }
/* Cannot test this case as there is no external access to SSL object to check SSL_get_peer_certificate() == NULL /* Cannot test this case as there is no external access to SSL object to check
TEST(SSLClientServerTest, ClientCAPathRequired) { SSL_get_peer_certificate() == NULL TEST(SSLClientServerTest,
SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE, nullptr, TRUST_CERT_DIR); ClientCAPathRequired) { SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE,
nullptr, TRUST_CERT_DIR);
} }
*/ */
#endif #endif