PapaTutuWawa/etesync-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make the cache TTL configurable

Browse Source
This commit is contained in:
PapaTutuWawa 2021-12-09 13:40:39 +01:00
parent 167533a65f
commit 440927b2c1
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etebase_server/settings.py
View File

@ -173,6 +173,7 @@ if any(os.path.isfile(x) for x in config_locations):
LDAP_BIND_DN = ldap.get("bind_dn", "") LDAP_BIND_DN = ldap.get("bind_dn", "")
LDAP_BIND_PW = ldap.get("bind_pw", "") LDAP_BIND_PW = ldap.get("bind_pw", "")
LDAP_BIND_PW_FILE = ldap.get("bind_pw_file", "") LDAP_BIND_PW_FILE = ldap.get("bind_pw_file", "")
LDAP_CACHE_TTL = ldap.get("cache_ttl", "")
# Configure EteBase to use LDAP # Configure EteBase to use LDAP
ETEBASE_CREATE_USER_FUNC = "myauth.ldap.create_user" ETEBASE_CREATE_USER_FUNC = "myauth.ldap.create_user"

9
myauth/ldap.py
View File

@ -36,6 +36,13 @@ class LDAPConnection:
self.__LDAP_FILTER = ldap_setting("FILTER", "") self.__LDAP_FILTER = ldap_setting("FILTER", "")
self.__LDAP_SEARCH_BASE = ldap_setting("SEARCH_BASE", "") self.__LDAP_SEARCH_BASE = ldap_setting("SEARCH_BASE", "")
# The time a cache entry is valid (in hours)
try:
self.__LDAP_CACHE_TTL = int(ldap_setting("CACHE_TTL", ""))
except ValueError:
logging.error("Invalid value for cache_ttl. Defaulting to 1 hour")
self.__LDAP_CACHE_TTL = 1
password = ldap_setting("BIND_PW", "") password = ldap_setting("BIND_PW", "")
if not password: if not password:
pwfile = ldap_setting("BIND_PW_FILE", "") pwfile = ldap_setting("BIND_PW_FILE", "")
@ -84,7 +91,7 @@ class LDAPConnection:
return False return False
if len(result) == 1: if len(result) == 1:
self.__user_cache[username] = timezone.now() + timezone.timedelta(hours=1) self.__user_cache[username] = timezone.now() + timezone.timedelta(hours=self.__LDAP_CACHE_TTL)
return True return True
return False return False