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

8269933: test/jdk/javax/net/ssl/compatibility/JdkInfo incorrect verification of protocol and cipher support #4710

Closed
wants to merge 1 commit into from

Conversation

fguallini
Copy link
Member

@fguallini fguallini commented Jul 7, 2021

test/jdk/javax/net/ssl/compatibility/JdkInfo is a helper class for the compatibility tests. It is verifying whether a protocol or cipher suite is supported/enabled by setting all the allowed values as a string, and then invoking String contains() to return whether a specific version is supported. This approach is problematic when, for instance, supportedProtocols is equal to 'TLSv1.3,TLSv1.2', then supportedProtocols.contains("TLSv1") will return true, given that 'TLSv1' is effectively a substring of 'TLSv1.3'.

Proposed fix: Set the supported/enabled protocols and ciphers as elements in lists, and use List contains() to find matches


Progress

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

Issue

  • JDK-8269933: test/jdk/javax/net/ssl/compatibility/JdkInfo incorrect verification of protocol and cipher support

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4710

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 7, 2021

👋 Welcome back fguallini! 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 Jul 7, 2021
@openjdk
Copy link

openjdk bot commented Jul 7, 2021

@fguallini 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 Jul 7, 2021
@mlbridge
Copy link

mlbridge bot commented Jul 7, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented Jul 7, 2021

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

8269933: test/jdk/javax/net/ssl/compatibility/JdkInfo incorrect verification of protocol and cipher support

Reviewed-by: xuelei, rhalade

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

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@XueleiFan, @rhalade) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 7, 2021
@fguallini
Copy link
Member Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jul 8, 2021
@openjdk
Copy link

openjdk bot commented Jul 8, 2021

@fguallini
Your change (at version 42b7da1) is now ready to be sponsored by a Committer.

@rhalade
Copy link
Member

rhalade commented Jul 21, 2021

/sponsor

@openjdk
Copy link

openjdk bot commented Jul 21, 2021

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

  • 1eeb179: Merge
  • 61359c4: 8270993: Missing forward declaration of ZeroFrame
  • 8e8e87a: 8268223: Problemlist vmTestbase/nsk/jdi/HiddenClass/events/events001.java
  • 845c31d: 8269240: java/foreign/stackwalk/TestAsyncStackWalk.java test failed with concurrent GC
  • 0cec11d: 8270307: C2: assert(false) failed: bad AD file after JDK-8267687
  • 38694aa: 8270939: ProblemList java/lang/invoke/RicochetTest.java until JDK-8251969 is fixed
  • 754352f: 8270340: Base64 decodeBlock intrinsic for Power64 needs cleanup
  • 8cd0769: 8270875: Deprecate the FilterSpuriousWakeups flag so it can be removed
  • 534f005: 8268284: javax/swing/JComponent/7154030/bug7154030.java fails with "Exception: Failed to hide opaque button"
  • 00195b8: 8265604: Support unlinked classes in dynamic CDS archive
  • ... and 142 more: https://git.openjdk.java.net/jdk/compare/77a5b7b27e36457cf63be45b3e4f120abad57d4a...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jul 21, 2021
@openjdk 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 sponsor Pull request is ready to be sponsored labels Jul 21, 2021
@openjdk
Copy link

openjdk bot commented Jul 21, 2021

@rhalade @fguallini Pushed as commit 6346793.

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

3 participants