diff --git a/Docker/build/Dockerfile-MareSynchronosServer b/Docker/build/Dockerfile-MareSynchronosServer index 9a33d5c..ea802c4 100644 --- a/Docker/build/Dockerfile-MareSynchronosServer +++ b/Docker/build/Dockerfile-MareSynchronosServer @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 as BUILD +FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD COPY MareAPI /server/MareAPI COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared @@ -12,7 +12,7 @@ RUN dotnet publish \ --output=/build \ MareSynchronosServer.csproj -FROM mcr.microsoft.com/dotnet/aspnet:7.0 +FROM mcr.microsoft.com/dotnet/aspnet:8.0 RUN adduser \ --disabled-password \ diff --git a/Docker/build/Dockerfile-MareSynchronosServer-git b/Docker/build/Dockerfile-MareSynchronosServer-git index 1f643da..fec5c0b 100644 --- a/Docker/build/Dockerfile-MareSynchronosServer-git +++ b/Docker/build/Dockerfile-MareSynchronosServer-git @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 as BUILD +FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD RUN git clone --recurse-submodules https://github.com/Penumbra-Sync/server @@ -10,7 +10,7 @@ RUN dotnet publish \ --output=/MareSynchronosServer \ MareSynchronosServer.csproj -FROM mcr.microsoft.com/dotnet/aspnet:7.0 +FROM mcr.microsoft.com/dotnet/aspnet:8.0 RUN adduser \ --disabled-password \ diff --git a/Docker/build/Dockerfile-MareSynchronosServices b/Docker/build/Dockerfile-MareSynchronosServices index 7dc8d35..eeba345 100644 --- a/Docker/build/Dockerfile-MareSynchronosServices +++ b/Docker/build/Dockerfile-MareSynchronosServices @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 as BUILD +FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD COPY MareAPI /server/MareAPI COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared @@ -12,7 +12,7 @@ RUN dotnet publish \ --output=/build \ MareSynchronosServices.csproj -FROM mcr.microsoft.com/dotnet/aspnet:7.0 +FROM mcr.microsoft.com/dotnet/aspnet:8.0 RUN adduser \ --disabled-password \ diff --git a/Docker/build/Dockerfile-MareSynchronosServices-git b/Docker/build/Dockerfile-MareSynchronosServices-git index 1e47631..964d0ac 100644 --- a/Docker/build/Dockerfile-MareSynchronosServices-git +++ b/Docker/build/Dockerfile-MareSynchronosServices-git @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 as BUILD +FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD RUN git clone --recurse-submodules https://github.com/Penumbra-Sync/server @@ -10,7 +10,7 @@ RUN dotnet publish \ --output=/MareSynchronosServices \ MareSynchronosServices.csproj -FROM mcr.microsoft.com/dotnet/aspnet:7.0 +FROM mcr.microsoft.com/dotnet/aspnet:8.0 RUN adduser \ --disabled-password \ diff --git a/Docker/build/Dockerfile-MareSynchronosStaticFilesServer b/Docker/build/Dockerfile-MareSynchronosStaticFilesServer index ad5499a..ff2adb2 100644 --- a/Docker/build/Dockerfile-MareSynchronosStaticFilesServer +++ b/Docker/build/Dockerfile-MareSynchronosStaticFilesServer @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 as BUILD +FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD COPY MareAPI /server/MareAPI COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared @@ -12,7 +12,7 @@ RUN dotnet publish \ --output=/build \ MareSynchronosStaticFilesServer.csproj -FROM mcr.microsoft.com/dotnet/aspnet:7.0 +FROM mcr.microsoft.com/dotnet/aspnet:8.0 RUN adduser \ --disabled-password \ diff --git a/Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git b/Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git index 2270ed2..579c38b 100644 --- a/Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git +++ b/Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 as BUILD +FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD RUN git clone --recurse-submodules https://github.com/Penumbra-Sync/server @@ -10,7 +10,7 @@ RUN dotnet publish \ --output=/MareSynchronosStaticFilesServer \ MareSynchronosStaticFilesServer.csproj -FROM mcr.microsoft.com/dotnet/aspnet:7.0 +FROM mcr.microsoft.com/dotnet/aspnet:8.0 RUN adduser \ --disabled-password \ diff --git a/MareAPI b/MareAPI index 1163f38..cd8934a 160000 --- a/MareAPI +++ b/MareAPI @@ -1 +1 @@ -Subproject commit 1163f38f709681898d0c4fa71ebd1639e5d49518 +Subproject commit cd8934a4ab37a3549bacf7e7108f83a34403da96 diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs index 9766cbb..b81a7ed 100644 --- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs +++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs @@ -11,6 +11,8 @@ using MareSynchronosShared.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; using Microsoft.EntityFrameworkCore; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.PixelFormats; namespace MareSynchronosServer.Hubs; diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/SignalRLimitFilter.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/SignalRLimitFilter.cs index 100a706..a2e8017 100644 --- a/MareSynchronosServer/MareSynchronosServer/Hubs/SignalRLimitFilter.cs +++ b/MareSynchronosServer/MareSynchronosServer/Hubs/SignalRLimitFilter.cs @@ -10,8 +10,8 @@ public class SignalRLimitFilter : IHubFilter private readonly IRateLimitProcessor _processor; private readonly IHttpContextAccessor accessor; private readonly ILogger logger; - private static readonly SemaphoreSlim ConnectionLimiterSemaphore = new(10); - private static readonly SemaphoreSlim DisconnectLimiterSemaphore = new(10); + private static readonly SemaphoreSlim ConnectionLimiterSemaphore = new(20, 20); + private static readonly SemaphoreSlim DisconnectLimiterSemaphore = new(20, 20); public SignalRLimitFilter( IOptions options, IProcessingStrategy processing, IIpPolicyStore policyStore, IHttpContextAccessor accessor, ILogger logger) diff --git a/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj b/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj index 9d1cdbb..9d29e39 100644 --- a/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj +++ b/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 aspnet-MareSynchronosServer-BA82A12A-0B30-463C-801D-B7E81318CD50 1.1.0.0 enable @@ -21,19 +21,19 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/MareSynchronosServer/MareSynchronosServices/MareSynchronosServices.csproj b/MareSynchronosServer/MareSynchronosServices/MareSynchronosServices.csproj index 110a7ef..1de88d1 100644 --- a/MareSynchronosServer/MareSynchronosServices/MareSynchronosServices.csproj +++ b/MareSynchronosServer/MareSynchronosServices/MareSynchronosServices.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable @@ -21,14 +21,14 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj b/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj index f124b4b..fa5a231 100644 --- a/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj +++ b/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable @@ -18,15 +18,15 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -35,25 +35,25 @@ - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - + + + + + + + + + + diff --git a/MareSynchronosServer/MareSynchronosShared/Services/MareConfigurationServiceClient.cs b/MareSynchronosServer/MareSynchronosShared/Services/MareConfigurationServiceClient.cs index 16fb54f..4929342 100644 --- a/MareSynchronosServer/MareSynchronosShared/Services/MareConfigurationServiceClient.cs +++ b/MareSynchronosServer/MareSynchronosShared/Services/MareConfigurationServiceClient.cs @@ -107,9 +107,9 @@ public class MareConfigurationServiceClient : IHostedService, IConfigurationS try { _logger.LogInformation("Getting {key} from Http", key); - HttpRequestMessage msg = new(HttpMethod.Get, GetRoute(key, Convert.ToString(defaultValue, CultureInfo.InvariantCulture))); + using HttpRequestMessage msg = new(HttpMethod.Get, GetRoute(key, Convert.ToString(defaultValue, CultureInfo.InvariantCulture))); msg.Headers.Authorization = new AuthenticationHeaderValue("Bearer", _serverTokenGenerator.Token); - var response = await _httpClient.SendAsync(msg).ConfigureAwait(false); + using var response = await _httpClient.SendAsync(msg).ConfigureAwait(false); response.EnsureSuccessStatusCode(); var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); _logger.LogInformation("Http Response for {key} = {value}", key, content); diff --git a/MareSynchronosServer/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj b/MareSynchronosServer/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj index 94e5a0c..b1243f1 100644 --- a/MareSynchronosServer/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj +++ b/MareSynchronosServer/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable @@ -18,12 +18,16 @@ - - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/MareSynchronosServer/MareSynchronosStaticFilesServer/Startup.cs b/MareSynchronosServer/MareSynchronosStaticFilesServer/Startup.cs index 9df174c..089ee24 100644 --- a/MareSynchronosServer/MareSynchronosStaticFilesServer/Startup.cs +++ b/MareSynchronosServer/MareSynchronosStaticFilesServer/Startup.cs @@ -205,6 +205,7 @@ public class Startup services.AddStackExchangeRedisExtensions(redisConfiguration); services.AddHealthChecks(); + services.AddHttpLogging(e => e = new Microsoft.AspNetCore.HttpLogging.HttpLoggingOptions()); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env)