From 51dbd8801d000dbe0ef71e94cf5e6ad016995707 Mon Sep 17 00:00:00 2001 From: Baekjun Kim Date: Fri, 24 Jun 2022 15:23:21 -0700 Subject: [PATCH 1/4] Displaying fullname --- models/db/name.go | 3 +++ models/user/user.go | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/models/db/name.go b/models/db/name.go index 9c9d18f18474..c7295a967975 100644 --- a/models/db/name.go +++ b/models/db/name.go @@ -18,6 +18,9 @@ var ( // AlphaDashDotPattern characters prohibited in a user name (anything except A-Za-z0-9_.-) AlphaDashDotPattern = regexp.MustCompile(`[^\w-\.]`) + + // AlphaDashDotPattern characters prohibited in a user name (anything except A-Za-z0-9_.-) + AlphaDashDotPipePattern = regexp.MustCompile(`[^\w-\.\|]`) ) // ErrNameReserved represents a "reserved name" error. diff --git a/models/user/user.go b/models/user/user.go index f7d457b91b5a..9d4671820046 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -485,6 +485,9 @@ func (u *User) GitName() string { // ShortName ellipses username to length func (u *User) ShortName(length int) string { + if setting.UI.DefaultShowFullName { + return base.EllipsisString(u.FullName, length) + } return base.EllipsisString(u.Name, length) } @@ -607,6 +610,13 @@ var ( // IsUsableUsername returns an error when a username is reserved func IsUsableUsername(name string) error { + // Validate username make sure it satisfies requirement. + if { + if db.AlphaDashDotPattern.MatchString(name) { + // Note: usually this error is normally caught up earlier in the UI + return db.ErrNameCharsNotAllowed{Name: name} + } + } // Validate username make sure it satisfies requirement. if db.AlphaDashDotPattern.MatchString(name) { // Note: usually this error is normally caught up earlier in the UI From d8572652ac216cbf7caeb212ec160baf0af5782b Mon Sep 17 00:00:00 2001 From: Baekjun Kim Date: Fri, 24 Jun 2022 15:27:22 -0700 Subject: [PATCH 2/4] fix bug --- models/user/user.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/models/user/user.go b/models/user/user.go index 9d4671820046..6dec6aeb8f22 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -485,7 +485,7 @@ func (u *User) GitName() string { // ShortName ellipses username to length func (u *User) ShortName(length int) string { - if setting.UI.DefaultShowFullName { + if setting.UI.DefaultShowFullName && len(u.FullName) > 0 { return base.EllipsisString(u.FullName, length) } return base.EllipsisString(u.Name, length) @@ -611,17 +611,18 @@ var ( // IsUsableUsername returns an error when a username is reserved func IsUsableUsername(name string) error { // Validate username make sure it satisfies requirement. - if { + if setting.OAuth2Client.Username == "userid" { + if db.AlphaDashDotPipePattern.MatchString(name) { + // Note: usually this error is normally caught up earlier in the UI + return db.ErrNameCharsNotAllowed{Name: name} + } + } else { + // Validate username make sure it satisfies requirement. if db.AlphaDashDotPattern.MatchString(name) { // Note: usually this error is normally caught up earlier in the UI return db.ErrNameCharsNotAllowed{Name: name} } } - // Validate username make sure it satisfies requirement. - if db.AlphaDashDotPattern.MatchString(name) { - // Note: usually this error is normally caught up earlier in the UI - return db.ErrNameCharsNotAllowed{Name: name} - } return db.IsUsableName(reservedUsernames, reservedUserPatterns, name) } From 2d53e24e56ca9f2d41c3b841aa8a827086c858f0 Mon Sep 17 00:00:00 2001 From: Baekjun Kim Date: Tue, 28 Jun 2022 14:52:05 -0700 Subject: [PATCH 3/4] revert enabling pipe as username --- models/user/user.go | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/models/user/user.go b/models/user/user.go index 6dec6aeb8f22..a2c759cf804b 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -611,17 +611,9 @@ var ( // IsUsableUsername returns an error when a username is reserved func IsUsableUsername(name string) error { // Validate username make sure it satisfies requirement. - if setting.OAuth2Client.Username == "userid" { - if db.AlphaDashDotPipePattern.MatchString(name) { - // Note: usually this error is normally caught up earlier in the UI - return db.ErrNameCharsNotAllowed{Name: name} - } - } else { - // Validate username make sure it satisfies requirement. - if db.AlphaDashDotPattern.MatchString(name) { - // Note: usually this error is normally caught up earlier in the UI - return db.ErrNameCharsNotAllowed{Name: name} - } + if db.AlphaDashDotPattern.MatchString(name) { + // Note: usually this error is normally caught up earlier in the UI + return db.ErrNameCharsNotAllowed{Name: name} } return db.IsUsableName(reservedUsernames, reservedUserPatterns, name) } From 26fffbb813769d0332e59b2a80892b1063d6b5e2 Mon Sep 17 00:00:00 2001 From: Baekjun Kim Date: Wed, 29 Jun 2022 11:01:48 -0700 Subject: [PATCH 4/4] remove unnecessary line --- models/db/name.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/models/db/name.go b/models/db/name.go index c7295a967975..9c9d18f18474 100644 --- a/models/db/name.go +++ b/models/db/name.go @@ -18,9 +18,6 @@ var ( // AlphaDashDotPattern characters prohibited in a user name (anything except A-Za-z0-9_.-) AlphaDashDotPattern = regexp.MustCompile(`[^\w-\.]`) - - // AlphaDashDotPattern characters prohibited in a user name (anything except A-Za-z0-9_.-) - AlphaDashDotPipePattern = regexp.MustCompile(`[^\w-\.\|]`) ) // ErrNameReserved represents a "reserved name" error.