8344896: Remove obsolete checks for AWTPermission accessClipboard

Reviewed-by: azvegint

Author: prrace

src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java

@@ -407,12 +407,6 @@ public final PrintJob getPrintJob(Frame frame, String doctitle,
 
     @Override
     public final Clipboard getSystemClipboard() {
-        @SuppressWarnings("removal")
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            security.checkPermission(AWTPermissions.ACCESS_CLIPBOARD_PERMISSION);
-        }
-
         synchronized (this) {
             if (clipboard == null) {
                 clipboard = createPlatformClipboard();

src/java.desktop/share/classes/java/awt/TextComponent.java

@@ -44,7 +44,6 @@
 import javax.accessibility.AccessibleText;
 import javax.swing.text.AttributeSet;
 
-import sun.awt.AWTPermissions;
 import sun.awt.InputMethodSupport;
 
 /**
@@ -744,20 +743,6 @@ protected String paramString() {
         return str + ",selection=" + getSelectionStart() + "-" + getSelectionEnd();
     }
 
-    /**
-     * Assigns a valid value to the canAccessClipboard instance variable.
-     */
-    private boolean canAccessClipboard() {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm == null) return true;
-        try {
-            sm.checkPermission(AWTPermissions.ACCESS_CLIPBOARD_PERMISSION);
-            return true;
-        } catch (SecurityException e) {}
-        return false;
-    }
-
     /*
      * Serialization support.
      */

src/java.desktop/share/classes/java/awt/event/InputEvent.java

@@ -33,7 +33,6 @@
 import java.util.Arrays;
 
 import sun.awt.AWTAccessor;
-import sun.awt.AWTPermissions;
 import sun.util.logging.PlatformLogger;
 
 /**
@@ -313,6 +312,7 @@ public static int getMaskForButton(int button) {
     /*
      * A flag that indicates that this instance can be used to access
      * the system clipboard.
+     * This should be false in a headless environment, true in a headful one.
      */
     private transient boolean canAccessSystemClipboard;
 
@@ -385,26 +385,7 @@ public void setCanAccessSystemClipboard(InputEvent event,
     }
 
     private boolean canAccessSystemClipboard() {
-        boolean b = false;
-
-        if (!GraphicsEnvironment.isHeadless()) {
-            @SuppressWarnings("removal")
-            SecurityManager sm = System.getSecurityManager();
-            if (sm != null) {
-                try {
-                    sm.checkPermission(AWTPermissions.ACCESS_CLIPBOARD_PERMISSION);
-                    b = true;
-                } catch (SecurityException se) {
-                    if (logger.isLoggable(PlatformLogger.Level.FINE)) {
-                        logger.fine("InputEvent.canAccessSystemClipboard() got SecurityException ", se);
-                    }
-                }
-            } else {
-                b = true;
-            }
-        }
-
-        return b;
+        return !GraphicsEnvironment.isHeadless();
     }
 
     /**

src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java

@@ -467,12 +467,10 @@ public void mouseClicked(MouseEvent e) {
                 // mouse 1 behavior
                 if(nclicks == 1) {
                     selectedWordEvent = null;
-                } else if(nclicks == 2
-                          && SwingUtilities2.canEventAccessSystemClipboard(e)) {
+                } else if (nclicks == 2) {
                     selectWord(e);
                     selectedWordEvent = null;
-                } else if(nclicks == 3
-                          && SwingUtilities2.canEventAccessSystemClipboard(e)) {
+                } else if (nclicks == 3) {
                     Action a = null;
                     ActionMap map = getComponent().getActionMap();
                     if (map != null) {
@@ -489,8 +487,7 @@ public void mouseClicked(MouseEvent e) {
                 }
             } else if (SwingUtilities.isMiddleMouseButton(e)) {
                 // mouse 2 behavior
-                if (nclicks == 1 && component.isEditable() && component.isEnabled()
-                    && SwingUtilities2.canEventAccessSystemClipboard(e)) {
+                if (nclicks == 1 && component.isEditable() && component.isEnabled()) {
                     // paste system selection, if it exists
                     JTextComponent c = (JTextComponent) e.getSource();
                     if (c != null) {
@@ -547,8 +544,7 @@ public void mousePressed(MouseEvent e) {
             } else {
                 shouldHandleRelease = false;
                 adjustCaretAndFocus(e);
-                if (nclicks == 2
-                    && SwingUtilities2.canEventAccessSystemClipboard(e)) {
+                if (nclicks == 2) {
                     selectWord(e);
                 }
             }
@@ -1394,9 +1390,6 @@ void repaintNewCaret() {
     }
 
     private void updateSystemSelection() {
-        if ( ! SwingUtilities2.canCurrentEventAccessSystemClipboard() ) {
-            return;
-        }
         if (this.dot != this.mark && component != null && component.hasFocus()) {
             Clipboard clip = getSystemSelection();
             if (clip != null) {

src/java.desktop/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java

@@ -224,18 +224,6 @@ public Object getTransferData(DataFlavor df)
         InvalidDnDOperationException
     {
 
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        try {
-            if (!dropInProcess && sm != null) {
-                sm.checkPermission(AWTPermissions.ACCESS_CLIPBOARD_PERMISSION);
-            }
-        } catch (Exception e) {
-            Thread currentThread = Thread.currentThread();
-            currentThread.getUncaughtExceptionHandler().uncaughtException(currentThread, e);
-            return null;
-        }
-
         Long lFormat = null;
         Transferable localTransferable = local;
 

src/java.desktop/share/classes/sun/swing/SwingUtilities2.java

@@ -189,10 +189,6 @@ public static void putAATextInfo(boolean lafCondition,
     public static final StringUIClientPropertyKey BASICMENUITEMUI_MAX_TEXT_OFFSET =
         new StringUIClientPropertyKey ("maxTextOffset");
 
-    // security stuff
-    private static final String UntrustedClipboardAccess =
-        "UNTRUSTED_CLIPBOARD_ACCESS_KEY";
-
     //all access to  charsBuffer is to be synchronized on charsBufferLock
     private static final int CHAR_BUFFER_SIZE = 100;
     private static final Object charsBufferLock = new Object();
@@ -1458,123 +1454,14 @@ public int hashCode() {
         }
     }
 
-    /*
-     * here goes the fix for 4856343 [Problem with applet interaction
-     * with system selection clipboard]
-     *
-     * NOTE. In case isTrustedContext() no checking
-     * are to be performed
-     */
-
     /**
-    * checks the security permissions for accessing system clipboard
-    *
-    * for untrusted context (see isTrustedContext) checks the
-    * permissions for the current event being handled
+    * checks if the system clipboard can be accessed.
+    * This is true in a headful environment, false in a headless one
     *
     */
    public static boolean canAccessSystemClipboard() {
-       boolean canAccess = false;
-       if (!GraphicsEnvironment.isHeadless()) {
-           @SuppressWarnings("removal")
-           SecurityManager sm = System.getSecurityManager();
-           if (sm == null) {
-               canAccess = true;
-           } else {
-               try {
-                   sm.checkPermission(AWTPermissions.ACCESS_CLIPBOARD_PERMISSION);
-                   canAccess = true;
-               } catch (SecurityException e) {
-               }
-               if (canAccess && ! isTrustedContext()) {
-                   canAccess = canCurrentEventAccessSystemClipboard(true);
-               }
-           }
-       }
-       return canAccess;
+       return !GraphicsEnvironment.isHeadless();
    }
-    /**
-    * Returns true if EventQueue.getCurrentEvent() has the permissions to
-     * access the system clipboard
-     */
-    public static boolean canCurrentEventAccessSystemClipboard() {
-        return  isTrustedContext()
-            || canCurrentEventAccessSystemClipboard(false);
-    }
-
-    /**
-     * Returns true if the given event has permissions to access the
-     * system clipboard
-     *
-     * @param e AWTEvent to check
-     */
-    public static boolean canEventAccessSystemClipboard(AWTEvent e) {
-        return isTrustedContext()
-            || canEventAccessSystemClipboard(e, false);
-    }
-
-    /**
-     * Returns true if the given event is current gesture for
-     * accessing clipboard
-     *
-     * @param ie InputEvent to check
-     */
-    @SuppressWarnings("deprecation")
-    private static boolean isAccessClipboardGesture(InputEvent ie) {
-        boolean allowedGesture = false;
-        if (ie instanceof KeyEvent) { //we can validate only keyboard gestures
-            KeyEvent ke = (KeyEvent)ie;
-            int keyCode = ke.getKeyCode();
-            int keyModifiers = ke.getModifiers();
-            switch(keyCode) {
-            case KeyEvent.VK_C:
-            case KeyEvent.VK_V:
-            case KeyEvent.VK_X:
-                allowedGesture = (keyModifiers == InputEvent.CTRL_MASK);
-                break;
-            case KeyEvent.VK_INSERT:
-                allowedGesture = (keyModifiers == InputEvent.CTRL_MASK ||
-                                  keyModifiers == InputEvent.SHIFT_MASK);
-                break;
-            case KeyEvent.VK_COPY:
-            case KeyEvent.VK_PASTE:
-            case KeyEvent.VK_CUT:
-                allowedGesture = true;
-                break;
-            case KeyEvent.VK_DELETE:
-                allowedGesture = ( keyModifiers == InputEvent.SHIFT_MASK);
-                break;
-            }
-        }
-        return allowedGesture;
-    }
-
-    /**
-     * Returns true if e has the permissions to
-     * access the system clipboard and if it is allowed gesture (if
-     * checkGesture is true)
-     *
-     * @param e AWTEvent to check
-     * @param checkGesture boolean
-     */
-    private static boolean canEventAccessSystemClipboard(AWTEvent e,
-                                                        boolean checkGesture) {
-        if (EventQueue.isDispatchThread()) {
-            /*
-             * Checking event permissions makes sense only for event
-             * dispatching thread
-             */
-            if (e instanceof InputEvent
-                && (! checkGesture || isAccessClipboardGesture((InputEvent)e))) {
-                return AWTAccessor.getInputEventAccessor().
-                        canAccessSystemClipboard((InputEvent) e);
-            } else {
-                return false;
-            }
-        } else {
-            return true;
-        }
-    }
 
     /**
      * Utility method that throws SecurityException if SecurityManager is set
@@ -1590,31 +1477,6 @@ public static void checkAccess(int modifiers) {
         }
     }
 
-    /**
-     * Returns true if EventQueue.getCurrentEvent() has the permissions to
-     * access the system clipboard and if it is allowed gesture (if
-     * checkGesture true)
-     *
-     * @param checkGesture boolean
-     */
-    private static boolean canCurrentEventAccessSystemClipboard(boolean
-                                                               checkGesture) {
-        AWTEvent event = EventQueue.getCurrentEvent();
-        return canEventAccessSystemClipboard(event, checkGesture);
-    }
-
-    /**
-     * see RFE 5012841 [Per AppContect security permissions] for the
-     * details
-     *
-     */
-    @SuppressWarnings("removal")
-    private static boolean isTrustedContext() {
-        return (System.getSecurityManager() == null)
-            || (AppContext.getAppContext().
-                get(UntrustedClipboardAccess) == null);
-    }
-
     public static String displayPropertiesToCSS(Font font, Color fg) {
         StringBuilder rule = new StringBuilder("body {");
         if (font != null) {

src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java

@@ -114,7 +114,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Map;
@@ -129,7 +128,6 @@
 import javax.swing.UIDefaults;
 
 import sun.awt.AWTAccessor;
-import sun.awt.AWTPermissions;
 import sun.awt.AppContext;
 import sun.awt.DisplayChangedListener;
 import sun.awt.LightweightFrame;
@@ -1233,11 +1231,6 @@ public boolean getLockingKeyState(int key) {
 
     @Override
     public  Clipboard getSystemClipboard() {
-        @SuppressWarnings("removal")
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            security.checkPermission(AWTPermissions.ACCESS_CLIPBOARD_PERMISSION);
-        }
         synchronized (this) {
             if (clipboard == null) {
                 clipboard = new XClipboard("System", "CLIPBOARD");
@@ -1248,11 +1241,6 @@ public  Clipboard getSystemClipboard() {
 
     @Override
     public Clipboard getSystemSelection() {
-        @SuppressWarnings("removal")
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            security.checkPermission(AWTPermissions.ACCESS_CLIPBOARD_PERMISSION);
-        }
         synchronized (this) {
             if (selection == null) {
                 selection = new XClipboard("Selection", "PRIMARY");

src/java.desktop/windows/classes/sun/awt/windows/WTextComponentPeer.java

@@ -32,10 +32,6 @@
 abstract
 class WTextComponentPeer extends WComponentPeer implements TextComponentPeer {
 
-    static {
-        initIDs();
-    }
-
     // TextComponentPeer implementation
 
     @Override
@@ -107,11 +103,6 @@ public void valueChanged() {
         postEvent(new TextEvent(target, TextEvent.TEXT_VALUE_CHANGED));
     }
 
-    /**
-     * Initialize JNI field and method IDs
-     */
-    private static native void initIDs();
-
     @Override
     public boolean shouldClearRectBeforePaint() {
         return false;