github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-23 06:38:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

New fixes

Browse Source
This commit is contained in:
Antoine Nguyen
2025-02-18 15:11:18 +01:00
parent 01fb00c38c
commit f202b702df
11 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/ldapsync/lib.py
+9 -5
View File
@@ -79,7 +79,7 @@ def create_ldap_account(user, dn, conn):
try:
conn.add_s(dn, ldif)
except ldap.LDAPError as e:
raise InternalError(_("Failed to create LDAP account: {}").format(e))
raise InternalError(_("Failed to create LDAP account: {}").format(e)) from None
def check_if_dn_exists(conn, dn):
@@ -118,7 +118,7 @@ def update_ldap_account(user, config):
try:
conn.modify_s(dn, ldif)
except ldap.LDAPError as e:
raise InternalError(_("Failed to update LDAP account: {}").format(e))
raise InternalError(_("Failed to update LDAP account: {}").format(e)) from None
def delete_ldap_account(user, config):
@@ -131,14 +131,18 @@ def delete_ldap_account(user, config):
try:
conn.delete_s(dn)
except ldap.LDAPError as e:
raise InternalError(_("Failed to delete LDAP account: {}").format(e))
raise InternalError(
_("Failed to delete LDAP account: {}").format(e)
) from None
else:
password = get_user_password(user, True)
ldif = [(ldap.MOD_REPLACE, "userPassword", password)]
try:
conn.modify_s(dn, ldif)
except ldap.LDAPError as e:
raise InternalError(_("Failed to disable LDAP account: {}").format(e))
raise InternalError(
_("Failed to disable LDAP account: {}").format(e)
) from None
def find_user_groups(conn, config, dn, entry):
@@ -154,7 +158,7 @@ def find_user_groups(conn, config, dn, entry):
result = conn.search_s(config["ldap_groups_search_base"], ldap.SCOPE_SUBTREE, flt)
groups = []
for dn, entry in result:
for dn, _entry in result:
if not dn:
continue
groups.append(dn.split(",")[0].split("=")[1])