From 1396c3ca6fc675dcf4bdea708c8a8c89d481e3b8 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 14 Jan 2023 21:29:29 +0100 Subject: Replace AccessController.doPrivileged() w/ SecurityUtil.doPrivileged() --- src/java/com/jogamp/common/util/SecurityUtil.java | 27 +++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'src/java/com/jogamp/common/util/SecurityUtil.java') diff --git a/src/java/com/jogamp/common/util/SecurityUtil.java b/src/java/com/jogamp/common/util/SecurityUtil.java index 1b8b7c2..9591f70 100644 --- a/src/java/com/jogamp/common/util/SecurityUtil.java +++ b/src/java/com/jogamp/common/util/SecurityUtil.java @@ -27,7 +27,6 @@ */ package com.jogamp.common.util; -import java.security.AccessController; import java.security.AllPermission; import java.security.CodeSource; import java.security.Permission; @@ -36,18 +35,38 @@ import java.security.ProtectionDomain; import java.security.cert.Certificate; public class SecurityUtil { + @SuppressWarnings("removal") private static final SecurityManager securityManager; private static final Permission allPermissions; private static final boolean DEBUG = false; + /** + * Deprecated call to {@link System#getSecurityManager()} w/o warnings. + */ + @SuppressWarnings({ "deprecation", "removal" }) + public static final SecurityManager getSecurityManager() { + return System.getSecurityManager(); + } + + /** + * Deprecated call to {@link java.security.AccessController#doPrivileged(PrivilegedAction)} w/o warnings. + * @param + * @param o + * @return + */ + @SuppressWarnings({ "deprecation", "removal" }) + public static T doPrivileged(final PrivilegedAction o) { + return java.security.AccessController.doPrivileged( o ); + } + static { allPermissions = new AllPermission(); - securityManager = System.getSecurityManager(); + securityManager = getSecurityManager(); if( DEBUG ) { final boolean hasAllPermissions; { - final ProtectionDomain insecPD = AccessController.doPrivileged(new PrivilegedAction() { + final ProtectionDomain insecPD = doPrivileged(new PrivilegedAction() { @Override public ProtectionDomain run() { return SecurityUtil.class.getProtectionDomain(); @@ -64,7 +83,7 @@ public class SecurityUtil { System.err.println("SecurityUtil: Has SecurityManager: "+ ( null != securityManager ) ) ; System.err.println("SecurityUtil: Has AllPermissions: "+hasAllPermissions); - final Certificate[] certs = AccessController.doPrivileged(new PrivilegedAction() { + final Certificate[] certs = doPrivileged(new PrivilegedAction() { @Override public Certificate[] run() { return getCerts(SecurityUtil.class); -- cgit v1.2.3