tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #500 from Unrud/loginuser

Browse Source 
Map logins to internal users in Auth module
This commit is contained in:
Guillaume Ayoub
2016-08-31 14:40:08 +02:00
committed by GitHub
parent 5f46cc24bd 689e5c9dd5
commit db681da08e
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
radicale/__init__.py
View File

@ -167,7 +167,7 @@ class Application:
super().__init__()
self.configuration = configuration
self.logger = logger
self.is_authenticated = auth.load(configuration, logger)
self.Auth = auth.load(configuration, logger)
self.Collection = storage.load(configuration, logger)
self.authorized = rights.load(configuration, logger)
self.encoding = configuration.get("encoding", "request")
@ -287,10 +287,11 @@ class Application:
authorization = environ.get("HTTP_AUTHORIZATION", None)
if authorization and authorization.startswith("Basic"):
authorization = authorization[len("Basic"):].strip()
user, password = self.decode(base64.b64decode(
login, password = self.decode(base64.b64decode(
authorization.encode("ascii")), environ).split(":", 1)
user = self.Auth.map_login_to_user(login)
else:
user = environ.get("REMOTE_USER")
user = self.Auth.map_login_to_user(environ.get("REMOTE_USER", ""))
password = None
# If "/.well-known" is not available, clients query "/"
@ -302,7 +303,7 @@ class Application:
self.logger.info("Refused unsafe username: %s", user)
is_authenticated = False
else:
is_authenticated = self.is_authenticated(user, password)
is_authenticated = self.Auth.is_authenticated(user, password)
is_valid_user = is_authenticated or not user
# Create principal collection