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.

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

Add checks in Provider put() method in Java Security Restricted Mode #19

Merged
merged 1 commit into from
Aug 2, 2023

Conversation

taoliult
Copy link
Contributor

Signed-off-by: Tao Liu [email protected]

This is a back port PR from JDKNext PR ibmruntimes/openj9-openjdk-jdk#610

This PR is for adding the services check in Provider legacy "put()" method and debug info in Java Security Restricted Mode.

The legacy “put()” method is for adding the services and it is used by provider SUN and SunEC in Semeru OpenJDK8. From OpenJDK11 and above versions, all those usages of “put()” method changed to "putService()" method. But we still need to check the services which are added by the legacy “put()” method in Java Security Restricted Mode. So, updated the codes for checking the registered services, only allowed the needed services be stored in the "legacyMap".

@taoliult
Copy link
Contributor Author

taoliult commented Aug 2, 2023

@keithc-ca This is a back port PR from JDKNext PR ibmruntimes/openj9-openjdk-jdk#610. Please help to review.

@keithc-ca keithc-ca self-requested a review August 2, 2023 14:55
@keithc-ca keithc-ca self-assigned this Aug 2, 2023
@keithc-ca
Copy link
Member

Please expand the commit message (see ibmruntimes/openj9-openjdk-jdk#610 (comment)).

@taoliult taoliult force-pushed the fips branch 2 times, most recently from c2cab3d to a37afc9 Compare August 2, 2023 17:08
@keithc-ca
Copy link
Member

See https://github.com/eclipse/omr/blob/master/CONTRIBUTING.md#commit-guidelines for expectations of commit messags. In particular note the advice that the "body should be wrapped at 72 characters", and that the "Signed-off-by:" line should follow the body.

The legacy “put()” method is for adding the services and it is used by
provider SUN and SunEC in Semeru OpenJDK8. From OpenJDK11 and above
versions, all those usages of “put()” method changed to "putService()"
method. But we still need to check the services which are added by the
legacy “put()” method in Java Security Restricted Mode. So, updated
the codes in Provider.java for checking the registered services, only
allowed the needed services be stored in the "legacyMap". And this
commit also added more debug info in Java Security Restricted Mode.

Signed-off-by: Tao Liu <[email protected]>
@taoliult
Copy link
Contributor Author

taoliult commented Aug 2, 2023

@keithc-ca Sorry about the commit messages. I wrapped the body at 72 characters for each line and also move the "Signed-off-by:" line follow the body. Please help to review.

@keithc-ca
Copy link
Member

Jenkins test sanity.openjdk amac jdk21

@keithc-ca keithc-ca merged commit 1fdb064 into ibmruntimes:openj9 Aug 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants