sam/Foxnouns.NET
sam/Foxnouns.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

fix(backend): fix username regex accepting characters with diacritics

Browse source
This commit is contained in:
sam 2024-10-01 16:04:36 +02:00
parent b1165c3780
commit 5a8b7aae80
Signed by: sam
GPG key ID: B4EF20DDE721CAA1
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Foxnouns.Backend/Utils/ValidationUtils.cs
View file

@ -7,13 +7,8 @@ namespace Foxnouns.Backend.Utils;
/// <summary> /// <summary>
/// Static methods for validating user input (mostly making sure it's not too short or too long) /// Static methods for validating user input (mostly making sure it's not too short or too long)
/// </summary> /// </summary>
public static class ValidationUtils public static partial class ValidationUtils
{ {
private static readonly Regex UsernameRegex = new("^[\\w-.]{2,40}$", RegexOptions.IgnoreCase);
private static readonly Regex MemberRegex =
new("^[^@\\?!#/\\\\[\\]\"\\{\\}'$%&()+<=>^|~`,\\*]{1,100}$", RegexOptions.IgnoreCase);
private static readonly string[] InvalidUsernames = private static readonly string[] InvalidUsernames =
[ [
"..", "..",
@ -40,7 +35,7 @@ public static class ValidationUtils
public static ValidationError? ValidateUsername(string username) public static ValidationError? ValidateUsername(string username)
{ {
if (!UsernameRegex.IsMatch(username)) if (!UsernameRegex().IsMatch(username))
return username.Length switch return username.Length switch
{ {
< 2 => ValidationError.LengthError("Username is too short", 2, 40, username.Length), < 2 => ValidationError.LengthError("Username is too short", 2, 40, username.Length),
@ -57,7 +52,7 @@ public static class ValidationUtils
public static ValidationError? ValidateMemberName(string memberName) public static ValidationError? ValidateMemberName(string memberName)
{ {
if (!MemberRegex.IsMatch(memberName)) if (!MemberRegex().IsMatch(memberName))
return memberName.Length switch return memberName.Length switch
{ {
< 1 => ValidationError.LengthError("Name is too short", 1, 100, memberName.Length), < 1 => ValidationError.LengthError("Name is too short", 1, 100, memberName.Length),
@ -128,7 +123,7 @@ public static class ValidationUtils
} }
public const int MaxBioLength = 1024; public const int MaxBioLength = 1024;
public static ValidationError? ValidateBio(string? bio) public static ValidationError? ValidateBio(string? bio)
{ {
return bio?.Length switch return bio?.Length switch
@ -291,4 +286,9 @@ public static class ValidationUtils
return errors; return errors;
} }
[GeneratedRegex(@"^[a-zA-Z_0-9\-\.]{2,40}$", RegexOptions.IgnoreCase, "en-NL")]
private static partial Regex UsernameRegex();
[GeneratedRegex("""^[^@'$%&()+<=>^|~`,*!#/\\\[\]""\{\}\?]{1,100}$""", RegexOptions.IgnoreCase, "en-NL")]
private static partial Regex MemberRegex();
} }