tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

Check user != nil before checking values (#9881)

Browse source 
* Check user != nil before checking values

* Handle autoAdmin
This commit is contained in:
zeripath 2020-01-19 23:49:55 +00:00 committed by techknowlogick
parent bec99507a4
commit dcf7e858cb
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
models/login_source.go
View file

@ -473,13 +473,21 @@ func LoginViaLDAP(user *User, login, password string, source *LoginSource, autoR
// Update User admin flag if exist // Update User admin flag if exist
if isExist, err := IsUserExist(0, sr.Username); err != nil { if isExist, err := IsUserExist(0, sr.Username); err != nil {
return nil, err return nil, err
} else if isExist && } else if isExist {
!user.ProhibitLogin && len(source.LDAP().AdminFilter) > 0 && user.IsAdmin != sr.IsAdmin { if user == nil {
// Change existing admin flag only if AdminFilter option is set user, err = GetUserByName(sr.Username)
user.IsAdmin = sr.IsAdmin if err != nil {
err = UpdateUserCols(user, "is_admin") return nil, err
if err != nil { }
return nil, err }
if user != nil &&
!user.ProhibitLogin && len(source.LDAP().AdminFilter) > 0 && user.IsAdmin != sr.IsAdmin {
// Change existing admin flag only if AdminFilter option is set
user.IsAdmin = sr.IsAdmin
err = UpdateUserCols(user, "is_admin")
if err != nil {
return nil, err
}
} }
} }