Merge pull request #135 in ITERATE/cyberduck from feature/cli-nokeych…

…ain to master * commit '519d14d602f235fc68535c75da12e88d28d4d2ed [formerly e7319bfa3e998bb0da93a5168c24b8f2f6c3a96d]': Add option to disable use of keychain in CLI. Former-commit-id: 5f9dbc6db5053f2894fa42c1e2b697531ab0113b
iterate-ch · Jan 18, 2016 · 8a1e36a · 8a1e36a
2 parents f7f9e11 + 519d14d
commit 8a1e36a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/cli/src/main/java/ch/cyberduck/cli/TerminalLoginService.java b/cli/src/main/java/ch/cyberduck/cli/TerminalLoginService.java
@@ -19,6 +19,7 @@
  */
 
 import ch.cyberduck.core.Credentials;
+import ch.cyberduck.core.DisabledPasswordStore;
 import ch.cyberduck.core.Host;
 import ch.cyberduck.core.KeychainLoginService;
 import ch.cyberduck.core.LocalFactory;
@@ -38,7 +39,8 @@ public class TerminalLoginService extends KeychainLoginService {
     private CommandLine input;
 
     public TerminalLoginService(final CommandLine input, final LoginCallback prompt) {
-        super(prompt, PasswordStoreFactory.get());
+        super(prompt, input.hasOption(TerminalOptionsBuilder.Params.nokeychain.name())
+                ? new DisabledPasswordStore() : PasswordStoreFactory.get());
         this.input = input;
     }
 

diff --git a/cli/src/main/java/ch/cyberduck/cli/TerminalOptionsBuilder.java b/cli/src/main/java/ch/cyberduck/cli/TerminalOptionsBuilder.java
@@ -145,6 +145,11 @@ public static Options options() {
                 .hasArg(true).withArgName("bytes per second")
                 .isRequired(false)
                 .create());
+        options.addOption(OptionBuilder
+                .withDescription("Do not save passwords in keychain")
+                .withLongOpt(Params.nokeychain.name())
+                .isRequired(false)
+                .create());
         final StringBuilder b = new StringBuilder().append(StringUtils.LF);
         b.append("Options for downloads and uploads:").append(StringUtils.LF);
         for(TransferAction a : TransferAction.forTransfer(Transfer.Type.download)) {
@@ -207,6 +212,7 @@ public enum Params {
         udt,
         parallel,
         throttle,
+        nokeychain,
         existing,
         verbose,
         quiet,