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

Jump to bottom

JDK24 removes SecurityConstants.GET_CLASSLOADER_PERMISSION #20717

Merged
merged 1 commit into from
Nov 29, 2024
+30 −10
Merged

JDK24 removes SecurityConstants.GET_CLASSLOADER_PERMISSION #20717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions jcl/src/java.base/share/classes/java/lang/Class.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,9 @@ private static Class<?> forNameHelper(
String className, boolean initializeBoolean, ClassLoader classLoader,
Class<?> caller, boolean isAdapter) throws ClassNotFoundException
{
/*[IF JAVA_SPEC_VERSION >= 24]*/
return forNameImpl(className, initializeBoolean, classLoader);
/*[ELSE] JAVA_SPEC_VERSION >= 24 */
@SuppressWarnings("removal")
SecurityManager sm = null;
if (J9VMInternals.initialized) {
Expand Down Expand Up @@ -590,6 +593,7 @@ private static Class<?> forNameHelper(
J9VMInternals.initialize(c);
}
return c;
/*[ENDIF] JAVA_SPEC_VERSION >= 24 */
}
/*[ENDIF] JAVA_SPEC_VERSION >= 18 */

Expand Down Expand Up @@ -678,14 +682,15 @@ private static Class<?> forName(Module module, String name, Class<?> caller)
@CallerSensitive
private static Class<?> forNameHelper(Module module, String name, Class<?> caller, boolean isAdapter)
{
@SuppressWarnings("removal")
SecurityManager sm = null;
ClassLoader classLoader;
Class<?> c;

if ((null == module) || (null == name)) {
throw new NullPointerException();
}
/*[IF JAVA_SPEC_VERSION < 24]*/
@SuppressWarnings("removal")
SecurityManager sm = null;
if (J9VMInternals.initialized) {
sm = System.getSecurityManager();
}
Expand All @@ -702,7 +707,9 @@ public ClassLoader run() {
return module.getClassLoader();
}
});
} else {
} else
/*[ENDIF] JAVA_SPEC_VERSION < 24 */
{
classLoader = module.getClassLoader();
}

