From 00986573d907ea6e79fdf144b01992d56fe43d51 Mon Sep 17 00:00:00 2001 From: Kevin Newland Date: Tue, 28 Jan 2020 17:36:45 -0600 Subject: [PATCH 1/2] Update LDAP Caching Options Update LDAP caching configuration to match changes made to django-auth-ldap in 1.6.0 Django social auth now uses different cache configuration options: https://github.com/django-auth-ldap/django-auth-ldap/blob/master/django_auth_ldap/backend.py#L1041-L1056 NetBox settings.py reference: https://github.com/netbox-community/netbox/blob/master/netbox/netbox/settings.py#L360 --- configuration/ldap_config.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configuration/ldap_config.py b/configuration/ldap_config.py index 39fc894..2ec75cd 100644 --- a/configuration/ldap_config.py +++ b/configuration/ldap_config.py @@ -70,8 +70,7 @@ AUTH_LDAP_USER_FLAGS_BY_GROUP = { AUTH_LDAP_FIND_GROUP_PERMS = os.environ.get('AUTH_LDAP_FIND_GROUP_PERMS', 'True').lower() == 'true' # Cache groups for one hour to reduce LDAP traffic -AUTH_LDAP_CACHE_GROUPS = os.environ.get('AUTH_LDAP_CACHE_GROUPS', 'True').lower() == 'true' -AUTH_LDAP_GROUP_CACHE_TIMEOUT = int(os.environ.get('AUTH_LDAP_GROUP_CACHE_TIMEOUT', 3600)) +AUTH_LDAP_CACHE_TIMEOUT = = int(os.environ.get('AUTH_LDAP_CACHE_TIMEOUT', 3600)) # Populate the Django user from the LDAP directory. AUTH_LDAP_USER_ATTR_MAP = { From 74eaae6bc82a959a752751e905c39255adc0c307 Mon Sep 17 00:00:00 2001 From: Kevin Newland Date: Tue, 28 Jan 2020 17:43:35 -0600 Subject: [PATCH 2/2] Update ldap_config.py --- configuration/ldap_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration/ldap_config.py b/configuration/ldap_config.py index 2ec75cd..ba2067c 100644 --- a/configuration/ldap_config.py +++ b/configuration/ldap_config.py @@ -70,7 +70,7 @@ AUTH_LDAP_USER_FLAGS_BY_GROUP = { AUTH_LDAP_FIND_GROUP_PERMS = os.environ.get('AUTH_LDAP_FIND_GROUP_PERMS', 'True').lower() == 'true' # Cache groups for one hour to reduce LDAP traffic -AUTH_LDAP_CACHE_TIMEOUT = = int(os.environ.get('AUTH_LDAP_CACHE_TIMEOUT', 3600)) +AUTH_LDAP_CACHE_TIMEOUT = int(os.environ.get('AUTH_LDAP_CACHE_TIMEOUT', 3600)) # Populate the Django user from the LDAP directory. AUTH_LDAP_USER_ATTR_MAP = {