8211227: Inconsistent TLS protocol version in debug output #2331

evwhelan · 2021-02-01T10:37:35Z

Hi everyone,

Please review my fix for JDK-8211227

This supportability fix will result in a more consistent debug format when reading and writing TLS protocol versions.

Thanks,
Evan

Progress

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

Issue

JDK-8211227: Inconsistent TLS protocol version in debug output

Reviewers

Xue-Lei Andrew Fan (@XueleiFan - Reviewer) ⚠️ Review applies to e8c262f
Rajan Halade (@rhalade - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2331/head:pull/2331
$ git checkout pull/2331

bridgekeeper · 2021-02-01T10:38:28Z

👋 Welcome back ewhelan! 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 · 2021-02-01T10:39:32Z

@evwhelan 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 · 2021-02-01T10:42:57Z

Webrevs

openjdk · 2021-02-01T17:18:34Z

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

8211227: Inconsistent TLS protocol version in debug output

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

7b924d8: 8261973: Shenandoah: Cleanup/simplify root verifier
63f8fc8: 8259662: Don't wrap SocketExceptions into SSLExceptions in SSLSocketImpl
cf0019d: 8259942: Enable customizations in CompileJavaModules.gmk and Main.gmk
a6a7e43: 8242032: G1 region remembered sets may contain non-coarse level PRTs for already coarsened regions
d7eebda: 8261391: ZGC crash - SEGV in RevokeOneBias::do_thread
5b7b18c: 8259800: timeout in tck test testForkJoin(ForkJoinPool8Test)
419717d: 8261803: Remove unused TaskTerminator in g1 full gc ref proc executor
011f5a5: 8261799: Remove unnecessary cast in psParallelCompact.hpp
e9d7c07: 8248318: Remove superfluous use of boxing in ObjectStreamClass
6b7575b: 8228748: Remove GCLocker::_doing_gc
... and 286 more: https://git.openjdk.java.net/jdk/compare/aec037721cf8990c3f7c4364730812447e0811e1...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.

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

rhalade · 2021-02-01T19:34:31Z

test/jdk/sun/security/ssl/SSLLogger/LoggingFormatConsistency.java

+
+/*
+ * This test runs in another process so we can monitor the debug
+ * results.  The OutputAnalyzer must see correct debug output to return a


Suggested change

* results. The OutputAnalyzer must see correct debug output to return a

* results. The OutputAnalyzer must see correct debug output to return a

Blank space removed

rhalade · 2021-02-01T19:40:07Z

test/jdk/sun/security/ssl/SSLLogger/LoggingFormatConsistency.java

+    private void simpleSSLConnectionTest() throws Exception {
+        // Re-enabling as test depends on these algorithms
+        SecurityUtils.removeFromDisabledTlsAlgs("TLSv1", "TLSv1.1");
+        var url = new URL("https://jpg-data.us.oracle.com/");


This URL is not accessible outside.

Thanks Rajan,

I'm going to change my approach for this test, I will set up a dummy server on localhost and create my URL based off that, rather than URLs pointing to an existing site

rhalade · 2021-02-01T19:41:09Z

test/jdk/sun/security/ssl/SSLLogger/LoggingFormatConsistency.java

+
+public class LoggingFormatConsistency {
+    public static void main(String[] args) throws Exception {
+        if (args.length == 0){


Please add a comment to explain when the test should be run with parameter.

Done! Thanks

…ther than an existing URL

rhalade · 2021-02-18T22:24:28Z

test/jdk/sun/security/ssl/SSLLogger/LoggingFormatConsistency.java

+     *
+     * Fork off the other side, then do your work.
+     */
+    LoggingFormatConsistency() throws Exception {


Have you looked at the templates available at test/jdk/javax/net/ssl/templates? Check SSLSocketTemplate.java which is using CountDownLatch.

I have not! I'll take a look, thanks

rhalade

Thanks for developing test for this change and updating it to use template.

evwhelan · 2021-02-22T21:04:16Z

Thanks Rajan, I appreciate the guidance.

evwhelan · 2021-02-22T21:04:23Z

/integrate

openjdk · 2021-02-22T21:05:08Z

@evwhelan
Your change (at version bc9d87d) is now ready to be sponsored by a Committer.

rhalade · 2021-02-22T21:11:24Z

/sponsor

openjdk · 2021-02-22T21:12:20Z

@rhalade @evwhelan Since your change was applied there have been 296 commits pushed to the master branch:

7b924d8: 8261973: Shenandoah: Cleanup/simplify root verifier
63f8fc8: 8259662: Don't wrap SocketExceptions into SSLExceptions in SSLSocketImpl
cf0019d: 8259942: Enable customizations in CompileJavaModules.gmk and Main.gmk
a6a7e43: 8242032: G1 region remembered sets may contain non-coarse level PRTs for already coarsened regions
d7eebda: 8261391: ZGC crash - SEGV in RevokeOneBias::do_thread
5b7b18c: 8259800: timeout in tck test testForkJoin(ForkJoinPool8Test)
419717d: 8261803: Remove unused TaskTerminator in g1 full gc ref proc executor
011f5a5: 8261799: Remove unnecessary cast in psParallelCompact.hpp
e9d7c07: 8248318: Remove superfluous use of boxing in ObjectStreamClass
6b7575b: 8228748: Remove GCLocker::_doing_gc
... and 286 more: https://git.openjdk.java.net/jdk/compare/aec037721cf8990c3f7c4364730812447e0811e1...master

Your commit was automatically rebased without conflicts.

Pushed as commit a867288.

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

8211227: Inconsistent TLS protocol version in debug output

e8c262f

openjdk bot added the rfr Pull request is ready for review label Feb 1, 2021

openjdk bot added the security security-dev@openjdk.org label Feb 1, 2021

XueleiFan approved these changes Feb 1, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Feb 1, 2021

rhalade suggested changes Feb 1, 2021

View reviewed changes

8211227: Re-wrote LoggingFormatConsistency to use local SSL server ra…

ff7e2eb

…ther than an existing URL

rhalade suggested changes Feb 18, 2021

View reviewed changes

8211227: Re-wrote LoggingFormatConsistency to leverage SSLSocketTemplate

bc9d87d

rhalade approved these changes Feb 22, 2021

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label Feb 22, 2021

openjdk bot closed this Feb 22, 2021

openjdk bot added integrated Pull request has been integrated and removed sponsor Pull request is ready to be sponsored ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 22, 2021

8211227: Inconsistent TLS protocol version in debug output #2331

8211227: Inconsistent TLS protocol version in debug output #2331

evwhelan commented Feb 1, 2021 •

edited by openjdk bot

bridgekeeper bot commented Feb 1, 2021

openjdk bot commented Feb 1, 2021

mlbridge bot commented Feb 1, 2021 •

edited

openjdk bot commented Feb 1, 2021 •

edited

rhalade Feb 1, 2021

evwhelan Feb 18, 2021

rhalade Feb 1, 2021

evwhelan Feb 18, 2021

rhalade Feb 1, 2021

evwhelan Feb 18, 2021

rhalade Feb 18, 2021

evwhelan Feb 19, 2021

rhalade left a comment

evwhelan commented Feb 22, 2021

evwhelan commented Feb 22, 2021

openjdk bot commented Feb 22, 2021

rhalade commented Feb 22, 2021

openjdk bot commented Feb 22, 2021

	* results. The OutputAnalyzer must see correct debug output to return a
	* results. The OutputAnalyzer must see correct debug output to return a

8211227: Inconsistent TLS protocol version in debug output #2331

8211227: Inconsistent TLS protocol version in debug output #2331

Conversation

evwhelan commented Feb 1, 2021 • edited by openjdk bot

Progress

Issue

Reviewers

Download

bridgekeeper bot commented Feb 1, 2021

openjdk bot commented Feb 1, 2021

mlbridge bot commented Feb 1, 2021 • edited

Webrevs

openjdk bot commented Feb 1, 2021 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rhalade left a comment

Choose a reason for hiding this comment

evwhelan commented Feb 22, 2021

evwhelan commented Feb 22, 2021

openjdk bot commented Feb 22, 2021

rhalade commented Feb 22, 2021

openjdk bot commented Feb 22, 2021

evwhelan commented Feb 1, 2021 •

edited by openjdk bot

mlbridge bot commented Feb 1, 2021 •

edited

openjdk bot commented Feb 1, 2021 •

edited