mirrors/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-04-05 06:07:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

add support for login info log

Browse source
This commit is contained in:
Peter Bieringer 2025-01-01 16:30:34 +01:00
parent 6ebca08423
commit c10ce7ae46
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
radicale/app/__init__.py
View file

@ -252,7 +252,7 @@ class Application(ApplicationPartDelete, ApplicationPartHead,
self.configuration, environ, base64.b64decode( self.configuration, environ, base64.b64decode(
authorization.encode("ascii"))).split(":", 1) authorization.encode("ascii"))).split(":", 1)
user = self._auth.login(login, password) or "" if login else "" (user, info) = self._auth.login(login, password) or ("", "") if login else ("", "")
if self.configuration.get("auth", "type") == "ldap": if self.configuration.get("auth", "type") == "ldap":
try: try:
logger.debug("Groups %r", ",".join(self._auth._ldap_groups)) logger.debug("Groups %r", ",".join(self._auth._ldap_groups))
@ -260,12 +260,12 @@ class Application(ApplicationPartDelete, ApplicationPartHead,
except AttributeError: except AttributeError:
pass pass
if user and login == user: if user and login == user:
logger.info("Successful login: %r", user) logger.info("Successful login: %r (%s)", user, info)
elif user: elif user:
logger.info("Successful login: %r -> %r", login, user) logger.info("Successful login: %r -> %r (%s)", login, user, info)
elif login: elif login:
logger.warning("Failed login attempt from %s: %r", logger.warning("Failed login attempt from %s: %r (%s)",
remote_host, login) remote_host, login, info)
# Random delay to avoid timing oracles and bruteforce attacks # Random delay to avoid timing oracles and bruteforce attacks
if self._auth_delay > 0: if self._auth_delay > 0:
random_delay = self._auth_delay * (0.5 + random.random()) random_delay = self._auth_delay * (0.5 + random.random())

13
radicale/auth/__init__.py
View file

@ -143,7 +143,8 @@ class BaseAuth:
raise NotImplementedError raise NotImplementedError
@final @final
def login(self, login: str, password: str) -> str: def login(self, login: str, password: str) -> Tuple[str, str]:
result_from_cache = False
if self._lc_username: if self._lc_username:
login = login.lower() login = login.lower()
if self._uc_username: if self._uc_username:
@ -182,7 +183,7 @@ class BaseAuth:
(time_ns_cache, login_cache) = self._cache_failed[digest] (time_ns_cache, login_cache) = self._cache_failed[digest]
age_failed = int((time_ns - time_ns_cache) / 1000 / 1000 / 1000) age_failed = int((time_ns - time_ns_cache) / 1000 / 1000 / 1000)
logger.debug("Login failed cache entry for user+password found: '%s' (age: %d sec)", login_cache, age_failed) logger.debug("Login failed cache entry for user+password found: '%s' (age: %d sec)", login_cache, age_failed)
return "" return ("", self._type + " / cached")
if self._cache_successful.get(login): if self._cache_successful.get(login):
# login found in cache "successful" # login found in cache "successful"
(digest_cache, time_ns_cache) = self._cache_successful[login] (digest_cache, time_ns_cache) = self._cache_successful[login]
@ -197,6 +198,7 @@ class BaseAuth:
else: else:
logger.debug("Login successful cache entry for user+password found: '%s' (age: %d sec)", login, age_success) logger.debug("Login successful cache entry for user+password found: '%s' (age: %d sec)", login, age_success)
result = login result = login
result_from_cache = True
else: else:
logger.debug("Login successful cache entry for user+password not matching: '%s'", login) logger.debug("Login successful cache entry for user+password not matching: '%s'", login)
else: else:
@ -225,6 +227,9 @@ class BaseAuth:
self._cache_failed[digest_failed] = (time_ns, login) self._cache_failed[digest_failed] = (time_ns, login)
self._lock.release() self._lock.release()
logger.debug("Login failed cache for user set: '%s'", login) logger.debug("Login failed cache for user set: '%s'", login)
return result if result_from_cache is True:
return (result, self._type + " / cached")
else: else:
return self._login(login, password) return (result, self._type)
else:
return (self._login(login, password), self._type)