(iotdb) branch master updated: If the client input uses "-usessl", then force interactive input of trustStore and trustStorePwd. (#16676)

[jiangtian]

This is an automated email from the ASF dual-hosted git repository.

jiangtian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new acaf594ab46 If the client input uses "-usessl", then force interactive 
input of trustStore and trustStorePwd. (#16676)
acaf594ab46 is described below

commit acaf594ab46ec41ad5eea4f6746080e62182d410
Author: Hongzhi Gao <761417...@qq.com>
AuthorDate: Fri Oct 31 09:32:46 2025 +0800

    If the client input uses "-usessl", then force interactive input of 
trustStore and trustStorePwd. (#16676)
---
 .../main/java/org/apache/iotdb/cli/AbstractCli.java   | 19 ++-----------------
 .../cli/src/main/java/org/apache/iotdb/cli/Cli.java   |  6 ++++--
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git 
a/iotdb-client/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java 
b/iotdb-client/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java
index 1b890b680c4..aee48bd9927 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java
@@ -200,7 +200,8 @@ public abstract class AbstractCli {
     Option password =
         Option.builder(PW_ARGS)
             .argName(PW_NAME)
-            .hasArg()
+            .hasArg(true)
+            .optionalArg(true)
             .desc("Password. Default is root. (optional)")
             .build();
     options.addOption(password);
@@ -213,22 +214,6 @@ public abstract class AbstractCli {
             .build();
     options.addOption(useSSL);
 
-    Option trustStore =
-        Option.builder(TRUST_STORE_ARGS)
-            .argName(TRUST_STORE)
-            .hasArg()
-            .desc("Trust store statement. (optional)")
-            .build();
-    options.addOption(trustStore);
-
-    Option trustStorePwd =
-        Option.builder(TRUST_STORE_PWD_ARGS)
-            .argName(TRUST_STORE_PWD)
-            .hasArg()
-            .desc("Trust store password statement. (optional)")
-            .build();
-    options.addOption(trustStorePwd);
-
     Option execute =
         Option.builder(EXECUTE_ARGS)
             .argName(EXECUTE_NAME)
diff --git a/iotdb-client/cli/src/main/java/org/apache/iotdb/cli/Cli.java 
b/iotdb-client/cli/src/main/java/org/apache/iotdb/cli/Cli.java
index a6667a3bcff..b34cfe249c4 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/cli/Cli.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/cli/Cli.java
@@ -158,8 +158,10 @@ public class Cli extends AbstractCli {
   private static void serve(CliContext ctx) {
     try {
       useSsl = commandLine.getOptionValue(USE_SSL_ARGS);
-      trustStore = commandLine.getOptionValue(TRUST_STORE_ARGS);
-      trustStorePwd = commandLine.getOptionValue(TRUST_STORE_PWD_ARGS);
+      if (Boolean.parseBoolean(useSsl)) {
+        trustStore = ctx.getLineReader().readLine("please input your 
trust_store:", '\0');
+        trustStorePwd = ctx.getLineReader().readLine("please input your 
trust_store_pwd:", '\0');
+      }
       password = commandLine.getOptionValue(PW_ARGS);
       if (password == null) {
         password = ctx.getLineReader().readLine("please input your password:", 
'\0');