From 8fb8cd85b7bd2e004329b4968f9564f340002cc1 Mon Sep 17 00:00:00 2001
From: Hai-May Chao <hchao@openjdk.org>
Date: Thu, 5 Sep 2024 20:17:52 +0000
Subject: [PATCH] 8339347: keytool -importpass insists prompting the user even
 if there is no terminal

Reviewed-by: weijun
---
 .../sun/security/tools/keytool/Main.java      |  5 +-
 .../tools/keytool/TestImportPass.java         | 48 +++++++++++++++++++
 2 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 test/jdk/sun/security/tools/keytool/TestImportPass.java

diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Main.java b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
index b2527a7fc2c..00e40c5f587 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/Main.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1789,7 +1789,8 @@ public final class Main {
      */
     private char[] promptForCredential() throws Exception {
         // Handle password supplied via stdin
-        if (System.console() == null) {
+        Console console = System.console();
+        if (console == null || !console.isTerminal()) {
             char[] importPass = Password.readPassword(System.in);
             passwords.add(importPass);
             return importPass;
diff --git a/test/jdk/sun/security/tools/keytool/TestImportPass.java b/test/jdk/sun/security/tools/keytool/TestImportPass.java
new file mode 100644
index 00000000000..adf8dba8415
--- /dev/null
+++ b/test/jdk/sun/security/tools/keytool/TestImportPass.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8339347
+ * @summary Test keytool -importpass with password input from System.in for
+ *          the non-terminal console
+ * @library /test/lib
+ * @run main TestImportPass
+ */
+
+import jdk.test.lib.SecurityTools;
+
+public class TestImportPass {
+    public static void main(String[] args) throws Throwable {
+        SecurityTools.setResponse("pass123");
+        SecurityTools.keytool("-importpass -keystore ks.p12 -storepass changeit " +
+                "-storetype pkcs12 -alias newentry")
+                .shouldNotContain("Enter the password to be stored:")
+                .shouldHaveExitValue(0);
+
+        SecurityTools.keytool("-list -keystore ks.p12 -storepass changeit " +
+                "-v")
+                .shouldContain("Alias name: newentry")
+                .shouldHaveExitValue(0);
+    }
+}