8266459: Implement JEP 411: Deprecate the Security Manager for Removal #4073

wangweij · 2021-05-17T18:23:41Z

Please review this implementation of JEP 411.

The code change is divided into 3 commits. Please review them one by one.

576161d The essential change for this JEP, including the @Deprecate annotations and spec change. It also update the default value of the java.security.manager system property to "disallow", and necessary test change following this update.
26a54a8 Manual changes to several files so that the next commit can be generated programatically.
eb6c566 Automatic changes to other source files to avoid javac warnings on deprecation for removal

The 1st and 2nd commits should be reviewed carefully. The 3rd one is generated programmatically, see the comment below for more details. If you are only interested in a portion of the 3rd commit and would like to review it as a separate file, please comment here and I'll generate an individual webrev.

Due to the size of this PR, no attempt is made to update copyright years for any file to minimize unnecessary merge conflict.

Furthermore, since the default value of java.security.manager system property is now "disallow", most of the tests calling System.setSecurityManager() need to launched with -Djava.security.manager=allow. This is covered in a different PR at #4071.

Update: the deprecation annotations and javadoc tags, build, compiler, core-libs, hotspot, i18n, jmx, net, nio, security, and serviceability are reviewed. Rest are 2d, awt, beans, sound, and swing.

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8266459: Implement JEP 411: Deprecate the Security Manager for Removal

Reviewers

Erik Joelsson (@erikj79 - Reviewer) ⚠️ Review applies to eb6c566
Joe Darcy (@jddarcy - Reviewer) ⚠️ Review applies to eb6c566
Chris Hegarty (@ChrisHegarty - Reviewer) ⚠️ Review applies to eb6c566
Naoto Sato (@naotoj - Reviewer) ⚠️ Review applies to eb6c566
Joe Wang (@JoeWang-Java - Reviewer) ⚠️ Review applies to ea2c4b4
Alan Bateman (@AlanBateman - Reviewer) ⚠️ Review applies to ea2c4b4
Mandy Chung (@mlchung - Reviewer) ⚠️ Review applies to eb6c566
Kevin Rushforth (@kevinrushforth - Author) ⚠️ Review applies to c4221b5
Phil Race (@prrace - Reviewer) ⚠️ Review applies to 1f6ff6c
Lance Andersen (@LanceAndersen - Reviewer) ⚠️ Review applies to 8fd09c3

Contributors

Sean Mullan <[email protected]>
Lance Andersen <[email protected]>
Weijun Wang <[email protected]>

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/4073/head:pull/4073
$ git checkout pull/4073

Update a local copy of the PR:
$ git checkout pull/4073
$ git pull https://git.openjdk.java.net/jdk pull/4073/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4073

View PR using the GUI difftool:
$ git pr show -t 4073

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/4073.diff

bridgekeeper · 2021-05-17T18:23:47Z

👋 Welcome back weijun! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

wangweij · 2021-05-17T18:25:16Z

The 3rd commit is the biggest one but it's all generated programmatically. All changes are simply adding @SupressWarnings("removal") to a declaration.

Precisely, of all the diff hunks (leading whitespaces ignored), there are 1607

+ @SuppressWarnings("removal")

There are also 7 cases where an existing annotation is updated

================= 2 ====================
- @SuppressWarnings("deprecation")
+ @SuppressWarnings({"removal","deprecation"})
================= 1 ====================
- @SuppressWarnings("Convert2Lambda")
+ @SuppressWarnings({"removal","Convert2Lambda"})
================= 1 ====================
- @SuppressWarnings({"unchecked", "CloneDeclaresCloneNotSupported"})
+ @SuppressWarnings({"removal","unchecked", "CloneDeclaresCloneNotSupported"})
================= 1 ====================
- @SuppressWarnings("deprecation") // Use of RMISecurityManager
+ @SuppressWarnings({"removal","deprecation"}) // Use of RMISecurityManager
================= 1 ====================
- @SuppressWarnings("unchecked")     /*To suppress warning from line 1374*/
+ @SuppressWarnings({"removal","unchecked"})     /*To suppress warning from line 1374*/
================= 1 ====================
- @SuppressWarnings("fallthrough")
+ @SuppressWarnings({"removal","fallthrough"})

