8344039: Remove security manager dependency in java.time #22042

RogerRiggs · 2024-11-12T15:41:01Z

After JDK-8338411, java.time implementation dependencies on doPriviledged and AccessController are removed.
Some refactoring to cleanup the remaining code is expected.

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8344039: Remove security manager dependency in java.time (Bug - P4)

Reviewers

Sean Mullan (@seanjmullan - Reviewer) Review applies to 0f2e92f5
Lance Andersen (@LanceAndersen - Reviewer) Review applies to 0f2e92f5
Naoto Sato (@naotoj - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/22042/head:pull/22042
$ git checkout pull/22042

Update a local copy of the PR:
$ git checkout pull/22042
$ git pull https://git.openjdk.org/jdk.git pull/22042/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22042

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/22042.diff

Using Webrev

Link to Webrev Comment

Co-authored-by: Sean Mullan <[email protected]> Co-authored-by: Alan Bateman <[email protected]> Co-authored-by: Weijun Wang <[email protected]> Co-authored-by: Aleksei Efimov <[email protected]> Co-authored-by: Brian Burkhalter <[email protected]> Co-authored-by: Daniel Fuchs <[email protected]> Co-authored-by: Harshitha Onkar <[email protected]> Co-authored-by: Joe Wang <[email protected]> Co-authored-by: Jorn Vernee <[email protected]> Co-authored-by: Justin Lu <[email protected]> Co-authored-by: Kevin Walls <[email protected]>> Co-authored-by: Lance Andersen <[email protected]> Co-authored-by: Naoto Sato <[email protected]> Co-authored-by: Roger Riggs <[email protected]> Co-authored-by: Brent Christian <[email protected]>

…java, not useful without SM

…stance.

setInitialContextFactoryBuilder and setObjectFactoryBuilder methods in javax.naming.spi.NamingManager.

permission cannot be used anymore to control access.

description.

…sion checks of the Class.getNestHost and getNestMembers methods, which no longer apply.

…ested by other tests

…ava, useless without SM

ModuleDescriptor.location().

…attacker to create new instances

…Class<?> clazz, int which)

openjdk-notifier · 2024-11-12T17:20:32Z

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout 8344039-sm-cleanup-java-time
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

openjdk · 2024-11-12T17:21:28Z

@RogerRiggs this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8344039-sm-cleanup-java-time
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

openjdk · 2024-11-12T17:21:37Z

⚠️ @RogerRiggs This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

mlbridge · 2024-11-12T19:28:38Z

Webrevs

naotoj · 2024-11-13T01:25:25Z

