8344289: SM cleanup in jdk.internal.util

Reviewed-by: liach, rriggs, bpb

Author: Eirik Bjørsnøs

src/java.base/share/classes/jdk/internal/util/ClassFileDumper.java

@@ -29,8 +29,6 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.HexFormat;
 import java.util.Objects;
 import java.util.Set;
@@ -79,10 +77,6 @@ public static ClassFileDumper getInstance(String key, String path) {
     private final AtomicInteger counter = new AtomicInteger();
 
     private ClassFileDumper(String key, String path) {
-        /*
-         * GetPropertyAction.privilegedGetProperty cannot be used here, Using VM.getSavedProperty to avoid a bootstrap
-         * circularity issue in the java/lang/String/concat/WithSecurityManager.java test
-         */
         String value = VM.getSavedProperty(key);
         this.key = key;
         boolean enabled = value != null && value.isEmpty() ? true : Boolean.parseBoolean(value);
@@ -132,50 +126,39 @@ public void dumpFailedClass(String name, byte[] bytes) {
         write(pathname(name + ".failed-" + counter.incrementAndGet()), bytes);
     }
 
-    @SuppressWarnings("removal")
     private void write(Path path, byte[] bytes) {
-        AccessController.doPrivileged(new PrivilegedAction<>() {
-            @Override public Void run() {
-                try {
-                    Files.createDirectories(path.getParent());
-                    Files.write(path, bytes);
-                } catch (Exception ex) {
-                    if (VM.isModuleSystemInited()) {
-                        // log only when lambda is ready to use
-                        System.getLogger(ClassFileDumper.class.getName())
-                              .log(System.Logger.Level.WARNING, "Exception writing to " +
-                                        path + " " + ex.getMessage());
-                    }
-                    // simply don't care if this operation failed
-                }
-                return null;
-            }});
+        try {
+            Files.createDirectories(path.getParent());
+            Files.write(path, bytes);
+        } catch (Exception ex) {
+            if (VM.isModuleSystemInited()) {
+                // log only when lambda is ready to use
+                System.getLogger(ClassFileDumper.class.getName())
+                        .log(System.Logger.Level.WARNING, "Exception writing to " +
+                                path + " " + ex.getMessage());
+            }
+            // simply don't care if this operation failed
+        }
     }
 
     /*
      * Validate if the given dir is a writeable directory if exists.
      */
-    @SuppressWarnings("removal")
     private static Path validateDumpDir(String dir) {
-        return AccessController.doPrivileged(new PrivilegedAction<>() {
-            @Override
-            public Path run() {
-                Path path = Path.of(dir);
-                if (Files.notExists(path)) {
-                    try {
-                        Files.createDirectories(path);
-                    } catch (IOException ex) {
-                        throw new IllegalArgumentException("Fail to create " + path, ex);
-                    }
-                }
-                if (!Files.isDirectory(path)) {
-                    throw new IllegalArgumentException("Path " + path + " is not a directory");
-                } else if (!Files.isWritable(path)) {
-                    throw new IllegalArgumentException("Directory " + path + " is not writable");
-                }
-                return path;
+        Path path = Path.of(dir);
+        if (Files.notExists(path)) {
+            try {
+                Files.createDirectories(path);
+            } catch (IOException ex) {
+                throw new IllegalArgumentException("Fail to create " + path, ex);
             }
-        });
+        }
+        if (!Files.isDirectory(path)) {
+            throw new IllegalArgumentException("Path " + path + " is not a directory");
+        } else if (!Files.isWritable(path)) {
+            throw new IllegalArgumentException("Directory " + path + " is not writable");
+        }
+        return path;
     }
 
     private static final HexFormat HEX = HexFormat.of().withUpperCase();

src/java.base/share/classes/jdk/internal/util/StaticProperty.java

@@ -32,14 +32,11 @@
  * Read-only access to System property values initialized during Phase 1
  * are cached.  Setting, clearing, or modifying the value using
  * {@link System#setProperty} or {@link System#getProperties()} is ignored.
- * <strong>{@link SecurityManager#checkPropertyAccess} is NOT checked
- * in these access methods. The caller of these methods should take care to ensure
- * that the returned property is not made accessible to untrusted code.</strong>
  */
 public final class StaticProperty {
 
     // The class static initialization is triggered to initialize these final
-    // fields during init Phase 1 and before a security manager is set.
+    // fields during init Phase 1.
     private static final String JAVA_HOME;
     private static final String USER_HOME;
     private static final String USER_DIR;
@@ -143,76 +140,48 @@ private static String getProperty(Properties props, String key,
 
     /**
      * {@return the {@code java.home} system property}
-     *
-     * <strong>{@link SecurityManager#checkPropertyAccess} is NOT checked
-     * in this method. The caller of this method should take care to ensure
-     * that the returned property is not made accessible to untrusted code.</strong>
      */
     public static String javaHome() {
         return JAVA_HOME;
     }
 
     /**
      * {@return the {@code user.home} system property}
-     *
-     * <strong>{@link SecurityManager#checkPropertyAccess} is NOT checked
-     * in this method. The caller of this method should take care to ensure
-     * that the returned property is not made accessible to untrusted code.</strong>
      */
     public static String userHome() {
         return USER_HOME;
     }
 
     /**
      * {@return the {@code user.dir} system property}
-     *
-     * <strong>{@link SecurityManager#checkPropertyAccess} is NOT checked
-     * in this method. The caller of this method should take care to ensure
-     * that the returned property is not made accessible to untrusted code.</strong>
      */
     public static String userDir() {
         return USER_DIR;
     }
 
     /**
      * {@return the {@code user.name} system property}
-     *
-     * <strong>{@link SecurityManager#checkPropertyAccess} is NOT checked
-     * in this method. The caller of this method should take care to ensure
-     * that the returned property is not made accessible to untrusted code.</strong>
      */
     public static String userName() {
         return USER_NAME;
     }
 
     /**
      * {@return the {@code java.library.path} system property}
-     *
-     * <strong>{@link SecurityManager#checkPropertyAccess} is NOT checked
-     * in this method. The caller of this method should take care to ensure
-     * that the returned property is not made accessible to untrusted code.</strong>
      */
     public static String javaLibraryPath() {
         return JAVA_LIBRARY_PATH;
     }
 
     /**
      * {@return the {@code java.io.tmpdir} system property}
-     *
-     * <strong>{@link SecurityManager#checkPropertyAccess} is NOT checked
-     * in this method. The caller of this method should take care to ensure
-     * that the returned property is not made accessible to untrusted code.</strong>
      */
     public static String javaIoTmpDir() {
         return JAVA_IO_TMPDIR;
     }
 
     /**
      * {@return the {@code sun.boot.library.path} system property}
-     *
-     * <strong>{@link SecurityManager#checkPropertyAccess} is NOT checked
-     * in this method. The caller of this method should take care to ensure
-     * that the returned property is not made accessible to untrusted code.</strong>
      */
     public static String sunBootLibraryPath() {
         return SUN_BOOT_LIBRARY_PATH;
@@ -221,10 +190,6 @@ public static String sunBootLibraryPath() {
 
     /**
      * {@return the {@code jdk.serialFilter} system property}
-     *
-     * <strong>{@link SecurityManager#checkPropertyAccess} is NOT checked
-     * in this method. The caller of this method should take care to ensure
-     * that the returned property is not made accessible to untrusted code.</strong>
      */
     public static String jdkSerialFilter() {
         return JDK_SERIAL_FILTER;
@@ -233,91 +198,62 @@ public static String jdkSerialFilter() {
 
     /**
      * {@return the {@code jdk.serialFilterFactory} system property}
-     *
-     * <strong>{@link SecurityManager#checkPropertyAccess} is NOT checked
-     * in this method. The caller of this method should take care to ensure
-     * that the returned property is not made accessible to untrusted code.</strong>
      */
     public static String jdkSerialFilterFactory() {
         return JDK_SERIAL_FILTER_FACTORY;
     }
 
     /**
      * {@return the {@code native.encoding} system property}
-     *
-     * <strong>{@link SecurityManager#checkPropertyAccess} is NOT checked
-     * in this method. The caller of this method should take care to ensure
-     * that the returned property is not made accessible to untrusted code.</strong>
      */
     public static String nativeEncoding() {
         return NATIVE_ENCODING;
     }
 
     /**
      * {@return the {@code file.encoding} system property}
-     *
-     * <strong>{@link SecurityManager#checkPropertyAccess} is NOT checked
-     * in this method. The caller of this method should take care to ensure
-     * that the returned property is not made accessible to untrusted code.</strong>
      */
     public static String fileEncoding() {
         return FILE_ENCODING;
     }
 
     /**
      * {@return the {@code java.properties.date} system property}
-     *
-     * <strong>{@link SecurityManager#checkPropertyAccess} is NOT checked
-     * in this method.</strong>
      */
     public static String javaPropertiesDate() {
         return JAVA_PROPERTIES_DATE;
     }
 
     /**
      * {@return the {@code sun.jnu.encoding} system property}
-     *
-     * <strong>{@link SecurityManager#checkPropertyAccess} is NOT checked
-     * in this method. The caller of this method should take care to ensure
-     * that the returned property is not made accessible to untrusted code.</strong>
      */
     public static String jnuEncoding() {
         return SUN_JNU_ENCODING;
     }
 
     /**
      * {@return the {@code java.locale.useOldISOCodes} system property}
-     *
-     * <strong>{@link SecurityManager#checkPropertyAccess} is NOT checked
-     * in this method. The caller of this method should take care to ensure
-     * that the returned property is not made accessible to untrusted code.</strong>
      */
     public static String javaLocaleUseOldISOCodes() {
         return JAVA_LOCALE_USE_OLD_ISO_CODES;
     }
 
      /**
       * {@return the {@code os.name} system property}
-      * <strong>{@link SecurityManager#checkPropertyAccess} is NOT checked
-      * in this method. This property is not considered security sensitive.</strong>
       */
      public static String osName() {
          return OS_NAME;
      }
 
      /**
       * {@return the {@code os.arch} system property}
-      * <strong>{@link SecurityManager#checkPropertyAccess} is NOT checked
-      * in this method. This property is not considered security sensitive.</strong>
       */
      public static String osArch() {
          return OS_ARCH;
      }
 
      /**
       * {@return the {@code os.version} system property}
-      * <strong>{@link SecurityManager#checkPropertyAccess} is NOT checked
-      * in this method. This property is not considered security sensitive.</strong>
       */
      public static String osVersion() {
          return OS_VERSION;

src/java.base/share/classes/jdk/internal/util/random/RandomSupport.java

@@ -725,11 +725,7 @@ public static float boundedNextFloat(RandomGenerator rng, float bound) {
 
     // The following decides which of two strategies initialSeed() will use.
     private static boolean secureRandomSeedRequested() {
-        @SuppressWarnings("removal")
-        String pp = java.security.AccessController.doPrivileged(
-                new sun.security.action.GetPropertyAction(
-                        "java.util.secureRandomSeed"));
-        return (pp != null && pp.equalsIgnoreCase("true"));
+        return Boolean.getBoolean("java.util.secureRandomSeed");
     }
 
     private static final boolean useSecureRandomSeed = secureRandomSeedRequested();