JDK24: Permanently Disable the Security Manager #20625
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -1265,6 +1265,9 @@ static void checkTmpDir() { | |||||
|
|
||||||
| /*[IF JAVA_SPEC_VERSION >= 9]*/ | ||||||
| static void initSecurityManager(ClassLoader applicationClassLoader) { | ||||||
| /*[IF JAVA_SPEC_VERSION >= 24]*/ | ||||||
| boolean throwErrorOnInit = false; | ||||||
| /*[ENDIF] JAVA_SPEC_VERSION >= 24 */ | ||||||
| String javaSecurityManager = internalGetProperties().getProperty("java.security.manager"); //$NON-NLS-1$ | ||||||
| if (null == javaSecurityManager) { | ||||||
| /*[IF JAVA_SPEC_VERSION >= 18]*/ | ||||||
|
|
@@ -1273,14 +1276,21 @@ static void initSecurityManager(ClassLoader applicationClassLoader) { | |||||
| /* Do nothing. */ | ||||||
| /*[ENDIF] JAVA_SPEC_VERSION >= 18 */ | ||||||
| } else if ("allow".equals(javaSecurityManager)) { //$NON-NLS-1$ | ||||||
| /*[IF JAVA_SPEC_VERSION >= 24]*/ | ||||||
| throwErrorOnInit = true; | ||||||
| /*[ELSE] JAVA_SPEC_VERSION >= 24 */ | ||||||
| /* Do nothing. */ | ||||||
| /*[ENDIF] JAVA_SPEC_VERSION >= 24 */ | ||||||
| } else if ("disallow".equals(javaSecurityManager)) { //$NON-NLS-1$ | ||||||
| /*[IF JAVA_SPEC_VERSION > 11]*/ | ||||||
| throwUOEFromSetSM = true; | ||||||
| /*[ELSE] JAVA_SPEC_VERSION > 11 */ | ||||||
| /* Do nothing. */ | ||||||
| /*[ENDIF] JAVA_SPEC_VERSION > 11 */ | ||||||
| } else { | ||||||
| /*[IF JAVA_SPEC_VERSION >= 24]*/ | ||||||
| throwErrorOnInit = true; | ||||||
| /*[ELSE] JAVA_SPEC_VERSION >= 24 */ | ||||||
| /*[IF JAVA_SPEC_VERSION >= 17]*/ | ||||||
| initialErr.println("WARNING: A command line option has enabled the Security Manager"); //$NON-NLS-1$ | ||||||
| initialErr.println("WARNING: The Security Manager is deprecated and will be removed in a future release"); //$NON-NLS-1$ | ||||||
theresa-m marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
|
|
@@ -1297,7 +1307,14 @@ static void initSecurityManager(ClassLoader applicationClassLoader) { | |||||
| throw new Error(Msg.getString("K0631", e.toString()), e); //$NON-NLS-1$ | ||||||
| } | ||||||
| } | ||||||
| /*[ENDIF] JAVA_SPEC_VERSION >= 24 */ | ||||||
| } | ||||||
| /*[IF JAVA_SPEC_VERSION >= 24]*/ | ||||||
| if (throwErrorOnInit) { | ||||||
| /*[MSG "K0B04", "A command line option has attempted to allow or enable the Security Manager. Enabling a Security Manager is not supported."]*/ | ||||||
| throw new Error(Msg.getString("K0B04")); //$NON-NLS-1$ | ||||||
| } | ||||||
| /*[ENDIF] JAVA_SPEC_VERSION >= 24 */ | ||||||
|
There was a problem hiding this comment. I think There was a problem hiding this comment. I liked the variable since the There was a problem hiding this comment. The message should be prefixed with "Error: "; see SecurityManagerWarnings.java. There was a problem hiding this comment. That is from |
||||||
| } | ||||||
| /*[ENDIF] JAVA_SPEC_VERSION >= 9 */ | ||||||
|
|
||||||
|
|
@@ -1315,17 +1332,25 @@ static boolean allowSecurityManager() { | |||||
| * | ||||||
| * @param s the new security manager | ||||||
| * | ||||||
| /*[IF JAVA_SPEC_VERSION > 24] | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| * @throws UnsupportedOperationException always | ||||||
| /*[ELSE] JAVA_SPEC_VERSION > 24 | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| * @throws SecurityException if the security manager has already been set and its checkPermission method doesn't allow it to be replaced. | ||||||
| /*[IF JAVA_SPEC_VERSION > 11] | ||||||
| * @throws UnsupportedOperationException if s is non-null and a special token "disallow" has been set for system property "java.security.manager" | ||||||
| * which indicates that a security manager is not allowed to be set dynamically. | ||||||
| /*[ENDIF] JAVA_SPEC_VERSION > 11 | ||||||
| /*[ENDIF] JAVA_SPEC_VERSION > 24 | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| */ | ||||||
| /*[IF JAVA_SPEC_VERSION >= 17]*/ | ||||||
| @Deprecated(since="17", forRemoval=true) | ||||||
| @CallerSensitive | ||||||
| /*[ENDIF] JAVA_SPEC_VERSION >= 17 */ | ||||||
| public static void setSecurityManager(final SecurityManager s) { | ||||||
| /*[IF JAVA_SPEC_VERSION >= 24]*/ | ||||||
| /*[MSG "K0B03", "Setting a Security Manager is not supported"]*/ | ||||||
| throw new UnsupportedOperationException(Msg.getString("K0B03")); //$NON-NLS-1$ | ||||||
| /*[ELSE] JAVA_SPEC_VERSION >= 24*/ | ||||||
| /*[IF CRIU_SUPPORT]*/ | ||||||
| if (openj9.internal.criu.InternalCRIUSupport.isCRIUSupportEnabled()) { | ||||||
| /*[MSG "K0B02", "Enabling a SecurityManager currently unsupported when -XX:+EnableCRIUSupport is specified"]*/ | ||||||
|
|
@@ -1403,6 +1428,7 @@ public Void run() { | |||||
| currentSecurity.checkPermission(com.ibm.oti.util.RuntimePermissions.permissionSetSecurityManager); | ||||||
| } | ||||||
| security = s; | ||||||
| /*[ENDIF] JAVA_SPEC_VERSION >= 24*/ | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
|
|
||||||
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
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.
initSecurityManager()can be removed atopenj9/jcl/src/java.base/share/classes/java/lang/ClassLoader.java
Line 297 in 48709bf
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.
This is still needed since
initSecurityManageris used to detect settings of thejava.security.managerproperty.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.
initSecurityManager()reads the system propertyjava.security.manager, and setsthrowUOEFromSetSMwhich can be skipped withinsetSecurityManager().System.initSecurityManager(applicationClassLoader)seems not needed for JDK24+.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.
It will still be needed to throw an exception on startup for illegal java.security.manager manager settings triggered by
throwErrorOnInit.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.