summaryrefslogtreecommitdiffstats
path: root/models
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2020-01-20 03:47:39 +0000
committerLunny Xiao <xiaolunwen@gmail.com>2020-01-20 11:47:39 +0800
commitc5014a7f2c4a263818269216d16d6f21b008cd17 (patch)
tree42423c1aa2ac688b4694e36bdc450d47d4276299 /models
parent54c2854cd2c4084ead621fa42565100338ff3467 (diff)
downloadgitea-c5014a7f2c4a263818269216d16d6f21b008cd17.tar.gz
gitea-c5014a7f2c4a263818269216d16d6f21b008cd17.zip
Add option to prevent LDAP from deactivating everything on empty search (#9879)
* 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>
Diffstat (limited to 'models')
-rw-r--r--models/user.go9
1 files changed, 9 insertions, 0 deletions
diff --git a/models/user.go b/models/user.go
index 4a4af3547a..c2631d5dd2 100644
--- a/models/user.go
+++ b/models/user.go
@@ -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():