8351843: change test/jdk/com/sun/net/httpserver/simpleserver/RootDirPermissionsTest.java to a manual test

Reviewed-by: dfuchs
This commit is contained in:
Serhiy Sachkov 2025-05-19 09:08:33 +00:00 committed by Jaikiran Pai
parent 2fb3329d71
commit effe40a24c
3 changed files with 69 additions and 25 deletions

View File

@ -625,6 +625,7 @@ jdk_core_manual_no_input = \
java/util/Vector/Bug8148174.java \ java/util/Vector/Bug8148174.java \
com/sun/net/httpserver/simpleserver/CommandLinePortNotSpecifiedTest.java \ com/sun/net/httpserver/simpleserver/CommandLinePortNotSpecifiedTest.java \
com/sun/net/httpserver/simpleserver/jwebserver/CommandLinePortNotSpecifiedTest.java \ com/sun/net/httpserver/simpleserver/jwebserver/CommandLinePortNotSpecifiedTest.java \
com/sun/net/httpserver/simpleserver/DocRootDirPermissionsWinTest.java \
javax/xml/jaxp/datatype/8033980/GregorianCalAndDurSerDataUtil.java javax/xml/jaxp/datatype/8033980/GregorianCalAndDurSerDataUtil.java
jdk_security_manual_no_input = \ jdk_security_manual_no_input = \

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -24,10 +24,11 @@
/* /*
* @test * @test
* @summary Tests file permission checks during the creation of a `FileServerHandler` * @summary Tests file permission checks during the creation of a `FileServerHandler`
* @requires (os.family != "windows")
* @library /test/lib * @library /test/lib
* @build jdk.test.lib.net.URIBuilder * @build jdk.test.lib.net.URIBuilder
* @run main/othervm -ea RootDirPermissionsTest true * @run main/othervm -ea DocRootDirPermissionsTest true
* @run main/othervm -ea RootDirPermissionsTest false * @run main/othervm -ea DocRootDirPermissionsTest false
*/ */
import java.io.IOException; import java.io.IOException;
@ -73,24 +74,28 @@ import static java.nio.file.StandardOpenOption.CREATE;
* 2) reuses the test directory created in the previous run, revoking * 2) reuses the test directory created in the previous run, revoking
* read access. * read access.
* */ * */
public class RootDirPermissionsTest { public class DocRootDirPermissionsTest {
static final Path CWD = Path.of(".").toAbsolutePath().normalize(); private static final Path CWD = Path.of(".").toAbsolutePath().normalize();
static final Path TEST_DIR = CWD.resolve("RootDir"); private static final Path TEST_DIR = CWD.resolve("RootDir");
static final InetSocketAddress LOOPBACK_ADDR = private static final InetSocketAddress LOOPBACK_ADDR =
new InetSocketAddress(InetAddress.getLoopbackAddress(), 0); new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
static final boolean ENABLE_LOGGING = true; private static final boolean ENABLE_LOGGING = true;
static final Logger LOGGER = Logger.getLogger("com.sun.net.httpserver"); private static final Logger LOGGER = Logger.getLogger("com.sun.net.httpserver");
static boolean readPermitted; private static boolean readPermitted;
static String lastModifiedDir; private static String lastModifiedDir;
static String lastModifiedFile; private static String lastModifiedFile;
static Set<PosixFilePermission> posixPermissions; private static Set<PosixFilePermission> posixPermissions;
static List<AclEntry> acls; private static List<AclEntry> acls;
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
new DocRootDirPermissionsTest().run(args);
}
protected void run(String[] args) throws Exception{
setupLogging(); setupLogging();
readPermitted = Boolean.parseBoolean(args[0]); readPermitted = Boolean.parseBoolean(args[0]);
if (readPermitted) { if (readPermitted) {
@ -107,7 +112,7 @@ public class RootDirPermissionsTest {
} }
} }
private static void revokePermissions() throws IOException { private void revokePermissions() throws IOException {
if (!Files.isReadable(TEST_DIR)) { if (!Files.isReadable(TEST_DIR)) {
// good nothing to do: // good nothing to do:
System.out.println("File is already not readable: nothing to do"); System.out.println("File is already not readable: nothing to do");
@ -164,7 +169,7 @@ public class RootDirPermissionsTest {
System.out.println("File is readable: " + Files.isReadable(TEST_DIR)); System.out.println("File is readable: " + Files.isReadable(TEST_DIR));
} }
private static void restorePermissions() throws IOException { private void restorePermissions() throws IOException {
if (Files.getFileStore(TEST_DIR).supportsFileAttributeView("posix")) { if (Files.getFileStore(TEST_DIR).supportsFileAttributeView("posix")) {
if (posixPermissions != null) { if (posixPermissions != null) {
System.out.println("Restoring original POSIX permissions"); System.out.println("Restoring original POSIX permissions");
@ -181,7 +186,7 @@ public class RootDirPermissionsTest {
} }
} }
private static void setupLogging() { private void setupLogging() {
if (ENABLE_LOGGING) { if (ENABLE_LOGGING) {
ConsoleHandler ch = new ConsoleHandler(); ConsoleHandler ch = new ConsoleHandler();
LOGGER.setLevel(Level.ALL); LOGGER.setLevel(Level.ALL);
@ -190,7 +195,7 @@ public class RootDirPermissionsTest {
} }
} }
private static void createTestDir() throws IOException { private void createTestDir() throws IOException {
if (Files.exists(TEST_DIR)) { if (Files.exists(TEST_DIR)) {
FileUtils.deleteFileTreeWithRetry(TEST_DIR); FileUtils.deleteFileTreeWithRetry(TEST_DIR);
} }
@ -200,7 +205,7 @@ public class RootDirPermissionsTest {
lastModifiedFile = getLastModified(file); lastModifiedFile = getLastModified(file);
} }
private static void testDirectoryGET() throws Exception { private void testDirectoryGET() throws Exception {
var expectedBody = openHTML + """ var expectedBody = openHTML + """
<h1>Directory listing for &#x2F;</h1> <h1>Directory listing for &#x2F;</h1>
<ul> <ul>
@ -225,7 +230,7 @@ public class RootDirPermissionsTest {
} }
} }
private static void testFileGET() throws Exception { private void testFileGET() throws Exception {
var expectedBody = "some text"; var expectedBody = "some text";
var expectedLength = Integer.toString(expectedBody.getBytes(UTF_8).length); var expectedLength = Integer.toString(expectedBody.getBytes(UTF_8).length);
var server = SimpleFileServer.createFileServer(LOOPBACK_ADDR, TEST_DIR, OutputLevel.VERBOSE); var server = SimpleFileServer.createFileServer(LOOPBACK_ADDR, TEST_DIR, OutputLevel.VERBOSE);
@ -245,7 +250,7 @@ public class RootDirPermissionsTest {
} }
} }
private static void testCreateHandler(){ private void testCreateHandler(){
try { try {
SimpleFileServer.createFileServer(LOOPBACK_ADDR, TEST_DIR, OutputLevel.NONE); SimpleFileServer.createFileServer(LOOPBACK_ADDR, TEST_DIR, OutputLevel.NONE);
throw new RuntimeException("Handler creation expected to fail"); throw new RuntimeException("Handler creation expected to fail");
@ -257,7 +262,7 @@ public class RootDirPermissionsTest {
} catch (IllegalArgumentException expected) { } } catch (IllegalArgumentException expected) { }
} }
static final String openHTML = """ private static final String openHTML = """
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
@ -266,12 +271,12 @@ public class RootDirPermissionsTest {
<body> <body>
"""; """;
static final String closeHTML = """ private static final String closeHTML = """
</body> </body>
</html> </html>
"""; """;
static URI uri(HttpServer server, String path) { private URI uri(HttpServer server, String path) {
return URIBuilder.newBuilder() return URIBuilder.newBuilder()
.host("localhost") .host("localhost")
.port(server.getAddress().getPort()) .port(server.getAddress().getPort())
@ -280,7 +285,7 @@ public class RootDirPermissionsTest {
.buildUnchecked(); .buildUnchecked();
} }
static String getLastModified(Path path) throws IOException { private String getLastModified(Path path) throws IOException {
return Files.getLastModifiedTime(path).toInstant().atZone(ZoneId.of("GMT")) return Files.getLastModifiedTime(path).toInstant().atZone(ZoneId.of("GMT"))
.format(DateTimeFormatter.RFC_1123_DATE_TIME); .format(DateTimeFormatter.RFC_1123_DATE_TIME);
} }

View File

@ -0,0 +1,38 @@
/*
* 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
* @summary Tests file permission checks during the creation of a `FileServerHandler`
* @requires (os.family == "windows")
* @library /test/lib
* @build jdk.test.lib.net.URIBuilder
* @run main/manual/othervm -ea DocRootDirPermissionsWinTest true
* @run main/manual/othervm -ea DocRootDirPermissionsWinTest false
*/
public class DocRootDirPermissionsWinTest extends DocRootDirPermissionsTest{
public static void main(String[] args) throws Exception {
new DocRootDirPermissionsWinTest().run(args);
}
}