Skip to content
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.

Sign up for GitHub

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

avoid ArgumentOutOfRangeException while processing invalid or incomplete TLS frame #63184

Merged
merged 2 commits into from
Dec 31, 2021
Merged

avoid ArgumentOutOfRangeException while processing invalid or incomplete TLS frame #63184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9716749
avoid ArgumentOutOfRangeException while processing invalid or incompl…
wfurt Dec 29, 2021
659200d
feedback from review
wfurt Dec 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 8 additions & 31 deletions src/libraries/System.Net.Security/src/System/Net/Security/SslStream.Implementation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,12 +459,7 @@ private async Task ForceAuthenticationAsync<TIOAdapter>(TIOAdapter adapter, bool
private async ValueTask<ProtocolToken> ReceiveBlobAsync<TIOAdapter>(TIOAdapter adapter)
where TIOAdapter : IReadWriteAdapter
{
int readBytes = await FillHandshakeBufferAsync(adapter, SecureChannel.ReadHeaderSize).ConfigureAwait(false);
if (readBytes == 0)
{
throw new IOException(SR.net_io_eof);
}

await FillHandshakeBufferAsync(adapter, SecureChannel.ReadHeaderSize).ConfigureAwait(false);
if (_framing == Framing.Unified || _framing == Framing.Unknown)
{
_framing = DetectFraming(_handshakeBuffer.ActiveReadOnlySpan);
Expand Down Expand Up @@ -1061,13 +1056,13 @@ private async ValueTask<int> ReadAsyncInternal<TIOAdapter>(TIOAdapter adapter, M

// This function tries to make sure buffer has at least minSize bytes available.
// If we have enough data, it returns synchronously. If not, it will try to read
// remaining bytes from given stream.
private ValueTask<int> FillHandshakeBufferAsync<TIOAdapter>(TIOAdapter adapter, int minSize)
// remaining bytes from given stream. It will throw if unable to fulfill minSize.
private ValueTask FillHandshakeBufferAsync<TIOAdapter>(TIOAdapter adapter, int minSize)
where TIOAdapter : IReadWriteAdapter
{
if (_handshakeBuffer.ActiveLength >= minSize)
{
return new ValueTask<int>(minSize);
return ValueTask.CompletedTask;
}

int bytesNeeded = minSize - _handshakeBuffer.ActiveLength;
Expand All @@ -1083,15 +1078,15 @@ private ValueTask<int> FillHandshakeBufferAsync<TIOAdapter>(TIOAdapter adapter,
int bytesRead = t.Result;
if (bytesRead == 0)
{
return new ValueTask<int>(0);
throw new IOException(SR.net_io_eof);
wfurt marked this conversation as resolved.
Show resolved Hide resolved
}

_handshakeBuffer.Commit(bytesRead);
}

return new ValueTask<int>(minSize);
return ValueTask.CompletedTask;

async ValueTask<int> InternalFillHandshakeBufferAsync(TIOAdapter adap, ValueTask<int> task, int minSize)
async ValueTask InternalFillHandshakeBufferAsync(TIOAdapter adap, ValueTask<int> task, int minSize)
{
while (true)
{
Expand All @@ -1104,32 +1099,14 @@ async ValueTask<int> InternalFillHandshakeBufferAsync(TIOAdapter adap, ValueTas
_handshakeBuffer.Commit(bytesRead);
if (_handshakeBuffer.ActiveLength >= minSize)
{
return minSize;
return;
}

task = adap.ReadAsync(_handshakeBuffer.AvailableMemory);
}
}
}

private async ValueTask FillBufferAsync<TIOAdapter>(TIOAdapter adapter, int numBytesRequired)
where TIOAdapter : IReadWriteAdapter
{
Debug.Assert(_internalBufferCount > 0);
Debug.Assert(_internalBufferCount < numBytesRequired);

while (_internalBufferCount < numBytesRequired)
{
int bytesRead = await adapter.ReadAsync(_internalBuffer.AsMemory(_internalBufferCount)).ConfigureAwait(false);
if (bytesRead == 0)
{
throw new IOException(SR.net_io_eof);
}

_internalBufferCount += bytesRead;
}
}

private async ValueTask WriteAsyncInternal<TIOAdapter>(TIOAdapter writeAdapter, ReadOnlyMemory<byte> buffer)
where TIOAdapter : struct, IReadWriteAdapter
{
Expand Down
43 changes: 43 additions & 0 deletions src/libraries/System.Net.Security/tests/FunctionalTests/ServerAsyncAuthenticateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,49 @@ public async Task ServerAsyncAuthenticate_NoCertificate_Throws(bool useAsync)
}
}

[Theory]
[InlineData(true)]
[InlineData(false)]
public async Task ServerAsyncAuthenticate_InvalidHello_Throws(bool close)
{
(NetworkStream client, NetworkStream server) = TestHelper.GetConnectedTcpStreams();
using (client)
using (SslStream ssl = new SslStream(server))
{
byte[] buffer = new byte[182];
buffer[0] = 178;
buffer[1] = 0;
buffer[2] = 0;
buffer[3] = 1;
buffer[4] = 133;
buffer[5] = 166;

Task t1 = ssl.AuthenticateAsServerAsync(_serverCertificate, false, false);
Task t2 = client.WriteAsync(buffer).AsTask();
if (close)
{
await t2.WaitAsync(TestConfiguration.PassingTestTimeout);
client.Socket.Shutdown(SocketShutdown.Send);
}
else
{
// Write enough data to full frame size
buffer = new byte[13000];
t2 = client.WriteAsync(buffer).AsTask();
await t2.WaitAsync(TestConfiguration.PassingTestTimeout);
}

if (close)
{
await Assert.ThrowsAsync<IOException>(() => t1);
}
else
{
await Assert.ThrowsAsync<AuthenticationException>(() => t1);
}
}
}

public static IEnumerable<object[]> ProtocolMismatchData()
{
if (PlatformDetection.SupportsSsl3)
Expand Down