fix buffer handling in Tls handshake #32267
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
reviewed
Feb 14, 2020
| private interface ISslIOAdapter | ||
| { | ||
| ValueTask<int> ReadAsync(byte[] buffer, int offset, int count); | ||
| ValueTask<int> ReadAsync(Memory<byte> buffer); |
Member
There was a problem hiding this comment.
Do we still need the ValueTask<int> ReadAsync(byte[] buffer, int offset, int count); overload?
Member
Author
There was a problem hiding this comment.
It is used in FillBufferAsync() but that is easy to fix.
stephentoub
reviewed
Feb 14, 2020
| if (!receiveFirst) | ||
| { | ||
| message = _context.NextMessage(reAuthenticationData, 0, (reAuthenticationData == null ? 0 : reAuthenticationData.Length)); | ||
| message = _context.NextMessage(reAuthenticationData == null ? default : new ReadOnlySpan<byte>(reAuthenticationData)); |
Member
There was a problem hiding this comment.
This conditional shouldn't be necessary, as a null array is converted to a default span by span's ctor/implicit cast/etc.
Suggested change
| message = _context.NextMessage(reAuthenticationData == null ? default : new ReadOnlySpan<byte>(reAuthenticationData)); | |
| message = _context.NextMessage(reAuthenticationData); |
stephentoub
reviewed
Feb 14, 2020
| if (reAuthenticationData == null) | ||
| { | ||
| _nestedAuth = 0; | ||
| _handshakeBuffer.Dispose(); |
Member
There was a problem hiding this comment.
Why don't we need to dispose this if reAuthenticationData != null? Also, should we set _handshakeBuffer to default after it's been disposed?
Member
Author
There was a problem hiding this comment.
no, we should. I missed that part.
stephentoub
reviewed
Feb 14, 2020
| int version = -1; | ||
|
|
||
| if ((bytes == null || bytes.Length <= 0)) | ||
| if (bytes.Length <= 0) |
Member
There was a problem hiding this comment.
It'll never be < 0.
Suggested change
| if (bytes.Length <= 0) | |
| if (bytes.Length == 0) |
stephentoub
approved these changes
Feb 14, 2020
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.
2 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 change primarily fixes a regression caused by #453. In an attempt to not allocate a new buffer for each message we start using _internalBuffer also for the handshake. That unfortunately caused #20507 and #1291
This change brings one buffer used through the entire handshake. The live cycle is managed within ForceAuthenticationAsync() used for both initial handshakes as well as possible renegotiation triggered by reading.
Since ArrayBuffer has convenient APIs, I decided to use it instead of implementing the logic again. This also allowed to complete spanification of SslStream where we have now clean path from ArrayBuffer all the way to native call on all platforms.
I was able to reproduce #1291 on my local systems in ~ 100 runs. So far I did several hundred with this change and I did not see any issue. (aside from flaky DNS)
This change also brings
FillHandshakeBufferAsync()very similar toFillBufferAsync.I think there is opportunity for more refactor but I would like to put out a fix for the failing tests to decrease CI noise for everybody.
fixes #1291
fixes #20507