Add limited support for LocalCertificateSelectionCallback for QUIC #70716
There are no files selected for viewing
This file contains 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 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 |
|---|---|---|
|
|
@@ -292,52 +292,6 @@ private async ValueTask WriteAsync<TBuffer>(Action<State, TBuffer> stateSetup, T | |
| { | ||
| ThrowIfDisposed(); | ||
|
|
||
|
There was a problem hiding this comment. I think you have this PR based on this #70716. You may wanna merge it, or rebase on main here. |
||
| if (cancellationToken.IsCancellationRequested) | ||
| { | ||
| lock (_state) | ||
|
|
@@ -369,7 +323,7 @@ private CancellationTokenRegistration SetupWriteStartState(bool emptyBuffer, Can | |
| } | ||
|
|
||
| // if token was already cancelled, this would execute synchronously | ||
| using CancellationTokenRegistration registration = cancellationToken.UnsafeRegister(static (s, token) => | ||
| { | ||
| var state = (State)s!; | ||
| bool shouldComplete = false; | ||
|
|
@@ -417,14 +371,11 @@ private CancellationTokenRegistration SetupWriteStartState(bool emptyBuffer, Can | |
|
|
||
| // Change the state in the same lock where we check for final states to prevent coming back from Aborted/ConnectionClosed. | ||
| Debug.Assert(_state.SendState != SendState.Pending); | ||
| _state.SendState = isEmpty ? SendState.Finished : SendState.Pending; | ||
| } | ||
|
|
||
| await WriteAsyncCore<TBuffer>(stateSetup, buffer, isEmpty, endStream).ConfigureAwait(false); | ||
|
|
||
| lock (_state) | ||
| { | ||
| if (_state.SendState == SendState.Finished) | ||
|
|
@@ -434,19 +385,57 @@ private void CleanupWriteCompletedState() | |
| } | ||
| } | ||
|
|
||
| private unsafe ValueTask WriteAsyncCore<TBuffer>(Action<State, TBuffer> stateSetup, TBuffer buffer, bool isEmpty, bool endStream) | ||
| { | ||
| if (isEmpty) | ||
| { | ||
| if (endStream) | ||
| { | ||
| // Start graceful shutdown sequence if passed in the fin flag and there is an empty buffer. | ||
| StartShutdown(QUIC_STREAM_SHUTDOWN_FLAGS.GRACEFUL, errorCode: 0); | ||
| } | ||
| return default; | ||
| } | ||
|
|
||
| stateSetup(_state, buffer); | ||
|
|
||
| Debug.Assert(!Monitor.IsEntered(_state), "!Monitor.IsEntered(_state)"); | ||
| int status = MsQuicApi.Api.ApiTable->StreamSend( | ||
| _state.Handle.QuicHandle, | ||
| _state.SendBuffers.Buffers, | ||
| (uint)_state.SendBuffers.Count, | ||
| endStream ? QUIC_SEND_FLAGS.FIN : QUIC_SEND_FLAGS.NONE, | ||
| (void*)IntPtr.Zero); | ||
|
|
||
| if (StatusFailed(status)) | ||
| { | ||
| lock (_state) | ||
| { | ||
| if (_state.SendState == SendState.Pending) | ||
| { | ||
| _state.SendState = SendState.Finished; | ||
| } | ||
| } | ||
|
|
||
| CleanupSendState(_state); | ||
|
|
||
| if (status == QUIC_STATUS_ABORTED) | ||
| { | ||
| throw ThrowHelper.GetConnectionAbortedException(_state.ConnectionState.AbortErrorCode); | ||
| } | ||
| ThrowIfFailure(status, "Could not send data to peer."); | ||
| } | ||
|
|
||
| return _state.SendResettableCompletionSource.GetTypelessValueTask(); | ||
| } | ||
|
|
||
| internal override async ValueTask<int> ReadAsync(Memory<byte> destination, CancellationToken cancellationToken = default) | ||
| { | ||
| // | ||
| // If MsQuic indicated that some data were received (QUIC_STREAM_EVENT_RECEIVE), we use it to complete the request | ||
| // synchronously. Otherwise we setup the request to be completed by the HandleEventReceive handler. | ||
| // | ||
|
|
||
| ThrowIfDisposed(); | ||
|
|
||
| if (_state.ReadState == ReadState.Closed) | ||
|
|
@@ -1009,6 +998,13 @@ private static unsafe int NativeCallback(QUIC_HANDLE* stream, void* context, QUI | |
|
|
||
| private static unsafe int HandleEventReceive(State state, ref QUIC_STREAM_EVENT streamEvent) | ||
| { | ||
| // | ||
| // Handle MsQuic QUIC_STREAM_EVENT_RECEIVE event | ||
| // | ||
| // If there is a pending ReadAsync call, then we complete it. Otherwise we keep a pointer to the received data | ||
| // and use it to complete the next ReadAsync operation synchronously. | ||
| // | ||
|
|
||
| ref var receiveEvent = ref streamEvent.RECEIVE; | ||
|
|
||
| if (NetEventSource.Log.IsEnabled()) | ||
|
|
||
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why might throw here, and do we need to eat all exceptions or just specific ones?
Also,
certabove is nullable, but we're not checking for null?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
for server, we run this on msquic thread AFAIK. However, for client this is called from
MsQuicConnectionconstructor. So we can perhaps surface any exception from the callback. (including the cast and perhaps check for PrivateKey.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
BTW it should be OK for the callback return NULL. It is up to the server to decide if no certificate is OK or not. I think SslStram has some tests for that case.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see that the only way this could throw is if it is not
X509Certificate2instance or it was.Reset()ed, I will remove the try-catch and replace it with explicit checks.