github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-17 05:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1839 from modoboa/fix/ldap_ad_groups

Browse Source 
Retrieve LDAP groups with AD.
This commit is contained in:
Antoine Nguyen
2020-02-24 09:13:21 +01:00
committed by GitHub
parent 2571354a27 9e328a3c2a
commit 7cad5ef629
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/core/app_settings.py
+10 -4
View File
@@ -471,7 +471,9 @@ class GeneralParametersForm(param_forms.AdminParametersForm):
"""Apply configuration for given backend."""
import ldap
from django_auth_ldap.config import (
LDAPSearch, PosixGroupType, GroupOfNamesType)
LDAPSearch, PosixGroupType, GroupOfNamesType,
ActiveDirectoryGroupType
)
if not hasattr(settings, backend.setting_fullname("USER_ATTR_MAP")):
setattr(settings, backend.setting_fullname("USER_ATTR_MAP"), {
@@ -488,9 +490,13 @@ class GeneralParametersForm(param_forms.AdminParametersForm):
if values["ldap_secured"] == "starttls":
setattr(settings, backend.setting_fullname("START_TLS"), True)
if values["ldap_group_type"] == "groupofnames":
setattr(settings, backend.setting_fullname("GROUP_TYPE"),
GroupOfNamesType())
if values["ldap_is_active_directory"]:
setattr(
settings, "AUTH_LDAP_GROUP_TYPE", ActiveDirectoryGroupType()
)
searchfilter = "(objectClass=group)"
elif values["ldap_group_type"] == "groupofnames":
setattr(settings, "AUTH_LDAP_GROUP_TYPE", GroupOfNamesType())
searchfilter = "(objectClass=groupOfNames)"
else:
setattr(settings, backend.setting_fullname("GROUP_TYPE"),