Skip to content

Do not try to recreate ldap user if they are already created #9900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zeripath merged 5 commits into from
Jan 21, 2020
Merged

Do not try to recreate ldap user if they are already created #9900

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ea0787f
Do not try to recreate ldap user if they are already created
zeripath Jan 20, 2020
e0fe16c
just remove autoregister
zeripath Jan 20, 2020
b67373e
Merge branch 'master' into fix-9897
zeripath Jan 20, 2020
6b4791c
Merge branch 'master' into fix-9897
techknowlogick Jan 21, 2020
fcd9994
Merge branch 'master' into fix-9897
zeripath Jan 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions models/login_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ var (

// LoginViaLDAP queries if login/password is valid against the LDAP directory pool,
// and create a local user if success when enabled.
func LoginViaLDAP(user *User, login, password string, source *LoginSource, autoRegister bool) (*User, error) {
func LoginViaLDAP(user *User, login, password string, source *LoginSource) (*User, error) {
sr := source.Cfg.(*LDAPConfig).SearchEntry(login, password, source.Type == LoginDLDAP)
if sr == nil {
// User not in LDAP, do nothing
Expand Down Expand Up @@ -491,7 +491,7 @@ func LoginViaLDAP(user *User, login, password string, source *LoginSource, autoR
}
}

if !autoRegister {
if user != nil {
if isAttributeSSHPublicKeySet && synchronizeLdapSSHPublicKeys(user, source, sr.SSHPublicKey) {
return user, RewriteAllPublicKeys()
}
Expand Down Expand Up @@ -699,7 +699,7 @@ func ExternalUserLogin(user *User, login, password string, source *LoginSource,
var err error
switch source.Type {
case LoginLDAP, LoginDLDAP:
user, err = LoginViaLDAP(user, login, password, source, autoRegister)
user, err = LoginViaLDAP(user, login, password, source)
case LoginSMTP:
user, err = LoginViaSMTP(user, login, password, source.ID, source.Cfg.(*SMTPConfig), autoRegister)
case LoginPAM:
Expand Down