engineering/java-topology
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

undefect. CWE-407 — 63 sites patched across 27 ecosystems

Browse source 
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:
russell@unturf.com 2026-03-26 17:11:57 -04:00
commit 0a580b313d
70422 changed files with 17213626 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

24
test/jdk/java/util/ServiceLoader/basic/BarProvider.java Normal file
View file

@ -0,0 +1,24 @@
/*
* Copyright (c) 2016, 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.
*/
public class BarProvider { }

92
test/jdk/java/util/ServiceLoader/basic/Basic.java Normal file
View file

@ -0,0 +1,92 @@
/*
* Copyright (c) 2005, 2012, 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.*;
import java.util.*;
public class Basic {
private static PrintStream out = System.err;
private static <T> Set<T> setOf(Iterable<T> it) {
Set<T> s = new HashSet<T>();
for (T t : it)
s.add(t);
return s;
}
private static <T> void checkEquals(Set<T> s1, Set<T> s2, boolean eq) {
if (s1.equals(s2) != eq)
throw new RuntimeException(String.format("%b %s : %s",
eq, s1, s2));
}
abstract static class TestLoader {
String name;
TestLoader(String name) { this.name = name; }
abstract ServiceLoader<FooService> load();
}
static TestLoader tcclLoader = new TestLoader("Thread context class loader") {
ServiceLoader<FooService> load() {
return ServiceLoader.load(FooService.class);
}
};
static TestLoader systemClLoader = new TestLoader("System class loader") {
ServiceLoader<FooService> load() {
return ServiceLoader.load(FooService.class, ClassLoader.getSystemClassLoader());
}
};
static TestLoader nullClLoader = new TestLoader("null (defer to system class loader)") {
ServiceLoader<FooService> load() {
return ServiceLoader.load(FooService.class, null);
}
};
public static void main(String[] args) {
for (TestLoader tl : Arrays.asList(tcclLoader, systemClLoader, nullClLoader)) {
test(tl);
}
}
static void test(TestLoader tl) {
ServiceLoader<FooService> sl = tl.load();
out.format("%s: %s%n", tl.name, sl);
// Providers are cached
Set<FooService> ps = setOf(sl);
checkEquals(ps, setOf(sl), true);
// The cache can be flushed and reloaded
sl.reload();
checkEquals(ps, setOf(sl), false);
}
}

24
test/jdk/java/util/ServiceLoader/basic/FooProvider1.java Normal file
View file

@ -0,0 +1,24 @@
/*
* Copyright (c) 2005, 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.
*/
public class FooProvider1 extends FooService { }

24
test/jdk/java/util/ServiceLoader/basic/FooProvider2.java Normal file
View file

@ -0,0 +1,24 @@
/*
* Copyright (c) 2005, 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.
*/
public class FooProvider2 extends FooService { }

24
test/jdk/java/util/ServiceLoader/basic/FooProvider3.java Normal file
View file

@ -0,0 +1,24 @@
/*
* Copyright (c) 2005, 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.
*/
public class FooProvider3 extends FooService { }

24
test/jdk/java/util/ServiceLoader/basic/FooService.java Normal file
View file

@ -0,0 +1,24 @@
/*
* Copyright (c) 2005, 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.
*/
public abstract class FooService { }

79
test/jdk/java/util/ServiceLoader/basic/Load.java Normal file
View file

