Merge pull request 'fix: address vulnerabilities' (#1) from stevanfreeborn/fix/address-vulnerabilities into main

.editorconfig

@@ -97,7 +97,7 @@ csharp_style_var_when_type_is_apparent = true:suggestion
 csharp_style_expression_bodied_accessors = true:silent
 csharp_style_expression_bodied_constructors = false:silent
 csharp_style_expression_bodied_indexers = true:silent
-csharp_style_expression_bodied_lambdas = true:suggestion
+csharp_style_expression_bodied_lambdas = false:silent
 csharp_style_expression_bodied_local_functions = false:silent
 csharp_style_expression_bodied_methods = false:silent
 csharp_style_expression_bodied_operators = false:silent

src/src/Directory.Packages.props

@@ -5,15 +5,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.11" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.11" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.11" />
-    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.5.0" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.9.0" />
-    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
+    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.18.0" />
-    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.18.0" />
-    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.18.0" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.18.0" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.18.0" />
   </ItemGroup>
 
 </Project>

src/tests/Directory.Packages.props

@@ -5,15 +5,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageVersion Include="coverlet.collector" Version="10.0.0" />
+    <PackageVersion Include="coverlet.collector" Version="10.0.1" />
-    <PackageVersion Include="coverlet.msbuild" Version="10.0.0" />
+    <PackageVersion Include="coverlet.msbuild" Version="10.0.1" />
     <PackageVersion Include="FluentAssertions" Version="[7.2.0]" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.11" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
     <PackageVersion Include="moq" Version="4.20.72" />
-    <PackageVersion Include="RichardSzalay.MockHttp" Version="7.0.0" />
+    <PackageVersion Include="RichardSzalay.MockHttp" Version="7.1.0" />
     <PackageVersion Include="xunit" Version="2.9.3" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="4.0.0" />
   </ItemGroup>
 
 </Project>

src/tests/StevesBot.Webhook.Tests/Unit/VerifySubscriptionHandlerTests.cs

@@ -92,7 +92,7 @@ public class VerifySubscriptionHandlerTests
 
     task.Should().BeTrue();
     dequeuedTask.Should().NotBeNull();
-    dequeuedTask!.CallbackUrl.Should().Be(callbackUrl);
+    dequeuedTask.CallbackUrl.Should().Be(callbackUrl);
     dequeuedTask.TopicUrl.Should().Be(topic);
     dequeuedTask.ExpiresAt.Should().Be(now.AddSeconds(leaseSeconds));
   }

src/tests/StevesBot.Worker.Tests/Integration/Infrastructure/TestWebSocketServer.cs

