Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8344799: Remove permissions checks from java.awt.Desktop #22311

Closed
wants to merge 2 commits into from
+0 −84
Closed

8344799: Remove permissions checks from java.awt.Desktop #22311

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c4913a
8344799
prrace Nov 21, 2024
74c2c83
8344799
prrace Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/java.base/share/classes/module-info.java
View file
Original file line number Diff line number Diff line change
@@ -319,8 +319,6 @@
java.management.rmi,
java.rmi,
java.sql.rowset;
exports sun.security.action to
java.desktop;
exports sun.security.internal.interfaces to
jdk.crypto.cryptoki;
exports sun.security.internal.spec to
@@ -346,7 +344,6 @@
exports sun.security.tools to
jdk.jartool;
exports sun.security.util to
java.desktop,
java.naming,
java.rmi,
java.security.jgss,
81 changes: 0 additions & 81 deletions src/java.desktop/share/classes/java/awt/Desktop.java
View file
Original file line number Diff line number Diff line change
@@ -38,7 +38,6 @@
import java.awt.desktop.SystemEventListener;
import java.awt.peer.DesktopPeer;
import java.io.File;
import java.io.FilePermission;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -47,7 +46,6 @@
import javax.swing.JMenuBar;

import sun.awt.SunToolkit;
import sun.security.util.SecurityConstants;

