archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 20:14:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8189667: Desktop#moveToTrash expects incorrect "<<ALL FILES>>" FilePermission

Browse source 
Reviewed-by: prr, sveerabhadra
This commit is contained in:
Sergey Bylokhov 2018-08-08 15:51:08 -07:00
parent 1543db08da
commit e850549b71
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/java.desktop/share/classes/java/awt/Desktop.java
View file

@ -42,7 +42,6 @@ import java.io.FilePermission;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL;
import java.security.AccessController; import java.security.AccessController;
import java.security.PrivilegedAction; import java.security.PrivilegedAction;
import java.util.Objects; import java.util.Objects;
@ -85,10 +84,6 @@ import sun.security.util.SecurityConstants;
* application is executed, it will be executed on the same system as * application is executed, it will be executed on the same system as
* the one on which the Java application was launched. * the one on which the Java application was launched.
* *
* <p> Note: the methods in the {@code Desktop} class may require
* platform-dependent permissions in addition to those described in the
* specification.
*
* @see Action * @see Action
* *
* @since 1.6 * @since 1.6
@ -389,9 +384,10 @@ public class Desktop {
/** /**
* Calls to the security manager's {@code checkPermission} method with * Calls to the security manager's {@code checkPermission} method with an
* an {@code AWTPermission("showWindowWithoutWarningBanner")} * {@code AWTPermission("showWindowWithoutWarningBanner")} permission. This
* permission. * permission is needed, because we cannot add a security warning icon to
* the windows of the external native application.
*/ */
private void checkAWTPermission() { private void checkAWTPermission() {
SecurityManager sm = System.getSecurityManager(); SecurityManager sm = System.getSecurityManager();
@ -938,7 +934,11 @@ public class Desktop {
* and registered in the Info.plist with CFBundleHelpBookFolder * and registered in the Info.plist with CFBundleHelpBookFolder
* *
* @throws SecurityException if a security manager exists and it denies the * @throws SecurityException if a security manager exists and it denies the
* {@code RuntimePermission("canProcessApplicationEvents")} permission. * {@code RuntimePermission("canProcessApplicationEvents")}
* permission, or it denies the
* {@code AWTPermission("showWindowWithoutWarningBanner")}
* permission, or the calling thread is not allowed to create a
* subprocess
* @throws UnsupportedOperationException if the current platform * @throws UnsupportedOperationException if the current platform
* does not support the {@link Desktop.Action#APP_HELP_VIEWER} action * does not support the {@link Desktop.Action#APP_HELP_VIEWER} action
* @since 9 * @since 9
@ -982,12 +982,15 @@ public class Desktop {
* @param file the file * @param file the file
* @throws SecurityException If a security manager exists and its * @throws SecurityException If a security manager exists and its
* {@link SecurityManager#checkRead(java.lang.String)} method * {@link SecurityManager#checkRead(java.lang.String)} method
* denies read access to the file * denies read access to the file or to its parent, or it denies the
* {@code AWTPermission("showWindowWithoutWarningBanner")}
* permission, or the calling thread is not allowed to create a
* subprocess
* @throws UnsupportedOperationException if the current platform * @throws UnsupportedOperationException if the current platform
* does not support the {@link Desktop.Action#BROWSE_FILE_DIR} action * does not support the {@link Desktop.Action#BROWSE_FILE_DIR} action
* @throws NullPointerException if {@code file} is {@code null} * @throws NullPointerException if {@code file} is {@code null}
* @throws IllegalArgumentException if the specified file doesn't * @throws IllegalArgumentException if the specified file or its parent
* exist * doesn't exist
* @since 9 * @since 9
*/ */
public void browseFileDirectory(File file) { public void browseFileDirectory(File file) {
@ -1014,8 +1017,7 @@ public class Desktop {
* @throws UnsupportedOperationException if the current platform * @throws UnsupportedOperationException if the current platform
* does not support the {@link Desktop.Action#MOVE_TO_TRASH} action * does not support the {@link Desktop.Action#MOVE_TO_TRASH} action
* @throws NullPointerException if {@code file} is {@code null} * @throws NullPointerException if {@code file} is {@code null}
* @throws IllegalArgumentException if the specified file doesn't * @throws IllegalArgumentException if the specified file doesn't exist
* exist
* *
* @since 9 * @since 9
*/ */