Skip to content

Fix compression #79412

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
CarnaViire merged 5 commits into from
Dec 12, 2022
Merged

Fix compression #79412

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
15eed2e
Fix compression
Dec 8, 2022
f40af7f
Apply suggestions from code review
Dec 9, 2022
95e8abd
Adding SendAsync to ref
Dec 9, 2022
c06ae14
fix ws deflate tests
Dec 9, 2022
af9943e
Check bytes on server side
CarnaViire Dec 12, 2022
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
fix ws deflate tests
  • Loading branch information
Katya Sokolova committed Dec 9, 2022
commit c06ae140b783697cf3cf152e88b71407e6c2fcf0
40 changes: 35 additions & 5 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 @@ -89,43 +89,73 @@ await LoopbackServer.CreateClientAndServerAsync(async uri =>
[ConditionalFact(nameof(WebSocketsSupported))]
public async Task ThrowsWhenContinuationHasDifferentCompressionFlags()
{
var deflateOpt = new WebSocketDeflateOptions
{
ClientMaxWindowBits = 14,
ClientContextTakeover = true,
ServerMaxWindowBits = 14,
ServerContextTakeover = true
};
await LoopbackServer.CreateClientAndServerAsync(async uri =>
{
using var cws = new ClientWebSocket();
using var cts = new CancellationTokenSource(TimeOutMilliseconds);

cws.Options.DangerousDeflateOptions = new WebSocketDeflateOptions();
cws.Options.DangerousDeflateOptions = deflateOpt;
await ConnectAsync(cws, uri, cts.Token);


await cws.SendAsync(Memory<byte>.Empty, WebSocketMessageType.Text, WebSocketMessageFlags.DisableCompression, default);
Assert.Throws<ArgumentException>("messageFlags", () =>
cws.SendAsync(Memory<byte>.Empty, WebSocketMessageType.Binary, WebSocketMessageFlags.EndOfMessage, default));
}, server => server.AcceptConnectionAsync(async connection =>
{
await LoopbackHelper.WebSocketHandshakeAsync(connection);
var extensionsReply = CreateDeflateOptionsHeader(deflateOpt);
await LoopbackHelper.WebSocketHandshakeAsync(connection, extensionsReply);
}), new LoopbackServer.Options { WebSocketEndpoint = true });
}

[ConditionalFact(nameof(WebSocketsSupported))]
public async Task SendHelloWithDisableCompression()
{
byte[] bytes = "Hello"u8.ToArray();
byte[] compressed = new byte[] { 0xc1, 0x07, 0xf2, 0x48, 0xcd, 0xc9, 0xc9, 0x07, 0x00 };
var deflateOpt = new WebSocketDeflateOptions
{
ClientMaxWindowBits = 14,
ClientContextTakeover = true,
ServerMaxWindowBits = 14,
ServerContextTakeover = true
};

await LoopbackServer.CreateClientAndServerAsync(async uri =>
{
using var cws = new ClientWebSocket();
using var cts = new CancellationTokenSource(TimeOutMilliseconds);

cws.Options.DangerousDeflateOptions = new WebSocketDeflateOptions();
cws.Options.DangerousDeflateOptions = deflateOpt;
await ConnectAsync(cws, uri, cts.Token);

await cws.SendAsync(bytes, WebSocketMessageType.Text, true, cts.Token);

WebSocketMessageFlags flags = WebSocketMessageFlags.DisableCompression | WebSocketMessageFlags.EndOfMessage;
await cws.SendAsync(bytes, WebSocketMessageType.Text, flags, cts.Token);
}, server => server.AcceptConnectionAsync(async connection =>
{
var buffer = new byte[bytes.Length];
await LoopbackHelper.WebSocketHandshakeAsync(connection);
using WebSocket websocket = WebSocket.CreateFromStream(connection.Stream, true, null, TimeSpan.FromSeconds(30));
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);

await websocket.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None);
Assert.Equal(bytes, buffer);

await websocket.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None);
Assert.Equal(bytes, buffer);
}), new LoopbackServer.Options { WebSocketEndpoint = true });
Expand Down