Expand Down Expand Up @@ -799,9 +806,10 @@ public Class<?>[] getClasses() {
@CallerSensitive
public ClassLoader getClassLoader() {
if (null != classLoader) {
if (classLoader == ClassLoader.bootstrapClassLoader) {
if (classLoader == ClassLoader.bootstrapClassLoader) {
return null;
}
/*[IF JAVA_SPEC_VERSION < 24]*/
@SuppressWarnings("removal")
SecurityManager security = System.getSecurityManager();
if (null != security) {
Expand All @@ -810,6 +818,7 @@ public ClassLoader getClassLoader() {
security.checkPermission(SecurityConstants.GET_CLASSLOADER_PERMISSION);
}
}
/*[ENDIF] JAVA_SPEC_VERSION < 24 */
}
return classLoader;
}
Expand Down
19 changes: 15 additions & 4 deletions jcl/src/java.base/share/classes/java/lang/ClassLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,12 +830,15 @@ protected final Class<?> findSystemClass (String className) throws ClassNotFound
*
* @return java.lang.ClassLoader
* the class or null.
/*[IF JAVA_SPEC_VERSION < 24]
* @exception SecurityException
* if a security manager exists and it does not
* allow the parent loader to be retrieved.
/*[ENDIF] JAVA_SPEC_VERSION < 24
*/
@CallerSensitive
public final ClassLoader getParent() {
/*[IF JAVA_SPEC_VERSION < 24]*/
if (parent == null) {
return null;
}
JasonFengJ9 marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -848,6 +851,7 @@ public final ClassLoader getParent() {
security.checkPermission(SecurityConstants.GET_CLASSLOADER_PERMISSION);
}
}
/*[ENDIF] JAVA_SPEC_VERSION < 24 */
return parent;
}

Expand Down Expand Up @@ -1062,19 +1066,23 @@ static ClassLoader getClassLoader(Class<?> clz) {
* allow access a SecurityException will be thrown.
*
* @return the platformClassLoader
/*[IF JAVA_SPEC_VERSION < 24]
* @throws SecurityException if access to the platform classloader is denied
/*[ENDIF] JAVA_SPEC_VERSION < 24
*/
@CallerSensitive
public static ClassLoader getPlatformClassLoader() {
ClassLoader platformClassLoader = ClassLoaders.platformClassLoader();
/*[IF JAVA_SPEC_VERSION < 24]*/
@SuppressWarnings("removal")
SecurityManager security = System.getSecurityManager();
ClassLoader platformClassLoader = ClassLoaders.platformClassLoader();
if (security != null) {
ClassLoader callersClassLoader = callerClassLoader();
if (needsClassLoaderPermissionCheck(callersClassLoader, platformClassLoader)) {
security.checkPermission(SecurityConstants.GET_CLASSLOADER_PERMISSION);
}
}
/*[ENDIF] JAVA_SPEC_VERSION < 24 */
return platformClassLoader;
}

Expand Down Expand Up @@ -1108,9 +1116,11 @@ public String getName() {
* same <code>ClassLoader</code> as that used to launch an application.
*
* @return java.lang.ClassLoader the system classLoader.
/*[IF JAVA_SPEC_VERSION < 24]
* @exception SecurityException
* if a security manager exists and it does not permit the
* caller to access the system class loader.
/*[ENDIF] JAVA_SPEC_VERSION < 24
*/
@CallerSensitive
public static ClassLoader getSystemClassLoader () {
Expand Down Expand Up @@ -1147,6 +1157,7 @@ public static ClassLoader getSystemClassLoader () {
}

ClassLoader sysLoader = applicationClassLoader;
/*[IF JAVA_SPEC_VERSION < 24]*/
@SuppressWarnings("removal")
SecurityManager security = System.getSecurityManager();
if (security != null) {
Expand All @@ -1155,7 +1166,7 @@ public static ClassLoader getSystemClassLoader () {
security.checkPermission(SecurityConstants.GET_CLASSLOADER_PERMISSION);
}
}

/*[ENDIF] JAVA_SPEC_VERSION < 24 */
return sysLoader;
}

Expand Down Expand Up @@ -2578,7 +2589,7 @@ public final boolean isRegisteredAsParallelCapable() {
}
/*[ENDIF] JAVA_SPEC_VERSION >= 9 */

/*[IF JAVA_SPEC_VERSION >= 19]*/
/*[IF (19 <= JAVA_SPEC_VERSION) & (JAVA_SPEC_VERSION < 24)]*/
static void checkClassLoaderPermission(ClassLoader classLoader, Class<?> caller) {
@SuppressWarnings("removal")
SecurityManager security = System.getSecurityManager();
Expand All @@ -2590,7 +2601,7 @@ static void checkClassLoaderPermission(ClassLoader classLoader, Class<?> caller)
}
}
}
/*[ENDIF] JAVA_SPEC_VERSION >= 19 */
/*[ENDIF] (19 <= JAVA_SPEC_VERSION) & (JAVA_SPEC_VERSION < 24) */

/*[IF JAVA_SPEC_VERSION >= 24]*/
static NativeLibraries nativeLibrariesFor(ClassLoader loader) {
Expand Down
4 changes: 2 additions & 2 deletions jcl/src/java.base/share/classes/java/lang/invoke/MethodTypeHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,13 +321,13 @@ static final ArrayList<Class<?>> parseIntoClasses(String methodDescriptor, Class
static MethodType fromMethodDescriptorStringInternal(String methodDescriptor, ClassLoader loader) {
ClassLoader classLoader = loader;
if (classLoader == null) {
/*[IF JAVA_SPEC_VERSION >= 14]*/
/*[IF (14 <= JAVA_SPEC_VERSION) & (JAVA_SPEC_VERSION < 24)]*/
@SuppressWarnings("removal")
SecurityManager security = System.getSecurityManager();
if (security != null) {
security.checkPermission(sun.security.util.SecurityConstants.GET_CLASSLOADER_PERMISSION);
}
/*[ENDIF] JAVA_SPEC_VERSION >= 14 */
/*[ENDIF] (14 <= JAVA_SPEC_VERSION) & (JAVA_SPEC_VERSION < 24) */
classLoader = ClassLoader.getSystemClassLoader();
}

Expand Down