aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua M. Boniface <joshua@boniface.me>2019-03-17 00:12:15 -0400
committerGitHub <noreply@github.com>2019-03-17 00:12:15 -0400
commit67fbbcfd124090ceac670091a0acbb7ebc4b7edd (patch)
tree0a4adaa69a1715c33ee3890ef0ceb004cd6b40ba
parent3d1d27230de88cbf5c3ed3f882399175661c1c94 (diff)
parente3dbed1c1aff986e51e25ba244a6a6bf52816dbe (diff)
Merge pull request #1121 from LogicalPhallacy/master
Update username regex to string literal with escaped -
-rw-r--r--Emby.Server.Implementations/Library/UserManager.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/Emby.Server.Implementations/Library/UserManager.cs b/Emby.Server.Implementations/Library/UserManager.cs
index efb1ef4a5..ee90b3558 100644
--- a/Emby.Server.Implementations/Library/UserManager.cs
+++ b/Emby.Server.Implementations/Library/UserManager.cs
@@ -216,10 +216,10 @@ namespace Emby.Server.Implementations.Library
public static bool IsValidUsername(string username)
{
- //This is some regex that matches only on unicode "word" characters, as well as -, _ and @
- //In theory this will cut out most if not all 'control' characters which should help minimize any weirdness
- // Usernames can contain letters (a-z + whatever else unicode is cool with), numbers (0-9), dashes (-), underscores (_), apostrophes ('), and periods (.)
- return Regex.IsMatch(username, "^[\\w-'._@]*$");
+ // This is some regex that matches only on unicode "word" characters, as well as -, _ and @
+ // In theory this will cut out most if not all 'control' characters which should help minimize any weirdness
+ // Usernames can contain letters (a-z + whatever else unicode is cool with), numbers (0-9), at-signs (@), dashes (-), underscores (_), apostrophes ('), and periods (.)
+ return Regex.IsMatch(username, @"^[\w\-'._@]*$");
}
private static bool IsValidUsernameCharacter(char i)