fix(backedn): add NPOI lib

GZTimeWalker · Apr 21, 2024 · c4b20ee · c4b20ee
1 parent 2d046b5
commit c4b20ee
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 18 deletions.
diff --git a/src/Dockerfile b/src/Dockerfile
@@ -28,7 +28,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
 
 WORKDIR /app
 EXPOSE 8080
-RUN apk add --no-cache wget libpcap icu-data-full icu-libs ca-certificates && \
+RUN apk add --update --no-cache wget libpcap icu-data-full icu-libs ca-certificates libgdiplus && \
     update-ca-certificates
 
 COPY --from=publish /app/publish .

diff --git a/src/GZCTF/Controllers/ProxyController.cs b/src/GZCTF/Controllers/ProxyController.cs
@@ -171,7 +171,8 @@ async Task<IActionResult> DoContainerProxy(Guid id, IPEndPoint client, IPEndPoin
             catch (SocketException e)
             {
                 logger.SystemLog(
-                    Program.StaticLocalizer[nameof(Resources.Program.Proxy_ContainerConnectionFailedLog), e.SocketErrorCode,
+                    Program.StaticLocalizer[nameof(Resources.Program.Proxy_ContainerConnectionFailedLog),
+                        e.SocketErrorCode,
                         $"{target.Address}:{target.Port}"],
                     TaskStatus.Failed, LogLevel.Debug);
                 return new JsonResult(new RequestResponse(

diff --git a/src/GZCTF/Dockerfile b/src/GZCTF/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy AS build
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS build
 ARG TARGETPLATFORM
 COPY publish /build
 RUN cp -r /build/${TARGETPLATFORM} /publish
@@ -10,7 +10,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
 
 WORKDIR /app
 EXPOSE 8080
-RUN apk add --no-cache wget libpcap icu-data-full icu-libs ca-certificates && \
+RUN apk add --update --no-cache wget libpcap icu-data-full icu-libs ca-certificates libgdiplus && \
     update-ca-certificates
 
 COPY --from=build /publish .

diff --git a/src/GZCTF/Extensions/TelemetryExtension.cs b/src/GZCTF/Extensions/TelemetryExtension.cs
@@ -93,9 +93,9 @@ public static void UseTelemetry(this IApplicationBuilder app, TelemetryConfig? c
             app.UseOpenTelemetryPrometheusScrapingEndpoint(context =>
             {
                 if (string.Equals(
-                    context.Request.Path.ToString().TrimEnd('/'),
-                    "/metrics",
-                    StringComparison.OrdinalIgnoreCase))
+                        context.Request.Path.ToString().TrimEnd('/'),
+                        "/metrics",
+                        StringComparison.OrdinalIgnoreCase))
                 {
                     // FIXME: workaround for prometheus
                     context.Request.Headers.Accept = "application/openmetrics-text";
@@ -105,4 +105,4 @@ public static void UseTelemetry(this IApplicationBuilder app, TelemetryConfig? c
                 return false;
             });
     }
-}
+}
diff --git a/src/GZCTF/Services/Cache/CacheMaker.cs b/src/GZCTF/Services/Cache/CacheMaker.cs
@@ -42,7 +42,8 @@ public async Task StartAsync(CancellationToken token)
 
         #endregion
 
-        await Task.Factory.StartNew(() => Maker(TokenSource.Token), token, TaskCreationOptions.LongRunning, TaskScheduler.Default);
+        await Task.Factory.StartNew(() => Maker(TokenSource.Token), token, TaskCreationOptions.LongRunning,
+            TaskScheduler.Default);
     }
 
     public Task StopAsync(CancellationToken token)

diff --git a/src/GZCTF/Services/FlagChecker.cs b/src/GZCTF/Services/FlagChecker.cs
@@ -19,7 +19,8 @@ public async Task StartAsync(CancellationToken cancellationToken)
         TokenSource = new CancellationTokenSource();
 
         for (var i = 0; i < 2; ++i)
-            await Task.Factory.StartNew(() => Checker(i, TokenSource.Token), cancellationToken, TaskCreationOptions.LongRunning, TaskScheduler.Default);
+            await Task.Factory.StartNew(() => Checker(i, TokenSource.Token), cancellationToken,
+                TaskCreationOptions.LongRunning, TaskScheduler.Default);
 
         await using AsyncServiceScope scope = serviceScopeFactory.CreateAsyncScope();
 

diff --git a/src/GZCTF/Services/MailSender.cs b/src/GZCTF/Services/MailSender.cs
@@ -43,9 +43,11 @@ public MailSender(
                     {
                         var cipherName = cipher.ToString();
                         // Exclude MD5, SHA1, and NULL ciphers for security reasons
-                        return !cipherName.EndsWith("MD5") && !cipherName.EndsWith("SHA") && !cipherName.EndsWith("NULL");
+                        return !cipherName.EndsWith("MD5") && !cipherName.EndsWith("SHA") &&
+                               !cipherName.EndsWith("NULL");
                     }));
             }
