Skip to content
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

Enforcer truststore should trust ca root certs #3088

Merged
merged 8 commits into from
Oct 21, 2022
Merged

Enforcer truststore should trust ca root certs #3088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d225309
tried jre home certs adding to truststore
Amila-Rukshan Sep 15, 2022
81b1b65
adding jre ca certs to existing trust store
Amila-Rukshan Sep 26, 2022
e651e45
splitted two certs loaders into private methods
Amila-Rukshan Sep 26, 2022
0284a0d
added todo comment
Amila-Rukshan Sep 29, 2022
e6b8000
add env config for certs trusting
Amila-Rukshan Sep 30, 2022
86e384d
changed env config to a boolean
Amila-Rukshan Oct 6, 2022
b1fb4a7
added null check
Amila-Rukshan Oct 13, 2022
c4c6dae
less confused name isTrustDefaultCerts is used
Amila-Rukshan Oct 21, 2022
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
49 changes: 47 additions & 2 deletions ...r-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/config/ConfigHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.wso2.choreo.connect.enforcer.config;

import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down Expand Up @@ -80,14 +81,17 @@
import java.security.NoSuchAlgorithmException;
import java.security.cert.Certificate;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;

/**
* Configuration holder class for Microgateway.
Expand Down Expand Up @@ -362,17 +366,58 @@ private void populateTMBinaryConfig(BinaryPublisher binary) {

private void loadTrustStore() {
try {

trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
trustStore.load(null);
String truststoreFilePath = getEnvVarConfig().getTrustedAdapterCertsPath();
TLSUtils.addCertsToTruststore(trustStore, truststoreFilePath);

if (getEnvVarConfig().isTrustDefaultCerts()) {
loadDefaultCertsToTrustStore();
}
loadTrustedCertsToTrustStore();

trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
trustManagerFactory.init(trustStore);

} catch (KeyStoreException | CertificateException | NoSuchAlgorithmException | IOException e) {
logger.error("Error in loading certs to the trust store.", e);
}
}

private void loadTrustedCertsToTrustStore() throws IOException {
String truststoreFilePath = getEnvVarConfig().getTrustedAdapterCertsPath();
TLSUtils.addCertsToTruststore(trustStore, truststoreFilePath);
}

private void loadDefaultCertsToTrustStore() throws NoSuchAlgorithmException, KeyStoreException {
TrustManagerFactory tmf = TrustManagerFactory
.getInstance(TrustManagerFactory.getDefaultAlgorithm());
// Using null here initialises the TMF with the default trust store.
tmf.init((KeyStore) null);

// Get hold of the default trust manager
X509TrustManager defaultTm = null;
for (TrustManager tm : tmf.getTrustManagers()) {
if (tm instanceof X509TrustManager) {
defaultTm = (X509TrustManager) tm;
break;
}
}

// Get the certs from defaultTm and add them to our trustStore
if (defaultTm != null) {
X509Certificate[] trustedCerts = defaultTm.getAcceptedIssuers();
Arrays.stream(trustedCerts)
.forEach(cert -> {
try {
trustStore.setCertificateEntry(RandomStringUtils.random(10, true, false),
cert);
} catch (KeyStoreException e) {
logger.error("Error while adding default trusted ca cert", e);
}
});
}
}

private void loadOpaClientKeyStore() {
String certPath = getEnvVarConfig().getOpaClientPublicKeyPath();
String keyPath = getEnvVarConfig().getOpaClientPrivateKeyPath();
Expand Down
9 changes: 9 additions & 0 deletions ...r-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/config/EnvVarConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
*/
public class EnvVarConfig {
private static final String TRUSTED_CA_CERTS_PATH = "TRUSTED_CA_CERTS_PATH";
private static final String TRUST_DEFAULT_CERTS = "TRUST_DEFAULT_CERTS";
private static final String ADAPTER_HOST_NAME = "ADAPTER_HOST_NAME";
private static final String ENFORCER_PRIVATE_KEY_PATH = "ENFORCER_PRIVATE_KEY_PATH";
private static final String ENFORCER_PUBLIC_CERT_PATH = "ENFORCER_PUBLIC_CERT_PATH";
Expand All @@ -42,6 +43,7 @@ public class EnvVarConfig {

// Since the container is running in linux container, path separator is not needed.
private static final String DEFAULT_TRUSTED_CA_CERTS_PATH = "/home/wso2/security/truststore";
private static final String DEFAULT_TRUST_DEFAULT_CERTS = "true";
private static final String DEFAULT_ADAPTER_HOST_NAME = "adapter";
private static final String DEFAULT_ENFORCER_PRIVATE_KEY_PATH = "/home/wso2/security/keystore/mg.key";
private static final String DEFAULT_ENFORCER_PUBLIC_CERT_PATH = "/home/wso2/security/keystore/mg.pem";
Expand All @@ -56,6 +58,7 @@ public class EnvVarConfig {

private static EnvVarConfig instance;
private final String trustedAdapterCertsPath;
private final String trustDefaultCerts;
private final String enforcerPrivateKeyPath;
private final String enforcerPublicKeyPath;
private final String opaClientPrivateKeyPath;
Expand All @@ -75,6 +78,8 @@ public class EnvVarConfig {
private EnvVarConfig() {
trustedAdapterCertsPath = retrieveEnvVarOrDefault(TRUSTED_CA_CERTS_PATH,
DEFAULT_TRUSTED_CA_CERTS_PATH);
trustDefaultCerts = retrieveEnvVarOrDefault(TRUST_DEFAULT_CERTS,
DEFAULT_TRUST_DEFAULT_CERTS);
enforcerPrivateKeyPath = retrieveEnvVarOrDefault(ENFORCER_PRIVATE_KEY_PATH,
DEFAULT_ENFORCER_PRIVATE_KEY_PATH);
enforcerPublicKeyPath = retrieveEnvVarOrDefault(ENFORCER_PUBLIC_CERT_PATH,
Expand Down Expand Up @@ -119,6 +124,10 @@ public String getTrustedAdapterCertsPath() {
return trustedAdapterCertsPath;
}

public boolean isTrustDefaultCerts() {
return Boolean.valueOf(trustDefaultCerts);
}

public String getEnforcerPrivateKeyPath() {
return enforcerPrivateKeyPath;
}
Expand Down