diff --git a/src/java.base/share/classes/jdk/internal/module/Resources.java b/src/java.base/share/classes/jdk/internal/module/Resources.java
index f72137bcc942e..2bd26e4743fa1 100644
--- a/src/java.base/share/classes/jdk/internal/module/Resources.java
+++ b/src/java.base/share/classes/jdk/internal/module/Resources.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -28,6 +28,7 @@
import java.io.IOException;
import java.nio.file.FileSystem;
import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
import java.nio.file.attribute.BasicFileAttributes;
@@ -132,15 +133,24 @@ private static Path toSafeFilePath(FileSystem fs, String name) {
return null;
}
- // convert to file path
- Path path;
+ // map resource name to a file path string
+ String pathString;
if (File.separatorChar == '/') {
- path = fs.getPath(name);
+ pathString = name;
} else {
// not allowed to embed file separators
if (name.contains(File.separator))
return null;
- path = fs.getPath(name.replace('/', File.separatorChar));
+ pathString = name.replace('/', File.separatorChar);
+ }
+
+ // try to convert to a Path
+ Path path;
+ try {
+ path = fs.getPath(pathString);
+ } catch (InvalidPathException e) {
+ // not a valid file path
+ return null;
}
// file path not allowed to have root component
diff --git a/test/jdk/java/lang/module/ModuleReader/ModuleReaderTest.java b/test/jdk/java/lang/module/ModuleReader/ModuleReaderTest.java
index 190a516a14355..61e5914798e5a 100644
--- a/test/jdk/java/lang/module/ModuleReader/ModuleReaderTest.java
+++ b/test/jdk/java/lang/module/ModuleReader/ModuleReaderTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -23,6 +23,7 @@
/**
* @test
+ * @bug 8142968 8300228
* @library /test/lib
* @modules java.base/jdk.internal.module
* jdk.compiler
@@ -64,9 +65,7 @@
import org.testng.annotations.Test;
import static org.testng.Assert.*;
-@Test
public class ModuleReaderTest {
-
private static final String TEST_SRC = System.getProperty("test.src");
private static final Path USER_DIR = Paths.get(System.getProperty("user.dir"));
@@ -110,6 +109,12 @@ public class ModuleReaderTest {
"../java/lang/Object.class",
"java/../lang/Object.class",
"java/lang/../Object.class",
+
+ // junk resource names
+ "java\u0000",
+ "C:java",
+ "C:\\java",
+ "java\\lang\\Object.class"
};
// resources in test module (can't use module-info.class as a test
@@ -136,26 +141,28 @@ public class ModuleReaderTest {
"./p/Main.class",
"p/./Main.class",
"../p/Main.class",
- "p/../p/Main.class"
- };
+ "p/../p/Main.class",
+ // junk resource names
+ "p\u0000",
+ "C:p",
+ "C:\\p",
+ "p\\Main.class"
+ };
@BeforeTest
public void compileTestModule() throws Exception {
-
// javac -d mods/$TESTMODULE src/$TESTMODULE/**
- boolean compiled
- = CompilerUtils.compile(SRC_DIR.resolve(TEST_MODULE),
- MODS_DIR.resolve(TEST_MODULE));
+ boolean compiled = CompilerUtils.compile(SRC_DIR.resolve(TEST_MODULE),
+ MODS_DIR.resolve(TEST_MODULE));
assertTrue(compiled, "test module did not compile");
}
-
/**
- * Test ModuleReader to module in runtime image
+ * Test ModuleReader with module in runtime image.
*/
+ @Test
public void testImage() throws IOException {
-
ModuleFinder finder = ModuleFinder.ofSystem();
ModuleReference mref = finder.find(BASE_MODULE).get();
ModuleReader reader = mref.open();
@@ -227,18 +234,18 @@ public void testImage() throws IOException {
} catch (IOException expected) { }
}
-
/**
- * Test ModuleReader to exploded module
+ * Test ModuleReader with exploded module.
*/
+ @Test
public void testExplodedModule() throws IOException {
test(MODS_DIR);
}
-
/**
- * Test ModuleReader to modular JAR
+ * Test ModuleReader with module in modular JAR.
*/
+ @Test
public void testModularJar() throws IOException {
Path dir = Files.createTempDirectory(USER_DIR, "mlib");
@@ -249,10 +256,10 @@ public void testModularJar() throws IOException {
test(dir);
}
-
/**
- * Test ModuleReader to JMOD
+ * Test ModuleReader with module in a JMOD file.
*/
+ @Test
public void testJMod() throws IOException {
Path dir = Files.createTempDirectory(USER_DIR, "mlib");
@@ -269,13 +276,11 @@ public void testJMod() throws IOException {
test(dir);
}
-
/**
* The test module is found on the given module path. Open a ModuleReader
* to the test module and test the reader.
*/
void test(Path mp) throws IOException {
-
ModuleFinder finder = ModulePath.of(Runtime.version(), true, mp);
ModuleReference mref = finder.find(TEST_MODULE).get();
ModuleReader reader = mref.open();
@@ -284,6 +289,7 @@ void test(Path mp) throws IOException {
// test resources in test module
for (String name : TEST_RESOURCES) {
+ System.out.println("resource: " + name);
byte[] expectedBytes
= Files.readAllBytes(MODS_DIR
.resolve(TEST_MODULE)
@@ -297,7 +303,7 @@ void test(Path mp) throws IOException {
// test resources that may be in the test module
for (String name : MAYBE_TEST_RESOURCES) {
- System.out.println(name);
+ System.out.println("resource: " + name);
Optional<URI> ouri = reader.find(name);
ouri.ifPresent(uri -> {
if (name.endsWith("/"))
@@ -307,6 +313,7 @@ void test(Path mp) throws IOException {
// test "not found" in test module
for (String name : NOT_TEST_RESOURCES) {
+ System.out.println("resource: " + name);
assertFalse(reader.find(name).isPresent());
assertFalse(reader.open(name).isPresent());
assertFalse(reader.read(name).isPresent());