GG-20639 control.sh shows passwords in the output

ibelyakov · ibelyakov · commit 40c4bc34bda4 · 2019-07-25T12:09:57.000+03:00
(cherry picked from commit 483d046) (cherry picked from commit f3a762d) (cherry picked from commit 4fddf21) # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/Command.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/Command.java
@@ -101,6 +101,13 @@ public default void parseArguments(CommandArgIterator argIterator) {
      */
     public void printUsage(Logger logger);
 
+    /**
+     * @return String which reflect of command-specific arguments in human-friendly format.
+     */
+    public default String argumentString() {
+        return arg() == null? "" : arg().toString();
+    }
+
     /**
      * @return command name.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
@@ -248,7 +248,11 @@ public int execute(List<String> rawArgs) {
 
                 try {
                     logger.info("Command [" + commandName + "] started");
-                    logger.info("Arguments: " + String.join(" ", rawArgs));
+                    logger.info("Common arguments: " + args.toString());
+
+                    if (command.arg() != null)
+                        logger.info("Command arguments: " + command.argumentString());
+
                     logger.info(DELIM);
                     lastOperationRes = command.execute(clientCfg, logger);
                 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/ConnectionAndSslParameters.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/ConnectionAndSslParameters.java
@@ -18,6 +18,8 @@
 package org.apache.ignite.internal.commandline;
 
 import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Container with common parsed and validated arguments.
@@ -33,6 +35,7 @@ public class ConnectionAndSslParameters {
     private String user;
 
     /** Password. */
+    @GridToStringExclude
     private String pwd;
 
     /** Force option is used for auto confirmation. */
@@ -60,6 +63,7 @@ public class ConnectionAndSslParameters {
     private String sslKeyStoreType;
 
     /** Keystore Password. */
+    @GridToStringExclude
     private char[] sslKeyStorePassword;
 
     /** Truststore. */
@@ -69,6 +73,7 @@ public class ConnectionAndSslParameters {
     private String sslTrustStoreType;
 
     /** Truststore Password. */
+    @GridToStringExclude
     private char[] sslTrustStorePassword;
 
     /** High-level command. */
@@ -259,4 +264,13 @@ public String sslTrustStoreType() {
     public char[] sslTrustStorePassword() {
         return sslTrustStorePassword;
     }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(ConnectionAndSslParameters.class, this,
+            "password", pwd == null ? null : "*****",
+            "sslKeyStorePassword", sslKeyStorePassword == null ? null: "*****",
+            "sslTrustStorePassword", sslTrustStorePassword == null? null: "*****"
+            );
+    }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/WalCommands.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/WalCommands.java
@@ -148,6 +148,11 @@ public class WalCommands implements Command<T2<String, String>> {
         return new T2<>(walAct, walArgs);
     }
 
+    /** {@inheritDoc} */
+    @Override public String argumentString() {
+        return "walAction=" + walAct + ", walArgs=" + walArgs;
+    }
+
     /**
      * Execute delete unused WAL segments task.
      *  @param client Client.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/baseline/BaselineArguments.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/baseline/BaselineArguments.java
@@ -21,6 +21,8 @@
 package org.apache.ignite.internal.commandline.baseline;
 
 import java.util.List;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * This class contains all possible arguments after parsing baseline command input.
@@ -38,6 +40,7 @@ public class BaselineArguments {
     /** Requested topology version. */
     private long topVer = -1;
     /** List of consistent ids for operation. */
+    @GridToStringInclude
     List<String> consistentIds;
 
     /**
@@ -92,6 +95,11 @@ public List<String> getConsistentIds() {
         return consistentIds;
     }
 
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(BaselineArguments.class, this);
+    }
+
     /**
      * Builder of {@link BaselineArguments}.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheCommands.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheCommands.java
@@ -214,6 +214,12 @@ private static String extendToLen(String s, int targetLen) {
         return subcommand;
     }
 
+    /** {@inheritDoc} */
+    @Override public String argumentString() {
+        return "cacheSubcommand=" + subcommand.name() +
+            (subcommand.subcommand() == null ? "" : ", " + subcommand.subcommand().argumentString());
+    }
+
     /** {@inheritDoc} */
     @Override public String name() {
         return CACHE.toCommandName();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheContention.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheContention.java
@@ -29,6 +29,7 @@
 import org.apache.ignite.internal.commandline.CommandArgIterator;
 import org.apache.ignite.internal.commandline.CommandLogger;
 import org.apache.ignite.internal.processors.cache.verify.ContentionInfo;
+import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.visor.verify.VisorContentionTask;
 import org.apache.ignite.internal.visor.verify.VisorContentionTaskArg;
 import org.apache.ignite.internal.visor.verify.VisorContentionTaskResult;
@@ -93,6 +94,11 @@ public int minQueueSize() {
         public int maxPrint() {
             return maxPrint;
         }
+
+        /** {@inheritDoc} */
+        @Override public String toString() {
+            return S.toString(Arguments.class, this);
+        }
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheDistribution.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheDistribution.java
@@ -36,6 +36,7 @@
 import org.apache.ignite.internal.commandline.cache.distribution.CacheDistributionTask;
 import org.apache.ignite.internal.commandline.cache.distribution.CacheDistributionTaskArg;
 import org.apache.ignite.internal.commandline.cache.distribution.CacheDistributionTaskResult;
+import org.apache.ignite.internal.util.typedef.internal.S;
 
 import static org.apache.ignite.internal.commandline.CommandHandler.NULL;
 import static org.apache.ignite.internal.commandline.CommandLogger.optional;
@@ -102,6 +103,11 @@ public UUID nodeId() {
         public Set<String> getUserAttributes() {
             return userAttributes;
         }
+
+        /** {@inheritDoc} */
+        @Override public String toString() {
+            return S.toString(Arguments.class, this);
+        }
     }
 
     /** Command parsed arguments */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheValidateIndexes.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheValidateIndexes.java
@@ -36,6 +36,7 @@
 import org.apache.ignite.internal.commandline.cache.argument.ValidateIndexesCommandArg;
 import org.apache.ignite.internal.processors.cache.verify.PartitionKey;
 import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.internal.visor.verify.IndexIntegrityCheckIssue;
 import org.apache.ignite.internal.visor.verify.IndexValidationIssue;
@@ -137,6 +138,11 @@ public int checkThrough() {
         public UUID nodeId() {
             return nodeId;
         }
+
+        /** {@inheritDoc} */
+        @Override public String toString() {
+            return S.toString(Arguments.class, this);
+        }
     }
 
     /** Command parsed arguments. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheViewer.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheViewer.java
@@ -36,6 +36,7 @@
 import org.apache.ignite.internal.commandline.argument.CommandArgUtils;
 import org.apache.ignite.internal.commandline.cache.argument.ListCommandArg;
 import org.apache.ignite.internal.processors.cache.verify.CacheInfo;
+import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.SB;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.internal.visor.cache.VisorCacheAffinityConfiguration;
@@ -149,6 +150,11 @@ public VisorViewCacheCmd cacheCommand() {
          * @return Full config flag.
          */
         public boolean fullConfig(){ return fullConfig; }
+
+        /** {@inheritDoc} */
+        @Override public String toString() {
+            return S.toString(Arguments.class, this);
+        }
     }
 
     /** Command parsed arguments */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/FindAndDeleteGarbage.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/FindAndDeleteGarbage.java
@@ -32,6 +32,7 @@
 import org.apache.ignite.internal.commandline.CommandLogger;
 import org.apache.ignite.internal.commandline.argument.CommandArgUtils;
 import org.apache.ignite.internal.commandline.cache.argument.FindAndDeleteGarbageArg;
+import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.visor.cache.VisorFindAndDeleteGarbageInPersistenceJobResult;
 import org.apache.ignite.internal.visor.cache.VisorFindAndDeleteGarbageInPersistenceTask;
 import org.apache.ignite.internal.visor.cache.VisorFindAndDeleteGarbageInPersistenceTaskArg;
@@ -100,6 +101,11 @@ public Set<String> groups() {
         public boolean delete() {
             return delete;
         }
+
+        /** {@inheritDoc} */
+        @Override public String toString() {
+            return S.toString(Arguments.class, this);
+        }
     }
 
     /** Command parsed arguments. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/IdleVerify.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/IdleVerify.java
@@ -27,8 +27,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.logging.Logger;
 import java.util.function.Consumer;
+import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 import org.apache.ignite.IgniteException;
@@ -46,6 +46,7 @@
 import org.apache.ignite.internal.processors.cache.verify.PartitionKey;
 import org.apache.ignite.internal.processors.cache.verify.VerifyBackupPartitionsTaskV2;
 import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.SB;
 import org.apache.ignite.internal.visor.verify.CacheFilterEnum;
 import org.apache.ignite.internal.visor.verify.VisorIdleVerifyDumpTask;
@@ -179,6 +180,11 @@ public boolean idleCheckCrc() {
         public boolean isSkipZeros() {
             return skipZeros;
         }
+
+        /** {@inheritDoc} */
+        @Override public String toString() {
+            return S.toString(Arguments.class, this);
+        }
     }
 
     /** Command parsed arguments. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/ResetLostPartitions.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/ResetLostPartitions.java
@@ -56,6 +56,11 @@ public class ResetLostPartitions implements Command<Set<String>> {
         return caches;
     }
 
+    /** {@inheritDoc} */
+    @Override public String argumentString() {
+        return "caches=" + caches;
+    }
+
     /** {@inheritDoc} */
     @Override public Object execute(GridClientConfiguration clientCfg, Logger logger) throws Exception {
         CacheResetLostPartitionsTaskArg taskArg = new CacheResetLostPartitionsTaskArg(caches);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/diagnostic/DiagnosticCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/diagnostic/DiagnosticCommand.java
@@ -64,6 +64,12 @@ public class DiagnosticCommand implements Command<DiagnosticSubCommand> {
         return subcommand;
     }
 
+    /** {@inheritDoc} */
+    @Override public String argumentString() {
+        return "diagnosticSubcommand=" + subcommand.name() +
+            (subcommand.subcommand() == null ? "" : ", " + subcommand.subcommand().argumentString());
+    }
+
     /** {@inheritDoc} */
     @Override public void parseArguments(CommandArgIterator argIter) {
         if (!argIter.hasNextSubArg()) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/diagnostic/PageLocksCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/diagnostic/PageLocksCommand.java
@@ -32,6 +32,7 @@
 import org.apache.ignite.internal.commandline.TaskExecutor;
 import org.apache.ignite.internal.commandline.argument.CommandArg;
 import org.apache.ignite.internal.commandline.argument.CommandArgUtils;
+import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.visor.diagnostic.Operation;
 import org.apache.ignite.internal.visor.diagnostic.VisorPageLocksResult;
 import org.apache.ignite.internal.visor.diagnostic.VisorPageLocksTask;
@@ -43,10 +44,10 @@
 import static org.apache.ignite.internal.commandline.CommandLogger.optional;
 import static org.apache.ignite.internal.commandline.diagnostic.DiagnosticSubCommand.PAGE_LOCKS;
 import static org.apache.ignite.internal.commandline.diagnostic.PageLocksCommand.PageLocksCommandArg.ALL;
-import static org.apache.ignite.internal.commandline.diagnostic.PageLocksCommand.PageLocksCommandArg.NODES;
-import static org.apache.ignite.internal.commandline.diagnostic.PageLocksCommand.PageLocksCommandArg.PATH;
 import static org.apache.ignite.internal.commandline.diagnostic.PageLocksCommand.PageLocksCommandArg.DUMP;
 import static org.apache.ignite.internal.commandline.diagnostic.PageLocksCommand.PageLocksCommandArg.DUMP_LOG;
+import static org.apache.ignite.internal.commandline.diagnostic.PageLocksCommand.PageLocksCommandArg.NODES;
+import static org.apache.ignite.internal.commandline.diagnostic.PageLocksCommand.PageLocksCommandArg.PATH;
 import static org.apache.ignite.internal.processors.diagnostic.DiagnosticProcessor.DEFAULT_TARGET_FOLDER;
 
 /**
@@ -76,7 +77,7 @@ public class PageLocksCommand implements Command<PageLocksCommand.Arguments> {
                 });
             }
 
-            VisorPageLocksTrackerArgs taskArg = new VisorPageLocksTrackerArgs(arguments.op, arguments.filePath, nodeIds);
+            VisorPageLocksTrackerArgs taskArg = new VisorPageLocksTrackerArgs(arguments.operation, arguments.filePath, nodeIds);
 
             res = TaskExecutor.executeTask(
                 client,
@@ -180,7 +181,7 @@ private void printResult(Map<ClusterNode, VisorPageLocksResult> res) {
     /** */
     public static class Arguments {
         /** */
-        private final Operation op;
+        private final Operation operation;
         /** */
         private final String filePath;
         /** */
@@ -189,22 +190,27 @@ public static class Arguments {
         private final Set<String> nodeIds;
 
         /**
-         * @param op Operation.
+         * @param operation Operation.
          * @param filePath File path.
          * @param allNodes If {@code True} include all available nodes for command. If {@code False} include only subset.
          * @param nodeIds Node ids.
          */
         public Arguments(
-            Operation op,
+            Operation operation,
             String filePath,
             boolean allNodes,
             Set<String> nodeIds
         ) {
-            this.op = op;
+            this.operation = operation;
             this.filePath = filePath;
             this.allNodes = allNodes;
             this.nodeIds = nodeIds;
         }
+
+        /** {@inheritDoc} */
+        @Override public String toString() {
+            return S.toString(Arguments.class, this);
+        }
     }
 
     enum PageLocksCommandArg implements CommandArg {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxTaskArg.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxTaskArg.java
diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerAbstractTest.java
diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
