Fix missing filtering, filter inconsistencies, and filter logging

ProjectLighthouse.Servers.GameServer/Controllers/CommentController.cs

@@ -1,14 +1,12 @@
 #nullable enable
 using LBPUnion.ProjectLighthouse.Configuration;
 using LBPUnion.ProjectLighthouse.Database;
 using LBPUnion.ProjectLighthouse.Extensions;
 using LBPUnion.ProjectLighthouse.Helpers;
-using LBPUnion.ProjectLighthouse.Logging;
 using LBPUnion.ProjectLighthouse.Types.Entities.Profile;
 using LBPUnion.ProjectLighthouse.Types.Entities.Token;
 using LBPUnion.ProjectLighthouse.Types.Filter;
 using LBPUnion.ProjectLighthouse.Types.Levels;
-using LBPUnion.ProjectLighthouse.Types.Logging;
 using LBPUnion.ProjectLighthouse.Types.Serialization;
 using LBPUnion.ProjectLighthouse.Types.Users;
 using Microsoft.AspNetCore.Authorization;
@@ -24,7 +22,7 @@
 public class CommentController : ControllerBase
 {
     private readonly DatabaseContext database;
     public CommentController(DatabaseContext database)
     {
         this.database = database;
     }
@@ -144,11 +142,7 @@
             targetId = await this.database.UserIdFromUsername(username!);
         }
 
-        string filteredText = CensorHelper.FilterMessage(comment.Message);
-
-        if (ServerConfiguration.Instance.LogChatFiltering && filteredText != comment.Message)
-            Logger.Info($"Censored profane word(s) from in-game comment sent by {username}: \"{comment.Message}\" => \"{filteredText}\"",
-                LogArea.Filter);
+        string filteredText = CensorHelper.FilterMessage(comment.Message, Location.ChatMessage, username);
 
         bool success = await this.database.PostComment(token.UserId, targetId, type, filteredText);
         if (success) return this.Ok();

ProjectLighthouse.Servers.GameServer/Controllers/MessageController.cs

@@ -10,6 +10,7 @@
 using LBPUnion.ProjectLighthouse.Types.Entities.Notifications;
 using LBPUnion.ProjectLighthouse.Types.Entities.Profile;
 using LBPUnion.ProjectLighthouse.Types.Entities.Token;
+using LBPUnion.ProjectLighthouse.Types.Filter;
 using LBPUnion.ProjectLighthouse.Types.Logging;
 using LBPUnion.ProjectLighthouse.Types.Mail;
 using LBPUnion.ProjectLighthouse.Types.Serialization;
@@ -41,7 +42,7 @@
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.";
 
     public MessageController(DatabaseContext database)
     {
         this.database = database;
     }
@@ -71,7 +72,7 @@
                                   $"user.UserId: {token.UserId}\n" +
                                   $"token.GameVersion: {token.GameVersion}\n" +
                                   $"token.TicketHash: {token.TicketHash}\n" +
                                   $"token.ExpiresAt: {token.ExpiresAt.ToString()}\n" +
                                   "---DEBUG INFO---");
         #endif
 
@@ -127,7 +128,7 @@
 
         if (message.StartsWith("/setemail ") && ServerConfiguration.Instance.Mail.MailEnabled)
         {
             string email = message[(message.IndexOf(" ", StringComparison.Ordinal)+1)..];
             if (!SanitizationHelper.IsValidEmail(email)) return this.Ok();
 
             if (await this.database.Users.AnyAsync(u => u.EmailAddress == email)) return this.Ok();
@@ -143,15 +144,10 @@
 
         string username = await this.database.UsernameFromGameToken(token);
 
-        string filteredText = CensorHelper.FilterMessage(message);
-
         if (ServerConfiguration.Instance.LogChatMessages) Logger.Info($"{username}: \"{message}\"", LogArea.Filter);
 
-        if (ServerConfiguration.Instance.LogChatFiltering && filteredText != message)
-            Logger.Info(
-                $"Censored profane word(s) from in-game text sent by {username}: \"{message}\" => \"{filteredText}\"",
-                LogArea.Filter);
+        message = CensorHelper.FilterMessage(message, Location.ChatMessage, username);
 
-        return this.Ok(filteredText);
+        return this.Ok(message);
     }
 }

ProjectLighthouse.Servers.GameServer/Controllers/Slots/PublishController.cs

@@ -10,6 +10,7 @@
 using LBPUnion.ProjectLighthouse.Types.Entities.Profile;
 using LBPUnion.ProjectLighthouse.Types.Entities.Token;
 using LBPUnion.ProjectLighthouse.Types.Logging;
+using LBPUnion.ProjectLighthouse.Types.Filter;
 using LBPUnion.ProjectLighthouse.Types.Resources;
 using LBPUnion.ProjectLighthouse.Types.Serialization;
 using LBPUnion.ProjectLighthouse.Types.Users;
@@ -27,7 +28,7 @@
 {
     private readonly DatabaseContext database;
 
     public PublishController(DatabaseContext database)
     {
         this.database = database;
     }
@@ -63,7 +64,7 @@
             return this.BadRequest();
         }
 
         if (slot.Resources?.Length == 0) slot.Resources = new[]{slot.RootLevel,};
 
         if (slot.Resources == null)
         {
@@ -99,7 +100,7 @@
             return this.Forbid();
         }
 
         HashSet<string> resources = new(slot.Resources)
         {
             slot.IconHash,
         };
@@ -142,7 +143,7 @@
         // Yes Rider, this isn't null
         Debug.Assert(slot.Resources != null, "slot.ResourceList != null");
 
-        slot.Name = CensorHelper.FilterMessage(slot.Name);
+        slot.Name = CensorHelper.FilterMessage(slot.Name, Location.SlotName, user.Username);
 
         if (slot.Name.Length > 64)
         {
@@ -153,7 +154,7 @@
             return this.BadRequest();
         }
 
