Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

SqlClient fix managed encryption connection failure #40732

Merged
merged 3 commits into from
Sep 4, 2019
Merged

SqlClient fix managed encryption connection failure #40732

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9fb311
simplify SllOverTdsStream.ReadInternal change
Wraith2 Aug 30, 2019
f3cc08d
fix SslOverTdsSTream.ReadInternal
Wraith2 Aug 30, 2019
c48e3ff
remove ReadInternalSync
Wraith2 Sep 4, 2019
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
84 changes: 32 additions & 52 deletions src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SslOverTdsStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,71 +89,51 @@ public override Task<int> ReadAsync(byte[] buffer, int offset, int count, Cancel
/// </summary>
private async Task<int> ReadInternal(byte[] buffer, int offset, int count, CancellationToken token, bool async)
{
int readBytes = 0;
byte[] packetData = null;
byte[] readTarget = buffer;
int readOffset = offset;
if (_encapsulate)
{
return await ReadInternalEncapsulate(buffer, offset, count, token, async).ConfigureAwait(false);
}
else if (async)
{
return await ReadInternalAsync(buffer, offset, count, token).ConfigureAwait(false);
}
else
{
return ReadInternalSync(buffer, offset, count);
}
}
packetData = ArrayPool<byte>.Shared.Rent(count < TdsEnums.HEADER_LEN ? TdsEnums.HEADER_LEN : count);
readTarget = packetData;
readOffset = 0;
if (_packetBytes == 0)
{
// Account for split packets
while (readBytes < TdsEnums.HEADER_LEN)
{
readBytes += async ?
await _stream.ReadAsync(packetData, readBytes, TdsEnums.HEADER_LEN - readBytes, token).ConfigureAwait(false) :
_stream.Read(packetData, readBytes, TdsEnums.HEADER_LEN - readBytes);
}

private async Task<int> ReadInternalEncapsulate(byte[] buffer, int offset, int count, CancellationToken token, bool async)
{
int readBytes = 0;
byte[] packetData = ArrayPool<byte>.Shared.Rent(count < TdsEnums.HEADER_LEN ? TdsEnums.HEADER_LEN : count);
_packetBytes = (packetData[TdsEnums.HEADER_LEN_FIELD_OFFSET] << 8) | packetData[TdsEnums.HEADER_LEN_FIELD_OFFSET + 1];
_packetBytes -= TdsEnums.HEADER_LEN;
}

if (_packetBytes == 0)
{
// Account for split packets
while (readBytes < TdsEnums.HEADER_LEN)
if (count > _packetBytes)
{
readBytes += (async ?
await ReadInternalAsync(packetData, readBytes, TdsEnums.HEADER_LEN - readBytes, token).ConfigureAwait(false) :
ReadInternalSync(packetData, readBytes, TdsEnums.HEADER_LEN - readBytes)
);
count = _packetBytes;
}

_packetBytes = (packetData[TdsEnums.HEADER_LEN_FIELD_OFFSET] << 8) | packetData[TdsEnums.HEADER_LEN_FIELD_OFFSET + 1];
_packetBytes -= TdsEnums.HEADER_LEN;
}

if (count > _packetBytes)
readBytes = async ?
await _stream.ReadAsync(readTarget, readOffset, count, token).ConfigureAwait(false) :
cheenamalhotra marked this conversation as resolved.
Show resolved Hide resolved
_stream.Read(readTarget, readOffset, count);

if (_encapsulate)
{
count = _packetBytes;
_packetBytes -= readBytes;
}
if (packetData != null)
{
Buffer.BlockCopy(packetData, 0, buffer, offset, readBytes);
ArrayPool<byte>.Shared.Return(packetData, clearArray: true);
}

readBytes = (async ?
await ReadInternalAsync(packetData, 0, count, token).ConfigureAwait(false) :
ReadInternalSync(packetData, 0, count)
);


_packetBytes -= readBytes;

Buffer.BlockCopy(packetData, 0, buffer, offset, readBytes);

Array.Clear(packetData, 0, readBytes);
ArrayPool<byte>.Shared.Return(packetData, clearArray: false);

return readBytes;
}

private async Task<int> ReadInternalAsync(byte[] buffer, int offset, int count, CancellationToken token)
{
return await _stream.ReadAsync(buffer, 0, count, token).ConfigureAwait(false);
}

private int ReadInternalSync(byte[] buffer, int offset, int count)
{
return _stream.Read(buffer, 0, count);
}

/// <summary>
/// The internal write method calls Sync APIs when Async flag is false
/// </summary>
Expand Down