mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-27 06:45:07 +02:00
8290313: Produce warning when user specified java.io.tmpdir directory doesn't exist
Reviewed-by: rriggs, naoto, coffeys
This commit is contained in:
parent
086763a629
commit
8df3bc4ec5
4 changed files with 140 additions and 4 deletions
|
@ -35,7 +35,7 @@ import java.nio.file.Path;
|
||||||
import java.security.SecureRandom;
|
import java.security.SecureRandom;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import sun.security.action.GetPropertyAction;
|
import jdk.internal.util.StaticProperty;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An abstract representation of file and directory pathnames.
|
* An abstract representation of file and directory pathnames.
|
||||||
|
@ -1986,8 +1986,8 @@ public class File
|
||||||
private TempDirectory() { }
|
private TempDirectory() { }
|
||||||
|
|
||||||
// temporary directory location
|
// temporary directory location
|
||||||
private static final File tmpdir = new File(
|
private static final File tmpdir = new File(StaticProperty.javaIoTmpDir());
|
||||||
GetPropertyAction.privilegedGetProperty("java.io.tmpdir"));
|
|
||||||
static File location() {
|
static File location() {
|
||||||
return tmpdir;
|
return tmpdir;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2244,6 +2244,12 @@ public final class System {
|
||||||
// SecurityManager
|
// SecurityManager
|
||||||
Unsafe.getUnsafe().ensureClassInitialized(StringConcatFactory.class);
|
Unsafe.getUnsafe().ensureClassInitialized(StringConcatFactory.class);
|
||||||
|
|
||||||
|
// Emit a warning if java.io.tmpdir is set via the command line
|
||||||
|
// to a directory that doesn't exist
|
||||||
|
if (SystemProps.isBadIoTmpdir()) {
|
||||||
|
System.err.println("WARNING: java.io.tmpdir directory does not exist");
|
||||||
|
}
|
||||||
|
|
||||||
String smProp = System.getProperty("java.security.manager");
|
String smProp = System.getProperty("java.security.manager");
|
||||||
boolean needWarning = false;
|
boolean needWarning = false;
|
||||||
if (smProp != null) {
|
if (smProp != null) {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2018, 2022, 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
|
||||||
|
@ -28,6 +28,7 @@ package jdk.internal.util;
|
||||||
import java.lang.annotation.Native;
|
import java.lang.annotation.Native;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* System Property initialization for internal use only
|
* System Property initialization for internal use only
|
||||||
|
@ -40,6 +41,18 @@ public final class SystemProps {
|
||||||
// no instances
|
// no instances
|
||||||
private SystemProps() {}
|
private SystemProps() {}
|
||||||
|
|
||||||
|
// Custom java.io.tmpdir via command line.
|
||||||
|
private static String customTmpdir;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if warning for custom java.io.tmpdir is required.
|
||||||
|
*
|
||||||
|
* @return a boolean value
|
||||||
|
*/
|
||||||
|
public static boolean isBadIoTmpdir() {
|
||||||
|
return customTmpdir != null && !(new File(customTmpdir).isDirectory());
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create and initialize the system properties from the native properties
|
* Create and initialize the system properties from the native properties
|
||||||
* and command line properties.
|
* and command line properties.
|
||||||
|
@ -95,6 +108,8 @@ public final class SystemProps {
|
||||||
putIfAbsent(props, "line.separator", raw.propDefault(Raw._line_separator_NDX));
|
putIfAbsent(props, "line.separator", raw.propDefault(Raw._line_separator_NDX));
|
||||||
putIfAbsent(props, "file.separator", raw.propDefault(Raw._file_separator_NDX));
|
putIfAbsent(props, "file.separator", raw.propDefault(Raw._file_separator_NDX));
|
||||||
putIfAbsent(props, "path.separator", raw.propDefault(Raw._path_separator_NDX));
|
putIfAbsent(props, "path.separator", raw.propDefault(Raw._path_separator_NDX));
|
||||||
|
|
||||||
|
customTmpdir = props.get("java.io.tmpdir");
|
||||||
putIfAbsent(props, "java.io.tmpdir", raw.propDefault(Raw._java_io_tmpdir_NDX));
|
putIfAbsent(props, "java.io.tmpdir", raw.propDefault(Raw._java_io_tmpdir_NDX));
|
||||||
putIfAbsent(props, "http.proxyHost", raw.propDefault(Raw._http_proxyHost_NDX));
|
putIfAbsent(props, "http.proxyHost", raw.propDefault(Raw._http_proxyHost_NDX));
|
||||||
putIfAbsent(props, "http.proxyPort", raw.propDefault(Raw._http_proxyPort_NDX));
|
putIfAbsent(props, "http.proxyPort", raw.propDefault(Raw._http_proxyPort_NDX));
|
||||||
|
|
115
test/jdk/java/io/File/TempDirDoesNotExist.java
Normal file
115
test/jdk/java/io/File/TempDirDoesNotExist.java
Normal file
|
@ -0,0 +1,115 @@
|
||||||
|
/*
|
||||||
|
* 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 8290313
|
||||||
|
* @library /test/lib
|
||||||
|
* @summary Produce warning when user specified java.io.tmpdir directory doesn't exist
|
||||||
|
*/
|
||||||
|
|
||||||
|
import jdk.test.lib.process.ProcessTools;
|
||||||
|
import jdk.test.lib.process.OutputAnalyzer;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
public class TempDirDoesNotExist {
|
||||||
|
final static String ioWarningMsg = "WARNING: java.io.tmpdir directory does not exist";
|
||||||
|
|
||||||
|
public static void main(String... args) throws Exception {
|
||||||
|
|
||||||
|
String userDir = System.getProperty("user.home");
|
||||||
|
String timeStamp = java.time.Instant.now().toString();
|
||||||
|
String tempDir = Path.of(userDir,"non-existing-", timeStamp).toString();
|
||||||
|
|
||||||
|
for (String arg : args) {
|
||||||
|
if (arg.equals("io")) {
|
||||||
|
try {
|
||||||
|
File.createTempFile("prefix", ".suffix");
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
} else if (arg.equals("nio")) {
|
||||||
|
try {
|
||||||
|
Files.createTempFile("prefix", ".suffix");
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
throw new Exception("unknown case: " + arg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (args.length == 0) {
|
||||||
|
// standard test with default setting for java.io.tmpdir
|
||||||
|
testMessageNotExist(0, ioWarningMsg, "TempDirDoesNotExist", "io");
|
||||||
|
testMessageNotExist(0, ioWarningMsg, "TempDirDoesNotExist", "nio");
|
||||||
|
|
||||||
|
// valid custom java.io.tmpdir
|
||||||
|
testMessageNotExist(0, ioWarningMsg, "-Djava.io.tmpdir=" + userDir,
|
||||||
|
"TempDirDoesNotExist", "io");
|
||||||
|
testMessageNotExist(0, ioWarningMsg, "-Djava.io.tmpdir=" + userDir,
|
||||||
|
"TempDirDoesNotExist", "nio");
|
||||||
|
|
||||||
|
// invalid custom java.io.tmpdir
|
||||||
|
testMessageExist(0, ioWarningMsg, "-Djava.io.tmpdir=" + tempDir,
|
||||||
|
"TempDirDoesNotExist", "io");
|
||||||
|
testMessageExist(0, ioWarningMsg, "-Djava.io.tmpdir=" + tempDir,
|
||||||
|
"TempDirDoesNotExist", "nio");
|
||||||
|
|
||||||
|
// test with security manager
|
||||||
|
testMessageExist(0, ioWarningMsg, "-Djava.io.tmpdir=" + tempDir
|
||||||
|
+ " -Djava.security.manager",
|
||||||
|
"TempDirDoesNotExist", "io");
|
||||||
|
|
||||||
|
testMessageExist(0, ioWarningMsg, "-Djava.io.tmpdir=" + tempDir
|
||||||
|
+ " -Djava.security.manager",
|
||||||
|
"TempDirDoesNotExist", "nio");
|
||||||
|
|
||||||
|
// error message printed only once
|
||||||
|
testMessageCounter(0, "-Djava.io.tmpdir=" + tempDir,
|
||||||
|
"TempDirDoesNotExist", "io", "nio");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void testMessageExist(int exitValue, String errorMsg, String... options) throws Exception {
|
||||||
|
ProcessTools.executeTestJvm(options).shouldContain(errorMsg)
|
||||||
|
.shouldHaveExitValue(exitValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void testMessageNotExist(int exitValue, String errorMsg,String... options) throws Exception {
|
||||||
|
ProcessTools.executeTestJvm(options).shouldNotContain(errorMsg).shouldHaveExitValue(exitValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void testMessageCounter(int exitValue,String... options) throws Exception {
|
||||||
|
OutputAnalyzer originalOutput = ProcessTools.executeTestJvm(options);
|
||||||
|
List<String> list = originalOutput.asLines().stream().filter(line
|
||||||
|
-> line.equalsIgnoreCase(ioWarningMsg)).collect(Collectors.toList());
|
||||||
|
if (list.size() != 1 || originalOutput.getExitValue() != exitValue)
|
||||||
|
throw new Exception("counter of messages is not one, but " + list.size()
|
||||||
|
+ "\n" + originalOutput.asLines().toString() + "\n");
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue