Browse Source

Add is_authenticated2 to BaseAuth

Adds the ``login`` argument.
Unrud 8 years ago
parent
commit
8be792280a
2 changed files with 14 additions and 3 deletions
  1. 2 1
      radicale/__init__.py
  2. 12 2
      radicale/auth.py

+ 2 - 1
radicale/__init__.py

@@ -446,7 +446,8 @@ class Application:
             self.logger.info("Refused unsafe username: %r", user)
             is_authenticated = False
         else:
-            is_authenticated = self.Auth.is_authenticated(user, password)
+            is_authenticated = self.Auth.is_authenticated2(login, user,
+                                                           password)
             if not is_authenticated:
                 self.logger.info("Failed login attempt: %r", user)
                 # Random delay to avoid timing oracles and bruteforce attacks

+ 12 - 2
radicale/auth.py

@@ -102,13 +102,23 @@ class BaseAuth:
         """
         return ()
 
-    def is_authenticated(self, user, password):
+    def is_authenticated2(self, login, user, password):
         """Validate credentials.
 
+        ``login`` the login name
+
         ``user`` the user from ``map_login_to_user(login)``.
 
         ``password`` the login password
 
+        """
+        return self.is_authenticated(user, password)
+
+    def is_authenticated(self, user, password):
+        """Validate credentials.
+
+        DEPRECATED: use ``is_authenticated2`` instead
+
         """
         raise NotImplementedError
 
@@ -119,7 +129,7 @@ class BaseAuth:
 
         Returns a string with the user name.
         If a login can't be mapped to an user, return ``login`` and
-        return ``False`` in ``is_authenticated(...)``.
+        return ``False`` in ``is_authenticated2(...)``.
 
         """
         return login