Checksums have to be passed first before sending welcome message

compujuckel · compujuckel · commit 8af59c10a467 · 2024-12-20T17:53:19.000+01:00
diff --git a/AssettoServer.Shared/AssettoServer.Shared.csproj b/AssettoServer.Shared/AssettoServer.Shared.csproj
@@ -11,6 +11,6 @@
     <ItemGroup>
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
       <FrameworkReference Include="Microsoft.AspNetCore.App" Version="2.2.8" />
-      <PackageReference Include="Serilog" Version="4.1.0" />
+      <PackageReference Include="Serilog" Version="4.2.0" />
     </ItemGroup>
 </Project>
diff --git a/AssettoServer/AssettoServer.csproj b/AssettoServer/AssettoServer.csproj
@@ -65,7 +65,7 @@
         <PackageReference Include="protobuf-net.Grpc" Version="1.2.2" />
         <PackageReference Include="Qmmands" Version="5.0.2" />
         <PackageReference Include="Scriban" Version="5.12.0" />
-        <PackageReference Include="Serilog" Version="4.1.0" />
+        <PackageReference Include="Serilog" Version="4.2.0" />
         <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
         <PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
         <PackageReference Include="Serilog.Enrichers.Sensitive" Version="1.7.3" />
diff --git a/AssettoServer/Network/Udp/ACUdpServer.cs b/AssettoServer/Network/Udp/ACUdpServer.cs
@@ -143,11 +143,14 @@ private void OnReceived(SocketAddress address, byte[] buffer, int size)
                 }
                 else if (packetId == ACServerProtocol.PositionUpdate)
                 {
+                    // Pass checksum first before sending first update + welcome message.
+                    // Plugins might rely on checksums to generate CSP extra options
+                    if (client.ChecksumStatus != ChecksumStatus.Succeeded) return;
+                    
                     if (!client.HasSentFirstUpdate)
                         client.SendFirstUpdate();
                     
-                    if (client.ChecksumStatus != ChecksumStatus.Succeeded
-                        || client.SecurityLevel < _configuration.Extra.MandatoryClientSecurityLevel) return;
+                    if (client.SecurityLevel < _configuration.Extra.MandatoryClientSecurityLevel) return;
 
                     car.UpdatePosition(packetReader.Read<PositionUpdateIn>());
                 }
diff --git a/FastLaneUtils/FastLaneUtils.csproj b/FastLaneUtils/FastLaneUtils.csproj
@@ -18,7 +18,7 @@
     <ItemGroup>
       <PackageReference Include="CommandLineParser" Version="2.9.1" />
       <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
-      <PackageReference Include="Serilog" Version="4.1.0" />
+      <PackageReference Include="Serilog" Version="4.2.0" />
       <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
     </ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -143,11 +143,14 @@ private void OnReceived(SocketAddress address, byte[] buffer, int size)`
`143`	`143`	`}`
`144`	`144`	`else if (packetId == ACServerProtocol.PositionUpdate)`
`145`	`145`	`{`
	`146`	`+ // Pass checksum first before sending first update + welcome message.`
	`147`	`+ // Plugins might rely on checksums to generate CSP extra options`
	`148`	`+ if (client.ChecksumStatus != ChecksumStatus.Succeeded) return;`
	`149`	`+`
`146`	`150`	`if (!client.HasSentFirstUpdate)`
`147`	`151`	`client.SendFirstUpdate();`
`148`	`152`
`149`		`- if (client.ChecksumStatus != ChecksumStatus.Succeeded`
`150`		`- \|\| client.SecurityLevel < _configuration.Extra.MandatoryClientSecurityLevel) return;`
	`153`	`+ if (client.SecurityLevel < _configuration.Extra.MandatoryClientSecurityLevel) return;`
`151`	`154`
`152`	`155`	`car.UpdatePosition(packetReader.Read<PositionUpdateIn>());`
`153`	`156`	`}`