undefect. CWE-407 — 63 sites patched across 27 ecosystems
Authors: russell@unturf.com · brackishbert@gmail.com · foxhop.net · TimeHexOn.com Patches, unit tests, benchmarks, whitepaper, and outreach briefs. Public domain — no copyright claimed. Use freely.
This commit is contained in:
commit
0a580b313d
70422 changed files with 17213626 additions and 0 deletions
43
test/jdk/java/security/SignedJar/CustomClassLoader.java
Normal file
43
test/jdk/java/security/SignedJar/CustomClassLoader.java
Normal file
|
|
@ -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());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,94 @@
|
|||
/*
|
||||
* Copyright (c) 2022, 2023, 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.helpers.ClassFileInstaller;
|
||||
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 {
|
||||
public static void main(String[] args) {}
|
||||
}
|
||||
""";
|
||||
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.createLimitedTestJavaProcessBuilder(
|
||||
"-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.createLimitedTestJavaProcessBuilder(
|
||||
"-cp", "signed.jar",
|
||||
"-Djava.system.class.loader=CustomClassLoader", "Main");
|
||||
ProcessTools.executeProcess(pb)
|
||||
.shouldHaveExitValue(0);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,126 @@
|
|||
/*
|
||||
* Copyright (c) 2022, Red Hat, Inc.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
import jdk.test.lib.util.JarUtils;
|
||||
import jdk.test.lib.SecurityTools;
|
||||
import jdk.test.lib.Asserts;
|
||||
import jdk.test.lib.process.ProcessTools;
|
||||
import jdk.test.lib.process.OutputAnalyzer;
|
||||
import java.util.Calendar;
|
||||
import java.util.Locale;
|
||||
import java.util.List;
|
||||
import java.util.ArrayList;
|
||||
import java.net.URI;
|
||||
import java.nio.file.Paths;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Files;
|
||||
import java.io.File;
|
||||
import static java.util.Calendar.WEDNESDAY;
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 8297684 8269039
|
||||
* @summary Checking custom CalendarDataProvider with SPI contained in signed jar does
|
||||
* not produce NPE.
|
||||
* @modules java.base/sun.security.pkcs
|
||||
* java.base/sun.security.timestamp
|
||||
* java.base/sun.security.x509
|
||||
* java.base/sun.security.util
|
||||
* java.base/sun.security.tools.keytool
|
||||
* jdk.jartool/jdk.security.jarsigner
|
||||
* @library /test/lib
|
||||
* @library provider
|
||||
* @build baz.CalendarDataProviderImpl
|
||||
* @run main/timeout=600 TestSPISigned
|
||||
*/
|
||||
public class TestSPISigned {
|
||||
|
||||
private static final String TEST_SRC = System.getProperty("test.src", ".");
|
||||
|
||||
private static final Path META_INF_DIR = Paths.get(TEST_SRC, "provider", "meta");
|
||||
private static final Path MODS_DIR = Paths.get("mods");
|
||||
private static final Path UNSIGNED_JAR = MODS_DIR.resolve("unsigned-with-locale.jar");
|
||||
private static final Path SIGNED_JAR = MODS_DIR.resolve("signed-with-locale.jar");
|
||||
|
||||
public static void main(String[] args) throws Throwable {
|
||||
if (args.length == 1) {
|
||||
String arg = args[0];
|
||||
if ("run-test".equals(arg)) {
|
||||
System.out.println("Debug: Running test");
|
||||
String provProp = System.getProperty("java.locale.providers");
|
||||
if (!"SPI".equals(provProp)) {
|
||||
throw new RuntimeException("Test failed! Expected -Djava.locale.providers=SPI to be set for test run");
|
||||
}
|
||||
doRunTest();
|
||||
} else {
|
||||
throw new RuntimeException("Test failed! Expected 'run-test' arg for test run");
|
||||
}
|
||||
} else {
|
||||
// Set up signed jar with custom calendar data provider
|
||||
//
|
||||
// 1. Create jar with custom CalendarDataProvider
|
||||
var codeSource = baz.CalendarDataProviderImpl.class.getProtectionDomain().getCodeSource();
|
||||
var providerDir = Path.of(URI.create(codeSource.getLocation().toString()));
|
||||
JarUtils.createJarFile(UNSIGNED_JAR, providerDir);
|
||||
JarUtils.updateJarFile(UNSIGNED_JAR, META_INF_DIR);
|
||||
// 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 + " " + UNSIGNED_JAR + " test")
|
||||
.shouldHaveExitValue(0);
|
||||
// run test, which must not throw a NPE
|
||||
List<String> testRun = new ArrayList<>();
|
||||
testRun.add("-Djava.locale.providers=SPI");
|
||||
testRun.add("-cp");
|
||||
String classPath = System.getProperty("java.class.path");
|
||||
classPath = classPath + File.pathSeparator + SIGNED_JAR.toAbsolutePath().toString();
|
||||
testRun.add(classPath);
|
||||
testRun.add(TestSPISigned.class.getSimpleName());
|
||||
testRun.add("run-test");
|
||||
OutputAnalyzer out = ProcessTools.executeTestJava(testRun);
|
||||
out.shouldHaveExitValue(0);
|
||||
out.shouldContain("DEBUG: Getting xx language");
|
||||
}
|
||||
}
|
||||
|
||||
private static void doRunTest() {
|
||||
Locale locale = new Locale("xx", "YY");
|
||||
Calendar kcal = Calendar.getInstance(locale);
|
||||
try {
|
||||
check(WEDNESDAY, kcal.getFirstDayOfWeek());
|
||||
check(7, kcal.getMinimalDaysInFirstWeek());
|
||||
} catch (Throwable ex) {
|
||||
throw new RuntimeException("Test failed with signed jar and " +
|
||||
" argument java.locale.providers=SPI", ex);
|
||||
}
|
||||
}
|
||||
|
||||
private static <T> void check(T expected, T actual) {
|
||||
Asserts.assertEquals(expected, actual, "Expected calendar from SPI to be in effect");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
/*
|
||||
* Copyright (c) 2022, Red Hat, Inc.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
package baz;
|
||||
|
||||
import static java.util.Calendar.*;
|
||||
import java.util.Locale;
|
||||
import java.util.spi.CalendarDataProvider;
|
||||
|
||||
public class CalendarDataProviderImpl extends CalendarDataProvider {
|
||||
private static final Locale[] locales = { new Locale("xx", "YY") };
|
||||
|
||||
@Override
|
||||
public int getFirstDayOfWeek(Locale locale) {
|
||||
return WEDNESDAY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMinimalDaysInFirstWeek(Locale locale) {
|
||||
if (locale.getLanguage().equals("xx")) {
|
||||
System.out.println("DEBUG: Getting xx language");
|
||||
}
|
||||
return 7;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Locale[] getAvailableLocales() {
|
||||
return locales;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
#
|
||||
#
|
||||
#
|
||||
# fully-qualified name of the java.util.spi.CalendarDataProvider
|
||||
# implementation class
|
||||
#
|
||||
baz.CalendarDataProviderImpl
|
||||
Loading…
Add table
Add a link
Reference in a new issue