Skip to content

PHOENIX-7665 Make TLS protocols and ciphersuites configurable in PQS #181

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
stoty merged 1 commit into from
Oct 27, 2025
Merged

PHOENIX-7665 Make TLS protocols and ciphersuites configurable in PQS #181

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
4 changes: 4 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 @@ -72,6 +72,10 @@ public class QueryServerProperties {
"phoenix.queryserver.tls.truststore";
public static final String QUERY_SERVER_TLS_TRUSTSTORE_PASSWORD =
"phoenix.queryserver.tls.truststore.password";
public static final String QUERY_SERVER_TLS_ENABLED_PROTCOLS =
"phoenix.queryserver.tls.protocols";
public static final String QUERY_SERVER_TLS_ENABLED_CIPHERSUITES =
"phoenix.queryserver.tls.ciphersuites";
public static final String QUERY_SERVER_JMX_JSON_ENDPOINT_DISABLED =
"phoenix.queryserver.jmxjsonendpoint.disabled";

Expand Down
14 changes: 13 additions & 1 deletion 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 @@ -297,7 +297,19 @@ private void setTlsIfNeccessary(Builder<Server> builder, Configuration conf) thr
throw new Exception(String.format("if %s is enabled, %s must be specfified" , QueryServerProperties.QUERY_SERVER_TLS_ENABLED, QueryServerProperties.QUERY_SERVER_TLS_TRUSTSTORE));
}
final File tlsTruststoreFile = new File(tlsTruststore);
builder.withTLS(tlsKeystoreFile, tlsKeystorePassword, tlsTruststoreFile, tlsTruststorePassword, keystoreType);

final String tlsEnabledProtocolsString = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_ENABLED_PROTCOLS);
String[] tlsEnabledProtocols = null;
if (tlsEnabledProtocolsString != null) {
tlsEnabledProtocols = tlsEnabledProtocolsString.trim().split(",");
}
final String tlsEnabledChiphersuitesString = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_ENABLED_CIPHERSUITES);
String[] tlsEnabledChiphersuites = null;
if (tlsEnabledChiphersuitesString != null) {
tlsEnabledChiphersuites = tlsEnabledChiphersuitesString.trim().split(",");
}

builder.withTLS(tlsKeystoreFile, tlsKeystorePassword, tlsTruststoreFile, tlsTruststorePassword, keystoreType, tlsEnabledProtocols, tlsEnabledChiphersuites);
}
}

Expand Down