inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-05-28 11:59:23 +00:00
Code Activity

Fix #11832: Prevent TypeError by making LDAP group search conditional in settings (#11898) (#11944)

Browse Source 
(cherry picked from commit 45d95142cc)

Co-authored-by: Aditya Kumar Mishra <154746713+adityakrmishra@users.noreply.github.com>
This commit is contained in:
github-actions[bot]
2026-05-14 22:48:16 +10:00
committed by GitHub
parent 812a6f7c52
commit 7134aab05b
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/InvenTree/InvenTree/settings.py
+21 -12
View File
@@ -517,20 +517,12 @@ if LDAP_AUTH: # pragma: no cover
'INVENTREE_LDAP_CACHE_TIMEOUT', 'ldap.cache_timeout', 3600, int 'INVENTREE_LDAP_CACHE_TIMEOUT', 'ldap.cache_timeout', 3600, int
) )
AUTH_LDAP_MIRROR_GROUPS = get_boolean_setting(
'INVENTREE_LDAP_MIRROR_GROUPS', 'ldap.mirror_groups', False
)
AUTH_LDAP_GROUP_OBJECT_CLASS = get_setting( AUTH_LDAP_GROUP_OBJECT_CLASS = get_setting(
'INVENTREE_LDAP_GROUP_OBJECT_CLASS', 'INVENTREE_LDAP_GROUP_OBJECT_CLASS',
'ldap.group_object_class', 'ldap.group_object_class',
'groupOfUniqueNames', 'groupOfUniqueNames',
str, str,
) )
AUTH_LDAP_GROUP_SEARCH = django_auth_ldap.config.LDAPSearch(
get_setting('INVENTREE_LDAP_GROUP_SEARCH', 'ldap.group_search'),
ldap.SCOPE_SUBTREE,
f'(objectClass={AUTH_LDAP_GROUP_OBJECT_CLASS})',
)
AUTH_LDAP_GROUP_TYPE_CLASS = get_setting( AUTH_LDAP_GROUP_TYPE_CLASS = get_setting(
'INVENTREE_LDAP_GROUP_TYPE_CLASS', 'INVENTREE_LDAP_GROUP_TYPE_CLASS',
'ldap.group_type_class', 'ldap.group_type_class',
@@ -546,9 +538,6 @@ if LDAP_AUTH: # pragma: no cover
{'name_attr': 'cn'}, {'name_attr': 'cn'},
dict, dict,
) )
AUTH_LDAP_GROUP_TYPE = getattr(django_auth_ldap.config, AUTH_LDAP_GROUP_TYPE_CLASS)(
*AUTH_LDAP_GROUP_TYPE_CLASS_ARGS, **AUTH_LDAP_GROUP_TYPE_CLASS_KWARGS
)
AUTH_LDAP_REQUIRE_GROUP = get_setting( AUTH_LDAP_REQUIRE_GROUP = get_setting(
'INVENTREE_LDAP_REQUIRE_GROUP', 'ldap.require_group' 'INVENTREE_LDAP_REQUIRE_GROUP', 'ldap.require_group'
) )
@@ -559,7 +548,27 @@ if LDAP_AUTH: # pragma: no cover
default_value=None, default_value=None,
typecast=dict, typecast=dict,
) )
AUTH_LDAP_FIND_GROUP_PERMS = True
# Only configure group search and group permissions if a valid base DN is provided.
# Without this guard, passing None to LDAPSearch causes django-auth-ldap to crash
# with: TypeError: search_ext() argument 1 must be str, not None
# See: https://github.com/inventree/InvenTree/issues/11832
_ldap_group_search = get_setting('INVENTREE_LDAP_GROUP_SEARCH', 'ldap.group_search')
if _ldap_group_search:
AUTH_LDAP_GROUP_SEARCH = django_auth_ldap.config.LDAPSearch(
_ldap_group_search,
ldap.SCOPE_SUBTREE,
f'(objectClass={AUTH_LDAP_GROUP_OBJECT_CLASS})',
)
AUTH_LDAP_GROUP_TYPE = getattr(
django_auth_ldap.config, AUTH_LDAP_GROUP_TYPE_CLASS
)(*AUTH_LDAP_GROUP_TYPE_CLASS_ARGS, **AUTH_LDAP_GROUP_TYPE_CLASS_KWARGS)
AUTH_LDAP_MIRROR_GROUPS = get_boolean_setting(
'INVENTREE_LDAP_MIRROR_GROUPS', 'ldap.mirror_groups', False
)
AUTH_LDAP_FIND_GROUP_PERMS = True
else:
AUTH_LDAP_FIND_GROUP_PERMS = False
# Allow secure http developer server in debug mode # Allow secure http developer server in debug mode
if DEBUG: if DEBUG: