-
Notifications
You must be signed in to change notification settings - Fork 10.3k
feat: support tls client hello bytes callback in Kestrel #61631
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
Merged
Merged
Changes from 6 commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
ecbc54d
support tls client hello bytes callback in Kestrel
DeagleGross c2a1d9e
prettify
DeagleGross 5a91164
address comments
DeagleGross 8201939
fix duplicate next middleware
DeagleGross 8e5ed75
nit
DeagleGross 48e07f8
nit nit
DeagleGross 1fcffb8
comments 1
DeagleGross 0581163
exit even if not enough data
DeagleGross 2bbd480
dont re-read the same data
DeagleGross 6f9a6de
increase delays
DeagleGross 4f6bc2b
await the middleware
DeagleGross ab06730
another test fix
DeagleGross 898c415
move tls client hello check
DeagleGross 4f87edd
move tests
DeagleGross 7856693
dont register callback from `TlsClientHelloBytesCallback` to not have…
DeagleGross d64fb45
tests
DeagleGross 7578f2b
address comments
DeagleGross aae7b2f
added comment
DeagleGross 90ef2c3
more test changes
DeagleGross e64cc04
nit
DeagleGross File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
124 changes: 124 additions & 0 deletions
124
src/Servers/Kestrel/Core/src/Middleware/TlsListenerMiddleware.cs
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,124 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
|
||
using System.Buffers; | ||
using System.Diagnostics; | ||
using Microsoft.AspNetCore.Connections; | ||
|
||
namespace Microsoft.AspNetCore.Server.Kestrel.Core.Middleware; | ||
|
||
internal sealed class TlsListenerMiddleware | ||
{ | ||
private readonly ConnectionDelegate _next; | ||
private readonly Action<ConnectionContext, ReadOnlySequence<byte>> _tlsClientHelloBytesCallback; | ||
|
||
public TlsListenerMiddleware(ConnectionDelegate next, Action<ConnectionContext, ReadOnlySequence<byte>> tlsClientHelloBytesCallback) | ||
{ | ||
_next = next; | ||
_tlsClientHelloBytesCallback = tlsClientHelloBytesCallback; | ||
} | ||
|
||
/// <summary> | ||
/// Sniffs the TLS Client Hello message, and invokes a callback if found. | ||
/// </summary> | ||
internal async Task OnTlsClientHelloAsync(ConnectionContext connection) | ||
{ | ||
var input = connection.Transport.Input; | ||
|
||
while (true) | ||
DeagleGross marked this conversation as resolved.
Show resolved
Hide resolved
|
||
{ | ||
var result = await input.ReadAsync(); | ||
var buffer = result.Buffer; | ||
|
||
// If the buffer length is less than 6 bytes (handshake + version + length + client-hello byte) | ||
// and no more data is coming, we can't block in a loop here because we will not get more data | ||
if (buffer.Length < 6 && result.IsCompleted) | ||
{ | ||
DeagleGross marked this conversation as resolved.
Show resolved
Hide resolved
|
||
break; | ||
} | ||
|
||
var parseState = TryParseClientHello(buffer, out var clientHelloBytes); | ||
|
||
// no data is consumed, it will be processed by the follow-up middlewares | ||
input.AdvanceTo(buffer.Start); | ||
DeagleGross marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
if (parseState == ClientHelloParseState.NotEnoughData) | ||
{ | ||
continue; | ||
} | ||
|
||
if (parseState == ClientHelloParseState.ValidTlsClientHello) | ||
{ | ||
_tlsClientHelloBytesCallback(connection, clientHelloBytes); | ||
} | ||
|
||
Debug.Assert(parseState is ClientHelloParseState.ValidTlsClientHello or ClientHelloParseState.NotTlsClientHello); | ||
break; // We can continue with the middleware pipeline | ||
} | ||
|
||
await _next(connection); | ||
} | ||
|
||
private static ClientHelloParseState TryParseClientHello(ReadOnlySequence<byte> buffer, out ReadOnlySequence<byte> clientHelloBytes) | ||
DeagleGross marked this conversation as resolved.
Show resolved
Hide resolved
|
||
{ | ||
clientHelloBytes = default; | ||
|
||
if (buffer.Length < 6) | ||
{ | ||
return ClientHelloParseState.NotEnoughData; | ||
} | ||
|
||
var reader = new SequenceReader<byte>(buffer); | ||
|
||
// Content type must be 0x16 for TLS Handshake | ||
if (!reader.TryRead(out byte contentType) || contentType != 0x16) | ||
{ | ||
return ClientHelloParseState.NotTlsClientHello; | ||
} | ||
|
||
// Protocol version | ||
if (!reader.TryReadBigEndian(out short version) || !IsValidProtocolVersion(version)) | ||
{ | ||
return ClientHelloParseState.NotTlsClientHello; | ||
} | ||
|
||
// Record length | ||
if (!reader.TryReadBigEndian(out short recordLength)) | ||
{ | ||
return ClientHelloParseState.NotTlsClientHello; | ||
} | ||
|
||
// 5 bytes are | ||
// 1) Handshake (1 byte) | ||
// 2) Protocol version (2 bytes) | ||
// 3) Record length (2 bytes) | ||
if (buffer.Length < 5 + recordLength) | ||
{ | ||
return ClientHelloParseState.NotEnoughData; | ||
} | ||
|
||
// byte 6: handshake message type (must be 0x01 for ClientHello) | ||
if (!reader.TryRead(out byte handshakeType) || handshakeType != 0x01) | ||
DeagleGross marked this conversation as resolved.
Show resolved
Hide resolved
|
||
{ | ||
return ClientHelloParseState.NotTlsClientHello; | ||
} | ||
|
||
clientHelloBytes = buffer.Slice(0, 5 + recordLength); | ||
return ClientHelloParseState.ValidTlsClientHello; | ||
} | ||
|
||
private static bool IsValidProtocolVersion(short version) | ||
=> version is 0x0002 // SSL 2.0 (0x0002) | ||
or 0x0300 // SSL 3.0 (0x0300) | ||
or 0x0301 // TLS 1.0 (0x0301) | ||
or 0x0302 // TLS 1.1 (0x0302) | ||
or 0x0303 // TLS 1.2 (0x0303) | ||
or 0x0304; // TLS 1.3 (0x0304) | ||
|
||
private enum ClientHelloParseState : byte | ||
{ | ||
NotEnoughData, | ||
NotTlsClientHello, | ||
ValidTlsClientHello | ||
} | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,3 @@ | ||
#nullable enable | ||
Microsoft.AspNetCore.Server.Kestrel.Https.HttpsConnectionAdapterOptions.TlsClientHelloBytesCallback.get -> System.Action<Microsoft.AspNetCore.Connections.ConnectionContext!, System.Buffers.ReadOnlySequence<byte>>? | ||
Microsoft.AspNetCore.Server.Kestrel.Https.HttpsConnectionAdapterOptions.TlsClientHelloBytesCallback.set -> void |
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.