Browser connections fail with "A server must not mask any frames that it sends to the client" #213

chronoxor · chronoxor · commit e2f8d140380d · 2022-08-12T22:15:25.000+04:00
diff --git a/source/NetCoreServer/NetCoreServer.csproj b/source/NetCoreServer/NetCoreServer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>6.4.0.0</Version>
+    <Version>6.5.0.0</Version>
     <Authors>Ivan Shynkarenka</Authors>
     <Copyright>Copyright (c) 2019-2022 Ivan Shynkarenka</Copyright>
     <RepositoryUrl>https://github.com/chronoxor/NetCoreServer</RepositoryUrl>
diff --git a/source/NetCoreServer/WsSession.cs b/source/NetCoreServer/WsSession.cs
@@ -27,7 +27,7 @@ public long SendText(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_TEXT, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_TEXT, false, buffer);
                 return base.Send(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -40,7 +40,7 @@ public bool SendTextAsync(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_TEXT, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_TEXT, false, buffer);
                 return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -58,7 +58,7 @@ public long SendBinary(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_BINARY, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_BINARY, false, buffer);
                 return base.Send(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -71,7 +71,7 @@ public bool SendBinaryAsync(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_BINARY, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_BINARY, false, buffer);
                 return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -89,7 +89,7 @@ public long SendClose(int status, ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_CLOSE, true, buffer, status);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_CLOSE, false, buffer, status);
                 return base.Send(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -102,7 +102,7 @@ public bool SendCloseAsync(int status, ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_CLOSE, true, buffer, status);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_CLOSE, false, buffer, status);
                 return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -120,7 +120,7 @@ public long SendPing(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PING, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PING, false, buffer);
                 return base.Send(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -133,7 +133,7 @@ public bool SendPingAsync(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PING, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PING, false, buffer);
                 return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -151,7 +151,7 @@ public long SendPong(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PONG, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PONG, false, buffer);
                 return base.Send(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -164,7 +164,7 @@ public bool SendPongAsync(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PONG, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PONG, false, buffer);
                 return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());
             }
         }
diff --git a/source/NetCoreServer/WssSession.cs b/source/NetCoreServer/WssSession.cs
@@ -27,7 +27,7 @@ public long SendText(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_TEXT, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_TEXT, false, buffer);
                 return base.Send(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -40,7 +40,7 @@ public bool SendTextAsync(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_TEXT, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_TEXT, false, buffer);
                 return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -58,7 +58,7 @@ public long SendBinary(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_BINARY, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_BINARY, false, buffer);
                 return base.Send(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -71,7 +71,7 @@ public bool SendBinaryAsync(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_BINARY, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_BINARY, false, buffer);
                 return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -89,7 +89,7 @@ public long SendClose(int status, ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_CLOSE, true, buffer, status);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_CLOSE, false, buffer, status);
                 return base.Send(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -102,7 +102,7 @@ public bool SendCloseAsync(int status, ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_CLOSE, true, buffer, status);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_CLOSE, false, buffer, status);
                 return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -120,7 +120,7 @@ public long SendPing(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PING, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PING, false, buffer);
                 return base.Send(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -133,7 +133,7 @@ public bool SendPingAsync(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PING, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PING, false, buffer);
                 return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -151,7 +151,7 @@ public long SendPong(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PONG, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PONG, false, buffer);
                 return base.Send(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -164,7 +164,7 @@ public bool SendPongAsync(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PONG, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PONG, false, buffer);
                 return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());
             }
         }
