feat: fix CVE-2019-0820 and CVE-2018-8292 (#54)

OpenDAoC · Jul 8, 2024 · cb4f0c7 · cb4f0c7
2 parents 43f6a4d + dc01e47
commit cb4f0c7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -34,11 +34,8 @@ RUN dotnet build DOLLinux.sln -c Release
 FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS final
 LABEL stage=final
 
-# Copy gosu
-COPY --from=tianon/gosu /gosu /usr/local/bin/
-
-## Install ICU libraries
-RUN apk add --no-cache icu-libs
+## Install ICU libraries and su-exec
+RUN apk add --no-cache icu-libs su-exec
 
 # Set the working directory in the container
 WORKDIR /app

diff --git a/GameServer/GameServer.csproj b/GameServer/GameServer.csproj
@@ -41,6 +41,8 @@
     <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="3.1.512801" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
+    <PackageReference Include="System.Net.Http" Version="4.3.4" />
+    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
     <ProjectReference Include="..\CoreBase\CoreBase.csproj" Name="CoreBase" />
     <ProjectReference Include="..\CoreDatabase\CoreDatabase.csproj" Name="CoreDatabase" />
   </ItemGroup>

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -70,4 +70,4 @@ EOF
 chown -R appuser:appgroup /app
 
 # Switch to the non-root user and start the server
-exec gosu appuser sh -c "cd /app && exec dotnet CoreServer.dll"
+exec su-exec appuser sh -c "cd /app && dotnet CoreServer.dll"