Skip to content

8292297: Fix up loading of override java.security properties file #10251

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

Closed
wants to merge 4 commits into from

Conversation

coffeys
Copy link
Contributor

@coffeys coffeys commented Sep 13, 2022

Ensure that security properties are only overridden if the override security properties file exists.
Refactored some of the code in Security class initialization also.
Extra test coverage for security properties file options.


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-8292297: Fix up loading of override java.security properties file

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10251

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 13, 2022

👋 Welcome back coffeys! 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.

@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 13, 2022
@openjdk
Copy link

openjdk bot commented Sep 13, 2022

@coffeys The following label will be automatically applied to this pull request:

  • security

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

@openjdk openjdk bot added the security security-dev@openjdk.org label Sep 13, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 13, 2022

Webrevs

@XueleiFan
Copy link
Member

Is it a behavioral change that requires CSR approval?

@coffeys
Copy link
Contributor Author

coffeys commented Sep 14, 2022

Is it a behavioral change that requires CSR approval?

I considered the CSR impact before logging this PR. This issue corrects a bug where security properties had potential to be lost if an incorrect URL/resource was specified for the secondary/override security conf file. The system was already working with bad user config in such a case. Don't think it needs a CSR but open to correction.

Copy link
Member

@XueleiFan XueleiFan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@openjdk
Copy link

openjdk bot commented Sep 14, 2022

@coffeys This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8292297: Fix up loading of override java.security properties file

Reviewed-by: xuelei

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 28 new commits pushed to the master branch:

  • 211fab8: 8291669: [REDO] Fix array range check hoisting for some scaled loop iv
  • 7f3250d: 8293787: Linux aarch64 build fails after 8292591
  • 2a38791: 8292755: Non-default method in interface leads to a stack overflow in JShell
  • 8351b30: 8293771: runtime/handshake/SystemMembarHandshakeTransitionTest.java fails if MEMBARRIER_CMD_QUERY is unsupported
  • 91f9c0d: 8293774: Improve TraceOptoParse to dump the bytecode name
  • 1169a15: 8291657: Javac assertion when compiling a method call with switch expression as argument
  • 2baf251: 8293654: Improve SharedRuntime handling of continuation helper out-arguments
  • 60f59a4: 8293660: Fix frame::sender_for_compiled_frame frame size assert
  • b3461c1: 8293680: PPC64BE build failure after JDK-8293344
  • 7e02039: 8293647: Avoid unnecessary boxing in jdk.hotspot.agent
  • ... and 18 more: https://git.openjdk.org/jdk/compare/9ef6c0925ae5a0ca774b23f6318551417a53e6c6...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 14, 2022
@coffeys
Copy link
Contributor Author

coffeys commented Sep 19, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Sep 19, 2022

Going to push as commit 1f9ff41.
Since your change was applied there have been 81 commits pushed to the master branch:

  • 64b96e5: 8293811: Provide a reason for PassFailJFrame.forceFail
  • f91762f: 8293965: Code signing warnings after JDK-8293550
  • 8082c24: 8054572: [macosx] JComboBox paints the border incorrectly
  • b920d29: 8271328: User is able to choose the color after disabling the color chooser.
  • 5725a93: 8293879: Remove unnecessary castings in jdk.hotspot.agent
  • ab7f58a: 6286501: JTabbedPane throws NPE from its stateChanged listener in particular case
  • d41f69f: 8293849: PrintIdealPhase in compiler directives file is ignored when used with other compile commands
  • 471e2f1: 8292088: C2: assert(is_OuterStripMinedLoop()) failed: invalid node class: IfTrue
  • a93cf92: 8293920: G1: Add index based heap region iteration
  • 36c9034: 8293808: mscapi destroyKeyContainer enhance KeyStoreException: Access is denied exception
  • ... and 71 more: https://git.openjdk.org/jdk/compare/9ef6c0925ae5a0ca774b23f6318551417a53e6c6...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 19, 2022
@openjdk openjdk bot closed this Sep 19, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 19, 2022
@openjdk
Copy link

openjdk bot commented Sep 19, 2022

@coffeys Pushed as commit 1f9ff41.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated security security-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

2 participants