Merge pull request #1009 from melpon/cacert

Allow setting CA certificate during TLS connection
paullouisageneau · Oct 21, 2023 · 5145ba8 · 5145ba8
2 parents 2cea835 + 2a429d7
commit 5145ba8
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 4 deletions.
diff --git a/include/rtc/websocket.hpp b/include/rtc/websocket.hpp
@@ -39,6 +39,7 @@ class RTC_CPP_EXPORT WebSocket final : private CheshireCat<impl::WebSocket>, pub
 		optional<std::chrono::milliseconds> connectionTimeout; // zero to disable
 		optional<std::chrono::milliseconds> pingInterval;      // zero to disable
 		optional<int> maxOutstandingPings;
+		optional<string> caCertificatePemFile;
 	};
 
 	WebSocket();

diff --git a/src/impl/verifiedtlstransport.cpp b/src/impl/verifiedtlstransport.cpp
@@ -13,9 +13,11 @@
 
 namespace rtc::impl {
 
+static const string PemBeginCertificateTag = "-----BEGIN CERTIFICATE-----";
+
 VerifiedTlsTransport::VerifiedTlsTransport(
     variant<shared_ptr<TcpTransport>, shared_ptr<HttpProxyTransport>> lower, string host,
-    certificate_ptr certificate, state_callback callback)
+    certificate_ptr certificate, state_callback callback, [[maybe_unused]] optional<string> cacert)
     : TlsTransport(std::move(lower), std::move(host), std::move(certificate), std::move(callback)) {
 
 	PLOG_DEBUG << "Setting up TLS certificate verification";
@@ -24,13 +26,36 @@ VerifiedTlsTransport::VerifiedTlsTransport(
 	gnutls_session_set_verify_cert(mSession, mHost->c_str(), 0);
 #elif USE_MBEDTLS
 	mbedtls_ssl_conf_authmode(&mConf, MBEDTLS_SSL_VERIFY_REQUIRED);
+	mbedtls_x509_crt_init(&mCaCert);
+	try {
+		if (cacert) {
+			if (cacert->find(PemBeginCertificateTag) == string::npos) {
+				// *cacert is a file path
+				mbedtls::check(mbedtls_x509_crt_parse_file(&mCaCert, cacert->c_str()));
+			} else {
+				// *cacert is a PEM content
+				mbedtls::check(mbedtls_x509_crt_parse(
+				    &mCaCert, reinterpret_cast<const unsigned char *>(cacert->c_str()),
+				    cacert->size()));
+			}
+			mbedtls_ssl_conf_ca_chain(&mConf, &mCaCert, NULL);
+		}
+	} catch (...) {
+		mbedtls_x509_crt_free(&mCaCert);
+		throw;
+	}
 #else
 	SSL_set_verify(mSsl, SSL_VERIFY_PEER, NULL);
 	SSL_set_verify_depth(mSsl, 4);
 #endif
 }
 
-VerifiedTlsTransport::~VerifiedTlsTransport() { stop(); }
+VerifiedTlsTransport::~VerifiedTlsTransport() {
+	stop();
+#if USE_MBEDTLS
+	mbedtls_x509_crt_free(&mCaCert);
+#endif
+}
 
 } // namespace rtc::impl
 

diff --git a/src/impl/verifiedtlstransport.hpp b/src/impl/verifiedtlstransport.hpp
@@ -18,8 +18,14 @@ namespace rtc::impl {
 class VerifiedTlsTransport final : public TlsTransport {
 public:
 	VerifiedTlsTransport(variant<shared_ptr<TcpTransport>, shared_ptr<HttpProxyTransport>> lower,
-	                     string host, certificate_ptr certificate, state_callback callback);
+	                     string host, certificate_ptr certificate, state_callback callback,
+	                     optional<string> cacert);
 	~VerifiedTlsTransport();
+
+private:
+#if USE_MBEDTLS
+	mbedtls_x509_crt mCaCert;
+#endif
 };
 
 } // namespace rtc::impl

diff --git a/src/impl/websocket.cpp b/src/impl/websocket.cpp
@@ -358,7 +358,8 @@ shared_ptr<TlsTransport> WebSocket::initTlsTransport() {
 		shared_ptr<TlsTransport> transport;
 		if (verify)
 			transport = std::make_shared<VerifiedTlsTransport>(lower, mHostname.value(),
-			                                                   mCertificate, stateChangeCallback);
+			                                                   mCertificate, stateChangeCallback,
+			                                                   config.caCertificatePemFile);
 		else
 			transport =
 			    std::make_shared<TlsTransport>(lower, mHostname, mCertificate, stateChangeCallback);