8288209: SSL debug message wrong about unsupported authentication scheme #9140

wangweij · 2022-06-13T14:53:51Z

At the beginning, this bug was about the incorrect warning message "Unsupported authentication scheme" on line 1051 which should have been "This key algorithm has been checked, skip it".

Now, it's a code refactoring that emphasizes only the key algorithm inside a signature scheme is checked in these two methods, and therefore the ignore-if-checked logic in the old code is correct.

Note: logWarning is put inside SSLLogger so we can get the correct caller line number. Also, please advise if the || SSLLogger.logWarning style looks weird and if there is a better way to filter and log at the same time.

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-8288209: SSL debug message wrong about unsupported authentication scheme

Reviewers

Daniel Jeliński (@djelinski - Committer) ⚠️ Review applies to 4b338462
Jamil Nimeh (@jnimeh - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9140

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

Using diff file

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

bridgekeeper · 2022-06-13T14:55:12Z

👋 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 · 2022-06-13T14:57:28Z

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

mlbridge · 2022-06-13T15:01:32Z

Webrevs

01: Full - Incremental (fac8bd60)
00: Full (4b338462)

mcpowers · 2022-06-13T15:29:01Z

src/java.base/share/classes/sun/security/ssl/SSLLogger.java

@@ -207,6 +207,15 @@ static String toString(Object... params) {
        }
    }

+    // Logs an warning message and always returns false. This method


"Logs a warning"

Thanks. Fixed.

djelinski

LGTM

djelinski · 2022-06-13T16:28:53Z

src/java.base/share/classes/sun/security/ssl/CertificateMessage.java

+                            hc.algorithmConstraints,                        //  we will be able to produce
+                            hc.peerRequestedSignatureSchemes,               //  a CertificateVerify message later
+                            ka, hc.negotiatedProtocol) != null
+                            || SSLLogger.logWarning("ssl,handshake",


Nice syntax!

djelinski · 2022-06-13T16:30:36Z

src/java.base/share/classes/sun/security/ssl/CertificateMessage.java

-                }
-                supportedKeyTypes.add(ss.keyAlgorithm);
-            }
+            String[] supportedKeyTypes = hc.peerRequestedCertSignSchemes


Preexisting, but shouldn't we use peerRequestedSignatureSchemes here? If I read RFC 8446 correctly, peerRequestedCertSignSchemes only applies to how the certificates were signed; it does not limit the end-entity key type in any way.

It does appear that there is an issue here. Weijun and I have done a little playtesting with this and there are some cases where it isn't behaving as expected. I don't know if this can be solved as simply as using peerRequestedSignatureSchemes though. It might be that simple, but I think the selection code is complex enough and there are enough edge cases to test that this PR might not be the place to address this. We probably need a separate bug to deal with this one.

jnimeh

LGTM

openjdk · 2022-06-16T15:22:35Z

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

8288209: SSL debug message wrong about unsupported authentication scheme

Reviewed-by: djelinski, jnimeh

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

8fc8fdc: 8287905: Reduce runtime of java.nio microbenchmarks
cf4a496: 8288064: Class initialization locking
3d12c02: Merge
729164f: 8288533: Missing @param tags in com.sun.source classes
9254e12: 8288526: ProblemList gc/stress/TestStressG1Humongous.java on windows-x64
395aea3: 8288414: Long::compress/expand samples are not correct
f3b1f60: 8288289: Preview APIs in jdk.jdi, jdk.management, and jdk.jfr should be reflective preview APIs
31bc689: 8288324: Loom: Uninitialized JvmtiEnvs in VM_Virtual* ops
50f99c3: 8288360: CI: ciInstanceKlass::implementor() is not consistent for well-known classes
5a8e1e4: 8287889: (fs) Files.copy description of REPLACE_EXISTING is hard to read
... and 51 more: https://git.openjdk.org/jdk/compare/f1143b1b57683665c81d24ff192a9babc30f28ea...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.

wangweij · 2022-06-21T14:31:44Z

/integrate

