Skip to content

Support Thrift client mutual TLS #18026

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

Open
HTHou wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support Thrift client mutual TLS #18026

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
e649959
Support Thrift client mutual TLS
HTHou Jun 25, 2026
d161740
Support Python client mutual TLS
HTHou Jun 26, 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
6 changes: 6 additions & 0 deletions integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,12 @@ public CommonConfig setEnableThriftClientSSL(boolean enableThriftClientSSL) {
return this;
}

@Override
public CommonConfig setThriftSSLClientAuth(boolean thriftSSLClientAuth) {
setProperty("thrift_ssl_client_auth", String.valueOf(thriftSSLClientAuth));
return this;
}

@Override
public CommonConfig setEnableInternalSSL(boolean enableInternalSSL) {
setProperty("enable_internal_ssl", String.valueOf(enableInternalSSL));
Expand Down
7 changes: 7 additions & 0 deletions ...tion-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,13 @@ public CommonConfig setEnableThriftClientSSL(boolean enableThriftClientSSL) {
return this;
}

@Override
public CommonConfig setThriftSSLClientAuth(boolean thriftSSLClientAuth) {
cnConfig.setThriftSSLClientAuth(thriftSSLClientAuth);
dnConfig.setThriftSSLClientAuth(thriftSSLClientAuth);
return this;
}

@Override
public CommonConfig setEnableInternalSSL(boolean enableInternalSSL) {
cnConfig.setEnableInternalSSL(enableInternalSSL);
Expand Down
29 changes: 29 additions & 0 deletions integration-test/src/main/java/org/apache/iotdb/it/env/cluster/env/AbstractEnv.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,10 @@ private boolean isThriftClientSSLEnabled() {
return Boolean.parseBoolean(getDataNodeCommonConfigProperty("enable_thrift_ssl", "false"));
}

private boolean isThriftSSLClientAuthEnabled() {
return Boolean.parseBoolean(getDataNodeCommonConfigProperty("thrift_ssl_client_auth", "false"));
}

private String getDataNodeCommonConfigProperty(final String key, final String defaultValue) {
return ((MppCommonConfig) clusterConfig.getDataNodeCommonConfig())
.getProperty(key, defaultValue);
Expand All @@ -711,6 +715,11 @@ private Properties constructConnectionProperties(
putIfPresent(
info, Config.TRUST_STORE_PWD, getDataNodeCommonConfigProperty("trust_store_pwd", ""));
putIfPresent(info, Config.SSL_PROTOCOL, getClientSSLProtocol());
if (isThriftSSLClientAuthEnabled()) {
putIfPresent(info, Config.KEY_STORE, getDataNodeCommonConfigProperty("key_store_path", ""));
putIfPresent(
info, Config.KEY_STORE_PWD, getDataNodeCommonConfigProperty("key_store_pwd", ""));
}
}
return info;
}
Expand All @@ -728,6 +737,11 @@ private Session.Builder configureClientSSL(final Session.Builder builder) {
.trustStore(getDataNodeCommonConfigProperty("trust_store_path", ""))
.trustStorePwd(getDataNodeCommonConfigProperty("trust_store_pwd", ""))
.sslProtocol(getClientSSLProtocol());
if (isThriftSSLClientAuthEnabled()) {
builder
.keyStore(getDataNodeCommonConfigProperty("key_store_path", ""))
.keyStorePwd(getDataNodeCommonConfigProperty("key_store_pwd", ""));
}
}
return builder;
}
Expand All @@ -739,6 +753,11 @@ private TableSessionBuilder configureClientSSL(final TableSessionBuilder builder
.trustStore(getDataNodeCommonConfigProperty("trust_store_path", ""))
.trustStorePwd(getDataNodeCommonConfigProperty("trust_store_pwd", ""))
.sslProtocol(getClientSSLProtocol());
if (isThriftSSLClientAuthEnabled()) {
builder
.keyStore(getDataNodeCommonConfigProperty("key_store_path", ""))
.keyStorePwd(getDataNodeCommonConfigProperty("key_store_pwd", ""));
}
}
return builder;
}
Expand All @@ -750,6 +769,11 @@ private SessionPool.Builder configureClientSSL(final SessionPool.Builder builder
.trustStore(getDataNodeCommonConfigProperty("trust_store_path", ""))
.trustStorePwd(getDataNodeCommonConfigProperty("trust_store_pwd", ""))
.sslProtocol(getClientSSLProtocol());
if (isThriftSSLClientAuthEnabled()) {
builder
.keyStore(getDataNodeCommonConfigProperty("key_store_path", ""))
.keyStorePwd(getDataNodeCommonConfigProperty("key_store_pwd", ""));
}
}
return builder;
}
Expand All @@ -761,6 +785,11 @@ private TableSessionPoolBuilder configureClientSSL(final TableSessionPoolBuilder
.trustStore(getDataNodeCommonConfigProperty("trust_store_path", ""))
.trustStorePwd(getDataNodeCommonConfigProperty("trust_store_pwd", ""))
.sslProtocol(getClientSSLProtocol());
if (isThriftSSLClientAuthEnabled()) {
builder
.keyStore(getDataNodeCommonConfigProperty("key_store_path", ""))
.keyStorePwd(getDataNodeCommonConfigProperty("key_store_pwd", ""));
}
}
return builder;
}
Expand Down
5 changes: 5 additions & 0 deletions integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,11 @@ public CommonConfig setEnableThriftClientSSL(boolean enableThriftClientSSL) {
return this;
}

@Override
public CommonConfig setThriftSSLClientAuth(boolean thriftSSLClientAuth) {
return this;
}

@Override
public CommonConfig setSubscriptionPrefetchTsFileBatchMaxDelayInMs(
int subscriptionPrefetchTsFileBatchMaxDelayInMs) {
Expand Down
2 changes: 2 additions & 0 deletions integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,8 @@ default CommonConfig setDefaultDatabaseLevel(int defaultDatabaseLevel) {

CommonConfig setEnableThriftClientSSL(boolean enableThriftClientSSL);

CommonConfig setThriftSSLClientAuth(boolean thriftSSLClientAuth);

CommonConfig setEnableInternalSSL(boolean enableInternalSSL);

CommonConfig setKeyStorePath(String keyStorePath);
Expand Down
Loading
Loading