Skip to content
Snippets Groups Projects
Verified Commit 4a3c3dbd authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Fix LDAP import

parent aa96dbba
No related branches found
No related tags found
No related merge requests found
...@@ -85,10 +85,8 @@ def update_dynamic_preferences(): ...@@ -85,10 +85,8 @@ def update_dynamic_preferences():
section = section_ldap section = section_ldap
name = setting_name + "_re" name = setting_name + "_re"
verbose_name = _( verbose_name = _(
f( f"Regular expression to match LDAP value for"
"Regular expression to match LDAP value for" f"{field.verbose_name} on {model._meta.label} against"
"{field.verbose_name} on {model._meta.label} against"
)
) )
required = False required = False
default = "" default = ""
...@@ -365,11 +363,16 @@ def mass_ldap_import(): ...@@ -365,11 +363,16 @@ def mass_ldap_import():
**TQDM_DEFAULTS, **TQDM_DEFAULTS,
): ):
dn, attrs = ldap_group dn, attrs = ldap_group
if dn not in group_dict:
logger.warning(f"Skip {dn} because there are no groups with this dn.")
continue
group = group_dict[dn] group = group_dict[dn]
ldap_members = [_.lower() for _ in attrs[member_attr]] if member_attr in attrs else [] ldap_members = [_.lower() for _ in attrs[member_attr]] if member_attr in attrs else []
if member_attr.lower() == "memberUid": if member_attr.lower() == "memberuid":
members = Person.objects.filter(user__username__in=ldap_members) members = Person.objects.filter(user__username__in=ldap_members)
else: else:
members = Person.objects.filter(ldap_dn__in=ldap_members) members = Person.objects.filter(ldap_dn__in=ldap_members)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment