Skip to content

Add client certificate option. #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 10, 2022
Merged

Add client certificate option. #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 60 additions & 0 deletions src/oatpp-mbedtls/Config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ Config::Config() {
mbedtls_entropy_init(&m_entropy);
mbedtls_ctr_drbg_init(&m_ctr_drbg);
mbedtls_x509_crt_init(&m_srvcert);
mbedtls_x509_crt_init(&m_clientcert);
mbedtls_x509_crt_init(&m_cachain);
mbedtls_pk_init(&m_privateKey);

Expand All @@ -65,6 +66,7 @@ Config::~Config() {

mbedtls_ctr_drbg_free(&m_ctr_drbg);
mbedtls_x509_crt_free(&m_srvcert);
mbedtls_x509_crt_free(&m_clientcert);
mbedtls_x509_crt_free(&m_cachain);

mbedtls_pk_free(&m_privateKey);
Expand Down Expand Up @@ -151,6 +153,64 @@ std::shared_ptr<Config> Config::createDefaultClientConfigShared(bool throwOnVeri

}

std::shared_ptr<Config> Config::createDefaultClientConfigShared(bool throwOnVerificationFailed, std::string caRootCert, std::string clientCert, std::string privateKey) {
auto result = createShared();
v_int32 res;

#if defined(OATPP_MBEDTLS_DEBUG)
mbedtls_ssl_conf_dbg( &result->m_config, mbedtlsDebug, (void*)"Client" );
mbedtls_debug_set_threshold( OATPP_MBEDTLS_DEBUG );
#endif

result->m_throwOnVerificationFailed = throwOnVerificationFailed;

res = mbedtls_ssl_config_defaults(&result->m_config, MBEDTLS_SSL_IS_CLIENT, MBEDTLS_SSL_TRANSPORT_STREAM, MBEDTLS_SSL_PRESET_DEFAULT);
if(res != 0) {
OATPP_LOGD("[oatpp::mbedtls::Config::createDefaultClientConfigShared()]", "Error. Call to mbedtls_ssl_config_defaults() failed, return value=%d.", res);
throw std::runtime_error("[oatpp::mbedtls::Config::createDefaultClientConfigShared()]: Error. Call to mbedtls_ssl_config_defaults() failed.");
}

if (caRootCert.size())
{
res = mbedtls_x509_crt_parse(&result->m_cachain, (const unsigned char *)caRootCert.data(), caRootCert.size()+1);
if (res != 0) {
OATPP_LOGD("[oatpp::mbedtls::Config::createDefaultClientConfigShared()]", "Error. Call to mbedtls_x509_crt_parse() failed, return value=%d.", res);
throw std::runtime_error("[oatpp::mbedtls::Config::createDefaultClientConfigShared()]: Error. Call to mbedtls_x509_crt_parse() failed.");
}
mbedtls_ssl_conf_authmode(&result->m_config, MBEDTLS_SSL_VERIFY_REQUIRED);
mbedtls_ssl_conf_ca_chain(&result->m_config, &result->m_cachain, nullptr );
} else {
mbedtls_ssl_conf_authmode(&result->m_config, MBEDTLS_SSL_VERIFY_NONE);
}
mbedtls_ssl_conf_rng(&result->m_config, mbedtls_ctr_drbg_random, &result->m_ctr_drbg);

if (clientCert.size())
{
res = mbedtls_x509_crt_parse(&result->m_clientcert, (const unsigned char *)clientCert.data(), clientCert.size()+1);
if (res != 0) {
OATPP_LOGD("[oatpp::mbedtls::Config::createDefaultClientConfigShared()]", "Error. Call to mbedtls_x509_crt_parse() failed, return value=%d.", res);
throw std::runtime_error("[oatpp::mbedtls::Config::createDefaultClientConfigShared()]: Error. Call to mbedtls_x509_crt_parse() failed.");
}
}

if (privateKey.size())
{
res = mbedtls_pk_parse_key(&result->m_privateKey, (const unsigned char *)privateKey.data(), privateKey.size()+1, NULL, 0);
if (res != 0) {
OATPP_LOGD("[oatpp::mbedtls::Config::createDefaultClientConfigShared()]", "Error. Call to mbedtls_pk_parse_key() failed, return value=%d.", res);
throw std::runtime_error("[oatpp::mbedtls::Config::createDefaultClientConfigShared()]: Error. Call to mbedtls_pk_parse_key() failed.");
}
}

res = mbedtls_ssl_conf_own_cert(&result->m_config, &result->m_clientcert, &result->m_privateKey);
if(res != 0) {
OATPP_LOGD("[oatpp::mbedtls::Config::createDefaultClientConfigShared()]", "Error. Call to mbedtls_ssl_conf_own_cert() failed, return value=%d.", res);
throw std::runtime_error("[oatpp::mbedtls::Config::createDefaultClientConfigShared()]: Error. Call to mbedtls_ssl_conf_own_cert() failed.");
}

return result;
}

mbedtls_ssl_config* Config::getTLSConfig() {
return &m_config;
}
Expand Down
11 changes: 11 additions & 0 deletions src/oatpp-mbedtls/Config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ class Config {
mbedtls_entropy_context m_entropy;
mbedtls_ctr_drbg_context m_ctr_drbg;
mbedtls_x509_crt m_srvcert;
mbedtls_x509_crt m_clientcert;
mbedtls_x509_crt m_cachain;
mbedtls_pk_context m_privateKey;

Expand Down Expand Up @@ -89,6 +90,16 @@ class Config {
*/
static std::shared_ptr<Config> createDefaultClientConfigShared(bool throwOnVerificationFailed = false, const char* caRootCertFile = nullptr);

/**
* Create default client config.
* @param throwOnVerificationFailed - throw error on server certificate
* @param caRootCert - string buffer containing the CA Root certificate to verify against
* @param clientCert - string buffer containing the client certificate
* @param privateKey - string buffer containing the private key
* @return - `std::shared_ptr` to Config.
*/
static std::shared_ptr<Config> createDefaultClientConfigShared(bool throwOnVerificationFailed, std::string caRootCert, std::string clientCert, std::string privateKey);

/**
* Get underlying mbedtls_ssl_config.
* @return - `mbedtls_ssl_config*`.
Expand Down