lianguan/gitea
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Add option to prevent LDAP from deactivating everything on empty search (#9879)

Browse Source 
* Add option to prevent LDAP from deactivating everything on empty search

* Update options/locale/locale_en-US.ini

Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>

Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
zeripath
2020-01-20 03:47:39 +00:00
committed by Lunny Xiao
parent 54c2854cd2
commit c5014a7f2c
7 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
models/user.go
View File

@ -1780,6 +1780,15 @@ func SyncExternalUsers(ctx context.Context) {
continue
}
if len(sr) == 0 {
if !s.LDAP().AllowDeactivateAll {
log.Error("LDAP search found no entries but did not report an error. Refusing to deactivate all users")
continue
} else {
log.Warn("LDAP search found no entries but did not report an error. All users will be deactivated as per settings")
}
}
for _, su := range sr {
select {
case <-ctx.Done():