src/java.base/share/classes/java/time/zone/ZoneRulesProvider.java

    static {
        // if the property java.time.zone.DefaultZoneRulesProvider is
        // set then its value is the class name of the default provider
        @SuppressWarnings("removal")


Should this SuppressWarnings be removed?

ServiceLoader configuration exceptions (in a static initialization) are rethrown as Error. Remove dependency on SecurityException thrown by ServiceLoader (as obsolete)

seanjmullan · 2024-11-13T14:13:59Z

src/java.base/share/classes/java/time/zone/ZoneRulesProvider.java

Lines 171-172:

if (ex.getCause() instanceof SecurityException) { continue; // ignore the security exception, try the next provider }

You may be able to remove this code, but may be better to leave it as-is for now until the SL code has been checked for cleanup.

The SL changes are in JDK-8344011.

seanjmullan · 2024-11-13T14:42:47Z

The PR description above seems to be copied from the serialization PR.

LanceAndersen

Looks good to me Roger

…plete.

naotoj

LGTM

RogerRiggs · 2024-11-13T20:02:08Z

/integrate

openjdk · 2024-11-13T20:03:28Z

Going to push as commit 5ac330b.
Since your change was applied there have been 26 commits pushed to the master branch:

1eb38c8: 8343219: Manual clientlibs test failures after SM removal
dde6230: 8343416: CDS dump fails when unregistered class can also be loaded from system modules
ffea980: 8344023: Unnecessary Hashtable usage in LdapClient.defaultBinaryAttrs
5e01c40: 8343981: Remove usage of security manager from Thread and related classes
dbf2346: 8341260: Add Float16 to jdk.incubator.vector
a5f11b5: 8343483: Remove unnecessary @SuppressWarnings annotations (serviceability)
7be7772: 8344112: Remove code to support security manager execution mode from DatagramChannel implementation
bd3fec3: 8344086: Remove security manager dependency in FFM
916694f: 8343317: Extend test generation tool to handle APX NDD/NF flavor of instructions
eb240a7: 8344051: Problemlist jdk/jfr/event/runtime/TestNativeMemoryUsageEvents.java with ZGC until JDK-8343893 is fixed
... and 16 more: https://git.openjdk.org/jdk/compare/63eb4853f6782f350f67b6bcf25d83bc4480be71...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-11-13T20:03:37Z

@RogerRiggs Pushed as commit 5ac330b.

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

AlanBateman and others added 30 commits September 30, 2024 18:02

ServerSocket bind/accept no longer throw SecurityException

591d3d6

Merge

781eecd

hack out Security Manager from LoaderHandler

4035376

Update spec for RMIClassLoader

6d2006d

Fix whitespace.

6c325c2

Restore URL parsing to LoaderHandler::getClassLoader.

463d46b

Merge

439ed26

Remove vmTestbase/nsk/jvmti/AttachOnDemand/attach004/TestDescription.…

53e06d0

…java, not useful without SM

Remove leftover SecurityException text from RMIConnection.getObjectIn…

9e1cec8

…stance.

Remove leftover "@see java.lang.SecurityManager#checkSetFactory" from

7cf5824

setInitialContextFactoryBuilder and setObjectFactoryBuilder methods in javax.naming.spi.NamingManager.

Remove unnecessary comma.

77b58bf

Merge

b5f2ca3

Fix typo.

938737a

Remove text about granting permission and add api note indicating

2612400

permission cannot be used anymore to control access.

Remove text about implementers using Security Manager checks from class

4688f78

description.

Remove Security Manager text from EXIT_ON_CLOSE.

34da8c7

Removed TestSecurityManagerChecks.java - this test was testing permis…

c62c4ad

…sion checks of the Class.getNestHost and getNestMembers methods, which no longer apply.

Drop reference to permissions from Font.getFont

d8e15dd

Merge

29c0bb2

Update record tests to not require SM

23e0f09

Remove tests for repeating annotations with SM set, no SM case well t…

bd27286

…ested by other tests

Change reflect/Nestmates/TestReflectionAPI to not test with a SM set

7f451ea

Remove test/langtools/tools/javac/api/ToolProvider/ToolProviderTest.j…

c9ab253

…ava, useless without SM

Remove text about granting permissions to module from

36522ed

ModuleDescriptor.location().

Remove text about Proxy objects being granted AllPermission.

c769f2d

Remove text about needing ReflectPermission to access AccessibleObject.

79b4b21

JDK-8003881: Prevent lambda implementing inner classes from allowing …

e46d99c

…attacker to create new instances

JDK-8007035: deprecate public void SecurityManager.checkMemberAccess(…

422c489

…Class<?> clazz, int which)

Update copyright header

1f4be6f

openjdk bot added the i18n [email protected] label Nov 12, 2024

openjdk-notifier bot changed the base branch from pr/21498 to master November 12, 2024 17:20

openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Nov 12, 2024

Merge branch 'master' into 8344039-sm-cleanup-java-time

96a8d26

openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Nov 12, 2024

RogerRiggs marked this pull request as ready for review November 12, 2024 19:24

openjdk bot added the rfr Pull request is ready for review label Nov 12, 2024

naotoj reviewed Nov 13, 2024

View reviewed changes

Remove unnecessary suppress warnings removal

0f2e92f

ServiceLoader configuration exceptions (in a static initialization) are rethrown as Error. Remove dependency on SecurityException thrown by ServiceLoader (as obsolete)

seanjmullan reviewed Nov 13, 2024

View reviewed changes

seanjmullan approved these changes Nov 13, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 13, 2024

LanceAndersen approved these changes Nov 13, 2024

View reviewed changes

Retain check for SecurityException until ServiceLoader cleanup is com…

23f149e

…plete.

openjdk bot removed the ready Pull request is ready to be integrated label Nov 13, 2024

naotoj approved these changes Nov 13, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 13, 2024

openjdk bot added the integrated Pull request has been integrated label Nov 13, 2024

openjdk bot closed this Nov 13, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 13, 2024

RogerRiggs deleted the 8344039-sm-cleanup-java-time branch February 24, 2025 14:15

8344039: Remove security manager dependency in java.time #22042

8344039: Remove security manager dependency in java.time #22042

Uh oh!

Conversation

RogerRiggs commented Nov 12, 2024 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

openjdk-notifier bot commented Nov 12, 2024

Uh oh!

openjdk bot commented Nov 12, 2024

Uh oh!

openjdk bot commented Nov 12, 2024

Uh oh!

mlbridge bot commented Nov 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

naotoj Nov 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

seanjmullan Nov 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

AlanBateman Nov 13, 2024

Choose a reason for hiding this comment

Uh oh!

seanjmullan commented Nov 13, 2024

Uh oh!

LanceAndersen left a comment

Choose a reason for hiding this comment

Uh oh!

naotoj left a comment

Choose a reason for hiding this comment

Uh oh!

RogerRiggs commented Nov 13, 2024

Uh oh!

openjdk bot commented Nov 13, 2024

Uh oh!

openjdk bot commented Nov 13, 2024

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

14 participants

RogerRiggs commented Nov 12, 2024 •

edited by openjdk bot

Loading

mlbridge bot commented Nov 12, 2024 •

edited

Loading

naotoj Nov 13, 2024 •

edited

Loading

seanjmullan Nov 13, 2024 •

edited

Loading