mirrors/cpp-httplib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib.git synced 2025-05-10 09:43:51 +00:00
Code Issues Projects Releases Wiki Activity

Fix #674

Browse Source
This commit is contained in:
yhirose 2020-09-29 19:22:28 -04:00
parent d87082f04b
commit e2c4e9d95c
1 changed files with 69 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
httplib.h
View File

@ -839,6 +839,10 @@ public:
void set_proxy_digest_auth(const char *username, const char *password); void set_proxy_digest_auth(const char *username, const char *password);
#endif #endif
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
void enable_server_certificate_verification(bool enabled);
#endif
void set_logger(Logger logger); void set_logger(Logger logger);
protected: protected:
@ -859,6 +863,8 @@ protected:
Error get_last_error() const; Error get_last_error() const;
void copy_settings(const ClientImpl &rhs);
// Error state // Error state
mutable Error error_ = Error::Success; mutable Error error_ = Error::Success;
@ -916,41 +922,11 @@ protected:
std::string proxy_digest_auth_password_; std::string proxy_digest_auth_password_;
#endif #endif
Logger logger_; #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
bool server_certificate_verification_ = true;
#endif
void copy_settings(const ClientImpl &rhs) { Logger logger_;
client_cert_path_ = rhs.client_cert_path_;
client_key_path_ = rhs.client_key_path_;
connection_timeout_sec_ = rhs.connection_timeout_sec_;
read_timeout_sec_ = rhs.read_timeout_sec_;
read_timeout_usec_ = rhs.read_timeout_usec_;
write_timeout_sec_ = rhs.write_timeout_sec_;
write_timeout_usec_ = rhs.write_timeout_usec_;
basic_auth_username_ = rhs.basic_auth_username_;
basic_auth_password_ = rhs.basic_auth_password_;
bearer_token_auth_token_ = rhs.bearer_token_auth_token_;
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
digest_auth_username_ = rhs.digest_auth_username_;
digest_auth_password_ = rhs.digest_auth_password_;
#endif
keep_alive_ = rhs.keep_alive_;
follow_location_ = rhs.follow_location_;
tcp_nodelay_ = rhs.tcp_nodelay_;
socket_options_ = rhs.socket_options_;
compress_ = rhs.compress_;
decompress_ = rhs.decompress_;
interface_ = rhs.interface_;
proxy_host_ = rhs.proxy_host_;
proxy_port_ = rhs.proxy_port_;
proxy_basic_auth_username_ = rhs.proxy_basic_auth_username_;
proxy_basic_auth_password_ = rhs.proxy_basic_auth_password_;
proxy_bearer_token_auth_token_ = rhs.proxy_bearer_token_auth_token_;
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
proxy_digest_auth_username_ = rhs.proxy_digest_auth_username_;
proxy_digest_auth_password_ = rhs.proxy_digest_auth_password_;
#endif
logger_ = rhs.logger_;
}
private: private:
socket_t create_client_socket() const; socket_t create_client_socket() const;
@ -1096,16 +1072,18 @@ public:
void set_proxy_digest_auth(const char *username, const char *password); void set_proxy_digest_auth(const char *username, const char *password);
#endif #endif
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
void enable_server_certificate_verification(bool enabled);
#endif
void set_logger(Logger logger); void set_logger(Logger logger);
// SSL // SSL
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
Client &set_ca_cert_path(const char *ca_cert_file_path, void set_ca_cert_path(const char *ca_cert_file_path,
const char *ca_cert_dir_path = nullptr); const char *ca_cert_dir_path = nullptr);
Client &set_ca_cert_store(X509_STORE *ca_cert_store); void set_ca_cert_store(X509_STORE *ca_cert_store);
Client &enable_server_certificate_verification(bool enabled);
long get_openssl_verify_result() const; long get_openssl_verify_result() const;
@ -1163,8 +1141,6 @@ public:
void set_ca_cert_store(X509_STORE *ca_cert_store); void set_ca_cert_store(X509_STORE *ca_cert_store);
void enable_server_certificate_verification(bool enabled);
long get_openssl_verify_result() const; long get_openssl_verify_result() const;
SSL_CTX *ssl_context() const; SSL_CTX *ssl_context() const;
@ -1196,7 +1172,6 @@ private:
std::string ca_cert_file_path_; std::string ca_cert_file_path_;
std::string ca_cert_dir_path_; std::string ca_cert_dir_path_;
X509_STORE *ca_cert_store_ = nullptr; X509_STORE *ca_cert_store_ = nullptr;
bool server_certificate_verification_ = true;
long verify_result_ = 0; long verify_result_ = 0;
friend class ClientImpl; friend class ClientImpl;
@ -4616,6 +4591,43 @@ inline bool ClientImpl::is_valid() const { return true; }
inline Error ClientImpl::get_last_error() const { return error_; } inline Error ClientImpl::get_last_error() const { return error_; }
inline void ClientImpl::copy_settings(const ClientImpl &rhs) {
client_cert_path_ = rhs.client_cert_path_;
client_key_path_ = rhs.client_key_path_;
connection_timeout_sec_ = rhs.connection_timeout_sec_;
read_timeout_sec_ = rhs.read_timeout_sec_;
read_timeout_usec_ = rhs.read_timeout_usec_;
write_timeout_sec_ = rhs.write_timeout_sec_;
write_timeout_usec_ = rhs.write_timeout_usec_;
basic_auth_username_ = rhs.basic_auth_username_;
basic_auth_password_ = rhs.basic_auth_password_;
bearer_token_auth_token_ = rhs.bearer_token_auth_token_;
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
digest_auth_username_ = rhs.digest_auth_username_;
digest_auth_password_ = rhs.digest_auth_password_;
#endif
keep_alive_ = rhs.keep_alive_;
follow_location_ = rhs.follow_location_;
tcp_nodelay_ = rhs.tcp_nodelay_;
socket_options_ = rhs.socket_options_;
compress_ = rhs.compress_;
decompress_ = rhs.decompress_;
interface_ = rhs.interface_;
proxy_host_ = rhs.proxy_host_;
proxy_port_ = rhs.proxy_port_;
proxy_basic_auth_username_ = rhs.proxy_basic_auth_username_;
proxy_basic_auth_password_ = rhs.proxy_basic_auth_password_;
proxy_bearer_token_auth_token_ = rhs.proxy_bearer_token_auth_token_;
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
proxy_digest_auth_username_ = rhs.proxy_digest_auth_username_;
proxy_digest_auth_password_ = rhs.proxy_digest_auth_password_;
#endif
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
server_certificate_verification_ = rhs.server_certificate_verification_;
#endif
logger_ = rhs.logger_;
}
inline socket_t ClientImpl::create_client_socket() const { inline socket_t ClientImpl::create_client_socket() const {
if (!proxy_host_.empty() && proxy_port_ != -1) { if (!proxy_host_.empty() && proxy_port_ != -1) {
return detail::create_client_socket( return detail::create_client_socket(
@ -5489,6 +5501,12 @@ inline void ClientImpl::set_proxy_digest_auth(const char *username,
} }
#endif #endif
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
inline void ClientImpl::enable_server_certificate_verification(bool enabled) {
server_certificate_verification_ = enabled;
}
#endif
inline void ClientImpl::set_logger(Logger logger) { inline void ClientImpl::set_logger(Logger logger) {
logger_ = std::move(logger); logger_ = std::move(logger);
} }
@ -5829,10 +5847,6 @@ inline void SSLClient::set_ca_cert_store(X509_STORE *ca_cert_store) {
if (ca_cert_store) { ca_cert_store_ = ca_cert_store; } if (ca_cert_store) { ca_cert_store_ = ca_cert_store; }
} }
inline void SSLClient::enable_server_certificate_verification(bool enabled) {
server_certificate_verification_ = enabled;
}
inline long SSLClient::get_openssl_verify_result() const { inline long SSLClient::get_openssl_verify_result() const {
return verify_result_; return verify_result_;
} }
@ -6413,31 +6427,27 @@ inline void Client::set_proxy_digest_auth(const char *username,
} }
#endif #endif
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
inline void Client::enable_server_certificate_verification(bool enabled) {
cli_->enable_server_certificate_verification(enabled);
}
#endif
inline void Client::set_logger(Logger logger) { cli_->set_logger(logger); } inline void Client::set_logger(Logger logger) { cli_->set_logger(logger); }
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
inline Client &Client::set_ca_cert_path(const char *ca_cert_file_path, inline void Client::set_ca_cert_path(const char *ca_cert_file_path,
const char *ca_cert_dir_path) { const char *ca_cert_dir_path) {
if (is_ssl_) { if (is_ssl_) {
static_cast<SSLClient &>(*cli_).set_ca_cert_path(ca_cert_file_path, static_cast<SSLClient &>(*cli_).set_ca_cert_path(ca_cert_file_path,
ca_cert_dir_path); ca_cert_dir_path);
} }
return *this;
} }
inline Client &Client::set_ca_cert_store(X509_STORE *ca_cert_store) { inline void Client::set_ca_cert_store(X509_STORE *ca_cert_store) {
if (is_ssl_) { if (is_ssl_) {
static_cast<SSLClient &>(*cli_).set_ca_cert_store(ca_cert_store); static_cast<SSLClient &>(*cli_).set_ca_cert_store(ca_cert_store);
} }
return *this;
}
inline Client &Client::enable_server_certificate_verification(bool enabled) {
if (is_ssl_) {
static_cast<SSLClient &>(*cli_).enable_server_certificate_verification(
enabled);
}
return *this;
} }
inline long Client::get_openssl_verify_result() const { inline long Client::get_openssl_verify_result() const {