8293176: SSLEngine handshaker does not send an alert after a bad parameters #15148

djelinski · 2023-08-04T08:17:39Z

Please review this patch that ensures that all exceptions thrown by SSLEngine delegated tasks are translated to alerts.

All exceptions should already be translated to SSLExceptions and alerts by the time we exit from context.dispatch; these exceptions are rethrown by conContext.fatal without modification. With this patch the remaining exceptions are translated to internal_error alerts.

SSLSocket implements similar handling in SSLSocketImpl#startHandshake. SSLSocket rethrows SocketExceptions without modification, and translates other IOExceptions to handshake_failure alerts. SSLEngine does not need to handle SocketExceptions, and IMO internal_error is a better choice here.

Tier1-3 tests pass.

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-8293176: SSLEngine handshaker does not send an alert after a bad parameters (Bug - P4)

Reviewers

Matthew Donovan (@mpdonova - Committer)
Jamil Nimeh (@jnimeh - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15148

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-08-04T08:18:24Z

👋 Welcome back djelinski! 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 · 2023-08-04T08:19:57Z

@djelinski 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 · 2023-08-04T08:39:45Z

Webrevs

01: Full - Incremental (33fee1fc)
00: Full (4e2d43de)

mpdonova · 2023-08-11T16:16:01Z

test/jdk/sun/security/ssl/SSLEngineImpl/SSLEngineDecodeBadPoint.java

+        try {
+            eng.wrap(emptyBuf, alert);
+            throw new RuntimeException("Expected wrap to throw");
+        } catch (Exception e) {


Catching Exception here will consume the RuntimeException being thrown.

oops, right. Fixed.

mpdonova · 2023-08-11T16:16:40Z

test/jdk/sun/security/ssl/SSLEngineImpl/SSLEngineDecodeBadPoint.java

+            eng.wrap(emptyBuf, alert);
+            throw new RuntimeException("Expected wrap to throw");
+        } catch (Exception e) {
+            System.err.println("Received expected exception:");


I find it useful when looking at logs to have the message explicitly say what exception is expected.

mpdonova · 2023-08-11T16:17:23Z

test/jdk/sun/security/ssl/SSLEngineImpl/SSLEngineDecodeBadPoint.java

+ */
+public class SSLEngineDecodeBadPoint {
+    static final byte[] clientHello = HexFormat.of().parseHex(
+            "160303013a0100013603031570" +


This may be the github display but this line is indented differently than the others.

Thanks for pointing it out, fixed. Apparently my IntelliJ prefers this style of formatting multiline strings. I wonder if that's configurable.

I believe so, but I still have to do some of the formatting by hand.

mpdonova

LGTM

djelinski · 2023-09-07T06:49:45Z

Can I get another review on this?

jnimeh

LGTM

openjdk · 2023-09-26T16:16:37Z

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

8293176: SSLEngine handshaker does not send an alert after a bad parameters

Reviewed-by: mdonovan, 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 703 new commits pushed to the master branch:

36ac839: 8073061: (fs) Files.copy(foo, bar, REPLACE_EXISTING) deletes bar even if foo is not readable
efb7e85: 8316935: [s390x] Use consistent naming for lightweight locking in MacroAssembler
4e1e579: 8315920: C2: "control input must dominate current control" assert failure
1f7dfda: 8316671: sun/security/ssl/SSLSocketImpl/SSLSocketCloseHang.java test fails intermittent with Read timed out
20ff603: 8316735: Print LockStack in hs_err files
e510dee: 8316098: Revise signature of numa_get_leaf_groups
1513e79: 8316940: Serial: Remove unused declarations in genCollectedHeap
52983ed: 8303737: C2: Load can bypass subtype check that enforces it's from the right object type
9e6cb62: 8316851: Add @sealedGraph to Executable
3fe6e0f: 8308479: [s390x] Implement alternative fast-locking scheme
... and 693 more: https://git.openjdk.org/jdk/compare/0a3c6d6bd010231d02e92016037149e85fb1db3f...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.

djelinski · 2023-09-27T07:32:29Z

Thanks for the reviews!

/integrate

openjdk · 2023-09-27T07:33:55Z

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

fd52be2: 8316895: SeenThread::print_action_queue called on a null pointer
e39197e: 8316933: RISC-V: compiler/vectorapi/VectorCastShape128Test.java fails when using RVV
b659e03: 8316897: tools/jpackage/junit tests fail on AIX after JDK-8316547
83806ab: 6450193: After the first Serialization, JTableHeader does not uninstall its UI
2f311d5: 8316211: Open source several manual applet tests
65227a3: 8316389: Open source few AWT applet tests
788e6e1: 8316218: Open some swing tests 5
ee9776f: 8304839: Move TestScaffold.main() to the separate class DebugeeWrapper
36ac839: 8073061: (fs) Files.copy(foo, bar, REPLACE_EXISTING) deletes bar even if foo is not readable
efb7e85: 8316935: [s390x] Use consistent naming for lightweight locking in MacroAssembler
... and 701 more: https://git.openjdk.org/jdk/compare/0a3c6d6bd010231d02e92016037149e85fb1db3f...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-09-27T07:34:02Z

@djelinski Pushed as commit fee9d33.

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

bradfordwetmore

This comment comes too late to catch this integration, but a thought as I was looking over the code.

bradfordwetmore · 2023-09-28T00:50:54Z

test/jdk/sun/security/ssl/SSLEngineImpl/SSLEngineDecodeBadPoint.java

+ */
+public class SSLEngineDecodeBadPoint {
+    static final byte[] clientHello = HexFormat.of().parseHex(
+            "160303013a0100013603031570" +


I believe so, but I still have to do some of the formatting by hand.

bradfordwetmore · 2023-09-28T00:54:32Z

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

+                        } catch (Exception e) {
+                            throw context.conContext.fatal(Alert.INTERNAL_ERROR,
+                                    "Unhandled exception", e);
+                        }


Is there any chance this will double alert?

Not really. Only the first call to fatal sends an alert, subsequent calls just rethrow the given exception, wrapping it in a SSLException if necessary.

Thanks for confirming.

Add test, send alert

4e2d43d

openjdk bot changed the title ~~8293176~~ 8293176: SSLEngine handshaker does not send an alert after a bad parameters Aug 4, 2023

openjdk bot added the security security-dev@openjdk.org label Aug 4, 2023

djelinski marked this pull request as ready for review August 4, 2023 08:33

openjdk bot added the rfr Pull request is ready for review label Aug 4, 2023

mpdonova reviewed Aug 11, 2023

View reviewed changes

djelinski added 2 commits August 11, 2023 22:18

Fix indentation

d1d9020

Fix exception handling

33fee1f

mpdonova approved these changes Aug 15, 2023

View reviewed changes

jnimeh approved these changes Sep 26, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Sep 26, 2023

openjdk bot added the integrated Pull request has been integrated label Sep 27, 2023

openjdk bot closed this Sep 27, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 27, 2023

djelinski deleted the sslengine-bad-clienthello branch September 27, 2023 08:09

bradfordwetmore reviewed Sep 28, 2023

View reviewed changes

8293176: SSLEngine handshaker does not send an alert after a bad parameters #15148

8293176: SSLEngine handshaker does not send an alert after a bad parameters #15148

Uh oh!

Conversation

djelinski commented Aug 4, 2023 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Aug 4, 2023

Uh oh!

openjdk bot commented Aug 4, 2023

Uh oh!

mlbridge bot commented Aug 4, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mpdonova left a comment

Choose a reason for hiding this comment

Uh oh!

djelinski commented Sep 7, 2023

Uh oh!

jnimeh left a comment

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Sep 26, 2023

Uh oh!

djelinski commented Sep 27, 2023

Uh oh!

openjdk bot commented Sep 27, 2023

Uh oh!

openjdk bot commented Sep 27, 2023

Uh oh!

bradfordwetmore left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

djelinski commented Aug 4, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Aug 4, 2023 •

edited

Loading