archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8339347: keytool -importpass insists prompting the user even if there is no terminal

Browse source 
Reviewed-by: weijun
This commit is contained in:
Hai-May Chao 2024-09-05 20:17:52 +00:00
parent 9e1af8cc7c
commit 8fb8cd85b7
2 changed files with 51 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/java.base/share/classes/sun/security/tools/keytool/Main.java
View file

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * 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 { private char[] promptForCredential() throws Exception {
// Handle password supplied via stdin // Handle password supplied via stdin
if (System.console() == null) { Console console = System.console();
if (console == null || !console.isTerminal()) {
char[] importPass = Password.readPassword(System.in); char[] importPass = Password.readPassword(System.in);
passwords.add(importPass); passwords.add(importPass);
return importPass; return importPass;

48
test/jdk/sun/security/tools/keytool/TestImportPass.java Normal file
View file

@ -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);
}
}