@@ -8,14 +8,13 @@ public sealed class TestWebSocketServer : IAsyncLifetime, IDisposable
 {
   private readonly IHost _host;
   private readonly CancellationTokenSource _echoCts = new();
-  private Uri? _webSocketUri;
 
   public Uri Uri
   {
     get
     {
-      _webSocketUri ??= GetWebSocketUri();
+      field ??= GetWebSocketUri();
-      return _webSocketUri;
+      return field;
     }
   }
 

src/tests/StevesBot.Worker.Tests/Unit/DiscordGatewayClientTests.cs

@@ -210,7 +210,7 @@ public sealed class DiscordGatewayClientTests : IDisposable
     mockWebSocket
       .Verify(
         x => x.SendAsync(
-          It.Is<ArraySegment<byte>>(b => expectedHeartbeatPayload.Bytes.SequenceEqual(b.Array!)),
+          It.Is<ArraySegment<byte>>(b => expectedHeartbeatPayload.Bytes.SequenceEqual(b.Array)),
           It.Is<WebSocketMessageType>(m => m == WebSocketMessageType.Text),
           true,
           It.IsAny<CancellationToken>()
@@ -238,7 +238,7 @@ public sealed class DiscordGatewayClientTests : IDisposable
     mockWebSocket
       .Verify(
         x => x.SendAsync(
-          It.Is<ArraySegment<byte>>(b => expectedIdentifyPayload.Bytes.SequenceEqual(b.Array!)),
+          It.Is<ArraySegment<byte>>(b => expectedIdentifyPayload.Bytes.SequenceEqual(b.Array)),
           It.Is<WebSocketMessageType>(m => m == WebSocketMessageType.Text),
           true,
           It.IsAny<CancellationToken>()
@@ -337,7 +337,7 @@ public sealed class DiscordGatewayClientTests : IDisposable
     initialWebSocket
       .Verify(
         x => x.SendAsync(
-          It.Is<ArraySegment<byte>>(b => expectedHeartbeatPayload.Bytes.SequenceEqual(b.Array!)),
+          It.Is<ArraySegment<byte>>(b => expectedHeartbeatPayload.Bytes.SequenceEqual(b.Array)),
           It.Is<WebSocketMessageType>(m => m == WebSocketMessageType.Text),
           true,
           It.IsAny<CancellationToken>()
@@ -413,7 +413,7 @@ public sealed class DiscordGatewayClientTests : IDisposable
     mockWebSocket
       .Verify(
         x => x.SendAsync(
-          It.Is<ArraySegment<byte>>(b => expectedHeartbeatPayload.Bytes.SequenceEqual(b.Array!)),
+          It.Is<ArraySegment<byte>>(b => expectedHeartbeatPayload.Bytes.SequenceEqual(b.Array)),
           It.Is<WebSocketMessageType>(m => m == WebSocketMessageType.Text),
           true,
           It.IsAny<CancellationToken>()
@@ -502,7 +502,7 @@ public sealed class DiscordGatewayClientTests : IDisposable
     mockWebSocket
       .Verify(
         x => x.SendAsync(
-          It.Is<ArraySegment<byte>>(b => expectedHeartbeatPayload.Bytes.SequenceEqual(b.Array!)),
+          It.Is<ArraySegment<byte>>(b => expectedHeartbeatPayload.Bytes.SequenceEqual(b.Array)),
           It.Is<WebSocketMessageType>(m => m == WebSocketMessageType.Text),
           true,
           It.IsAny<CancellationToken>()
@@ -1035,7 +1035,7 @@ public sealed class DiscordGatewayClientTests : IDisposable
     mockWebSocket
       .Verify(
         x => x.SendAsync(
-          It.Is<ArraySegment<byte>>(b => expectedIdlePayload.Bytes.SequenceEqual(b.Array!)),
+          It.Is<ArraySegment<byte>>(b => expectedIdlePayload.Bytes.SequenceEqual(b.Array)),
           It.Is<WebSocketMessageType>(m => m == WebSocketMessageType.Text),
           true,
           It.IsAny<CancellationToken>()

src/tests/StevesBot.Worker.Tests/Unit/HelloDiscordEventTests.cs

@@ -62,10 +62,10 @@ public class HelloDiscordEventTests
     var helloEvent = JsonSerializer.Deserialize<HelloDiscordEvent>(json);
 
     helloEvent.Should().NotBeNull();
-    helloEvent!.OpCode.Should().Be(data.op);
+    helloEvent.OpCode.Should().Be(data.op);
     helloEvent.Sequence.Should().Be(data.s);
     helloEvent.Type.Should().Be(data.t);
     helloEvent.Data.Should().NotBeNull();
-    helloEvent.Data!.HeartbeatInterval.Should().Be(data.d.heartbeat_interval);
+    helloEvent.Data.HeartbeatInterval.Should().Be(data.d.heartbeat_interval);
   }
 }

src/tests/StevesBot.Worker.Tests/Unit/ReadyDiscordEventTests.cs

@@ -62,7 +62,7 @@ public class ReadyDiscordEventTests
     var readyEvent = JsonSerializer.Deserialize<ReadyDiscordEvent>(json);
 
     readyEvent.Should().NotBeNull();
-    readyEvent!.OpCode.Should().Be(data.op);
+    readyEvent.OpCode.Should().Be(data.op);
     readyEvent.Sequence.Should().Be(data.s);
     readyEvent.Type.Should().Be(data.t);
     readyEvent.Data.Version.Should().Be(data.d.v);