This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch seprate_client_internal_keystruststore in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit b3217ba43988e0ed202c5ad750ba9034618987f2 Author: HTHou <[email protected]> AuthorDate: Mon Sep 29 19:06:46 2025 +0800 dev --- .../manager/consensus/ConsensusManager.java | 9 +-- .../service/thrift/ConfigNodeRPCService.java | 8 +-- .../iot/client/AsyncIoTConsensusServiceClient.java | 8 +-- .../iot/client/SyncIoTConsensusServiceClient.java | 8 +-- .../db/consensus/DataRegionConsensusImpl.java | 24 ++++---- .../db/consensus/SchemaRegionConsensusImpl.java | 9 +-- .../iotdb/db/protocol/client/ConfigNodeClient.java | 8 +-- .../execution/exchange/MPPDataExchangeService.java | 8 +-- .../db/service/DataNodeInternalRPCService.java | 8 +-- .../org/apache/iotdb/db/service/RestService.java | 2 +- .../iotdb/commons/client/ainode/AINodeClient.java | 6 +- .../client/ainode/AsyncAINodeServiceClient.java | 8 +-- .../AsyncConfigNodeInternalServiceClient.java | 8 +-- .../async/AsyncDataNodeExternalServiceClient.java | 8 +-- .../async/AsyncDataNodeInternalServiceClient.java | 8 +-- .../AsyncDataNodeMPPDataExchangeServiceClient.java | 8 +-- .../async/AsyncPipeConsensusServiceClient.java | 8 +-- .../client/sync/SyncConfigNodeIServiceClient.java | 8 +-- .../sync/SyncDataNodeInternalServiceClient.java | 8 +-- .../SyncDataNodeMPPDataExchangeServiceClient.java | 8 +-- .../sync/SyncPipeConsensusServiceClient.java | 8 +-- .../apache/iotdb/commons/conf/CommonConfig.java | 66 ++++++++++++++++++---- .../service/AbstractThriftServiceThread.java | 2 +- 23 files changed, 147 insertions(+), 99 deletions(-) diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/consensus/ConsensusManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/consensus/ConsensusManager.java index a4436a94fa2..580c1ded046 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/consensus/ConsensusManager.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/consensus/ConsensusManager.java @@ -175,10 +175,11 @@ public class ConsensusManager { .setLeaderOutstandingAppendsMax( CONF.getConfigNodeRatisGrpcLeaderOutstandingAppendsMax()) .setEnableSSL(COMMON_CONF.isEnableInternalSSL()) - .setSslKeyStorePath(COMMON_CONF.getKeyStorePath()) - .setSslKeyStorePassword(COMMON_CONF.getKeyStorePwd()) - .setSslTrustStorePath(COMMON_CONF.getTrustStorePath()) - .setSslTrustStorePassword(COMMON_CONF.getTrustStorePwd()) + .setSslKeyStorePath(COMMON_CONF.getInternalKeyStorePath()) + .setSslKeyStorePassword(COMMON_CONF.getInternalKeyStorePwd()) + .setSslTrustStorePath(COMMON_CONF.getInternalTrustStorePath()) + .setSslTrustStorePassword( + COMMON_CONF.getInternalTrustStorePwd()) .build()) .setRpc( RatisConfig.Rpc.newBuilder() diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java index 15be2e90d43..cff2464c5a9 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java @@ -72,10 +72,10 @@ public class ConfigNodeRPCService extends ThriftService implements ConfigNodeRPC configConf.getThriftServerAwaitTimeForStopService(), new ConfigNodeRPCServiceHandler(), commonConfig.isRpcThriftCompressionEnabled(), - commonConfig.getKeyStorePath(), - commonConfig.getKeyStorePwd(), - commonConfig.getTrustStorePath(), - commonConfig.getTrustStorePwd(), + commonConfig.getInternalKeyStorePath(), + commonConfig.getInternalKeyStorePwd(), + commonConfig.getInternalTrustStorePath(), + commonConfig.getInternalTrustStorePwd(), DeepCopyRpcTransportFactory.INSTANCE) : new ThriftServiceThread( processor, diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/client/AsyncIoTConsensusServiceClient.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/client/AsyncIoTConsensusServiceClient.java index 4a709062747..f4c7f1b9b2f 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/client/AsyncIoTConsensusServiceClient.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/client/AsyncIoTConsensusServiceClient.java @@ -63,10 +63,10 @@ public class AsyncIoTConsensusServiceClient extends IoTConsensusIService.AsyncCl endpoint.getIp(), endpoint.getPort(), property.getConnectionTimeoutMs(), - commonConfig.getKeyStorePath(), - commonConfig.getKeyStorePwd(), - commonConfig.getTrustStorePath(), - commonConfig.getTrustStorePwd()) + commonConfig.getInternalKeyStorePath(), + commonConfig.getInternalKeyStorePwd(), + commonConfig.getInternalTrustStorePath(), + commonConfig.getInternalTrustStorePwd()) : TNonblockingTransportWrapper.wrap( endpoint.getIp(), endpoint.getPort(), property.getConnectionTimeoutMs())); setTimeout(property.getConnectionTimeoutMs()); diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/client/SyncIoTConsensusServiceClient.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/client/SyncIoTConsensusServiceClient.java index 43b2f60d89f..9ba9eb33089 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/client/SyncIoTConsensusServiceClient.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/client/SyncIoTConsensusServiceClient.java @@ -58,10 +58,10 @@ public class SyncIoTConsensusServiceClient extends IoTConsensusIService.Client endpoint.getIp(), endpoint.getPort(), property.getConnectionTimeoutMs(), - commonConfig.getTrustStorePath(), - commonConfig.getTrustStorePwd(), - commonConfig.getKeyStorePath(), - commonConfig.getKeyStorePwd()) + commonConfig.getInternalTrustStorePath(), + commonConfig.getInternalTrustStorePwd(), + commonConfig.getInternalKeyStorePath(), + commonConfig.getInternalKeyStorePwd()) : DeepCopyRpcTransportFactory.INSTANCE.getTransport( new TSocket( TConfigurationConst.defaultTConfiguration, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java index 2649f8de7af..2782b8a7ff7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java @@ -139,10 +139,10 @@ public class DataRegionConsensusImpl { .setThriftMaxFrameSize(CONF.getThriftMaxFrameSize()) .setMaxClientNumForEachNode(CONF.getMaxClientNumForEachNode()) .setEnableSSL(COMMON_CONF.isEnableInternalSSL()) - .setSslKeyStorePath(COMMON_CONF.getKeyStorePath()) - .setSslKeyStorePassword(COMMON_CONF.getKeyStorePwd()) - .setSslTrustStorePath(COMMON_CONF.getTrustStorePath()) - .setSslTrustStorePassword(COMMON_CONF.getTrustStorePwd()) + .setSslKeyStorePath(COMMON_CONF.getInternalKeyStorePath()) + .setSslKeyStorePassword(COMMON_CONF.getInternalKeyStorePwd()) + .setSslTrustStorePath(COMMON_CONF.getInternalTrustStorePath()) + .setSslTrustStorePassword(COMMON_CONF.getInternalTrustStorePwd()) .build()) .setReplication( IoTConsensusConfig.Replication.newBuilder() @@ -168,10 +168,10 @@ public class DataRegionConsensusImpl { CONF.getThriftServerAwaitTimeForStopService()) .setThriftMaxFrameSize(CONF.getThriftMaxFrameSize()) .setEnableSSL(COMMON_CONF.isEnableInternalSSL()) - .setSslKeyStorePath(COMMON_CONF.getKeyStorePath()) - .setSslKeyStorePassword(COMMON_CONF.getKeyStorePwd()) - .setSslTrustStorePath(COMMON_CONF.getTrustStorePath()) - .setSslTrustStorePassword(COMMON_CONF.getTrustStorePwd()) + .setSslKeyStorePath(COMMON_CONF.getInternalKeyStorePath()) + .setSslKeyStorePassword(COMMON_CONF.getInternalKeyStorePwd()) + .setSslTrustStorePath(COMMON_CONF.getInternalTrustStorePath()) + .setSslTrustStorePassword(COMMON_CONF.getInternalTrustStorePwd()) .build()) .setPipe( PipeConsensusConfig.Pipe.newBuilder() @@ -223,10 +223,10 @@ public class DataRegionConsensusImpl { .setLeaderOutstandingAppendsMax( CONF.getDataRatisConsensusGrpcLeaderOutstandingAppendsMax()) .setEnableSSL(COMMON_CONF.isEnableInternalSSL()) - .setSslKeyStorePath(COMMON_CONF.getKeyStorePath()) - .setSslKeyStorePassword(COMMON_CONF.getKeyStorePwd()) - .setSslTrustStorePath(COMMON_CONF.getTrustStorePath()) - .setSslTrustStorePassword(COMMON_CONF.getTrustStorePwd()) + .setSslKeyStorePath(COMMON_CONF.getInternalKeyStorePath()) + .setSslKeyStorePassword(COMMON_CONF.getInternalKeyStorePwd()) + .setSslTrustStorePath(COMMON_CONF.getInternalTrustStorePath()) + .setSslTrustStorePassword(COMMON_CONF.getInternalTrustStorePwd()) .build()) .setRpc( RatisConfig.Rpc.newBuilder() diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java index e5b9fbe15d0..fd5f200678e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java @@ -110,10 +110,11 @@ public class SchemaRegionConsensusImpl { CONF .getSchemaRatisConsensusGrpcLeaderOutstandingAppendsMax()) .setEnableSSL(COMMON_CONF.isEnableInternalSSL()) - .setSslKeyStorePath(COMMON_CONF.getKeyStorePath()) - .setSslKeyStorePassword(COMMON_CONF.getKeyStorePwd()) - .setSslTrustStorePath(COMMON_CONF.getTrustStorePath()) - .setSslTrustStorePassword(COMMON_CONF.getTrustStorePwd()) + .setSslKeyStorePath(COMMON_CONF.getInternalKeyStorePath()) + .setSslKeyStorePassword(COMMON_CONF.getInternalKeyStorePwd()) + .setSslTrustStorePath(COMMON_CONF.getInternalTrustStorePath()) + .setSslTrustStorePassword( + COMMON_CONF.getInternalTrustStorePwd()) .build()) .setRpc( RatisConfig.Rpc.newBuilder() diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/ConfigNodeClient.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/ConfigNodeClient.java index 6ce425143f2..2497ca39811 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/ConfigNodeClient.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/ConfigNodeClient.java @@ -277,10 +277,10 @@ public class ConfigNodeClient implements IConfigNodeRPCService.Iface, ThriftClie endpoint.getIp(), endpoint.getPort(), timeoutMs, - commonConfig.getTrustStorePath(), - commonConfig.getTrustStorePwd(), - commonConfig.getKeyStorePath(), - commonConfig.getKeyStorePwd()) + commonConfig.getInternalTrustStorePath(), + commonConfig.getInternalTrustStorePwd(), + commonConfig.getInternalKeyStorePath(), + commonConfig.getInternalKeyStorePwd()) : DeepCopyRpcTransportFactory.INSTANCE.getTransport( // As there is a try-catch already, we do not need to use TSocket.wrap endpoint.getIp(), endpoint.getPort(), timeoutMs); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/exchange/MPPDataExchangeService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/exchange/MPPDataExchangeService.java index 52ab689f304..1af11d6d20e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/exchange/MPPDataExchangeService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/exchange/MPPDataExchangeService.java @@ -104,10 +104,10 @@ public class MPPDataExchangeService extends ThriftService implements MPPDataExch config.getThriftServerAwaitTimeForStopService(), new MPPDataExchangeServiceThriftHandler(), config.isRpcThriftCompressionEnable(), - commonConfig.getKeyStorePath(), - commonConfig.getKeyStorePwd(), - commonConfig.getTrustStorePath(), - commonConfig.getTrustStorePwd(), + commonConfig.getInternalKeyStorePath(), + commonConfig.getInternalKeyStorePwd(), + commonConfig.getInternalTrustStorePath(), + commonConfig.getInternalTrustStorePwd(), DeepCopyRpcTransportFactory.INSTANCE) : new ThriftServiceThread( processor, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNodeInternalRPCService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNodeInternalRPCService.java index 5de1041a9a0..0d473360f8b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNodeInternalRPCService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNodeInternalRPCService.java @@ -74,10 +74,10 @@ public class DataNodeInternalRPCService extends ThriftService config.getThriftServerAwaitTimeForStopService(), new InternalServiceThriftHandler(), config.isRpcThriftCompressionEnable(), - commonConfig.getKeyStorePath(), - commonConfig.getKeyStorePwd(), - commonConfig.getTrustStorePath(), - commonConfig.getTrustStorePwd(), + commonConfig.getInternalKeyStorePath(), + commonConfig.getInternalKeyStorePwd(), + commonConfig.getInternalTrustStorePath(), + commonConfig.getInternalTrustStorePwd(), DeepCopyRpcTransportFactory.INSTANCE) : new ThriftServiceThread( processor, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/RestService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/RestService.java index fa8df0c9a69..7fc4d788380 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/RestService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/RestService.java @@ -67,7 +67,7 @@ public class RestService implements IService { if (clientAuth) { sslContextFactory.setTrustStorePath(trustStorePath); sslContextFactory.setTrustStorePassword(trustStorePwd); - sslContextFactory.setNeedClientAuth(clientAuth); + sslContextFactory.setNeedClientAuth(true); } ServerConnector httpsConnector = diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/ainode/AINodeClient.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/ainode/AINodeClient.java index 0058bc7a2fc..d75df7a07f3 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/ainode/AINodeClient.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/ainode/AINodeClient.java @@ -107,8 +107,10 @@ public class AINodeClient implements AutoCloseable, ThriftClient { if (commonConfig.isEnableInternalSSL()) { TSSLTransportFactory.TSSLTransportParameters params = new TSSLTransportFactory.TSSLTransportParameters(); - params.setTrustStore(commonConfig.getTrustStorePath(), commonConfig.getTrustStorePwd()); - params.setKeyStore(commonConfig.getKeyStorePath(), commonConfig.getKeyStorePwd()); + params.setTrustStore( + commonConfig.getInternalTrustStorePath(), commonConfig.getInternalTrustStorePwd()); + params.setKeyStore( + commonConfig.getInternalKeyStorePath(), commonConfig.getInternalKeyStorePwd()); transport = new TFramedTransport.Factory() .getTransport( diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/ainode/AsyncAINodeServiceClient.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/ainode/AsyncAINodeServiceClient.java index ba0b1d11e70..cea906e765c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/ainode/AsyncAINodeServiceClient.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/ainode/AsyncAINodeServiceClient.java @@ -58,10 +58,10 @@ public class AsyncAINodeServiceClient extends IAINodeRPCService.AsyncClient endPoint.getIp(), endPoint.getPort(), property.getConnectionTimeoutMs(), - commonConfig.getKeyStorePath(), - commonConfig.getKeyStorePwd(), - commonConfig.getTrustStorePath(), - commonConfig.getTrustStorePwd()) + commonConfig.getInternalKeyStorePath(), + commonConfig.getInternalKeyStorePwd(), + commonConfig.getInternalTrustStorePath(), + commonConfig.getInternalTrustStorePwd()) : TNonblockingTransportWrapper.wrap( endPoint.getIp(), endPoint.getPort(), property.getConnectionTimeoutMs())); setTimeout(property.getConnectionTimeoutMs()); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncConfigNodeInternalServiceClient.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncConfigNodeInternalServiceClient.java index 70786f40096..147ed6743fc 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncConfigNodeInternalServiceClient.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncConfigNodeInternalServiceClient.java @@ -65,10 +65,10 @@ public class AsyncConfigNodeInternalServiceClient extends IConfigNodeRPCService. endpoint.getIp(), endpoint.getPort(), property.getConnectionTimeoutMs(), - commonConfig.getKeyStorePath(), - commonConfig.getKeyStorePwd(), - commonConfig.getTrustStorePath(), - commonConfig.getTrustStorePwd()) + commonConfig.getInternalKeyStorePath(), + commonConfig.getInternalKeyStorePwd(), + commonConfig.getInternalTrustStorePath(), + commonConfig.getInternalTrustStorePwd()) : TNonblockingTransportWrapper.wrap( endpoint.getIp(), endpoint.getPort(), property.getConnectionTimeoutMs())); setTimeout(property.getConnectionTimeoutMs()); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeExternalServiceClient.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeExternalServiceClient.java index 3751104e853..2a6417a1594 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeExternalServiceClient.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeExternalServiceClient.java @@ -65,10 +65,10 @@ public class AsyncDataNodeExternalServiceClient extends IDataNodeRPCService.Asyn endpoint.getIp(), endpoint.getPort(), property.getConnectionTimeoutMs(), - commonConfig.getKeyStorePath(), - commonConfig.getKeyStorePwd(), - commonConfig.getTrustStorePath(), - commonConfig.getTrustStorePwd()) + commonConfig.getInternalKeyStorePath(), + commonConfig.getInternalKeyStorePwd(), + commonConfig.getInternalTrustStorePath(), + commonConfig.getInternalTrustStorePwd()) : TNonblockingTransportWrapper.wrap( endpoint.getIp(), endpoint.getPort(), property.getConnectionTimeoutMs())); setTimeout(property.getConnectionTimeoutMs()); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeInternalServiceClient.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeInternalServiceClient.java index 9edfdb3d8e5..0b8b66ca310 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeInternalServiceClient.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeInternalServiceClient.java @@ -67,10 +67,10 @@ public class AsyncDataNodeInternalServiceClient extends IDataNodeRPCService.Asyn endpoint.getIp(), endpoint.getPort(), property.getConnectionTimeoutMs(), - commonConfig.getKeyStorePath(), - commonConfig.getKeyStorePwd(), - commonConfig.getTrustStorePath(), - commonConfig.getTrustStorePwd()) + commonConfig.getInternalKeyStorePath(), + commonConfig.getInternalKeyStorePwd(), + commonConfig.getInternalTrustStorePath(), + commonConfig.getInternalTrustStorePwd()) : TNonblockingTransportWrapper.wrap( endpoint.getIp(), endpoint.getPort(), property.getConnectionTimeoutMs())); setTimeout(property.getConnectionTimeoutMs()); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeMPPDataExchangeServiceClient.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeMPPDataExchangeServiceClient.java index d3d81401ff0..d59c28c9ffa 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeMPPDataExchangeServiceClient.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncDataNodeMPPDataExchangeServiceClient.java @@ -63,10 +63,10 @@ public class AsyncDataNodeMPPDataExchangeServiceClient extends MPPDataExchangeSe endpoint.getIp(), endpoint.getPort(), property.getConnectionTimeoutMs(), - commonConfig.getKeyStorePath(), - commonConfig.getKeyStorePwd(), - commonConfig.getTrustStorePath(), - commonConfig.getTrustStorePwd()) + commonConfig.getInternalKeyStorePath(), + commonConfig.getInternalKeyStorePwd(), + commonConfig.getInternalTrustStorePath(), + commonConfig.getInternalTrustStorePwd()) : TNonblockingTransportWrapper.wrap( endpoint.getIp(), endpoint.getPort(), property.getConnectionTimeoutMs())); setTimeout(property.getConnectionTimeoutMs()); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncPipeConsensusServiceClient.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncPipeConsensusServiceClient.java index fb59d2147d1..a5164634d77 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncPipeConsensusServiceClient.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/async/AsyncPipeConsensusServiceClient.java @@ -68,10 +68,10 @@ public class AsyncPipeConsensusServiceClient extends PipeConsensusIService.Async endpoint.getIp(), endpoint.getPort(), property.getConnectionTimeoutMs(), - commonConfig.getKeyStorePath(), - commonConfig.getKeyStorePwd(), - commonConfig.getTrustStorePath(), - commonConfig.getTrustStorePwd()) + commonConfig.getInternalKeyStorePath(), + commonConfig.getInternalKeyStorePwd(), + commonConfig.getInternalTrustStorePath(), + commonConfig.getInternalTrustStorePwd()) : TNonblockingTransportWrapper.wrap( endpoint.getIp(), endpoint.getPort(), property.getConnectionTimeoutMs())); setTimeout(property.getConnectionTimeoutMs()); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncConfigNodeIServiceClient.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncConfigNodeIServiceClient.java index ced2c92b4a0..53616f4c421 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncConfigNodeIServiceClient.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncConfigNodeIServiceClient.java @@ -60,10 +60,10 @@ public class SyncConfigNodeIServiceClient extends IConfigNodeRPCService.Client endPoint.getIp(), endPoint.getPort(), property.getConnectionTimeoutMs(), - commonConfig.getTrustStorePath(), - commonConfig.getTrustStorePwd(), - commonConfig.getKeyStorePath(), - commonConfig.getKeyStorePwd()) + commonConfig.getInternalTrustStorePath(), + commonConfig.getInternalTrustStorePwd(), + commonConfig.getInternalKeyStorePath(), + commonConfig.getInternalKeyStorePwd()) : DeepCopyRpcTransportFactory.INSTANCE.getTransport( new TSocket( TConfigurationConst.defaultTConfiguration, diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncDataNodeInternalServiceClient.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncDataNodeInternalServiceClient.java index 854b4a4aa18..8df5538677f 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncDataNodeInternalServiceClient.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncDataNodeInternalServiceClient.java @@ -61,10 +61,10 @@ public class SyncDataNodeInternalServiceClient extends IDataNodeRPCService.Clien endpoint.getIp(), endpoint.getPort(), property.getConnectionTimeoutMs(), - commonConfig.getTrustStorePath(), - commonConfig.getTrustStorePwd(), - commonConfig.getKeyStorePath(), - commonConfig.getKeyStorePwd()) + commonConfig.getInternalTrustStorePath(), + commonConfig.getInternalTrustStorePwd(), + commonConfig.getInternalKeyStorePath(), + commonConfig.getInternalKeyStorePwd()) : DeepCopyRpcTransportFactory.INSTANCE.getTransport( new TSocket( TConfigurationConst.defaultTConfiguration, diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncDataNodeMPPDataExchangeServiceClient.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncDataNodeMPPDataExchangeServiceClient.java index 4dcde11bfac..ea1500f2ecf 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncDataNodeMPPDataExchangeServiceClient.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncDataNodeMPPDataExchangeServiceClient.java @@ -60,10 +60,10 @@ public class SyncDataNodeMPPDataExchangeServiceClient extends MPPDataExchangeSer endpoint.getIp(), endpoint.getPort(), property.getConnectionTimeoutMs(), - commonConfig.getTrustStorePath(), - commonConfig.getTrustStorePwd(), - commonConfig.getKeyStorePath(), - commonConfig.getKeyStorePwd()) + commonConfig.getInternalTrustStorePath(), + commonConfig.getInternalTrustStorePwd(), + commonConfig.getInternalKeyStorePath(), + commonConfig.getInternalKeyStorePwd()) : DeepCopyRpcTransportFactory.INSTANCE.getTransport( new TSocket( TConfigurationConst.defaultTConfiguration, diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncPipeConsensusServiceClient.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncPipeConsensusServiceClient.java index 334d3cf43fc..abf1da46370 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncPipeConsensusServiceClient.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/sync/SyncPipeConsensusServiceClient.java @@ -60,10 +60,10 @@ public class SyncPipeConsensusServiceClient extends PipeConsensusIService.Client endpoint.getIp(), endpoint.getPort(), property.getConnectionTimeoutMs(), - commonConfig.getTrustStorePath(), - commonConfig.getTrustStorePwd(), - commonConfig.getKeyStorePath(), - commonConfig.getKeyStorePwd()) + commonConfig.getInternalTrustStorePath(), + commonConfig.getInternalTrustStorePwd(), + commonConfig.getInternalKeyStorePath(), + commonConfig.getInternalKeyStorePwd()) : DeepCopyRpcTransportFactory.INSTANCE.getTransport( new TSocket( TConfigurationConst.defaultTConfiguration, diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java index a960584c66c..1ad7065f523 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java @@ -431,9 +431,6 @@ public class CommonConfig { /** Enable the Thrift Client ssl. */ private boolean enableThriftClientSSL = false; - /** Enable the cluster internal connection ssl. */ - private boolean enableInternalSSL = false; - /** ssl key Store Path. */ private String keyStorePath = ""; @@ -446,6 +443,21 @@ public class CommonConfig { /** ssl trust Store password. */ private String trustStorePwd = ""; + /** Enable the cluster internal connection ssl. */ + private boolean enableInternalSSL = false; + + /** ssl key Store Path for internal connection */ + private String internalKeyStorePath = ""; + + /** ssl key Store password for internal connection */ + private String internalKeyStorePwd = ""; + + /** ssl trust Store Path for internal connection */ + private String internalTrustStorePath = ""; + + /** ssl trust Store password for internal connection */ + private String internalTrustStorePwd = ""; + private String userEncryptTokenHint = "not set yet"; private boolean enforceStrongPassword = false; @@ -2569,14 +2581,6 @@ public class CommonConfig { this.enableThriftClientSSL = enableThriftClientSSL; } - public boolean isEnableInternalSSL() { - return enableInternalSSL; - } - - public void setEnableInternalSSL(boolean enableInternalSSL) { - this.enableInternalSSL = enableInternalSSL; - } - public String getKeyStorePath() { return keyStorePath; } @@ -2609,6 +2613,46 @@ public class CommonConfig { this.trustStorePwd = trustStorePwd; } + public boolean isEnableInternalSSL() { + return enableInternalSSL; + } + + public void setEnableInternalSSL(boolean enableInternalSSL) { + this.enableInternalSSL = enableInternalSSL; + } + + public String getInternalKeyStorePath() { + return internalKeyStorePath; + } + + public void setInternalKeyStorePath(String internalKeyStorePath) { + this.internalKeyStorePath = internalKeyStorePath; + } + + public String getInternalKeyStorePwd() { + return internalKeyStorePwd; + } + + public void setInternalKeyStorePwd(String internalKeyStorePwd) { + this.internalKeyStorePwd = internalKeyStorePwd; + } + + public String getInternalTrustStorePath() { + return internalTrustStorePath; + } + + public void setInternalTrustStorePath(String internalTrustStorePath) { + this.internalTrustStorePath = internalTrustStorePath; + } + + public String getInternalTrustStorePwd() { + return internalTrustStorePwd; + } + + public void setInternalTrustStorePwd(String internalTrustStorePwd) { + this.internalTrustStorePwd = internalTrustStorePwd; + } + public boolean isEnforceStrongPassword() { return enforceStrongPassword; } diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/AbstractThriftServiceThread.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/AbstractThriftServiceThread.java index 7537308d6cd..796ae911957 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/AbstractThriftServiceThread.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/AbstractThriftServiceThread.java @@ -182,8 +182,8 @@ public abstract class AbstractThriftServiceThread extends Thread { params.setKeyStore(keyStorePath, keyStorePwd); if (trustStorePath != null && !trustStorePath.isEmpty()) { params.setTrustStore(trustStorePath, trustStorePwd); + params.requireClientAuth(true); } - params.requireClientAuth(false); InetSocketAddress socketAddress = new InetSocketAddress(bindAddress, port); serverTransport = TSSLTransportFactory.getServerSocket(