@ -0,0 +1,79 @@
/*
* Copyright (c) 2005, 2006, 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.*;
import java.util.*;
public class Load {
private static PrintStream out = System.err;
public static void main(String[] args) throws Exception {
boolean installedOnly = false;
List<String> expected = new ArrayList<String>(Arrays.asList(args));
if (!expected.isEmpty() && expected.get(0).equals("-i")) {
expected.remove(0);
installedOnly = true;
}
if (expected.isEmpty())
throw new Exception("usage: Load [-i] ( fail | provider-class-name )*");
ServiceLoader<FooService> sl = (installedOnly
? ServiceLoader.loadInstalled(FooService.class)
: ServiceLoader.load(FooService.class));
out.format("%s%n", sl);
Iterator<FooService> sli = sl.iterator();
Iterator<String> ei = expected.iterator();
for (;; ei.remove()) {
FooService fp = null;
try {
if (!sli.hasNext())
break;
fp = sli.next();
} catch (ServiceConfigurationError x) {
if (ei.next().equals("fail")) {
out.format("Failed as expected: %s%n", x);
continue;
}
throw x;
}
String ec = ei.next();
if (!fp.getClass().getName().equals(ec))
throw new
Exception(String.format("Wrong provider %s; expected %s",
fp.getClass().getName(), ec));
out.format("Provider found: %s%n", fp.getClass().getName());
}
if (ei.hasNext())
throw new Exception("Missing providers: " + expected);
}
}

156
test/jdk/java/util/ServiceLoader/basic/ServiceLoaderBasicTest.java Normal file
View file

@ -0,0 +1,156 @@
/*
* Copyright (c) 2018, 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.
*/
/*
* @test
* @bug 4640520 6354623 7198496
* @summary Unit test for java.util.ServiceLoader
* @library /test/lib
* @build jdk.test.lib.process.*
* jdk.test.lib.util.JarUtils
* Basic Load FooService FooProvider1 FooProvider2 FooProvider3 BarProvider
* @run junit ServiceLoaderBasicTest
*/
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import jdk.test.lib.JDKToolFinder;
import jdk.test.lib.Utils;
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.util.JarUtils;
import static java.nio.file.StandardOpenOption.CREATE;
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
import static java.util.Arrays.asList;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.junit.jupiter.params.provider.ValueSource;
public class ServiceLoaderBasicTest {
private static final String METAINFO = "META-INF/services/FooService";
private static final Path XTEST_CONFIG = Path.of("x.test").resolve(METAINFO);
private static final Path XMETA_CONFIG = Path.of("x.meta").resolve(METAINFO);
private static final Path P2JAR = Path.of("p2.jar");
private static final Path P2DUPJAR = Path.of("p2dup.jar");
private static final Path P3JAR = Path.of("x.ext", "p3.jar");
private static final String XTEST = File.pathSeparator + "x.test";
private static final String XMETA = File.pathSeparator + "x.meta";
private static final String P2 = File.pathSeparator + P2JAR.toString();
private static final String P2DUP = File.pathSeparator + P2DUPJAR.toString();
private static final String P3 = File.pathSeparator + P3JAR.toString();
private static final String XTEST_CP = Utils.TEST_CLASS_PATH + XTEST;
private static final String P2_CP = Utils.TEST_CLASS_PATH + P2;
private static final String P2DUP_CP = P2_CP + P2DUP;
private static final String P3P2_CP = Utils.TEST_CLASS_PATH + P3 + P2;
private static final String XTESTP2_CP = XTEST_CP + P2;
private static final String P3XTEST_CP = Utils.TEST_CLASS_PATH + P3 + XTEST;
private static final String P3XTESTP2_CP = P3XTEST_CP + P2;
private static final String XMETA_CP = Utils.TEST_CLASS_PATH + XMETA;
private static final String XMETAXTEST_CP = XMETA_CP + XTEST;
private static final String XTESTXMETA_CP = XTEST_CP + XMETA;
private static final String XTESTXMETAP2_CP = XTESTXMETA_CP + P2;
@BeforeAll
public static void initialize() throws Exception {
createProviderConfig(XTEST_CONFIG, "FooProvider1");
createProviderConfig(XMETA_CONFIG, "FooProvider42");
createJar(P2JAR, "FooProvider2", List.of("FooProvider2"));
createJar(P3JAR, "FooProvider3", List.of("FooProvider3", "FooService"));
Files.copy(P2JAR, P2DUPJAR, REPLACE_EXISTING);
}
private static Object[][] testCases() {
return new Object[][]{
// CLI options, Test, Runtime arguments
// Success cases
{List.of("-cp", XTESTP2_CP, "Basic")},
{List.of("-cp", XTEST_CP, "Load", "FooProvider1")},
{List.of("-cp", P2_CP, "Load", "FooProvider2")},
{List.of("-cp", P2DUP_CP, "Load", "FooProvider2")},
{List.of("-cp", P3P2_CP, "Load", "FooProvider3", "FooProvider2")},
{List.of("-cp", XTESTP2_CP, "Load", "FooProvider1", "FooProvider2")},
{List.of("-cp", P3XTEST_CP, "Load", "FooProvider3", "FooProvider1")},
{List.of("-cp", P3XTESTP2_CP, "Load", "FooProvider3",
"FooProvider1",
"FooProvider2")},
// Failures followed by successes
{List.of("-cp", XTESTXMETA_CP, "Load", "FooProvider1", "fail")},
{List.of("-cp", XMETAXTEST_CP, "Load", "fail", "FooProvider1")},
{List.of("-cp", XTESTXMETAP2_CP, "Load", "FooProvider1", "fail", "FooProvider2")}
};
}
@ParameterizedTest
@MethodSource("testCases")
public void testProvider(List<String> args) throws Throwable {
runJava(args);
}
@ParameterizedTest // negative test cases
@ValueSource(strings = { "blah blah", "9234", "X!", "BarProvider", "FooProvider42" })
public void testBadProvider(String providerName) throws Throwable {
Files.write(XMETA_CONFIG, providerName.getBytes());
runJava(List.of("-cp", XMETA_CP, "Load", "fail"));
}
private void runJava(List<String> opts) throws Throwable {
List<String> cmds = new ArrayList<>();
cmds.add(JDKToolFinder.getJDKTool("java"));
cmds.addAll(asList(Utils.getTestJavaOpts()));
cmds.addAll(opts);
ProcessTools.executeCommand(cmds.stream()
.filter(t -> !t.isEmpty())
.toArray(String[]::new))
.shouldHaveExitValue(0);
}
private static void createProviderConfig(Path config, String providerName) throws Exception {
Files.createDirectories(config.getParent());
Files.write(config, providerName.getBytes(), CREATE);
}
private static void createJar(Path jar, String provider, List<String> files) throws Exception {
Path xdir = Path.of(provider);
createProviderConfig(xdir.resolve(METAINFO), provider);
for (String f : files) {
Path source = Path.of(Utils.TEST_CLASSES, f + ".class");
Path target = xdir.resolve(source.getFileName());
Files.copy(source, target, REPLACE_EXISTING);
}
JarUtils.createJarFile(jar, xdir);
}
}