/**
* The {@code Desktop} class allows interact with various desktop capabilities.
@@ -274,15 +272,6 @@ private Desktop() {
}
}

private void checkEventsProcessingPermission() {
@SuppressWarnings("removal")
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkPermission(new RuntimePermission(
"canProcessApplicationEvents"));
}
}

/**
* Returns the {@code Desktop} instance of the current
* desktop context. On some platforms the Desktop API may not be
@@ -395,7 +384,6 @@ private void checkActionSupport(Action actionType){
*/
public void open(File file) throws IOException {
file = new File(file.getPath());
checkExec();
checkActionSupport(Action.OPEN);
checkFileValidation(file);

@@ -417,7 +405,6 @@ public void open(File file) throws IOException {
*/
public void edit(File file) throws IOException {
file = new File(file.getPath());
checkExec();
checkActionSupport(Action.EDIT);
file.canWrite();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not related to this PR, but it looks like that the file.canWrite(); check is useless here, as its result is ignored.

checkFileValidation(file);
@@ -443,12 +430,6 @@ public void edit(File file) throws IOException {
*/
public void print(File file) throws IOException {
file = new File(file.getPath());
checkExec();
@SuppressWarnings("removal")
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkPrintJobAccess();
}
checkActionSupport(Action.PRINT);
checkFileValidation(file);
if (file.isDirectory()) {
@@ -475,7 +456,6 @@ public void print(File file) throws IOException {
* @see java.net.URI
*/
public void browse(URI uri) throws IOException {
checkExec();
checkActionSupport(Action.BROWSE);
Objects.requireNonNull(uri);
peer.browse(uri);
@@ -491,7 +471,6 @@ public void browse(URI uri) throws IOException {
* found, or it fails to be launched
*/
public void mail() throws IOException {
checkExec();
checkActionSupport(Action.MAIL);
URI mailtoURI = null;
try{
@@ -528,7 +507,6 @@ public void mail() throws IOException {
* @see java.net.URI
*/
public void mail(URI mailtoURI) throws IOException {
checkExec();
checkActionSupport(Action.MAIL);
if (mailtoURI == null) throw new NullPointerException();

@@ -539,32 +517,6 @@ public void mail(URI mailtoURI) throws IOException {
peer.mail(mailtoURI);
}

private void checkExec() throws SecurityException {
@SuppressWarnings("removal")
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkPermission(new FilePermission("<<ALL FILES>>",
SecurityConstants.FILE_EXECUTE_ACTION));
}
}

private void checkRead() throws SecurityException {
@SuppressWarnings("removal")
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkPermission(new FilePermission("<<ALL FILES>>",
SecurityConstants.FILE_READ_ACTION));
}
}

private void checkQuitPermission() {
@SuppressWarnings("removal")
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkExit(0);
}
}

/**
* Adds sub-types of {@link SystemEventListener} to listen for notifications
* from the native system.
@@ -583,7 +535,6 @@ private void checkQuitPermission() {
* @since 9
*/
public void addAppEventListener(final SystemEventListener listener) {
checkEventsProcessingPermission();
peer.addAppEventListener(listener);
}

@@ -605,7 +556,6 @@ public void addAppEventListener(final SystemEventListener listener) {
* @since 9
*/
public void removeAppEventListener(final SystemEventListener listener) {
checkEventsProcessingPermission();
peer.removeAppEventListener(listener);
}

@@ -624,7 +574,6 @@ public void removeAppEventListener(final SystemEventListener listener) {
* @since 9
*/
public void setAboutHandler(final AboutHandler aboutHandler) {
checkEventsProcessingPermission();
checkActionSupport(Action.APP_ABOUT);
peer.setAboutHandler(aboutHandler);
}
@@ -644,7 +593,6 @@ public void setAboutHandler(final AboutHandler aboutHandler) {
* @since 9
*/
public void setPreferencesHandler(final PreferencesHandler preferencesHandler) {
checkEventsProcessingPermission();
checkActionSupport(Action.APP_PREFERENCES);
peer.setPreferencesHandler(preferencesHandler);
}
@@ -668,9 +616,6 @@ public void setPreferencesHandler(final PreferencesHandler preferencesHandler) {
* @since 9
*/
public void setOpenFileHandler(final OpenFilesHandler openFileHandler) {
checkEventsProcessingPermission();
checkExec();
checkRead();
checkActionSupport(Action.APP_OPEN_FILE);
peer.setOpenFileHandler(openFileHandler);
}
@@ -693,12 +638,6 @@ public void setOpenFileHandler(final OpenFilesHandler openFileHandler) {
* @since 9
*/
public void setPrintFileHandler(final PrintFilesHandler printFileHandler) {
checkEventsProcessingPermission();
@SuppressWarnings("removal")
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkPrintJobAccess();
}
checkActionSupport(Action.APP_PRINT_FILE);
peer.setPrintFileHandler(printFileHandler);
}
@@ -726,8 +665,6 @@ public void setPrintFileHandler(final PrintFilesHandler printFileHandler) {
* @since 9
*/
public void setOpenURIHandler(final OpenURIHandler openURIHandler) {
checkEventsProcessingPermission();
checkExec();
checkActionSupport(Action.APP_OPEN_URI);
peer.setOpenURIHandler(openURIHandler);
}
@@ -746,8 +683,6 @@ public void setOpenURIHandler(final OpenURIHandler openURIHandler) {
* @since 9
*/
public void setQuitHandler(final QuitHandler quitHandler) {
checkEventsProcessingPermission();
checkQuitPermission();
checkActionSupport(Action.APP_QUIT_HANDLER);
peer.setQuitHandler(quitHandler);
}
@@ -762,8 +697,6 @@ public void setQuitHandler(final QuitHandler quitHandler) {
* @since 9
*/
public void setQuitStrategy(final QuitStrategy strategy) {
checkEventsProcessingPermission();
checkQuitPermission();
checkActionSupport(Action.APP_QUIT_STRATEGY);
peer.setQuitStrategy(strategy);
}
@@ -788,8 +721,6 @@ public void setQuitStrategy(final QuitStrategy strategy) {
* @since 9
*/
public void enableSuddenTermination() {
checkEventsProcessingPermission();
checkQuitPermission();
checkActionSupport(Action.APP_SUDDEN_TERMINATION);
peer.enableSuddenTermination();
}
@@ -806,8 +737,6 @@ public void enableSuddenTermination() {
* @since 9
*/
public void disableSuddenTermination() {
checkEventsProcessingPermission();
checkQuitPermission();
checkActionSupport(Action.APP_SUDDEN_TERMINATION);
peer.disableSuddenTermination();
}
@@ -822,7 +751,6 @@ public void disableSuddenTermination() {
* @since 9
*/
public void requestForeground(final boolean allWindows) {
checkEventsProcessingPermission();
checkActionSupport(Action.APP_REQUEST_FOREGROUND);
peer.requestForeground(allWindows);
}
@@ -839,8 +767,6 @@ public void requestForeground(final boolean allWindows) {
* @since 9
*/
public void openHelpViewer() {
checkExec();
checkEventsProcessingPermission();
checkActionSupport(Action.APP_HELP_VIEWER);
peer.openHelpViewer();
}
@@ -854,7 +780,6 @@ public void openHelpViewer() {
* @since 9
*/
public void setDefaultMenuBar(final JMenuBar menuBar) {
checkEventsProcessingPermission();
checkActionSupport(Action.APP_MENU_BAR);

if (menuBar != null) {
@@ -881,7 +806,6 @@ public void setDefaultMenuBar(final JMenuBar menuBar) {
*/
public void browseFileDirectory(File file) {
file = new File(file.getPath());
checkExec();
checkActionSupport(Action.BROWSE_FILE_DIR);
checkFileValidation(file);
File parentFile = file.getParentFile();
@@ -903,13 +827,8 @@ public void browseFileDirectory(File file) {
*
* @since 9
*/
@SuppressWarnings("removal")
public boolean moveToTrash(File file) {
file = new File(file.getPath());
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkDelete(file.getPath());
}
checkActionSupport(Action.MOVE_TO_TRASH);
checkFileValidation(file);
return peer.moveToTrash(file);