Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[release/7.0] Fix compression #79547

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

Merged
merged 6 commits into from
Jan 5, 2023
Merged

[release/7.0] Fix compression #79547

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d66537c
Fix compression
Dec 8, 2022
84d3b4a
Apply suggestions from code review
Dec 9, 2022
12033d4
Adding SendAsync to ref
Dec 9, 2022
39d4d4a
fix ws deflate tests
Dec 9, 2022
e3608f6
Check bytes on server side
CarnaViire Dec 12, 2022
04b9174
Remove ref assembly change, pr feedback
CarnaViire Jan 4, 2023
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
Prev Previous commit
Next Next commit
Check bytes on server side
  • Loading branch information
@CarnaViire
CarnaViire authored and github-actions committed Dec 12, 2022
commit e3608f6274e6780cbd60bbefca4f5205d6e04e73
34 changes: 22 additions & 12 deletions src/libraries/System.Net.WebSockets.Client/tests/DeflateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,13 @@ await LoopbackServer.CreateClientAndServerAsync(async uri =>
public async Task SendHelloWithDisableCompression()
{
byte[] bytes = "Hello"u8.ToArray();
byte[] compressed = new byte[] { 0xc1, 0x07, 0xf2, 0x48, 0xcd, 0xc9, 0xc9, 0x07, 0x00 };

int prefixLength = 2;
byte[] rawPrefix = new byte[] { 0x81, 0x85 }; // fin=1, rsv=0, opcode=text; mask=1, len=5
int rawRemainingBytes = 9; // mask bytes (4) + payload bytes (5)
byte[] compressedPrefix = new byte[] { 0xc1, 0x87 }; // fin=1, rsv=compressed, opcode=text; mask=1, len=7
int compressedRemainingBytes = 11; // mask bytes (4) + payload bytes (7)

var deflateOpt = new WebSocketDeflateOptions
{
ClientMaxWindowBits = 14,
Expand All @@ -143,22 +149,26 @@ await LoopbackServer.CreateClientAndServerAsync(async uri =>
await cws.SendAsync(bytes, WebSocketMessageType.Text, flags, cts.Token);
}, server => server.AcceptConnectionAsync(async connection =>
{
var buffer = new byte[bytes.Length];
var buffer = new byte[compressedRemainingBytes];
var extensionsReply = CreateDeflateOptionsHeader(deflateOpt);
await LoopbackHelper.WebSocketHandshakeAsync(connection, extensionsReply);
using WebSocket websocket = WebSocket.CreateFromStream(connection.Stream, new WebSocketCreationOptions
{
IsServer = true,
DangerousDeflateOptions = deflateOpt
});

Assert.True(websocket.State == WebSocketState.Open || websocket.State == WebSocketState.CloseSent);
// first message is compressed
await ReadExactAsync(buffer, prefixLength);
Assert.Equal(compressedPrefix, buffer[..prefixLength]);
// read rest of the frame
await ReadExactAsync(buffer, compressedRemainingBytes);

await websocket.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None);
Assert.Equal(bytes, buffer);
// second message is not compressed
await ReadExactAsync(buffer, prefixLength);
Assert.Equal(rawPrefix, buffer[..prefixLength]);
// read rest of the frame
await ReadExactAsync(buffer, rawRemainingBytes);

await websocket.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None);
Assert.Equal(bytes, buffer);
async Task ReadExactAsync(byte[] buf, int n)
{
await connection.Stream.ReadAtLeastAsync(buf.AsMemory(0, n), n);
}
}), new LoopbackServer.Options { WebSocketEndpoint = true });
}

Expand Down