From 3ad80a2d0f0b813d614eb7789f4ab8e084d9e870 Mon Sep 17 00:00:00 2001 From: Max Erenberg Date: Wed, 7 Apr 2021 14:46:30 -0400 Subject: [PATCH] log invalid username (#17345) Automatic Merge --- model/user.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/model/user.go b/model/user.go index c81a4e3da1..27b88108d2 100644 --- a/model/user.go +++ b/model/user.go @@ -19,6 +19,7 @@ import ( "golang.org/x/text/language" "github.com/mattermost/mattermost-server/v5/services/timezones" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) const ( @@ -861,8 +862,8 @@ func IsValidUsername(s string) bool { return true } -func CleanUsername(s string) string { - s = NormalizeUsername(strings.Replace(s, " ", "-", -1)) +func CleanUsername(username string) string { + s := NormalizeUsername(strings.Replace(username, " ", "-", -1)) for _, value := range reservedName { if s == value { @@ -883,6 +884,8 @@ func CleanUsername(s string) string { if !IsValidUsername(s) { s = "a" + NewId() + mlog.Warn("Generating new username since provided username was invalid", + mlog.String("provided_username", username), mlog.String("new_username", s)) } return s