-        slot.Description = CensorHelper.FilterMessage(slot.Description);
+        slot.Description = CensorHelper.FilterMessage(slot.Description, Location.SlotDescription, user.Username);
 
         if (slot.Description.Length > 512)
         {

ProjectLighthouse.Servers.GameServer/Controllers/Slots/ReviewController.cs

@@ -1,4 +1,4 @@
 #nullable enable
 using LBPUnion.ProjectLighthouse.Configuration;
 using LBPUnion.ProjectLighthouse.Database;
 using LBPUnion.ProjectLighthouse.Extensions;
@@ -22,7 +22,7 @@
 {
     private readonly DatabaseContext database;
 
     public ReviewController(DatabaseContext database)
     {
         this.database = database;
     }
@@ -99,7 +99,9 @@
         GameReview? newReview = await this.DeserializeBody<GameReview>();
         if (newReview == null) return this.BadRequest();
 
-        newReview.Text = CensorHelper.FilterMessage(newReview.Text);
+        // Temporary fix until this can be refactored to use a UserEntity properly
+        string username = await this.database.UsernameFromGameToken(token);
+        newReview.Text = CensorHelper.FilterMessage(newReview.Text, Location.SlotReview, username);
 
         if (newReview.Text.Length > 512) return this.BadRequest();
 

ProjectLighthouse.Servers.GameServer/Controllers/UserController.cs

@@ -3,6 +3,7 @@
 using LBPUnion.ProjectLighthouse.Database;
 using LBPUnion.ProjectLighthouse.Extensions;
 using LBPUnion.ProjectLighthouse.Files;
+using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Logging;
 using LBPUnion.ProjectLighthouse.Servers.GameServer.Helpers;
 using LBPUnion.ProjectLighthouse.Servers.GameServer.Types.Users;
@@ -11,6 +12,7 @@
 using LBPUnion.ProjectLighthouse.Types.Entities.Token;
 using LBPUnion.ProjectLighthouse.Types.Levels;
 using LBPUnion.ProjectLighthouse.Types.Logging;
+using LBPUnion.ProjectLighthouse.Types.Filter;
 using LBPUnion.ProjectLighthouse.Types.Serialization;
 using LBPUnion.ProjectLighthouse.Types.Users;
 using Microsoft.AspNetCore.Authorization;
@@ -27,7 +29,7 @@
 {
     private readonly DatabaseContext database;
 
     public UserController(DatabaseContext database)
     {
         this.database = database;
     }
@@ -44,7 +46,7 @@
     [HttpGet("users")]
     public async Task<IActionResult> GetUserAlt([FromQuery(Name = "u")] string[] userList)
     {
         List<MinimalUserProfile> minimalUserList = new();
         foreach (string username in userList)
         {
             MinimalUserProfile? profile = await this.database.Users.Where(u => u.Username == username)
@@ -79,7 +81,9 @@
 
             if (update.Biography.Length > 512) return this.BadRequest();
 
-            user.Biography = update.Biography;
+            string filteredBio = CensorHelper.FilterMessage(update.Biography, Location.UserBiography, user.Username);
+
+            user.Biography = filteredBio;
         }
 
         if (update.Location != null) user.Location = update.Location;

ProjectLighthouse.Servers.Website/Controllers/SlotPageController.cs

@@ -1,4 +1,4 @@
 #nullable enable
 using LBPUnion.ProjectLighthouse.Configuration;
 using LBPUnion.ProjectLighthouse.Database;
 using LBPUnion.ProjectLighthouse.Helpers;
@@ -6,6 +6,7 @@
 using LBPUnion.ProjectLighthouse.Types.Entities.Level;
 using LBPUnion.ProjectLighthouse.Types.Entities.Profile;
 using LBPUnion.ProjectLighthouse.Types.Entities.Token;
+using LBPUnion.ProjectLighthouse.Types.Filter;
 using LBPUnion.ProjectLighthouse.Types.Logging;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -23,7 +24,7 @@
 {
     private readonly DatabaseContext database;
 
     public SlotPageController(DatabaseContext database)
     {
         this.database = database;
     }
@@ -73,11 +74,7 @@
         }
 
         string username = await this.database.UsernameFromWebToken(token);
-        string filteredText = CensorHelper.FilterMessage(msg);
-
-        if (ServerConfiguration.Instance.LogChatFiltering && filteredText != msg)
-            Logger.Info($"Censored profane word(s) from slot comment sent by {username}: \"{msg}\" => \"{filteredText}\"",
-                LogArea.Filter);
+        string filteredText = CensorHelper.FilterMessage(msg, Location.SlotReview, username);
 
         bool success = await this.database.PostComment(token.UserId, id, CommentType.Level, filteredText);
         if (success)

ProjectLighthouse.Servers.Website/Controllers/UserPageController.cs

@@ -1,10 +1,11 @@
 #nullable enable
 using LBPUnion.ProjectLighthouse.Configuration;
 using LBPUnion.ProjectLighthouse.Database;
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Logging;
 using LBPUnion.ProjectLighthouse.Types.Entities.Profile;
 using LBPUnion.ProjectLighthouse.Types.Entities.Token;
+using LBPUnion.ProjectLighthouse.Types.Filter;
 using LBPUnion.ProjectLighthouse.Types.Logging;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -17,7 +18,7 @@
 {
     private readonly DatabaseContext database;
 
     public UserPageController(DatabaseContext database)
     {
         this.database = database;
     }
@@ -49,11 +50,7 @@
         }
 
         string username = await this.database.UsernameFromWebToken(token);
-        string filteredText = CensorHelper.FilterMessage(msg);
-
-        if (ServerConfiguration.Instance.LogChatFiltering && filteredText != msg)
-            Logger.Info($"Censored profane word(s) from user comment sent by {username}: \"{msg}\" => \"{filteredText}\"",
-                LogArea.Filter);
+        string filteredText = CensorHelper.FilterMessage(msg, Location.UserComment, username);
 
         bool success = await this.database.PostComment(token.UserId, id, CommentType.Profile, filteredText);
         if (success)

ProjectLighthouse.Servers.Website/Pages/Debug/FilterTestPage.cshtml.cs

@@ -1,8 +1,9 @@
 #nullable enable
 #if DEBUG
 using LBPUnion.ProjectLighthouse.Helpers;
 #endif
 using LBPUnion.ProjectLighthouse.Database;
+using LBPUnion.ProjectLighthouse.Types.Filter;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 
@@ -10,7 +11,7 @@
 
 public class FilterTestPage : BaseLayout
 {
     public FilterTestPage(DatabaseContext database) : base(database)
     {}
 
     public string? FilteredText;
@@ -19,7 +20,7 @@
     public IActionResult OnGet(string? text = null)
     {
         #if DEBUG
-        if (text != null) this.FilteredText = CensorHelper.FilterMessage(text);
+        if (text != null) this.FilteredText = CensorHelper.FilterMessage(text, Location.Test);
         this.Text = text;
 
         return this.Page();

ProjectLighthouse.Servers.Website/Pages/SlotSettingsPage.cshtml.cs

@@ -1,10 +1,11 @@
 #nullable enable
 using LBPUnion.ProjectLighthouse.Configuration;
 using LBPUnion.ProjectLighthouse.Database;
 using LBPUnion.ProjectLighthouse.Files;
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types.Entities.Level;
+using LBPUnion.ProjectLighthouse.Types.Filter;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
@@ -14,17 +15,17 @@
 {
 
     public SlotEntity? Slot;
     public SlotSettingsPage(DatabaseContext database) : base(database)
     {}
 
     public async Task<IActionResult> OnPost([FromRoute] int slotId, [FromForm] string? avatar, [FromForm] string? name, [FromForm] string? description, string? labels)
     {
         this.Slot = await this.Database.Slots.FirstOrDefaultAsync(u => u.SlotId == slotId);
         if (this.Slot == null) return this.NotFound();
 
         if (this.User == null) return this.Redirect("~/slot/" + slotId);
 
         if (!this.User.IsModerator && this.User != this.Slot.Creator) return this.Redirect("~/slot/" + slotId);
 
         // Deny request if in read-only mode
         if (ServerConfiguration.Instance.UserGeneratedContentLimits.ReadOnlyMode)
@@ -36,15 +37,15 @@
 
         if (name != null)
         {
-            name = CensorHelper.FilterMessage(name);
-            if (this.Slot.Name != name && name.Length <= 64)
+            name = CensorHelper.FilterMessage(name, Location.SlotName, this.User.Username);
+            if (this.Slot.Name != name && name.Length <= 64) 
                 this.Slot.Name = name;
         }
 
         if (description != null)
         {
-            description = CensorHelper.FilterMessage(description);
-            if (this.Slot.Description != description && description?.Length <= 512)
+            description = CensorHelper.FilterMessage(description, Location.SlotDescription, this.User.Username);
+            if (this.Slot.Description != description && description.Length <= 512) 
                 this.Slot.Description = description;
         }
 

ProjectLighthouse.Servers.Website/Pages/UserSettingsPage.cshtml.cs

@@ -1,4 +1,4 @@
 #nullable enable
 using System.Diagnostics.CodeAnalysis;
 using LBPUnion.ProjectLighthouse.Configuration;
 using LBPUnion.ProjectLighthouse.Database;
@@ -7,6 +7,7 @@
 using LBPUnion.ProjectLighthouse.Localization;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types.Entities.Profile;
+using LBPUnion.ProjectLighthouse.Types.Filter;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
@@ -16,7 +17,7 @@
 {
 
     public UserEntity? ProfileUser;
     public UserSettingsPage(DatabaseContext database) : base(database)
     {}
 
     [SuppressMessage("ReSharper", "SpecifyStringComparison")]
@@ -55,9 +56,12 @@
             if (ServerConfiguration.Instance.UserGeneratedContentLimits.ReadOnlyMode)
                 return this.Redirect($"~/user/{userId}");
 
-            biography = CensorHelper.FilterMessage(biography);
             if (this.ProfileUser.Biography != biography && biography.Length <= 512)
-                this.ProfileUser.Biography = biography;
+            {
+                string filteredBio = CensorHelper.FilterMessage(biography, Location.UserBiography, this.ProfileUser.Username);
+
+                this.ProfileUser.Biography = filteredBio;
+            }
         }
 
         if (ServerConfiguration.Instance.Mail.MailEnabled &&
@@ -65,7 +69,7 @@
             (this.User == this.ProfileUser || this.User.IsAdmin))
         {
             // if email hasn't already been used
             if (!await this.Database.Users.AnyAsync(u => u.EmailAddress != null && u.EmailAddress.ToLower() == email!.ToLower()))
             {
                 if (this.ProfileUser.EmailAddress != email)
                 {

ProjectLighthouse/Helpers/CensorHelper.cs

@@ -2,22 +2,25 @@
 using System.Collections.Generic;
 using System.Text;
 using LBPUnion.ProjectLighthouse.Configuration;
+using LBPUnion.ProjectLighthouse.Logging;
+using LBPUnion.ProjectLighthouse.Types.Filter;
+using LBPUnion.ProjectLighthouse.Types.Logging;
 
 namespace LBPUnion.ProjectLighthouse.Helpers;
 
 public static class CensorHelper
 {
     private static readonly char[] randomCharacters =
     {
         '!', '@', '#', '$', '&', '%', '-', '_',
     };
 
     private static readonly string[] randomFurry =
     {
         "UwU", "OwO", "uwu", "owo", "o3o", ">.>", "*pounces on you*", "*boops*", "*baps*", ":P", "x3", "O_O", "xD", ":3", ";3", "^w^",
     };
 
-    public static string FilterMessage(string message)
+    public static string FilterMessage(string message, Location filterLocation = Location.None, string username = null)
     {
         if (CensorConfiguration.Instance.UserInputFilterMode == FilterMode.None) return message;
         StringBuilder stringBuilder = new(message);
@@ -26,7 +29,7 @@
         {
             int lastFoundProfanity = 0;
             int profaneIndex;
             List<int> censorIndices = new();
             do
             {
                 profaneIndex = message.IndexOf(profanity, lastFoundProfanity, StringComparison.OrdinalIgnoreCase);
@@ -44,7 +47,14 @@
             }
         }
 
-        return stringBuilder.ToString();
+        string filteredMessage = stringBuilder.ToString();
+
+        if (ServerConfiguration.Instance.LogChatFiltering && filteredMessage != message)
+            Logger.Info(
+                $"Comment sent {(username != null ? $"by {username} " : "")}" + $"from {filterLocation}" +
+                $"\"{message}\" => \"{filteredMessage}\"", LogArea.Filter);
+
+        return filteredMessage;
     }
 
     private static void Censor(int profanityIndex, int profanityLength, StringBuilder message)

ProjectLighthouse/Types/Filter/FilterLocation.cs

@@ -0,0 +1,13 @@
+namespace LBPUnion.ProjectLighthouse.Types.Filter;
+
+public enum Location
+{
+    SlotName = 0,
+    SlotDescription = 1,
+    SlotReview = 2,
+    UserBiography = 3,
+    UserComment = 4,
+    ChatMessage = 5,
+    Test = 6,
+    None = 7,
+}