Use handshake timeout for Tls listener callback #62177
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DeagleGross
requested review from
halter73,
BrennanConroy,
JamesNK and
mgravell
as code owners
github-actions
bot
added
the
area-networking
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
BrennanConroy
approved these changes
Jun 3, 2025
| @@ -21,7 +21,7 @@ | |||
|
|
|||
| namespace InMemory.FunctionalTests; | |||
|
|
|||
| public class TlsListenerMiddlewareTests : TestApplicationErrorLoggerLoggedTest | |||
| public class TlsListenerTests : TestApplicationErrorLoggerLoggedTest | |||
There was a problem hiding this comment.
We can probably add a cancellation test here as well. Set the handshake timeout to something small like 1 millisecond and check that the request was canceled.
| @@ -50,6 +50,57 @@ public Task OnTlsClientHelloAsync_ValidData_MultipleSegments(int id, List<byte[] | |||
| public Task OnTlsClientHelloAsync_InvalidData_MultipleSegments(int id, List<byte[]> packets) | |||
| => RunTlsClientHelloCallbackTest_WithMultipleSegments(id, packets, tlsClientHelloCallbackExpected: false); | |||
|
|
|||
| [Fact] | |||
| public async Task RunTlsClientHelloCallbackTest_WithPreCancelledToken() | |||
There was a problem hiding this comment.
Suggested change
| public async Task RunTlsClientHelloCallbackTest_WithPreCancelledToken() | |
| public async Task RunTlsClientHelloCallbackTest_WithPreCanceledToken() |
| { | ||
| clientHelloBytes = default; | ||
|
|
||
| // in case bad actor will be sending a TLS client hello one byte at a time | ||
| // and we know the expected length of TLS client hello, | ||
| // we can check and fail fastly here instead of re-parsing the TLS client hello "header" on each iteration |
There was a problem hiding this comment.
Suggested change
| // we can check and fail fastly here instead of re-parsing the TLS client hello "header" on each iteration | |
| // we can check and fail quickly here instead of re-parsing the TLS client hello "header" on each iteration |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
HttpsConnectionMiddleware carefully considers a handshake timeout.
New TlsListenerMiddleware does not use it, and in case of a configured timeout request will not be cancelled.
Solution
I renamed
TlsListenerMiddlewaretoTlsListenerto be used as part ofHttpsConnectionMiddleware. It will use the same cancellation token as the latter. We can move the code directly intoHttpsConnectionMiddlewarebut IMOTlsListenerhas a bit different purpose and can be living in a separate instance.TlsListenernow does not invoke next middleware delegate.Also changed the parsing code to remember the TLS client hello record length, and if that is known re-parsing of TLS client hello "header" will not be happening on each iteration.
Closes #62172