diff --git a/tests/tests.csproj b/tests/tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public long SendText(ReadOnlySpan<byte> buffer)`
`27`	`27`	`{`
`28`	`28`	`lock (WebSocket.WsSendLock)`
`29`	`29`	`{`
`30`		`- WebSocket.PrepareSendFrame(WebSocket.WS_FIN \| WebSocket.WS_TEXT, true, buffer);`
	`30`	`+ WebSocket.PrepareSendFrame(WebSocket.WS_FIN \| WebSocket.WS_TEXT, false, buffer);`
`31`	`31`	`return base.Send(WebSocket.WsSendBuffer.AsSpan());`
`32`	`32`	`}`
`33`	`33`	`}`
`@@ -40,7 +40,7 @@ public bool SendTextAsync(ReadOnlySpan<byte> buffer)`
`40`	`40`	`{`
`41`	`41`	`lock (WebSocket.WsSendLock)`
`42`	`42`	`{`
`43`		`- WebSocket.PrepareSendFrame(WebSocket.WS_FIN \| WebSocket.WS_TEXT, true, buffer);`
	`43`	`+ WebSocket.PrepareSendFrame(WebSocket.WS_FIN \| WebSocket.WS_TEXT, false, buffer);`
`44`	`44`	`return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());`
`45`	`45`	`}`
`46`	`46`	`}`
`@@ -58,7 +58,7 @@ public long SendBinary(ReadOnlySpan<byte> buffer)`
`58`	`58`	`{`
`59`	`59`	`lock (WebSocket.WsSendLock)`
`60`	`60`	`{`
`61`		`- WebSocket.PrepareSendFrame(WebSocket.WS_FIN \| WebSocket.WS_BINARY, true, buffer);`
	`61`	`+ WebSocket.PrepareSendFrame(WebSocket.WS_FIN \| WebSocket.WS_BINARY, false, buffer);`
`62`	`62`	`return base.Send(WebSocket.WsSendBuffer.AsSpan());`
`63`	`63`	`}`
`64`	`64`	`}`
`@@ -71,7 +71,7 @@ public bool SendBinaryAsync(ReadOnlySpan<byte> buffer)`
`71`	`71`	`{`
`72`	`72`	`lock (WebSocket.WsSendLock)`
`73`	`73`	`{`
`74`		`- WebSocket.PrepareSendFrame(WebSocket.WS_FIN \| WebSocket.WS_BINARY, true, buffer);`
	`74`	`+ WebSocket.PrepareSendFrame(WebSocket.WS_FIN \| WebSocket.WS_BINARY, false, buffer);`
`75`	`75`	`return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());`
`76`	`76`	`}`
`77`	`77`	`}`
`@@ -89,7 +89,7 @@ public long SendClose(int status, ReadOnlySpan<byte> buffer)`
`89`	`89`	`{`
`90`	`90`	`lock (WebSocket.WsSendLock)`
`91`	`91`	`{`
`92`		`- WebSocket.PrepareSendFrame(WebSocket.WS_FIN \| WebSocket.WS_CLOSE, true, buffer, status);`
	`92`	`+ WebSocket.PrepareSendFrame(WebSocket.WS_FIN \| WebSocket.WS_CLOSE, false, buffer, status);`
`93`	`93`	`return base.Send(WebSocket.WsSendBuffer.AsSpan());`
`94`	`94`	`}`
`95`	`95`	`}`
`@@ -102,7 +102,7 @@ public bool SendCloseAsync(int status, ReadOnlySpan<byte> buffer)`
`102`	`102`	`{`
`103`	`103`	`lock (WebSocket.WsSendLock)`
`104`	`104`	`{`
`105`		`- WebSocket.PrepareSendFrame(WebSocket.WS_FIN \| WebSocket.WS_CLOSE, true, buffer, status);`
	`105`	`+ WebSocket.PrepareSendFrame(WebSocket.WS_FIN \| WebSocket.WS_CLOSE, false, buffer, status);`
`106`	`106`	`return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());`
`107`	`107`	`}`
`108`	`108`	`}`
`@@ -120,7 +120,7 @@ public long SendPing(ReadOnlySpan<byte> buffer)`
`120`	`120`	`{`
`121`	`121`	`lock (WebSocket.WsSendLock)`
`122`	`122`	`{`
`123`		`- WebSocket.PrepareSendFrame(WebSocket.WS_FIN \| WebSocket.WS_PING, true, buffer);`
	`123`	`+ WebSocket.PrepareSendFrame(WebSocket.WS_FIN \| WebSocket.WS_PING, false, buffer);`
`124`	`124`	`return base.Send(WebSocket.WsSendBuffer.AsSpan());`
`125`	`125`	`}`
`126`	`126`	`}`
`@@ -133,7 +133,7 @@ public bool SendPingAsync(ReadOnlySpan<byte> buffer)`
`133`	`133`	`{`
`134`	`134`	`lock (WebSocket.WsSendLock)`
`135`	`135`	`{`
`136`		`- WebSocket.PrepareSendFrame(WebSocket.WS_FIN \| WebSocket.WS_PING, true, buffer);`
	`136`	`+ WebSocket.PrepareSendFrame(WebSocket.WS_FIN \| WebSocket.WS_PING, false, buffer);`
`137`	`137`	`return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());`
`138`	`138`	`}`
`139`	`139`	`}`
`@@ -151,7 +151,7 @@ public long SendPong(ReadOnlySpan<byte> buffer)`
`151`	`151`	`{`
`152`	`152`	`lock (WebSocket.WsSendLock)`
`153`	`153`	`{`
`154`		`- WebSocket.PrepareSendFrame(WebSocket.WS_FIN \| WebSocket.WS_PONG, true, buffer);`
	`154`	`+ WebSocket.PrepareSendFrame(WebSocket.WS_FIN \| WebSocket.WS_PONG, false, buffer);`
`155`	`155`	`return base.Send(WebSocket.WsSendBuffer.AsSpan());`
`156`	`156`	`}`
`157`	`157`	`}`
`@@ -164,7 +164,7 @@ public bool SendPongAsync(ReadOnlySpan<byte> buffer)`
`164`	`164`	`{`
`165`	`165`	`lock (WebSocket.WsSendLock)`
`166`	`166`	`{`
`167`		`- WebSocket.PrepareSendFrame(WebSocket.WS_FIN \| WebSocket.WS_PONG, true, buffer);`
	`167`	`+ WebSocket.PrepareSendFrame(WebSocket.WS_FIN \| WebSocket.WS_PONG, false, buffer);`
`168`	`168`	`return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());`
`169`	`169`	`}`
`170`	`170`	`}`