From 45783b971de2247b7eea5bf9ce2138f39383770c Mon Sep 17 00:00:00 2001 From: caicandong <1290147055@qq.com> Date: Wed, 13 Sep 2023 10:58:08 +0800 Subject: [PATCH] fix --- .../auth/source/ldap/source_authenticate.go | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/services/auth/source/ldap/source_authenticate.go b/services/auth/source/ldap/source_authenticate.go index 3f3219adb9463..e66c627a39889 100644 --- a/services/auth/source/ldap/source_authenticate.go +++ b/services/auth/source/ldap/source_authenticate.go @@ -29,7 +29,13 @@ func (source *Source) Authenticate(user *user_model.User, userName, password str // User not in LDAP, do nothing return nil, user_model.ErrUserNotExist{Name: loginName} } - + // Fallback. + if len(sr.Username) == 0 { + sr.Username = userName + } + if len(sr.Mail) == 0 { + sr.Mail = fmt.Sprintf("%s@localhost.local", sr.Username) + } isAttributeSSHPublicKeySet := len(strings.TrimSpace(source.AttributeSSHPublicKey)) > 0 // Update User admin flag if exist @@ -70,15 +76,6 @@ func (source *Source) Authenticate(user *user_model.User, userName, password str } } } else { - // Fallback. - if len(sr.Username) == 0 { - sr.Username = userName - } - - if len(sr.Mail) == 0 { - sr.Mail = fmt.Sprintf("%s@localhost.local", sr.Username) - } - user = &user_model.User{ LowerName: strings.ToLower(sr.Username), Name: sr.Username,