Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8280890: Cannot use '-Djava.system.class.loader' with class loader in…
… signed JAR Reviewed-by: clanger Backport-of: a0f6f2409ea61ff9ed9dc2e2b46e309c751d456d
- Loading branch information
Showing
4 changed files
with
155 additions
and
44 deletions.
There are no files selected for viewing
This file contains 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 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 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,43 @@ | ||
| /* | ||
| * Copyright (c) 2022, 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 java.io.IOException; | ||
| import java.io.InputStream; | ||
|
|
||
| public class CustomClassLoader extends ClassLoader { | ||
|
|
||
| public CustomClassLoader(ClassLoader parent) { | ||
| super(parent); | ||
| } | ||
|
|
||
| @Override | ||
| public Class<?> findClass(String name) throws ClassNotFoundException { | ||
| try (InputStream is = getClass().getClassLoader() | ||
| .getResourceAsStream(name + ".class")) { | ||
| byte[] buf = is.readAllBytes(); | ||
| return defineClass(name, buf, 0, buf.length); | ||
| } catch (IOException e) { | ||
| throw new ClassNotFoundException(e.getMessage()); | ||
| } | ||
| } | ||
| } |
91 changes: 91 additions & 0 deletions
91
test/jdk/java/security/SignedJar/SignedJarWithCustomClassLoader.java
This file contains 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,91 @@ | ||
| /* | ||
| * Copyright (c) 2022, 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 8280890 | ||
| * @library /test/lib | ||
| * @build SignedJarWithCustomClassLoader CustomClassLoader | ||
| * @run main/othervm SignedJarWithCustomClassLoader | ||
| * @summary Make sure java.system.class.loader property can be used when custom | ||
| * class loader is inside signed jar | ||
| */ | ||
|
|
||
| import java.nio.file.Path; | ||
| import java.nio.file.Paths; | ||
|
|
||
| import jdk.test.lib.SecurityTools; | ||
| import jdk.test.lib.compiler.InMemoryJavaCompiler; | ||
| import jdk.test.lib.process.ProcessTools; | ||
| import jdk.test.lib.util.JarUtils; | ||
|
|
||
| public class SignedJarWithCustomClassLoader { | ||
|
|
||
| public static void main(String[] args) throws Exception { | ||
|
|
||
| // compile the Main program | ||
| String main = "public class Main {\n" + | ||
| " public static void main(String[] args) {}\n" + | ||
| "}\n"; | ||
| String testClasses = System.getProperty("test.classes", ""); | ||
| ClassFileInstaller.writeClassToDisk("Main", | ||
| InMemoryJavaCompiler.compile("Main", main), | ||
| testClasses); | ||
|
|
||
| // create the jar file | ||
| Path classes = Paths.get(testClasses); | ||
| JarUtils.createJarFile(Paths.get("test.jar"), classes, | ||
| classes.resolve("CustomClassLoader.class"), | ||
| classes.resolve("Main.class")); | ||
|
|
||
| // create signer's keypair | ||
| SecurityTools.keytool("-genkeypair -keyalg RSA -keystore ks " + | ||
| "-storepass changeit -dname CN=test -alias test") | ||
| .shouldHaveExitValue(0); | ||
|
|
||
| // sign jar | ||
| SecurityTools.jarsigner("-keystore ks -storepass changeit " + | ||
| "-signedjar signed.jar test.jar test") | ||
| .shouldHaveExitValue(0); | ||
|
|
||
| // run app with system class loader set to custom classloader | ||
| ProcessBuilder pb = ProcessTools.createJavaProcessBuilder( | ||
| "-cp", "signed.jar", | ||
| "-Djava.system.class.loader=CustomClassLoader", "Main"); | ||
| ProcessTools.executeProcess(pb) | ||
| .shouldHaveExitValue(0); | ||
|
|
||
| // sign jar again, but this time with SHA-1 which is disabled | ||
| SecurityTools.jarsigner("-keystore ks -storepass changeit " + | ||
| "-digestalg SHA-1 -sigalg SHA1withRSA " + | ||
| "-signedjar signed.jar test.jar test") | ||
| .shouldHaveExitValue(0); | ||
|
|
||
| // run app again, should still succeed even though SHA-1 is disabled | ||
| pb = ProcessTools.createJavaProcessBuilder( | ||
| "-cp", "signed.jar", | ||
| "-Djava.system.class.loader=CustomClassLoader", "Main"); | ||
| ProcessTools.executeProcess(pb) | ||
| .shouldHaveExitValue(0); | ||
| } | ||
| } |
445ab52There 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.
Review
Issues