chore: tidy up

GZTimeWalker · May 13, 2024 · 322adba · 322adba
1 parent 6894dbd
commit 322adba
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 37 deletions.
diff --git a/src/GZCTF/Extensions/ConfigurationExtensions.cs b/src/GZCTF/Extensions/ConfigurationExtensions.cs
@@ -1,4 +1,5 @@
-using System.Text.Encodings.Web;
+using System.Net.Mime;
+using System.Text.Encodings.Web;
 using GZCTF.Models.Internal;
 using GZCTF.Providers;
 using GZCTF.Services.Cache;
@@ -16,18 +17,23 @@ public static class ConfigurationExtensions
         AbsoluteExpirationRelativeToNow = TimeSpan.FromDays(7)
     };
 
-    public static IConfigurationBuilder AddEntityConfiguration(this IConfigurationBuilder builder,
+    public static void AddEntityConfiguration(this IConfigurationBuilder builder,
         Action<DbContextOptionsBuilder> optionsAction) =>
         builder.Add(new EntityConfigurationSource(optionsAction));
 
     public static void UseCustomFavicon(this WebApplication app) =>
         app.MapGet("/favicon.webp", FaviconHandler);
 
-    public static async Task UseHomePageAsync(this WebApplication app)
+    public static async Task UseIndexAsync(this WebApplication app)
     {
-        if (app.Environment.IsDevelopment())
+        if (!File.Exists(Path.Join(app.Environment.WebRootPath, "index.html")))
         {
-            app.MapFallbackToFile("index.html");
+            app.MapFallback(context =>
+            {
+                context.Response.StatusCode = StatusCodes.Status404NotFound;
+                context.Response.ContentType = MediaTypeNames.Text.Html;
+                return Task.CompletedTask;
+            });
             return;
         }
 
@@ -37,7 +43,7 @@ public static async Task UseHomePageAsync(this WebApplication app)
         using var streamReader = new StreamReader(stream);
         var template = await streamReader.ReadToEndAsync();
 
-        app.MapFallback(HomePageHandler(template));
+        app.MapFallback(IndexHandler(template));
     }
 
     static string GetETag(string hash) => $"\"favicon-{hash[..8]}\"";
@@ -46,14 +52,12 @@ static async Task<IResult> FaviconHandler(HttpContext context, IDistributedCache
         IOptionsSnapshot<GlobalConfig> globalConfig, CancellationToken token = default)
     {
         var hash = await cache.GetStringAsync(CacheKey.Favicon, token);
-        if (hash is not null)
-            goto WriteCustomIcon;
-
-        hash = globalConfig.Value.FaviconHash;
-        if (hash is null || !Codec.FileHashRegex().IsMatch(hash))
-            goto FallbackToDefaultIcon;
-
-        WriteCustomIcon:
+        if (hash is null)
+        {
+            hash = globalConfig.Value.FaviconHash;
+            if (hash is null || !Codec.FileHashRegex().IsMatch(hash))
+                goto FallbackToDefaultIcon;
+        }
 
         var eTag = GetETag(hash[..8]);
         if (context.Request.Headers.IfNoneMatch == eTag)
@@ -70,7 +74,7 @@ static async Task<IResult> FaviconHandler(HttpContext context, IDistributedCache
 
         return Results.File(
             path,
-            "image/webp",
+            MediaTypeNames.Image.Webp,
             "favicon.webp",
             entityTag: EntityTagHeaderValue.Parse(eTag));
 
@@ -83,30 +87,29 @@ static async Task<IResult> FaviconHandler(HttpContext context, IDistributedCache
 
         return Results.File(
             Program.DefaultFavicon,
-            "image/webp",
+            MediaTypeNames.Image.Webp,
             "favicon.webp",
             entityTag: EntityTagHeaderValue.Parse(eTag));
     }
 
-    static HomePageHandlerDelegate HomePageHandler(string template)
-        => async (
-            IDistributedCache cache,
-            IOptionsSnapshot<GlobalConfig> globalConfig,
-            CancellationToken token = default) =>
-        {
-            var content = await cache.GetStringAsync(CacheKey.Index, token);
+    static HomePageHandlerDelegate IndexHandler(string template) => async (
+        IDistributedCache cache,
+        IOptionsSnapshot<GlobalConfig> globalConfig,
+        CancellationToken token = default) =>
+    {
+        var content = await cache.GetStringAsync(CacheKey.Index, token);
 
-            if (content is not null)
-                return Results.Text(content, "text/html");
+        if (content is not null)
+            return Results.Text(content, MediaTypeNames.Text.Html);
 
-            GlobalConfig config = globalConfig.Value;
-            var title = HtmlEncoder.Default.Encode(config.Platform);
-            var descr = HtmlEncoder.Default.Encode(config.Description ?? GlobalConfig.DefaultDescription);
-            content = template.Replace("%title%", title).Replace("%description%", descr);
+        GlobalConfig config = globalConfig.Value;
+        var title = HtmlEncoder.Default.Encode(config.Platform);
+        var descr = HtmlEncoder.Default.Encode(config.Description ?? GlobalConfig.DefaultDescription);
+        content = template.Replace("%title%", title).Replace("%description%", descr);
 
-            await cache.SetStringAsync(CacheKey.Index, content, token);
-            return Results.Text(content, "text/html");
-        };
+        await cache.SetStringAsync(CacheKey.Index, content, token);
+        return Results.Text(content, MediaTypeNames.Text.Html);
+    };
 
     delegate Task<IResult> HomePageHandlerDelegate(IDistributedCache cache, IOptionsSnapshot<GlobalConfig> globalConfig,
         CancellationToken token = default);

diff --git a/src/GZCTF/Program.cs b/src/GZCTF/Program.cs
@@ -3,6 +3,7 @@
 global using AppDbContext = GZCTF.Models.AppDbContext;
 global using TaskStatus = GZCTF.Utils.TaskStatus;
 using System.Globalization;
+using System.Net.Mime;
 using System.Reflection;
 using System.Security.Cryptography;
 using System.Text;
@@ -263,7 +264,12 @@
     options.Providers.Add<BrotliCompressionProvider>();
     options.Providers.Add<GzipCompressionProvider>();
     options.MimeTypes = ResponseCompressionDefaults.MimeTypes.Concat(
-        ["application/json", "text/javascript", "text/html", "text/css"]
+        [
+            MediaTypeNames.Application.Json,
+            MediaTypeNames.Text.Html,
+            MediaTypeNames.Text.JavaScript,
+            MediaTypeNames.Text.Css
+        ]
     );
 });
 
@@ -338,7 +344,7 @@
 app.MapHub<MonitorHub>("/hub/monitor");
 app.MapHub<AdminHub>("/hub/admin");
 
-await app.UseHomePageAsync();
+await app.UseIndexAsync();
 
 #endregion Middlewares
 
@@ -369,8 +375,10 @@ public class Program
     {
         static Program()
         {
-            using Stream stream = typeof(Program).Assembly.GetManifestResourceStream("GZCTF.Resources.favicon.webp")!;
+            using Stream stream = typeof(Program).Assembly
+                .GetManifestResourceStream("GZCTF.Resources.favicon.webp")!;
             DefaultFavicon = new byte[stream.Length];
+
             stream.ReadExactly(DefaultFavicon);
             DefaultFaviconHash = BitConverter.ToString(SHA256.HashData(DefaultFavicon))
                 .Replace("-", "").ToLowerInvariant();

diff --git a/src/GZCTF/Utils/PrelaunchHelper.cs b/src/GZCTF/Utils/PrelaunchHelper.cs
@@ -71,9 +71,8 @@ await context.Posts.AddAsync(new()
 
         if (!cache.CacheCheck())
             Program.ExitWithFatalMessage(Program.StaticLocalizer[nameof(Resources.Program.Init_InvalidCacheConfig)]);
-        
+
         await cache.RemoveAsync(CacheKey.Index);
-        await cache.RemoveAsync(CacheKey.Favicon);
     }
 
     static bool CacheCheck(this IDistributedCache cache)