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

Apply suggestions of mypy

Browse source
This commit is contained in:
Dipl. Ing. Péter Varkoly 2024-09-11 09:13:26 +02:00
parent d75b071fec
commit e05fbeb950
4 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radicale/auth/__init__.py
View file

@ -52,7 +52,7 @@ def load(configuration: "config.Configuration") -> "BaseAuth":
class BaseAuth: class BaseAuth:
_ldap_groups: set _ldap_groups: set[str] = set([])
_lc_username: bool _lc_username: bool
_strip_domain: bool _strip_domain: bool

8
radicale/auth/ldap.py
View file

@ -35,7 +35,7 @@ class Auth(auth.BaseAuth):
_ldap_secret: str _ldap_secret: str
_ldap_filter: str _ldap_filter: str
_ldap_load_groups: bool _ldap_load_groups: bool
_ldap_version: 3 _ldap_version: int = 3
def __init__(self, configuration: config.Configuration) -> None: def __init__(self, configuration: config.Configuration) -> None:
super().__init__(configuration) super().__init__(configuration)
@ -81,7 +81,7 @@ class Auth(auth.BaseAuth):
conn.protocol_version = 3 conn.protocol_version = 3
conn.set_option(self.ldap.OPT_REFERRALS, 0) conn.set_option(self.ldap.OPT_REFERRALS, 0)
conn.simple_bind_s(user_dn, password) conn.simple_bind_s(user_dn, password)
tmp = [] tmp: list[str] = []
if self._ldap_load_groups: if self._ldap_load_groups:
tmp = [] tmp = []
for t in res[0][1]['memberOf']: for t in res[0][1]['memberOf']:
@ -143,5 +143,5 @@ class Auth(auth.BaseAuth):
In the last step the authentication of the user will be proceeded. In the last step the authentication of the user will be proceeded.
""" """
if self._ldap_version == 2: if self._ldap_version == 2:
return self._login2(self, login, password) return self._login2(login, password)
return self._login3(self, login, password) return self._login3(login, password)

2
radicale/rights/__init__.py
View file

@ -57,6 +57,8 @@ def intersect(a: str, b: str) -> str:
class BaseRights: class BaseRights:
_user_groups: set[str] = set([])
def __init__(self, configuration: "config.Configuration") -> None: def __init__(self, configuration: "config.Configuration") -> None:
"""Initialize BaseRights. """Initialize BaseRights.

2
radicale/rights/from_file.py
View file

@ -71,7 +71,7 @@ class Rights(rights.BaseRights):
collection_pattern = rights_config.get(section, "collection") collection_pattern = rights_config.get(section, "collection")
allowed_groups = rights_config.get(section, "groups", fallback="").split(",") allowed_groups = rights_config.get(section, "groups", fallback="").split(",")
try: try:
group_match = self._user_groups.intersection(allowed_groups) > 0 group_match = len(self._user_groups.intersection(allowed_groups)) > 0
except Exception: except Exception:
pass pass
# Use empty format() for harmonized handling of curly braces # Use empty format() for harmonized handling of curly braces