Skip to content

PHOENIX-7976: Introduce new parameters to support single-purpose Extended Key Usage (EKU) certificates #194

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
richardantal merged 1 commit into from
Sep 2, 2026
Merged

PHOENIX-7976: Introduce new parameters to support single-purpose Extended Key Usage (EKU) certificates #194

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
8 changes: 4 additions & 4 deletions phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerEnvironment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,13 +236,13 @@ public QueryServerEnvironment(final Configuration confIn, int numberOfUsers, boo

if (tls) {
conf.setBoolean(QueryServerProperties.QUERY_SERVER_TLS_ENABLED, true);
conf.set(QueryServerProperties.QUERY_SERVER_TLS_KEYSTORE,
conf.set(QueryServerProperties.QUERY_SERVER_TLS_SERVER_KEYSTORE,
TlsUtil.getKeyStoreFile().getAbsolutePath());
conf.set(QueryServerProperties.QUERY_SERVER_TLS_KEYSTORE_PASSWORD,
conf.set(QueryServerProperties.QUERY_SERVER_TLS_SERVER_KEYSTORE_PASSWORD,
TlsUtil.getKeyStorePassword());
conf.set(QueryServerProperties.QUERY_SERVER_TLS_TRUSTSTORE,
conf.set(QueryServerProperties.QUERY_SERVER_TLS_SERVER_TRUSTSTORE,
TlsUtil.getTrustStoreFile().getAbsolutePath());
conf.set(QueryServerProperties.QUERY_SERVER_TLS_TRUSTSTORE_PASSWORD,
conf.set(QueryServerProperties.QUERY_SERVER_TLS_SERVER_TRUSTSTORE_PASSWORD,
TlsUtil.getTrustStorePassword());
}

Expand Down
8 changes: 8 additions & 0 deletions phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/QueryServerProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,20 @@ public class QueryServerProperties {
"phoenix.queryserver.tls.enabled";
public static final String QUERY_SERVER_TLS_KEYSTORE =
"phoenix.queryserver.tls.keystore";
public static final String QUERY_SERVER_TLS_SERVER_KEYSTORE =
"phoenix.queryserver.tls.server.keystore";
public static final String QUERY_SERVER_TLS_KEYSTORE_PASSWORD =
"phoenix.queryserver.tls.keystore.password";
public static final String QUERY_SERVER_TLS_SERVER_KEYSTORE_PASSWORD =
"phoenix.queryserver.tls.server.keystore.password";
public static final String QUERY_SERVER_TLS_TRUSTSTORE =
"phoenix.queryserver.tls.truststore";
public static final String QUERY_SERVER_TLS_SERVER_TRUSTSTORE =
"phoenix.queryserver.tls.server.truststore";
public static final String QUERY_SERVER_TLS_TRUSTSTORE_PASSWORD =
"phoenix.queryserver.tls.truststore.password";
public static final String QUERY_SERVER_TLS_SERVER_TRUSTSTORE_PASSWORD =
"phoenix.queryserver.tls.server.truststore.password";
public static final String QUERY_SERVER_TLS_ENABLED_PROTCOLS =
"phoenix.queryserver.tls.protocols";
public static final String QUERY_SERVER_TLS_ENABLED_CIPHERSUITES =
Expand Down
24 changes: 20 additions & 4 deletions phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,12 +283,28 @@ public int run(String[] args) throws Exception {
private void setTlsIfNeccessary(Builder<Server> builder, Configuration conf) throws Exception {
final boolean useTls = getConf().getBoolean(QueryServerProperties.QUERY_SERVER_TLS_ENABLED, QueryServerOptions.DEFAULT_QUERY_SERVER_TLS_ENABLED);
if(useTls) {
final String tlsKeystore = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_KEYSTORE);
final String keystoreType = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_KEYSTORE_TYPE_KEY, QueryServerProperties.QUERY_SERVER_TLS_KEYSTORE_TYPE_DEFAULT);

final String tlsKeystorePassword = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_KEYSTORE_PASSWORD, QueryServerOptions.DEFAULT_QUERY_SERVER_TLS_KEYSTORE_PASSWORD);
final String tlsTruststore = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_TRUSTSTORE);
final String tlsTruststorePassword = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_TRUSTSTORE_PASSWORD, QueryServerOptions.DEFAULT_QUERY_SERVER_TLS_TRUSTSTORE_PASSWORD);
String tlsKeystore = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_SERVER_KEYSTORE);
if (tlsKeystore == null){
tlsKeystore = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_KEYSTORE);
}

String tlsKeystorePassword = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_SERVER_KEYSTORE_PASSWORD, QueryServerOptions.DEFAULT_QUERY_SERVER_TLS_KEYSTORE_PASSWORD);
if (tlsKeystorePassword == null || tlsKeystorePassword.equals(QueryServerOptions.DEFAULT_QUERY_SERVER_TLS_KEYSTORE_PASSWORD)) {
tlsKeystorePassword = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_KEYSTORE_PASSWORD, QueryServerOptions.DEFAULT_QUERY_SERVER_TLS_KEYSTORE_PASSWORD);
}

String tlsTruststore = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_SERVER_TRUSTSTORE);
if (tlsTruststore == null){
tlsTruststore = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_TRUSTSTORE);
}

String tlsTruststorePassword = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_SERVER_TRUSTSTORE_PASSWORD, QueryServerOptions.DEFAULT_QUERY_SERVER_TLS_TRUSTSTORE_PASSWORD);
if (tlsTruststorePassword == null || tlsTruststorePassword.equals(QueryServerOptions.DEFAULT_QUERY_SERVER_TLS_TRUSTSTORE_PASSWORD)) {
tlsTruststorePassword = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_TRUSTSTORE_PASSWORD, QueryServerOptions.DEFAULT_QUERY_SERVER_TLS_TRUSTSTORE_PASSWORD);
}

if(tlsKeystore == null) {
throw new Exception(String.format("if %s is enabled, %s must be specfified" , QueryServerProperties.QUERY_SERVER_TLS_ENABLED, QueryServerProperties.QUERY_SERVER_TLS_KEYSTORE));
}
Expand Down
Loading