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

Fixed code to use the Java system properties for keystore and truststo… #1126

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+36 −9
Open

Fixed code to use the Java system properties for keystore and truststo… #1126

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86ec112
Fixed code to use the Java system properties for keystore and trustst…
dhoard Jan 31, 2025
8d9cddc
Merge branch 'main' into fix-keystore-truststore-default-types
dhoard Feb 1, 2025
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
45 changes: 36 additions & 9 deletions jmx_prometheus_common/src/main/java/io/prometheus/jmx/common/http/HTTPServerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,19 @@
*/
public class HTTPServerFactory {

private static final String JAVAX_NET_SSL_KEY_STORE = "javax.net.ssl.keyStore";
private static final String JAVAX_NET_SSL_KEY_STORE_TYPE = "javax.net.ssl.keyStoreType";
private static final String JAVAX_NET_SSL_KEY_STORE_PASSWORD = "javax.net.ssl.keyStorePassword";

private static final String DEFAULT_KEYSTORE_TYPE;

private static final String JAVAX_NET_SSL_TRUST_STORE = "javax.net.ssl.trustStore";
private static final String JAVAX_NET_SSL_TRUST_STORE_TYPE = "javax.net.ssl.trustStoreType";
private static final String JAVAX_NET_SSL_TRUST_STORE_PASSWORD =
"javax.net.ssl.trustStorePassword";

private static final String DEFAULT_TRUST_STORE_TYPE;

private static final int DEFAULT_MINIMUM_THREADS = 1;
private static final int DEFAULT_MAXIMUM_THREADS = 10;
private static final int DEFAULT_KEEP_ALIVE_TIME_SECONDS = 120;
Expand All @@ -70,16 +83,29 @@ public class HTTPServerFactory {
private static final Set<String> SHA_ALGORITHMS;
private static final Set<String> PBKDF2_ALGORITHMS;
private static final Map<String, Integer> PBKDF2_ALGORITHM_ITERATIONS;
private static final String JAVAX_NET_SSL_KEY_STORE = "javax.net.ssl.keyStore";
private static final String JAVAX_NET_SSL_KEY_STORE_PASSWORD = "javax.net.ssl.keyStorePassword";
private static final String JAVAX_NET_SSL_TRUST_STORE = "javax.net.ssl.trustStore";
private static final String JAVAX_NET_SSL_TRUST_STORE_TYPE = "javax.net.ssl.trustStoreType";
private static final String JAVAX_NET_SSL_TRUST_STORE_PASSWORD =
"javax.net.ssl.trustStorePassword";

private static final int PBKDF2_KEY_LENGTH_BITS = 128;

static {
// Get the keystore type system property
String keyStoreType = System.getProperty(JAVAX_NET_SSL_KEY_STORE_TYPE);
if (keyStoreType == null) {
// If the keystore type system property is not set, use the default keystore type
keyStoreType = KeyStore.getDefaultType();
}

// Set the default keystore type
DEFAULT_KEYSTORE_TYPE = keyStoreType;

// Get the truststore type system property
String trustStoreType = System.getProperty(JAVAX_NET_SSL_TRUST_STORE_TYPE);
if (trustStoreType == null) {
// If the truststore type system property is not set, use the default truststore type
trustStoreType = KeyStore.getDefaultType();
}

// Set the default truststore type
DEFAULT_TRUST_STORE_TYPE = trustStoreType;

SHA_ALGORITHMS = new HashSet<>();
SHA_ALGORITHMS.add("SHA-1");
SHA_ALGORITHMS.add("SHA-256");
Expand Down Expand Up @@ -655,7 +681,7 @@ public void configureSSL(HTTPServer.Builder httpServerBuilder) {
"Invalid configuration for"
+ " /httpServer/ssl/keyStore/type"
+ " must not be blank")))
.orElse(KeyStore.getDefaultType());
.orElse(DEFAULT_KEYSTORE_TYPE);

String keyStorePassword =
rootYamlMapAccessor
Expand Down Expand Up @@ -697,6 +723,7 @@ public void configureSSL(HTTPServer.Builder httpServerBuilder) {
String trustStoreFilename = null;
String trustStoreType = null;
String trustStorePassword = null;

final boolean mutualTLS =
rootYamlMapAccessor
.get("/httpServer/ssl/mutualTLS")
Expand Down Expand Up @@ -753,7 +780,7 @@ public void configureSSL(HTTPServer.Builder httpServerBuilder) {
"Invalid configuration for"
+ " /httpServer/ssl/trustStore/type"
+ " must not be blank")))
.orElse(System.getProperty(JAVAX_NET_SSL_TRUST_STORE_TYPE));
.orElse(DEFAULT_TRUST_STORE_TYPE);

trustStorePassword =
rootYamlMapAccessor
Expand Down