Merge pull request #1665 from itglob/master

Disable overloading BaseAuth login method

radicale/auth/__init__.py

@@ -29,7 +29,7 @@
 
 """
 
-from typing import Sequence, Set, Tuple, Union
+from typing import Sequence, Set, Tuple, Union, final
 
 from radicale import config, types, utils
 from radicale.log import logger
@@ -102,6 +102,7 @@ def _login(self, login: str, password: str) -> str:
 
         raise NotImplementedError
 
+    @final
     def login(self, login: str, password: str) -> str:
         if self._lc_username:
             login = login.lower()

radicale/auth/dovecot.py

@@ -32,7 +32,7 @@ def __init__(self, configuration):
         self.timeout = 5
         self.request_id_gen = itertools.count(1)
 
-    def login(self, login, password):
+    def _login(self, login, password):
         """Validate credentials.
 
         Check if the ``login``/``password`` pair is valid according to Dovecot.

radicale/auth/ldap.py

@@ -202,7 +202,7 @@ def _login3(self, login: str, password: str) -> str:
             pass
         return ""
 
-    def login(self, login: str, password: str) -> str:
+    def _login(self, login: str, password: str) -> str:
         """Validate credentials.
         In first step we make a connection to the ldap server with the ldap_reader_dn credential.
         In next step the DN of the user to authenticate will be searched.

radicale/tests/custom/auth.py

@@ -29,7 +29,7 @@
 
 class Auth(auth.BaseAuth):
 
-    def login(self, login: str, password: str) -> str:
+    def _login(self, login: str, password: str) -> str:
         if login == "tmp":
             return login
         return ""