All other cases are new annotation embedded inline:

================= 7 ====================
- AccessControlContext acc) {
+ @SuppressWarnings("removal") AccessControlContext acc) {
================= 4 ====================
- AccessControlContext acc,
+ @SuppressWarnings("removal") AccessControlContext acc,
================= 3 ====================
- AccessControlContext context,
+ @SuppressWarnings("removal") AccessControlContext context,
================= 3 ====================
- AccessControlContext acc)
+ @SuppressWarnings("removal") AccessControlContext acc)
================= 2 ====================
- try (InputStream stream = AccessController.doPrivileged(pa)) {
+ try (@SuppressWarnings("removal") InputStream stream = AccessController.doPrivileged(pa)) {
================= 2 ====================
- AccessControlContext context, Permission... perms) {
+ @SuppressWarnings("removal") AccessControlContext context, Permission... perms) {
================= 2 ====================
- } catch (java.security.AccessControlException e) {
+ } catch (@SuppressWarnings("removal") java.security.AccessControlException e) {
================= 2 ====================
- } catch (AccessControlException ace) {
+ } catch (@SuppressWarnings("removal") AccessControlException ace) {
================= 2 ====================
- AccessControlContext context)
+ @SuppressWarnings("removal") AccessControlContext context)
================= 2 ====================
- AccessControlContext acc) throws LoginException {
+ @SuppressWarnings("removal") AccessControlContext acc) throws LoginException {
================= 2 ====================
- } catch (AccessControlException e) {
+ } catch (@SuppressWarnings("removal") AccessControlException e) {
================= 1 ====================
- public static void addHook(AccessControlContext acc, PlatformEventType type, Runnable hook) {
+ public static void addHook(@SuppressWarnings("removal") AccessControlContext acc, PlatformEventType type, Runnable hook) {
================= 1 ====================
- DomainCombiner combiner,
+ @SuppressWarnings("removal") DomainCombiner combiner,
================= 1 ====================
- } catch (java.security.AccessControlException ace) {
+ } catch (@SuppressWarnings("removal") java.security.AccessControlException ace) {
================= 1 ====================
- private static File checkFile(File f, SecurityManager sm) {
+ private static File checkFile(File f, @SuppressWarnings("removal") SecurityManager sm) {
================= 1 ====================
- private static File checkFile(File file, SecurityManager sm) {
+ private static File checkFile(File file, @SuppressWarnings("removal") SecurityManager sm) {
================= 1 ====================
- private static void checkPackageAccessForPermittedSubclasses(SecurityManager sm,
+ private static void checkPackageAccessForPermittedSubclasses(@SuppressWarnings("removal") SecurityManager sm,
================= 1 ====================
- ProtectionDomain[] getProtectDomains(AccessControlContext context);
+ ProtectionDomain[] getProtectDomains(@SuppressWarnings("removal") AccessControlContext context);
================= 1 ====================
- SecureCallbackHandler(java.security.AccessControlContext acc,
+ SecureCallbackHandler(@SuppressWarnings("removal") java.security.AccessControlContext acc,
================= 1 ====================
- private static void addHookInternal(AccessControlContext acc, PlatformEventType type, Runnable hook) {
+ private static void addHookInternal(@SuppressWarnings("removal") AccessControlContext acc, PlatformEventType type, Runnable hook) {
================= 1 ====================
- private void checkMemberAccess(SecurityManager sm, int which,
+ private void checkMemberAccess(@SuppressWarnings("removal") SecurityManager sm, int which,
================= 1 ====================
- private static File[] checkFiles(Stream<File> filesStream, SecurityManager sm) {
+ private static File[] checkFiles(Stream<File> filesStream, @SuppressWarnings("removal") SecurityManager sm) {
================= 1 ====================
- Thread(Runnable target, AccessControlContext acc) {
+ Thread(Runnable target, @SuppressWarnings("removal") AccessControlContext acc) {
================= 1 ====================
- public ProtectionDomain[] getProtectDomains(AccessControlContext context) {
+ public ProtectionDomain[] getProtectDomains(@SuppressWarnings("removal") AccessControlContext context) {
================= 1 ====================
- AccessControlContext context);
+ @SuppressWarnings("removal") AccessControlContext context);
================= 1 ====================
- AccessControlContext stack,
- AccessControlContext context);
+ @SuppressWarnings("removal") AccessControlContext stack,
+ @SuppressWarnings("removal") AccessControlContext context);
================= 1 ====================
- AccessControlContext(ProtectionDomain caller, DomainCombiner combiner,
+ AccessControlContext(ProtectionDomain caller, @SuppressWarnings("removal") DomainCombiner combiner,
================= 1 ====================
- public URLClassPath(URL[] urls, AccessControlContext acc) {
+ public URLClassPath(URL[] urls, @SuppressWarnings("removal") AccessControlContext acc) {
================= 1 ====================
- URLClassLoader(URL[] urls, AccessControlContext acc) {
+ URLClassLoader(URL[] urls, @SuppressWarnings("removal") AccessControlContext acc) {
================= 1 ====================
- public static void setSecurityManager(SecurityManager sm) {
+ public static void setSecurityManager(@SuppressWarnings("removal") SecurityManager sm) {
================= 1 ====================
- try (DataInputStream dis = new DataInputStream(new InflaterInputStream(
+ try (@SuppressWarnings("removal") DataInputStream dis = new DataInputStream(new InflaterInputStream(
================= 1 ====================
- try (FileInputStream fis = AccessController.doPrivileged(
+ try (@SuppressWarnings("removal") FileInputStream fis = AccessController.doPrivileged(
================= 1 ====================
- FactoryURLClassLoader(URL[] urls, AccessControlContext acc) {
+ FactoryURLClassLoader(URL[] urls, @SuppressWarnings("removal") AccessControlContext acc) {
================= 1 ====================
- Thread newThreadWithAcc(Runnable target, AccessControlContext acc);
+ Thread newThreadWithAcc(Runnable target, @SuppressWarnings("removal") AccessControlContext acc);
================= 1 ====================
- SecureRecorderListener(AccessControlContext context, FlightRecorderListener changeListener) {
+ SecureRecorderListener(@SuppressWarnings("removal") AccessControlContext context, FlightRecorderListener changeListener) {
================= 1 ====================
- private PolicyDelegate(PolicySpi spi, Provider p,
+ private PolicyDelegate(@SuppressWarnings("removal") PolicySpi spi, Provider p,
================= 1 ====================
- DomainCombiner combiner) {
+ @SuppressWarnings("removal") DomainCombiner combiner) {
================= 1 ====================
- PrivilegedRunnable(Runnable r, AccessControlContext acc) {
+ PrivilegedRunnable(Runnable r, @SuppressWarnings("removal") AccessControlContext acc) {
================= 1 ====================
- private static File[] checkFiles(Stream<File> fs, SecurityManager sm) {
+ private static File[] checkFiles(Stream<File> fs, @SuppressWarnings("removal") SecurityManager sm) {
================= 1 ====================
- private void checkSpecifyHandler(SecurityManager sm) {
+ private void checkSpecifyHandler(@SuppressWarnings("removal") SecurityManager sm) {
================= 1 ====================
- String serverPrincipal, AccessControlContext acc)
+ String serverPrincipal, @SuppressWarnings("removal") AccessControlContext acc)
================= 1 ====================
- public Thread newThreadWithAcc(Runnable target, AccessControlContext acc) {
+ public Thread newThreadWithAcc(Runnable target, @SuppressWarnings("removal") AccessControlContext acc) {
================= 1 ====================
- try (InputStream is = AccessController.doPrivileged(new PrivilegedAction<InputStream>() {
+ try (@SuppressWarnings("removal") InputStream is = AccessController.doPrivileged(new PrivilegedAction<InputStream>() {
================= 1 ====================
- public EventFileStream(AccessControlContext acc, Path path) throws IOException {
+ public EventFileStream(@SuppressWarnings("removal") AccessControlContext acc, Path path) throws IOException {
================= 1 ====================
- AccessControlContext context, Permission... perms)
+ @SuppressWarnings("removal") AccessControlContext context, Permission... perms)
================= 1 ====================
- private static void privateCheckPackageAccess(SecurityManager s, Class<?> clazz) {
+ private static void privateCheckPackageAccess(@SuppressWarnings("removal") SecurityManager s, Class<?> clazz) {
================= 1 ====================
- AbstractEventStream(AccessControlContext acc, PlatformRecording recording, List<Configuration> configurations) throws IOException {
+ AbstractEventStream(@SuppressWarnings("removal") AccessControlContext acc, PlatformRecording recording, List<Configuration> configurations) throws IOException {
================= 1 ====================
- private void checkPackageAccess(SecurityManager sm, final ClassLoader ccl,
+ private void checkPackageAccess(@SuppressWarnings("removal") SecurityManager sm, final ClassLoader ccl,
================= 1 ====================
- AccessControlContext context) {
+ @SuppressWarnings("removal") AccessControlContext context) {
================= 1 ====================
- public PrivilegedExecutor(Executor executor, AccessControlContext acc) {
+ public PrivilegedExecutor(Executor executor, @SuppressWarnings("removal") AccessControlContext acc) {
================= 1 ====================
- private RequestHook(AccessControlContext acc, PlatformEventType eventType, Runnable hook) {
+ private RequestHook(@SuppressWarnings("removal") AccessControlContext acc, PlatformEventType eventType, Runnable hook) {
================= 1 ====================
- try (BufferedReader bufferedReader =
+ try (@SuppressWarnings("removal") BufferedReader bufferedReader =
================= 1 ====================
- private static void privateCheckProxyPackageAccess(SecurityManager s, Class<?> clazz) {
+ private static void privateCheckProxyPackageAccess(@SuppressWarnings("removal") SecurityManager s, Class<?> clazz) {

That's all.

openjdk · 2021-05-17T18:26:58Z

@wangweij The following labels will be automatically applied to this pull request:

2d
awt
beans
build
compiler
core-libs
hotspot
i18n
jmx
net
nio
security
serviceability
sound
swing

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

wangweij · 2021-05-17T18:27:40Z

/contributor add mullan, lancea, weijun

openjdk · 2021-05-17T18:29:16Z

@wangweij Could not parse mullan, lancea, weijun as a valid contributor.
Syntax: /contributor (add|remove) [@user | openjdk-user | Full Name <email@address>]. For example:

/contributor add @openjdk-bot
/contributor add duke
/contributor add J. Duke <[email protected]>

wangweij · 2021-05-17T18:31:54Z

/contributor add mullan
/contributor add lancea
/contributor add weijun

openjdk · 2021-05-17T18:32:55Z

@wangweij
Contributor Sean Mullan <[email protected]> successfully added.

wangweij · 2021-05-17T18:33:17Z

/contributor add lancea

wangweij · 2021-05-17T18:33:25Z

/contributor add weijun

openjdk · 2021-05-17T18:34:09Z

@wangweij
Contributor Lance Andersen <[email protected]> successfully added.

openjdk · 2021-05-17T18:35:42Z

@wangweij
Contributor Weijun Wang <[email protected]> successfully added.

wangweij · 2021-05-28T01:56:20Z

Two files were removed by JEP 403 and JEP 407, respectively. One method in XMLSchemaFactory.java got its own @SuppressWarnings and have to be merged with the one here. Another file ResourceBundle.java had a portion of a method extracted into a new method and the annotation must be moved there.

wangweij · 2021-05-31T15:06:21Z

New commit pushed. The default behavior is now reverted to be equivalent to -Djava.security.manager=allow. No warning will be shown when the system property is set to "allow", "disallow", or not set. A new test is added to check these warning messages. Some tests are updated to match the new behavior.

See https://mail.openjdk.java.net/pipermail/jdk-dev/2021-May/005616.html.

wangweij · 2021-05-31T15:07:28Z

/csr needed

openjdk · 2021-05-31T15:08:31Z

@wangweij the issue for this pull request, JDK-8266459, already has an approved CSR request: JDK-8266577

AlanBateman · 2021-06-01T12:47:37Z

System.setSecurityManagerDirect looks a bit ugly now. Can this be renamed to implSetSecurityManager and avoid the line break in the middle of the declaration?

The usage of System.err usage in setSecurityManager also needs to be re-examined as this will run arbitrary code when System.err can be changed. To fix this will require capturing the stream at startup (as was done with the illegal access logger). It's okay to integrate with what you have for the first push and we can fix this issue with System.err when the warning message is changed to the intended message.

wangweij · 2021-06-02T11:56:50Z

/integrate

openjdk · 2021-06-02T11:58:01Z

@wangweij Pushed as commit 6765f90.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

wangweij added 3 commits May 17, 2021 14:18

8266459: Implement JEP 411: Deprecate the Security Manager for Removal

576161d

manual change before automatic annotating

26a54a8

add supresswarnings annotations automatically

eb6c566

wangweij mentioned this pull request May 17, 2021

8267184: Add -Djava.security.manager=allow to tests calling System.setSecurityManager #4071

Closed

3 tasks

openjdk bot added net [email protected] compiler [email protected] awt [email protected] labels May 17, 2021

openjdk bot removed the ready Pull request is ready to be integrated label May 27, 2021

wangweij added 2 commits May 27, 2021 15:57

merge from master, two files removed, one needs merge

0e8692b

move one annotation to new method

01dc4c0

openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels May 27, 2021

default behavior reverted to allow

8fd09c3

LanceAndersen approved these changes May 31, 2021

View reviewed changes

rename setSecurityManagerDirect to implSetSecurityManager

926e4b9

openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed ready Pull request is ready to be integrated labels Jun 1, 2021

merge from master

ea2c4b4

openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Jun 1, 2021

AlanBateman approved these changes Jun 1, 2021

View reviewed changes

JoeWang-Java approved these changes Jun 1, 2021

View reviewed changes

wangweij added 3 commits June 1, 2021 14:40

Merge branch 'master'

2c66078

merge from master, resolve one conflict

c8bf8bc

copyright years

331389b

openjdk bot closed this Jun 2, 2021

openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 2, 2021

kevinrushforth mentioned this pull request Jun 3, 2021

8264139: Suppress removal warnings for Security Manager methods openjdk/jfx#528

Closed

3 tasks

8266459: Implement JEP 411: Deprecate the Security Manager for Removal #4073

8266459: Implement JEP 411: Deprecate the Security Manager for Removal #4073

Uh oh!

Conversation

wangweij commented May 17, 2021 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Contributors

Reviewing

Uh oh!

bridgekeeper bot commented May 17, 2021

Uh oh!

wangweij commented May 17, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented May 17, 2021

Uh oh!

wangweij commented May 17, 2021

Uh oh!

openjdk bot commented May 17, 2021

Uh oh!

wangweij commented May 17, 2021

Uh oh!

openjdk bot commented May 17, 2021

Uh oh!

wangweij commented May 17, 2021

Uh oh!

wangweij commented May 17, 2021

Uh oh!

openjdk bot commented May 17, 2021

Uh oh!

openjdk bot commented May 17, 2021

Uh oh!

wangweij commented May 28, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wangweij commented May 31, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wangweij commented May 31, 2021

Uh oh!

openjdk bot commented May 31, 2021

Uh oh!

AlanBateman commented Jun 1, 2021

Uh oh!

wangweij commented Jun 2, 2021

Uh oh!

openjdk bot commented Jun 2, 2021

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

13 participants

wangweij commented May 17, 2021 •

edited by openjdk bot

Loading

wangweij commented May 17, 2021 •

edited

Loading

wangweij commented May 28, 2021 •

edited

Loading

wangweij commented May 31, 2021 •

edited

Loading