+
             Task.Factory.StartNew(MailSenderWorker, _cancellationToken, TaskCreationOptions.LongRunning,
                 TaskScheduler.Default);
         }

diff --git a/src/GZCTF/Utils/ExcelHelper.cs b/src/GZCTF/Utils/ExcelHelper.cs
@@ -60,7 +60,7 @@ public MemoryStream GetSubmissionExcel(IEnumerable<Submission> submissions)
         return stream;
     }
 
-    ICellStyle GetHeaderStyle(XSSFWorkbook workbook)
+    static ICellStyle GetHeaderStyle(XSSFWorkbook workbook)
     {
         ICellStyle? style = workbook.CreateCellStyle();
         IFont? boldFontStyle = workbook.CreateFont();
@@ -139,7 +139,7 @@ int[] WriteBoardHeader(ISheet sheet, ICellStyle style, ScoreboardModel scoreboar
         return challIds.ToArray();
     }
 
-    void WriteBoardContent(ISheet sheet, ScoreboardModel scoreboard, int[] challIds, Game game)
+    static void WriteBoardContent(ISheet sheet, ScoreboardModel scoreboard, int[] challIds, Game game)
     {
         var rowIndex = 1;
         var withOrg = game.Organizations is not null && game.Organizations.Count > 0;
@@ -154,11 +154,13 @@ void WriteBoardContent(ISheet sheet, ScoreboardModel scoreboard, int[] challIds,
             if (withOrg)
                 row.CreateCell(colIndex++).SetCellValue(item.Organization);
 
-            row.CreateCell(colIndex++).SetCellValue(item.TeamInfo!.Captain!.RealName);
-            row.CreateCell(colIndex++).SetCellValue(string.Join("/", item.TeamInfo!.Members.Select(m => m.RealName)));
-            row.CreateCell(colIndex++).SetCellValue(string.Join("/", item.TeamInfo!.Members.Select(m => m.StdNumber)));
+            row.CreateCell(colIndex++).SetCellValue(item.TeamInfo?.Captain?.RealName ?? string.Empty);
             row.CreateCell(colIndex++)
-                .SetCellValue(string.Join("/", item.TeamInfo!.Members.Select(m => m.PhoneNumber)));
+                .SetCellValue(string.Join("/", item.TeamInfo?.Members.Select(m => m.RealName) ?? []));
+            row.CreateCell(colIndex++)
+                .SetCellValue(string.Join("/", item.TeamInfo?.Members.Select(m => m.StdNumber) ?? []));
+            row.CreateCell(colIndex++)
+                .SetCellValue(string.Join("/", item.TeamInfo?.Members.Select(m => m.PhoneNumber) ?? []));
 
             row.CreateCell(colIndex++).SetCellValue(item.SolvedCount);
             row.CreateCell(colIndex++).SetCellValue(item.LastSubmissionTime.ToString("u"));

diff --git a/src/GZCTF/Utils/RecordableNetworkStream.cs b/src/GZCTF/Utils/RecordableNetworkStream.cs
@@ -118,4 +118,4 @@ protected override void Dispose(bool disposing)
 
         _disposed = true;
     }
-}
+}