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

8279064: New options for ktab to provide non-default salt #6991

Closed
wants to merge 2 commits into from

Conversation

wangweij
Copy link
Contributor

@wangweij wangweij commented Jan 7, 2022

Please review this enhancement and its CSR. Two new options -s salt and -f can be specified on the ktab command when adding entries.

I'm a little concerned about the compatibility risk described in the CSR, i.e. the -f option is already used in ktab -d to force removing entries. Hopefully not many people are writing their own wrappers on ktab that always include the -f option. I do want to be consistent with the naming in the MIT krb5 ktutil command.

Another thing worth mentioning is the KerberosKey:<new>(KerberosPrincipal principal, char[] password, String algorithm) constructor which always uses the default salt. For consistency, it looks like a new constructor should be added that takes the salt string as a parameter as well. However, I don't intend to add it as I cannot see a proper usage for it. In fact, I now regret adding the constructor linked above.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed
  • Change requires a CSR request to be approved

Issues

  • JDK-8279064: New options for ktab to provide non-default salt
  • JDK-8279632: New options for ktab to provide non-default salt (CSR)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6991

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

Using diff file

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

8279064: New options for ktab to provide non-default salt
@wangweij
Copy link
Contributor Author

@wangweij wangweij commented Jan 7, 2022

/csr

@openjdk openjdk bot added the csr label Jan 7, 2022
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jan 7, 2022

👋 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.

@openjdk openjdk bot added the rfr label Jan 7, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Jan 7, 2022

@wangweij an approved CSR request is already required for this pull request.

@openjdk
Copy link

@openjdk openjdk bot commented Jan 7, 2022

@wangweij 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 label Jan 7, 2022
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 7, 2022

Webrevs

@valeriepeng
Copy link

@valeriepeng valeriepeng commented Jan 10, 2022

I will take a look. Thanks~

@valeriepeng
Copy link

@valeriepeng valeriepeng commented Jan 13, 2022

I added myself to the CSR as reviewer. Made minor edits, re-ordered the command line option ordering based on the ordering mentioned in the description.

Copy link

@valeriepeng valeriepeng left a comment

Looks good. Thanks~

@wangweij
Copy link
Contributor Author

@wangweij wangweij commented Jan 14, 2022

/integrate auto

@openjdk openjdk bot added the auto label Jan 14, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Jan 14, 2022

@wangweij This pull request will be automatically integrated when it is ready

@openjdk openjdk bot removed the csr label Jan 14, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Jan 14, 2022

@wangweij 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:

8279064: New options for ktab to provide non-default salt

Reviewed-by: valeriep

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 131 new commits pushed to the master branch:

  • c359c35: 8280002: jmap -histo may leak stream
  • fb8fdc0: 8279990: (fs) Awkward verbiage in description of Files.createTempFile(Path,String,String,FileAttribute)
  • d9dd485: 8280019: Remove unused code from metaspace
  • cf283e2: 8279570: IGV: Add source/destination property for load and store nodes with an associated field
  • f180530: 8279918: Fix various doc typos
  • ac98b22: 8280028: [BACKOUT] Parallel: More precise boundary in ObjectStartArray::object_starts_in_range
  • 61b8944: 8278851: Correct signer logic for jars signed with multiple digestalgs
  • 35734ad: 8279545: Buffer overrun in reverse_words of sharedRuntime_x86_64.cpp:3517
  • e8f494c: 8279825: JFR: JFCModel shouldn't need FilePermission to read predefined .jfc files
  • 9f30ec1: 8278398: jwebserver: Add test to confirm maximum request time
  • ... and 121 more: https://git.openjdk.java.net/jdk/compare/8dc4437d002db5d025b47f48e7420e3bae55bdec...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 label Jan 14, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Jan 14, 2022

/integrate

2 similar comments
@openjdk
Copy link

@openjdk openjdk bot commented Jan 14, 2022

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jan 14, 2022

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jan 14, 2022

Going to push as commit 0d1a97f.
Since your change was applied there have been 131 commits pushed to the master branch:

  • c359c35: 8280002: jmap -histo may leak stream
  • fb8fdc0: 8279990: (fs) Awkward verbiage in description of Files.createTempFile(Path,String,String,FileAttribute)
  • d9dd485: 8280019: Remove unused code from metaspace
  • cf283e2: 8279570: IGV: Add source/destination property for load and store nodes with an associated field
  • f180530: 8279918: Fix various doc typos
  • ac98b22: 8280028: [BACKOUT] Parallel: More precise boundary in ObjectStartArray::object_starts_in_range
  • 61b8944: 8278851: Correct signer logic for jars signed with multiple digestalgs
  • 35734ad: 8279545: Buffer overrun in reverse_words of sharedRuntime_x86_64.cpp:3517
  • e8f494c: 8279825: JFR: JFCModel shouldn't need FilePermission to read predefined .jfc files
  • 9f30ec1: 8278398: jwebserver: Add test to confirm maximum request time
  • ... and 121 more: https://git.openjdk.java.net/jdk/compare/8dc4437d002db5d025b47f48e7420e3bae55bdec...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Jan 14, 2022
@openjdk openjdk bot closed this Jan 14, 2022
@openjdk openjdk bot removed ready rfr labels Jan 14, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Jan 14, 2022

@openjdk[bot] Pushed as commit 0d1a97f.

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

@openjdk
Copy link

@openjdk openjdk bot commented Jan 14, 2022

@openjdk[bot] The command integrate can only be used in open pull requests.

@openjdk
Copy link

@openjdk openjdk bot commented Jan 14, 2022

@openjdk[bot] The command integrate can only be used in open pull requests.

@wangweij wangweij deleted the 8279064 branch Jan 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto integrated security
2 participants