Skip to content

Replace CertificatePinner with custom trust store using TrustManagerFactory #112

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
cisco-annikiti merged 2 commits into from
Aug 19, 2026
Merged

Replace CertificatePinner with custom trust store using TrustManagerFactory #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35a7521
Replace CertificatePinner with custom trust store using TrustManagerF…
cisco-annikiti Aug 6, 2026
0e2264b
Changed from InputSteam to String
cisco-annikiti Aug 7, 2026
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
139 changes: 139 additions & 0 deletions duo-client/src/main/java/com/duosecurity/client/CertificateUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
package com.duosecurity.client;

import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.Certificate;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.util.Collection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;

public class CertificateUtils {

private static final String DEFAULT_BUNDLE_PATH = "duo-ca-certs/ca_certs.pem";

/**
* Create a TrustManagerFactory loaded with the default Duo CA bundle.
*
* @return TrustManagerFactory initialized with bundled Duo root CAs
*/
public static TrustManagerFactory createDefaultTrustManagerFactory() {
InputStream pemStream = CertificateUtils.class.getClassLoader()
.getResourceAsStream(DEFAULT_BUNDLE_PATH);
if (pemStream == null) {
throw new IllegalStateException(
"Cannot find bundled CA certificates at " + DEFAULT_BUNDLE_PATH);
}
try {
return createTrustManagerFactory(pemStream);
} finally {
try {
pemStream.close();
} catch (IOException e) {
// ignore close error
}
}
}

/**
* Create a TrustManagerFactory from PEM certificate content.
*
* @param pemContent PEM-encoded certificates as a String
* @return TrustManagerFactory initialized with the provided certificates
*/
public static TrustManagerFactory createTrustManagerFactory(String pemContent) {
InputStream stream = new ByteArrayInputStream(pemContent.getBytes(StandardCharsets.UTF_8));
return createTrustManagerFactory(stream);
}

/**
* Create a TrustManagerFactory from a PEM certificate InputStream.
*
* @param pemStream InputStream containing PEM-encoded certificates
* @return TrustManagerFactory initialized with the provided certificates
*/
public static TrustManagerFactory createTrustManagerFactory(InputStream pemStream) {
try {
CertificateFactory cf = CertificateFactory.getInstance("X.509");
Collection<? extends Certificate> certs = cf.generateCertificates(pemStream);

if (certs.isEmpty()) {
throw new IllegalArgumentException("No certificates found in PEM input");
}

KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
keyStore.load(null, null);

int index = 0;
for (Certificate cert : certs) {
keyStore.setCertificateEntry("duo-ca-" + index, cert);
index++;
}

TrustManagerFactory tmf = TrustManagerFactory.getInstance(
TrustManagerFactory.getDefaultAlgorithm());
tmf.init(keyStore);
return tmf;
} catch (CertificateException | KeyStoreException | NoSuchAlgorithmException
| IOException e) {
throw new IllegalStateException("Failed to initialize trust store", e);
}
}

/**
* Create an SSLSocketFactory from a TrustManagerFactory.
*
* @param tmf the TrustManagerFactory to use
* @return SSLSocketFactory configured with the trust manager
*/
public static SSLSocketFactory createSslSocketFactory(TrustManagerFactory tmf) {
try {
SSLContext sslContext = SSLContext.getInstance("TLS");
sslContext.init(null, tmf.getTrustManagers(), null);
return sslContext.getSocketFactory();
} catch (Exception e) {
throw new IllegalStateException("Failed to create SSLSocketFactory", e);
}
}

/**
* Extract the X509TrustManager from a TrustManagerFactory.
*
* @param tmf the TrustManagerFactory
* @return the X509TrustManager
*/
public static X509TrustManager getX509TrustManager(TrustManagerFactory tmf) {
for (TrustManager tm : tmf.getTrustManagers()) {
if (tm instanceof X509TrustManager) {
return (X509TrustManager) tm;
}
}
throw new IllegalStateException("No X509TrustManager found in TrustManagerFactory");
}

/**
* Get a TrustManagerFactory initialized with the system default trust store.
*
* @return TrustManagerFactory using system cacerts
*/
public static TrustManagerFactory getSystemTrustManagerFactory() {
try {
TrustManagerFactory tmf = TrustManagerFactory.getInstance(
TrustManagerFactory.getDefaultAlgorithm());
tmf.init((KeyStore) null);
return tmf;
} catch (NoSuchAlgorithmException | KeyStoreException e) {
throw new IllegalStateException("Failed to initialize system trust store", e);
}
}
}
186 changes: 28 additions & 158 deletions duo-client/src/main/java/com/duosecurity/client/Http.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
import java.util.SortedMap;
import java.util.TreeMap;
import java.util.concurrent.TimeUnit;
import okhttp3.CertificatePinner;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
import okhttp3.Headers;
import okhttp3.MediaType;
import okhttp3.OkHttpClient;
Expand Down Expand Up @@ -54,147 +56,6 @@ public class Http {
public static MediaType FORM_ENCODED = MediaType.parse("application/x-www-form-urlencoded");
public static MediaType JSON_ENCODED = MediaType.parse("application/json");

private static final String[] DEFAULT_CA_CERTS = {
//Source URL: https://www.amazontrust.com/repository/AmazonRootCA1.cer
//Certificate #1 Details:
//Original Format: DER
//Subject: CN=Amazon Root CA 1,O=Amazon,C=US
//Issuer: CN=Amazon Root CA 1,O=Amazon,C=US
//Expiration Date: 2038-01-17 00:00:00
//Serial Number: 66C9FCF99BF8C0A39E2F0788A43E696365BCA
//SHA256 Fingerprint: 8ecde6884f3d87b1125ba31ac3fcb13d7016de7f57cc904fe1cb97c6ae98196e
"sha256/++MBgDH5WGvL9Bcn5Be30cRcL0f5O+NyoXuWtQdX1aI=",
//Source URL: https://www.amazontrust.com/repository/AmazonRootCA2.cer
//Certificate #1 Details:
//Original Format: DER
//Subject: CN=Amazon Root CA 2,O=Amazon,C=US
//Issuer: CN=Amazon Root CA 2,O=Amazon,C=US
//Expiration Date: 2040-05-26 00:00:00
//Serial Number: 66C9FD29635869F0A0FE58678F85B26BB8A37
//SHA256 Fingerprint: 1ba5b2aa8c65401a82960118f80bec4f62304d83cec4713a19c39c011ea46db4
"sha256/f0KW/FtqTjs108NpYj42SrGvOB2PpxIVM8nWxjPqJGE=",
//Source URL: https://www.amazontrust.com/repository/AmazonRootCA3.cer
//Certificate #1 Details:
//Original Format: DER
//Subject: CN=Amazon Root CA 3,O=Amazon,C=US
//Issuer: CN=Amazon Root CA 3,O=Amazon,C=US
//Expiration Date: 2040-05-26 00:00:00
//Serial Number: 66C9FD5749736663F3B0B9AD9E89E7603F24A
//SHA256 Fingerprint: 18ce6cfe7bf14e60b2e347b8dfe868cb31d02ebb3ada271569f50343b46db3a4
"sha256/NqvDJlas/GRcYbcWE8S/IceH9cq77kg0jVhZeAPXq8k=",
//Source URL: https://www.amazontrust.com/repository/AmazonRootCA4.cer
//Certificate #1 Details:
//Original Format: DER
//Subject: CN=Amazon Root CA 4,O=Amazon,C=US
//Issuer: CN=Amazon Root CA 4,O=Amazon,C=US
//Expiration Date: 2040-05-26 00:00:00
//Serial Number: 66C9FD7C1BB104C2943E5717B7B2CC81AC10E
//SHA256 Fingerprint: e35d28419ed02025cfa69038cd623962458da5c695fbdea3c22b0bfb25897092
"sha256/9+ze1cZgR9KO1kZrVDxA4HQ6voHRCSVNz4RdTCx4U8U=",
//Source URL: https://www.amazontrust.com/repository/SFSRootCAG2.cer
//Certificate #1 Details:
//Original Format: DER
//Subject: CN=Starfield Services Root Certificate Authority - G2,
// O=Starfield Technologies\, Inc.,L=Scottsdale,ST=Arizona,C=US
//Issuer: CN=Starfield Services Root Certificate Authority - G2,
// O=Starfield Technologies\, Inc.,L=Scottsdale,ST=Arizona,C=US
//Expiration Date: 2037-12-31 23:59:59
//Serial Number: 0
//SHA256 Fingerprint: 568d6905a2c88708a4b3025190edcfedb1974a606a13c6e5290fcb2ae63edab5
"sha256/KwccWaCgrnaw6tsrrSO61FgLacNgG2MMLq8GE6+oP5I=",
//Source URL: https://cacerts.digicert.com/DigiCertHighAssuranceEVRootCA.crt
//Certificate #1 Details:
//Original Format: DER
//Subject: CN=DigiCert High Assurance EV Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US
//Issuer: CN=DigiCert High Assurance EV Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US
//Expiration Date: 2031-11-10 00:00:00
//Serial Number: 2AC5C266A0B409B8F0B79F2AE462577
//SHA256 Fingerprint: 7431e5f4c3c1ce4690774f0b61e05440883ba9a01ed00ba6abd7806ed3b118cf
"sha256/WoiWRyIOVNa9ihaBciRSC7XHjliYS9VwUGOIud4PB18=",
//Source URL: https://cacerts.digicert.com/DigiCertTLSECCP384RootG5.crt
//Certificate #1 Details:
//Original Format: DER
//Subject: CN=DigiCert TLS ECC P384 Root G5,O=DigiCert\, Inc.,C=US
//Issuer: CN=DigiCert TLS ECC P384 Root G5,O=DigiCert\, Inc.,C=US
//Expiration Date: 2046-01-14 23:59:59
//Serial Number: 9E09365ACF7D9C8B93E1C0B042A2EF3
//SHA256 Fingerprint: 018e13f0772532cf809bd1b17281867283fc48c6e13be9c69812854a490c1b05
"sha256/oC+voZLIy4HLE0FVT5wFtxzKKokLDRKY1oNkfJYe+98=",
//Source URL: https://cacerts.digicert.com/DigiCertTLSRSA4096RootG5.crt
//Certificate #1 Details:
//Original Format: DER
//Subject: CN=DigiCert TLS RSA4096 Root G5,O=DigiCert\, Inc.,C=US
//Issuer: CN=DigiCert TLS RSA4096 Root G5,O=DigiCert\, Inc.,C=US
//Expiration Date: 2046-01-14 23:59:59
//Serial Number: 8F9B478A8FA7EDA6A333789DE7CCF8A
//SHA256 Fingerprint: 371a00dc0533b3721a7eeb40e8419e70799d2b0a0f2c1d80693165f7cec4ad75
"sha256/ape1HIIZ6T5d7GS61YBs3rD4NVvkfnVwELcCRW4Bqv0=",
//Source URL: https://secure.globalsign.com/cacert/rootr46.crt
//Certificate #1 Details:
//Original Format: DER
//Subject: CN=GlobalSign Root R46,O=GlobalSign nv-sa,C=BE
//Issuer: CN=GlobalSign Root R46,O=GlobalSign nv-sa,C=BE
//Expiration Date: 2046-03-20 00:00:00
//Serial Number: 11D2BBB9D723189E405F0A9D2DD0DF2567D1
//SHA256 Fingerprint: 4fa3126d8d3a11d1c4855a4f807cbad6cf919d3a5a88b03bea2c6372d93c40c9
"sha256/rn+WLLnmp9v3uDP7GPqbcaiRdd+UnCMrap73yz3yu/w=",
//Source URL: https://secure.globalsign.com/cacert/roote46.crt
//Certificate #1 Details:
//Original Format: DER
//Subject: CN=GlobalSign Root E46,O=GlobalSign nv-sa,C=BE
//Issuer: CN=GlobalSign Root E46,O=GlobalSign nv-sa,C=BE
//Expiration Date: 2046-03-20 00:00:00
//Serial Number: 11D2BBBA336ED4BCE62468C50D841D98E843
//SHA256 Fingerprint: cbb9c44d84b8043e1050ea31a69f514955d7bfd2e2c6b49301019ad61d9f5058
"sha256/4EoCLOMvTM8sf2BGKHuCijKpCfXnUUR/g/0scfb9gXM=",
//Source URL: https://i.pki.goog/r2.crt
//Certificate #1 Details:
//Original Format: DER
//Subject: CN=GTS Root R2,O=Google Trust Services LLC,C=US
//Issuer: CN=GTS Root R2,O=Google Trust Services LLC,C=US
//Expiration Date: 2036-06-22 00:00:00
//Serial Number: 203E5AEC58D04251AAB1125AA
//SHA256 Fingerprint: 8d25cd97229dbf70356bda4eb3cc734031e24cf00fafcfd32dc76eb5841c7ea8
"sha256/Vfd95BwDeSQo+NUYxVEEIlvkOlWY2SalKK1lPhzOx78=",
//Source URL: https://i.pki.goog/r4.crt
//Certificate #1 Details:
//Original Format: DER
//Subject: CN=GTS Root R4,O=Google Trust Services LLC,C=US
//Issuer: CN=GTS Root R4,O=Google Trust Services LLC,C=US
//Expiration Date: 2036-06-22 00:00:00
//Serial Number: 203E5C068EF631A9C72905052
//SHA256 Fingerprint: 349dfa4058c5e263123b398ae795573c4e1313c83fe68f93556cd5e8031b3c7d
"sha256/mEflZT5enoR1FuXLgYYGqnVEoZvmf9c2bVBpiOjYQ0c=",
//Source URL: https://www.identrust.com/file-download/download/public/5718
//Certificate #1 Details:
//Original Format: PKCS7-DER
//Subject: CN=IdenTrust Commercial Root CA 1,O=IdenTrust,C=US
//Issuer: CN=IdenTrust Commercial Root CA 1,O=IdenTrust,C=US
//Expiration Date: 2034-01-16 18:12:23
//Serial Number: A0142800000014523C844B500000002
//SHA256 Fingerprint: 5d56499be4d2e08bcfcad08a3e38723d50503bde706948e42f55603019e528ae
"sha256/B+hU8mp8vTiZJ6oEG/7xts0h3RQ4GK2UfcZVqeWH/og=",
//Source URL: https://www.identrust.com/file-download/download/public/5842
//Certificate #1 Details:
//Original Format: PKCS7-PEM
//Subject: CN=IdenTrust Commercial Root TLS ECC CA 2,O=IdenTrust,C=US
//Issuer: CN=IdenTrust Commercial Root TLS ECC CA 2,O=IdenTrust,C=US
//Expiration Date: 2039-04-11 21:11:10
//Serial Number: 40018ECF000DE911D7447B73E4C1F82E
//SHA256 Fingerprint: 983d826ba9c87f653ff9e8384c5413e1d59acf19ddc9c98cecae5fdea2ac229c
"sha256/uu5PB+MS9L3/ffB/PuTG6A+WjsTtTaF52qqjrcHFXRU=",
//Source URL: https://ssl-ccp.secureserver.net/repository/sfroot-g2.crt
//Certificate #1 Details:
//Original Format: PEM
//Subject: CN=Starfield Root Certificate Authority - G2,
// O=Starfield Technologies\, Inc.,L=Scottsdale,ST=Arizona,C=US
//Issuer: CN=Starfield Root Certificate Authority - G2,
// O=Starfield Technologies\, Inc.,L=Scottsdale,ST=Arizona,C=US
//Expiration Date: 2037-12-31 23:59:59
//Serial Number: 0
//SHA256 Fingerprint: 2ce1cb0bf9d2f9e102993fbe215152c3b2dd0cabde1c68e5319b839154dbb7f5
"sha256/gI1os/q0iEpflxrOfRBVDXqVoWN3Tz7Dav/7IT++THQ=",
};

/**
* Http constructor.
Expand Down Expand Up @@ -227,13 +88,15 @@ protected Http(String inMethod, String inHost, String inUri, int timeout) {
headers.add("user-agent", String.format("%s ca_bundle/%s (ca_pinning=%s)",
UserAgentString, CA_BUNDLE_VERSION, "enabled"));

CertificatePinner pinner = Util.createPinner(host, DEFAULT_CA_CERTS);
TrustManagerFactory tmf = CertificateUtils.createDefaultTrustManagerFactory();
SSLSocketFactory sslFactory = CertificateUtils.createSslSocketFactory(tmf);
X509TrustManager trustManager = CertificateUtils.getX509TrustManager(tmf);

httpClient = new OkHttpClient.Builder()
.connectTimeout(timeout, TimeUnit.SECONDS)
.writeTimeout(timeout, TimeUnit.SECONDS)
.readTimeout(timeout, TimeUnit.SECONDS)
.certificatePinner(pinner)
.sslSocketFactory(sslFactory, trustManager)
.build();
}

Expand Down Expand Up @@ -435,22 +298,29 @@ public void setProxy(String host, int port) {
}

/**
* Use custom CA certificates for certificate pinning.
* Use custom CA certificates for the trust store.
*
* @param customCaCerts The CA certificates to pin
* @param pemContent PEM-encoded CA certificates as a String
*/
public void useCustomCertificates(String[] customCaCerts) {
CertificatePinner pinner = Util.createPinner(host, customCaCerts);
httpClient = httpClient.newBuilder().certificatePinner(pinner).build();
public void useCustomCertificates(String pemContent) {
TrustManagerFactory tmf = CertificateUtils.createTrustManagerFactory(pemContent);
SSLSocketFactory sslFactory = CertificateUtils.createSslSocketFactory(tmf);
X509TrustManager trustManager = CertificateUtils.getX509TrustManager(tmf);
httpClient = httpClient.newBuilder()
.sslSocketFactory(sslFactory, trustManager)
.build();
}

/**
* Disable CA certificate pinning. TLS verification remains active
* via the OS trust store.
*/
public void disableCaPinning() {
TrustManagerFactory tmf = CertificateUtils.getSystemTrustManagerFactory();
SSLSocketFactory sslFactory = CertificateUtils.createSslSocketFactory(tmf);
X509TrustManager trustManager = CertificateUtils.getX509TrustManager(tmf);
httpClient = httpClient.newBuilder()
.certificatePinner(CertificatePinner.DEFAULT)
.sslSocketFactory(sslFactory, trustManager)
.build();
}

Expand Down Expand Up @@ -558,7 +428,7 @@ protected abstract static class ClientBuilder<T extends Http> {

private int timeout = DEFAULT_TIMEOUT_SECS;
private long maxBackoffMs = MAX_BACKOFF_MS;
private String[] caCerts = null;
private String customCertsContent = null;
private boolean disableCaPinning = false;
private SortedMap<String, String> additionalDuoHeaders = new TreeMap<String, String>();
private Map<String, String> headers = new HashMap<String, String>();
Expand Down Expand Up @@ -615,13 +485,13 @@ public ClientBuilder<T> useMaxBackoffMs(long maxBackoffMs) {
}

/**
* Provide custom CA certificates for certificate pinning.
* Provide custom CA certificates for the trust store.
*
* @param customCaCerts The CA certificates to pin to
* @param pemContent PEM-encoded CA certificates as a String
* @return the Builder
*/
public ClientBuilder<T> useCustomCertificates(String[] customCaCerts) {
this.caCerts = customCaCerts;
public ClientBuilder<T> useCustomCertificates(String pemContent) {
this.customCertsContent = pemContent;

return this;
}
Expand Down Expand Up @@ -672,14 +542,14 @@ public ClientBuilder<T> addHeader(String name, String value) {
* @return the specified Http client object
*/
public T build() {
if (disableCaPinning && caCerts != null) {
if (disableCaPinning && customCertsContent != null) {
throw new IllegalStateException(
"Cannot both disable CA pinning and provide custom certificates");
}
T duoClient = createClient(method, host, uri, timeout);
duoClient.setMaxBackoffMs(maxBackoffMs);
if (caCerts != null) {
duoClient.useCustomCertificates(caCerts);
if (customCertsContent != null) {
duoClient.useCustomCertificates(customCertsContent);
}
if (disableCaPinning) {
duoClient.disableCaPinning();
Expand Down
Loading