openjdk · 2022-06-21T14:33:15Z

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

0f801fe: 8288628: Unnecessary Hashtable usage in ConditionalSpecialCasing
701ea3b: 8288556: VM crashes if it gets sent SIGUSR2 from outside
5e680d0: 8288724: Prevent NullPointerException in serviceability/tmtools/jstack/DaemonThreadTest.java if jstack process fails
ad89146: 8288601: Consolidate static/dynamic archive tables
7e211d7: 8287672: jtreg test com/sun/jndi/ldap/LdapPoolTimeoutTest.java fails intermittently in nightly run
7039c66: Merge
453e8be: 8288527: broken link in java.base/java/util/zip/package-summary.html
33d0363: 8288741: JFR: Change package name of snippet files
0408f9c: 8288663: JFR: Disabling the JfrThreadSampler commits only a partially disabled state
1cf83a4: 8287800: JFR: Incorrect error message when starting recording with missing .jfc file
... and 92 more: https://git.openjdk.org/jdk/compare/f1143b1b57683665c81d24ff192a9babc30f28ea...master

Your commit was automatically rebased without conflicts.

openjdk · 2022-06-21T14:33:30Z

@wangweij Pushed as commit 1901735.

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

the fix

4b33846

openjdk bot added the rfr Pull request is ready for review label Jun 13, 2022

openjdk bot added the security security-dev@openjdk.org label Jun 13, 2022

mcpowers reviewed Jun 13, 2022

View reviewed changes

typo

fac8bd6

djelinski approved these changes Jun 13, 2022

View reviewed changes

jnimeh approved these changes Jun 16, 2022

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jun 16, 2022

openjdk bot added the integrated Pull request has been integrated label Jun 21, 2022

openjdk bot closed this Jun 21, 2022

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 21, 2022

wangweij deleted the 8288209 branch June 21, 2022 22:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8288209: SSL debug message wrong about unsupported authentication scheme #9140

8288209: SSL debug message wrong about unsupported authentication scheme #9140

wangweij commented Jun 13, 2022 •

edited by openjdk bot

Loading

bridgekeeper bot commented Jun 13, 2022

openjdk bot commented Jun 13, 2022

mlbridge bot commented Jun 13, 2022 •

edited

Loading

mcpowers Jun 13, 2022

wangweij Jun 13, 2022

djelinski left a comment

djelinski Jun 13, 2022

djelinski Jun 13, 2022

jnimeh Jun 14, 2022 •

edited

Loading

jnimeh left a comment

openjdk bot commented Jun 16, 2022 •

edited

Loading

wangweij commented Jun 21, 2022

openjdk bot commented Jun 21, 2022

openjdk bot commented Jun 21, 2022

8288209: SSL debug message wrong about unsupported authentication scheme #9140

8288209: SSL debug message wrong about unsupported authentication scheme #9140

Conversation

wangweij commented Jun 13, 2022 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Jun 13, 2022

openjdk bot commented Jun 13, 2022

mlbridge bot commented Jun 13, 2022 • edited Loading

Webrevs

mcpowers Jun 13, 2022

Choose a reason for hiding this comment

wangweij Jun 13, 2022

Choose a reason for hiding this comment

djelinski left a comment

Choose a reason for hiding this comment

djelinski Jun 13, 2022

Choose a reason for hiding this comment

djelinski Jun 13, 2022

Choose a reason for hiding this comment

jnimeh Jun 14, 2022 • edited Loading

Choose a reason for hiding this comment

jnimeh left a comment

Choose a reason for hiding this comment

openjdk bot commented Jun 16, 2022 • edited Loading

wangweij commented Jun 21, 2022

openjdk bot commented Jun 21, 2022

openjdk bot commented Jun 21, 2022

wangweij commented Jun 13, 2022 •

edited by openjdk bot

Loading

mlbridge bot commented Jun 13, 2022 •

edited

Loading

jnimeh Jun 14, 2022 •

edited

Loading

openjdk bot commented Jun 16, 2022 •

edited

Loading