From 6e667f48ec8c7154faf45533e661ca06d1109a8b Mon Sep 17 00:00:00 2001 From: Mikko Nieminen Date: Fri, 9 Aug 2024 10:48:14 +0200 Subject: [PATCH] update ldap settings (#1922) --- config/settings/base.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/config/settings/base.py b/config/settings/base.py index 13b93687..dac7c1b6 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -8,6 +8,7 @@ https://docs.djangoproject.com/en/3.2/ref/settings/ """ +import itertools import os import re @@ -356,7 +357,6 @@ LDAP_ALT_DOMAINS = env.list('LDAP_ALT_DOMAINS', None, default=[]) if ENABLE_LDAP: - import itertools import ldap from django_auth_ldap.config import LDAPSearch @@ -385,8 +385,9 @@ AUTH_LDAP_USER_FILTER = env.str( 'AUTH_LDAP_USER_FILTER', '(sAMAccountName=%(user)s)' ) + AUTH_LDAP_USER_SEARCH_BASE = env.str('AUTH_LDAP_USER_SEARCH_BASE', None) AUTH_LDAP_USER_SEARCH = LDAPSearch( - env.str('AUTH_LDAP_USER_SEARCH_BASE', None), + AUTH_LDAP_USER_SEARCH_BASE, ldap.SCOPE_SUBTREE, AUTH_LDAP_USER_FILTER, ) @@ -418,8 +419,11 @@ AUTH_LDAP2_USER_FILTER = env.str( 'AUTH_LDAP2_USER_FILTER', '(sAMAccountName=%(user)s)' ) + AUTH_LDAP2_USER_SEARCH_BASE = env.str( + 'AUTH_LDAP2_USER_SEARCH_BASE', None + ) AUTH_LDAP2_USER_SEARCH = LDAPSearch( - env.str('AUTH_LDAP2_USER_SEARCH_BASE', None), + AUTH_LDAP2_USER_SEARCH_BASE, ldap.SCOPE_SUBTREE, AUTH_LDAP2_USER_FILTER, )