8353749: Improve security warning when using JKS or JCEKS keystores #27624
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
There was a problem hiding this comment. I think you should create a new test which is a subclass of this Test which checks that JKS and JCEKS produce the proper warnings when using jarsigner. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| /* | ||
| * Copyright (c) 2025, 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 8353749 | ||
| * @summary Validate that keytool and jarsigner emit warnings for | ||
| * JKS and JCEKS keystore with java.security.debug=keystore | ||
| * @library /test/lib | ||
| */ | ||
|
|
||
| import java.nio.file.Path; | ||
| import java.io.ByteArrayOutputStream; | ||
| import java.io.File; | ||
| import java.io.PrintStream; | ||
| import java.util.Locale; | ||
|
|
||
| import jdk.test.lib.SecurityTools; | ||
| import jdk.test.lib.util.JarUtils; | ||
|
|
||
| public class OutdatedKeyStoreWarning { | ||
|
|
||
| private static final String KS_WARNING1 = | ||
| "uses outdated cryptographic algorithms and will be removed " + | ||
| "in a future release. Migrate to PKCS12 using:"; | ||
|
|
||
| private static final String KS_WARNING2= | ||
| "keytool -importkeystore -srckeystore <keystore> " + | ||
| "-destkeystore <keystore> -deststoretype pkcs12"; | ||
|
|
||
| public static void main(String[] args) throws Exception { | ||
| String[] ksTypes = {"JKS", "JCEKS"}; | ||
|
|
||
| for (String type : ksTypes) { | ||
| String ksFile = type.toLowerCase() + ".ks"; | ||
| String cmdWarning = type + " " + KS_WARNING1; | ||
|
|
||
| checkWarnings(type, () -> { | ||
| SecurityTools.keytool(String.format( | ||
| "-genkeypair -keystore %s -storetype %s -storepass changeit " + | ||
| "-keypass changeit -keyalg ec -alias a1 -dname CN=me " + | ||
| "-J-Djava.security.debug=keystore", | ||
| ksFile, type.toLowerCase())) | ||
| .shouldContain("Warning:") | ||
| .shouldContain(cmdWarning) | ||
| .shouldContain(KS_WARNING2) | ||
| .shouldHaveExitValue(0); | ||
| }); | ||
|
|
||
| JarUtils.createJarFile(Path.of("unsigned.jar"), Path.of("."), Path.of(ksFile)); | ||
| checkWarnings(type, () -> { | ||
| SecurityTools.jarsigner(String.format( | ||
| "-keystore %s -storetype %s -storepass changeit -signedjar signed.jar " + | ||
| "unsigned.jar a1 " + | ||
| "-J-Djava.security.debug=keystore", | ||
| ksFile, type.toLowerCase())) | ||
| .shouldContain("Warning:") | ||
| .shouldContain(cmdWarning) | ||
| .shouldContain(KS_WARNING2) | ||
| .shouldHaveExitValue(0); | ||
| }); | ||
|
|
||
| checkWarnings(type, () -> { | ||
| SecurityTools.jarsigner(String.format( | ||
| "-verify -keystore %s -storetype %s -storepass changeit signed.jar " + | ||
| "-J-Djava.security.debug=keystore", | ||
| ksFile, type.toLowerCase())) | ||
| .shouldContain("Warning:") | ||
| .shouldContain(cmdWarning) | ||
| .shouldContain(KS_WARNING2) | ||
| .shouldHaveExitValue(0); | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| private static void checkWarnings(String type, RunnableWithException r) throws Exception { | ||
| ByteArrayOutputStream bOut = new ByteArrayOutputStream(); | ||
| PrintStream origErr = System.err; | ||
| PrintStream origOut = System.out; | ||
|
|
||
| try { | ||
| PrintStream pStream = new PrintStream(bOut); | ||
| System.setErr(pStream); | ||
| System.setOut(pStream); | ||
| r.run(); | ||
| } finally { | ||
| System.setErr(origErr); | ||
| System.setOut(origOut); | ||
| } | ||
|
|
||
| String msg = bOut.toString(); | ||
| if (!msg.contains("WARNING: " + type.toUpperCase(Locale.ROOT)) || | ||
| !msg.contains(KS_WARNING1) || | ||
| !msg.contains(KS_WARNING2) || | ||
| !msg.contains("Warning:")) { | ||
| throw new RuntimeException("Expected warning not found for " + type + ":\n" + msg); | ||
| } | ||
| } | ||
|
|
||
| @FunctionalInterface | ||
| interface RunnableWithException { | ||
| void run() throws Exception; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should put in the same logic here as in
keytoolto check if the real storetype is JKS or JCEKS. Seejdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java
Line 1392 in f6d77cb