Mirrors/wg-portal
1
0
Fork 0
mirror of https://github.com/h44z/wg-portal.git synced 2025-12-15 19:16:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix user edit bug, allow to delete users from the database (#40)

Browse Source
This commit is contained in:
Christoph Haas
2022-03-15 23:34:55 +01:00
parent cc50fcf8e6
commit 83271b5d34
7 changed files with 73 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/server/ldapsync.go
View File

@@ -44,14 +44,14 @@ func (s *Server) SyncLdapWithUserDatabase() {
logrus.Info("ldap user synchronization stopped")
}
func (s Server)userIsInAdminGroup(ldapData *ldap.RawLdapData) bool {
func (s Server) userIsInAdminGroup(ldapData *ldap.RawLdapData) bool {
if s.config.LDAP.AdminLdapGroup_ == nil {
return false
return false
}
for _, group := range ldapData.RawAttributes[s.config.LDAP.GroupMemberAttribute] {
var dn,_ = gldap.ParseDN(string(group))
var dn, _ = gldap.ParseDN(string(group))
if s.config.LDAP.AdminLdapGroup_.Equal(dn) {
return true
return true
}
}
return false
@@ -114,7 +114,7 @@ func (s *Server) disableMissingLdapUsers(ldapUsers []ldap.RawLdapData) {
}
}
if err := s.users.DeleteUser(&activeUsers[i]); err != nil {
if err := s.users.DeleteUser(&activeUsers[i], true); err != nil {
logrus.Errorf("failed to delete deactivated user %s in database: %v", activeUsers[i].Email, err)
}
}