Merge branch 'LittleBigRefresh:main' into email-domain

Author: Toastbrot236

Refresh.Core/Configuration/GameServerConfig.cs

@@ -10,7 +10,7 @@ namespace Refresh.Core.Configuration;
 [SuppressMessage("ReSharper", "RedundantDefaultMemberInitializer")]
 public class GameServerConfig : Config
 {
-    public override int CurrentConfigVersion => 25;
+    public override int CurrentConfigVersion => 26;
     public override int Version { get; set; } = 0;
 
     protected override void Migrate(int oldVer, dynamic oldConfig)
@@ -117,6 +117,11 @@ protected override void Migrate(int oldVer, dynamic oldConfig)
     /// </summary>
     public bool PrintRoomStateWhenNoFoundRooms { get; set; } = true;
 
+    /// <summary>
+    /// Whether to unconditionally print data like token, token owner, remote IP, request URI etc during authentication outside of exceptions
+    /// </summary>
+    public bool PrintAuthenticationData { get; set; } = false;
+
     public string[] Sha1DigestKeys = ["CustomServerDigest"];
     public string[] HmacDigestKeys = ["CustomServerDigest"];
 

Refresh.Core/RateLimits/Levels/SingleLevelEndpointLimits.cs

@@ -4,7 +4,7 @@ public static class SingleLevelEndpointLimits
 {
     public const int TimeoutDuration = 300;
     public const int ApiRequestAmount = 50;
-    public const int GameRequestAmount = 170; // Game likes to request them a lot
+    public const int GameRequestAmount = 280; // Game likes to request them a lot
     public const int BlockDuration = 240;
     public const string ApiRequestBucket = "single-level-api";
     public const string GameRequestBucket = "single-level-game";

Refresh.Core/RateLimits/Presence/GamePresenceEndpointLimits.cs

@@ -5,8 +5,8 @@ namespace Refresh.Core.RateLimits.Presence;
 /// </summary>
 public static class GamePresenceEndpointLimits
 {
-    public const int TimeoutDuration = 450;
-    public const int RequestAmount = 30;
-    public const int BlockDuration = 300;
+    public const int TimeoutDuration = 300;
+    public const int RequestAmount = 80;
+    public const int BlockDuration = 240;
     public const string RequestBucket = "game-presence";
 }

Refresh.Core/RateLimits/Relations/PlayLevelEndpointLimits.cs

@@ -3,7 +3,7 @@ namespace Refresh.Core.RateLimits.Relations;
 public static class PlayLevelEndpointLimits
 {
     public const int TimeoutDuration = 300;
-    public const int RequestAmount = 20;
+    public const int RequestAmount = 40;
     public const int BlockDuration = 240;
     public const string RequestBucket = "play-level";
 }

Refresh.Core/RateLimits/Users/NotificationsEndpointLimits.cs

@@ -3,7 +3,7 @@ namespace Refresh.Core.RateLimits.Users;
 public static class NotificationsEndpointLimits
 {
     public const int TimeoutDuration = 180;
-    public const int GameRequestAmount = 4;
+    public const int GameRequestAmount = 8;
     public const int ApiRequestAmount = 20;
     public const int BlockDuration = 150;
     public const string GameRequestBucket = "notifications-game";

Refresh.Core/Services/CacheService.cs

@@ -53,15 +53,16 @@ public override void Initialize()
 
         // periodically automatically remove expired data if it hasn't been removed somehow else before,
         // to not keep unused data for a potentially undefined time
-        Thread expirationThread = new(() =>
+        Task expirationTask = new(async () =>
         {
             while(true)
             {
-                Thread.Sleep(1000 * 60 * 2);
+                await Task.Delay(1000 * 60 * 2);
                 this.RemoveExpiredCache();
             }
         });
-        expirationThread.Start();
+
+        expirationTask.Start();
     }
 
     private void RemoveExpiredCache()

Refresh.Database/GameDatabaseContext.Tokens.cs

@@ -90,7 +90,7 @@ public Token GenerateTokenForUser(GameUser user, TokenType type, TokenGame game,
 #if DEBUG
             if(Debugger.IsAttached) Debugger.Break();
 #endif
-            throw new InvalidDataException($"GetTokenFromTokenData - Token data or type does not match!");
+            throw new InvalidDataException($"GetTokenFromTokenData - Token data or type does not match (expected {tokenData} | {type}, got {token.TokenData} | {token.TokenType} by {token.User})!");
         }
 
         return token;

Refresh.GameServer/Authentication/GameAuthenticationProvider.cs

@@ -76,13 +76,16 @@ public GameAuthenticationProvider(GameServerConfig? config, Logger logger)
         if ((this._config?.MaintenanceMode ?? false) && user.Role != GameUserRole.Admin)
             return null;
 
+        if (this._config?.PrintAuthenticationData ?? false)
+            this._logger.LogInfo(BunkumCategory.Authentication, $"Authenticating request from {request.RemoteEndpoint} to {request.Uri.AbsolutePath} by {user} using token {tokenData}");
+        
         // Additional validation of the token gotten from DB. Exceptions will be caught, logged and InternalServerError will be returned automatically.
         if (token.TokenData != tokenData)
         {
 #if DEBUG
             if(Debugger.IsAttached) Debugger.Break();
 #endif
-            throw new InvalidDataException($"{typeof(GameAuthenticationProvider)} - Token from DB does not match token received from client!");
+            throw new InvalidDataException($"{typeof(GameAuthenticationProvider)} - Token from DB ({token.TokenData}) does not match token received from client ({tokenData})!");
         }
 
         if (token.User.UserId != token.UserId)

Refresh.Interfaces.APIv3/Endpoints/ApiTypes/Errors/ApiAuthenticationError.cs

@@ -9,6 +9,9 @@ public class ApiAuthenticationError : ApiError
     public const string NoPermissionsForCreationWhen = "You lack the permissions to create this type of resource.";
     public static readonly ApiAuthenticationError NoPermissionsForCreation = new(NoPermissionsForCreationWhen);
 
+    public const string ReadOnlyErrorWhen = "The server is currently in read-only mode.";
+    public static readonly ApiAuthenticationError ReadOnlyError = new(ReadOnlyErrorWhen);
+
     public const string NotAuthenticatedWhen = "You are not authenticated.";
     public static readonly ApiAuthenticationError NotAuthenticated = new(NotAuthenticatedWhen);
 

Refresh.Interfaces.APIv3/Endpoints/AuthenticationApiEndpoints.cs

@@ -425,9 +425,15 @@ public ApiOkResponse ResendVerificationCode(RequestContext context, GameUser use
     }
 
     [ApiV3Endpoint("users/me", HttpMethods.Delete), MinimumRole(GameUserRole.Restricted)]
-    [DocSummary("Deletes your own account. This action is non-reversible.")]
-    public ApiOkResponse DeleteMyAccount(RequestContext context, GameUser user, GameDatabaseContext database)
+    [DocSummary("Deletes your own account. This action is non-reversible. This endpoint now requires you to include your own password while being authenticated.")]
+    public ApiOkResponse DeleteMyAccount(RequestContext context, GameUser user, ApiOwnUserDeletionRequest body, GameDatabaseContext database)
     {
+        if (string.IsNullOrWhiteSpace(body.PasswordSha512))
+            return new ApiValidationError("You must enter your password to delete your account.");
+
+        if (!BC.Verify(body.PasswordSha512, user.PasswordBcrypt))
+            return new ApiValidationError("The password was incorrect.");
+
         database.DeleteUser(user);
         return new ApiOkResponse();
     }