Merge pull request #4683 from minrk/check-allow-later

don't run check_allowed until after check_blocked_users resolves
This commit is contained in:
Erik Sundell
2024-01-26 12:38:34 +01:00
committed by GitHub

View File

@@ -535,14 +535,13 @@ class Authenticator(LoggingConfigurable):
blocked_pass = await maybe_future(
self.check_blocked_users(username, authenticated)
)
allowed_pass = await maybe_future(self.check_allowed(username, authenticated))
if blocked_pass:
pass
else:
if not blocked_pass:
self.log.warning("User %r blocked. Stop authentication", username)
return
allowed_pass = await maybe_future(self.check_allowed(username, authenticated))
if allowed_pass:
if authenticated['admin'] is None:
authenticated['admin'] = await maybe_future(