mirror of
https://github.com/openjdk/jdk.git
synced 2026-01-28 12:09:14 +00:00
8374555: No need for visible input warning in s.s.u.Password when not reading from System.in
Reviewed-by: coffeys, hchao
This commit is contained in:
parent
cdbc493a6d
commit
fbc59ac0a1
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2003, 2026, 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
|
||||||
@ -32,6 +32,7 @@ import java.util.Arrays;
|
|||||||
|
|
||||||
import jdk.internal.access.SharedSecrets;
|
import jdk.internal.access.SharedSecrets;
|
||||||
import jdk.internal.io.JdkConsoleImpl;
|
import jdk.internal.io.JdkConsoleImpl;
|
||||||
|
import jdk.internal.misc.VM;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A utility class for reading passwords
|
* A utility class for reading passwords
|
||||||
@ -65,7 +66,9 @@ public class Password {
|
|||||||
}
|
}
|
||||||
consoleBytes = ConsoleHolder.convertToBytes(consoleEntered);
|
consoleBytes = ConsoleHolder.convertToBytes(consoleEntered);
|
||||||
in = new ByteArrayInputStream(consoleBytes);
|
in = new ByteArrayInputStream(consoleBytes);
|
||||||
} else if (System.in.available() == 0) {
|
} else if (in == System.in && VM.isBooted()
|
||||||
|
&& System.in.available() == 0) {
|
||||||
|
// Warn if reading password from System.in but it's empty.
|
||||||
// This may be running in an IDE Run Window or in JShell,
|
// This may be running in an IDE Run Window or in JShell,
|
||||||
// which acts like an interactive console and echoes the
|
// which acts like an interactive console and echoes the
|
||||||
// entered password. In this case, print a warning that
|
// entered password. In this case, print a warning that
|
||||||
@ -73,6 +76,7 @@ public class Password {
|
|||||||
// it's more likely the input comes from a pipe, such as
|
// it's more likely the input comes from a pipe, such as
|
||||||
// "echo password |" or "cat password_file |" where input
|
// "echo password |" or "cat password_file |" where input
|
||||||
// will be silently consumed without echoing to the screen.
|
// will be silently consumed without echoing to the screen.
|
||||||
|
// Warn only if VM is booted and ResourcesMgr is available.
|
||||||
System.err.print(ResourcesMgr.getString
|
System.err.print(ResourcesMgr.getString
|
||||||
("warning.input.may.be.visible.on.screen"));
|
("warning.input.may.be.visible.on.screen"));
|
||||||
}
|
}
|
||||||
|
|||||||
74
test/jdk/sun/security/util/Password/EmptyIn.java
Normal file
74
test/jdk/sun/security/util/Password/EmptyIn.java
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2026, 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import jdk.test.lib.Asserts;
|
||||||
|
import sun.security.util.Password;
|
||||||
|
|
||||||
|
import java.io.ByteArrayInputStream;
|
||||||
|
import java.io.ByteArrayOutputStream;
|
||||||
|
import java.io.PrintStream;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* @test
|
||||||
|
* @bug 8374555
|
||||||
|
* @summary only print warning when reading from System.in
|
||||||
|
* @modules java.base/sun.security.util
|
||||||
|
* @library /test/lib
|
||||||
|
*/
|
||||||
|
public class EmptyIn {
|
||||||
|
public static void main(String[] args) throws Exception {
|
||||||
|
testSystemIn();
|
||||||
|
testNotSystemIn();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void testSystemIn() throws Exception {
|
||||||
|
var in = new ByteArrayInputStream(new byte[0]);
|
||||||
|
var err = new ByteArrayOutputStream();
|
||||||
|
var oldErr = System.err;
|
||||||
|
var oldIn = System.in;
|
||||||
|
try {
|
||||||
|
System.setIn(in);
|
||||||
|
System.setErr(new PrintStream(err));
|
||||||
|
Password.readPassword(System.in);
|
||||||
|
} finally {
|
||||||
|
System.setIn(oldIn);
|
||||||
|
System.setErr(oldErr);
|
||||||
|
}
|
||||||
|
// Read from System.in. Should warn.
|
||||||
|
Asserts.assertNotEquals(0, err.size());
|
||||||
|
}
|
||||||
|
|
||||||
|
static void testNotSystemIn() throws Exception {
|
||||||
|
var in = new ByteArrayInputStream(new byte[0]);
|
||||||
|
var err = new ByteArrayOutputStream();
|
||||||
|
var oldErr = System.err;
|
||||||
|
try {
|
||||||
|
System.setErr(new PrintStream(err));
|
||||||
|
Password.readPassword(in);
|
||||||
|
} finally {
|
||||||
|
System.setErr(oldErr);
|
||||||
|
}
|
||||||
|
// Not read from System.in. Should not warn.
|
||||||
|
Asserts.assertEQ(0, err.size());
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user