use proper IO in ssl handshake #32013
Merged
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
stephentoub
requested changes
Feb 10, 2020
src/libraries/System.Net.Security/src/System/Net/Security/SslStream.Implementation.Adapters.cs
Outdated
Show resolved
Hide resolved
src/libraries/System.Net.Security/src/System/Net/Security/SslStream.Implementation.cs
Outdated
Show resolved
Hide resolved
halter73
reviewed
Feb 11, 2020
src/libraries/System.Net.Security/src/System/Net/Security/SslStream.Implementation.Adapters.cs
Show resolved
Hide resolved
stephentoub
reviewed
Feb 13, 2020
| // This method assumes that a SSPI context is already in a good shape. | ||
| // For example it is either a fresh context or already authenticated context that needs renegotiation. | ||
| // | ||
| private Task ProcessAuthentication(bool isAsync = false, bool isApm = false, CancellationToken cancellationToken = default) |
Member
There was a problem hiding this comment.
Nit: can we rename this to ProcessAuthenticationAsync?
stephentoub
reviewed
Feb 13, 2020
| } | ||
|
|
||
| await ForceAuthenticationAsync(false, buffer, cancellationToken).ConfigureAwait(false); | ||
| await ForceAuthenticationAsync(adapter, false, buffer).ConfigureAwait(false); |
Member
There was a problem hiding this comment.
Suggested change
| await ForceAuthenticationAsync(adapter, false, buffer).ConfigureAwait(false); | |
| await ForceAuthenticationAsync(adapter, receiveFirst: false, buffer).ConfigureAwait(false); |
stephentoub
reviewed
Feb 13, 2020
| // This is used to reply on re-handshake when received SEC_I_RENEGOTIATE on Read(). | ||
| // | ||
| private async Task ReplyOnReAuthenticationAsync(byte[] buffer, CancellationToken cancellationToken) | ||
| private async Task ReplyOnReAuthenticationAsync<TReadAdapter>(TReadAdapter adapter, byte[] buffer) |
Member
There was a problem hiding this comment.
Nit: Now that we've combined the read/write adapters, can we rename TReadAdapter to something that's not read specific, e.g. just TAdapter or TIOAdapter or something like that?
stephentoub
reviewed
Feb 13, 2020
| ReceiveBlob(buffer); | ||
| } | ||
| else | ||
| // prevent nesting ionly when authentication functions are called explicitly. e.g. handle renegotiation tansparently. |
Member
There was a problem hiding this comment.
Suggested change
| // prevent nesting ionly when authentication functions are called explicitly. e.g. handle renegotiation tansparently. | |
| // prevent nesting only when authentication functions are called explicitly. e.g. handle renegotiation transparently. |
Member
Author
|
OSX failures are unrelated. |
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
This is a fragment of deprecated #1949 and fixes for regression caused by #453.
When renegotiation is triggered in synchronous AuthenticateAs*(), we would hit asserts added by dotnet/corefx#42331
To fix that, we use the Adapter to do all the IO for ssl handshake. Because handshake needs to read AND write, I combined Read and Write adapter to one.
Note that the locking can be probably simplified but I did not want to do that in this change.
With that, the old synchronous path seems to be no longer needed. So this change also deletes lot of old synchronous functions.
That uncovered unused _CachedSession and _securityStatus. I did check corefx release/3.1 branch and both variables are only assigned to but never used for anything else.