Fixes #6184 - JEP-411 will deprecate/remove the SecurityManager from … #9616
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| // | ||
| // ======================================================================== | ||
| // Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others. | ||
| // | ||
| // This program and the accompanying materials are made available under the | ||
| // terms of the Eclipse Public License v. 2.0 which is available at | ||
| // https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 | ||
| // which is available at https://www.apache.org/licenses/LICENSE-2.0. | ||
| // | ||
| // SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 | ||
| // ======================================================================== | ||
| // | ||
|
|
||
| package org.eclipse.jetty.util.security; | ||
|
|
||
| import java.lang.invoke.MethodHandle; | ||
| import java.lang.invoke.MethodHandles; | ||
| import java.lang.invoke.MethodType; | ||
| import java.security.Permission; | ||
| import java.security.PrivilegedAction; | ||
|
|
||
| /** | ||
| * <p>Collections of utility methods to deal with the scheduled removal | ||
| * of the security classes defined by <a href="https://openjdk.org/jeps/411">JEP 411</a>.</p> | ||
| */ | ||
| public class SecurityUtils | ||
| { | ||
| private static final MethodHandle doPrivileged = lookup(); | ||
|
|
||
| private static MethodHandle lookup() | ||
| { | ||
| try | ||
| { | ||
| // Use reflection to work with Java versions that have and don't have AccessController. | ||
| Class<?> klass = ClassLoader.getPlatformClassLoader().loadClass("java.security.AccessController"); | ||
| MethodHandles.Lookup lookup = MethodHandles.lookup(); | ||
| return lookup.findStatic(klass, "doPrivileged", MethodType.methodType(Object.class, PrivilegedAction.class)); | ||
| } | ||
| catch (Throwable x) | ||
| { | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @return the current security manager, if available | ||
| */ | ||
| public static Object getSecurityManager() | ||
| { | ||
| try | ||
| { | ||
| // Use reflection to work with Java versions that have and don't have SecurityManager. | ||
| return System.class.getMethod("getSecurityManager").invoke(null); | ||
| } | ||
| catch (Throwable ignored) | ||
| { | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * <p>Checks the given permission, if the {@link #getSecurityManager() security manager} | ||
| * is set.</p> | ||
| * | ||
| * @param permission the permission to check | ||
| * @throws SecurityException if the permission check fails | ||
| */ | ||
| public static void checkPermission(Permission permission) throws SecurityException | ||
| { | ||
| Object securityManager = SecurityUtils.getSecurityManager(); | ||
| if (securityManager == null) | ||
| return; | ||
| try | ||
| { | ||
| securityManager.getClass().getMethod("checkPermission") | ||
| .invoke(securityManager, permission); | ||
| } | ||
| catch (SecurityException x) | ||
| { | ||
| throw x; | ||
| } | ||
| catch (Throwable ignored) | ||
| { | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * <p>Runs the given action with the calling context restricted | ||
| * to just the calling frame, not all the frames in the stack.</p> | ||
| * | ||
| * @param action the action to run | ||
| * @return the result of running the action | ||
| * @param <T> the type of the result | ||
| */ | ||
| public static <T> T doPrivileged(PrivilegedAction<T> action) | ||
| { | ||
| // Keep this method short and inlineable. | ||
| MethodHandle methodHandle = doPrivileged; | ||
| if (methodHandle == null) | ||
| return action.run(); | ||
| return doPrivileged(methodHandle, action); | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| private static <T> T doPrivileged(MethodHandle doPrivileged, PrivilegedAction<T> action) | ||
| { | ||
| try | ||
| { | ||
| return (T)doPrivileged.invoke(action); | ||
| } | ||
| catch (RuntimeException | Error x) | ||
| { | ||
| throw x; | ||
| } | ||
| catch (Throwable x) | ||
| { | ||
| throw new RuntimeException(x); | ||
| } | ||
| } | ||
|
|
||
| private SecurityUtils() | ||
| { | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we have a util class or method that does this as this is used in a few places.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought about this and there are only 2 places, which are quite unrelated: here and
ContextHandler.Given that JASPI is not the most common specification, I thought that the less dependencies the better, so a utility class was not worth the effort.
Note also that all JASPI permissions are
AuthPermissions, while a generic utility class would need a more generic signature, making this class a little more verbose.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm pretty sure this is no more complex than changing the method signature to
checkPermission(Permission). So my preference is still for a utility class/method.