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

Merge pull request #480 from Unrud/currentuserprincipal

Browse Source 
Ask for authentication if current-user-principal is requested
This commit is contained in:
Guillaume Ayoub 2016-08-13 04:25:55 +02:00 committed by GitHub
commit 3b29a56c81
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
radicale/__init__.py
View File

@ -532,9 +532,12 @@ class Application:
items = itertools.chain([item], items) items = itertools.chain([item], items)
read_items, write_items = self.collect_allowed_items(items, user) read_items, write_items = self.collect_allowed_items(items, user)
headers = {"DAV": DAV_HEADERS, "Content-Type": "text/xml"} headers = {"DAV": DAV_HEADERS, "Content-Type": "text/xml"}
answer = xmlutils.propfind( status, answer = xmlutils.propfind(
path, content, read_items, write_items, user) path, content, read_items, write_items, user)
return client.MULTI_STATUS, headers, answer if status == client.FORBIDDEN:
return NOT_ALLOWED
else:
return status, headers, answer
def do_PROPPATCH(self, environ, path, user): def do_PROPPATCH(self, environ, path, user):
"""Manage PROPPATCH request.""" """Manage PROPPATCH request."""

8
radicale/xmlutils.py
View File

@ -510,6 +510,12 @@ def propfind(path, xml_request, read_collections, write_collections, user):
_tag("ICAL", "calendar-color"), _tag("ICAL", "calendar-color"),
_tag("CS", "getctag")] _tag("CS", "getctag")]
if _tag("D", "current-user-principal") in props and not user:
# Ask for authentication
# Returning the DAV:unauthenticated pseudo-principal as specified in
# RFC 5397 doesn't seem to work with DAVdroid.
return client.FORBIDDEN, None
multistatus = ET.Element(_tag("D", "multistatus")) multistatus = ET.Element(_tag("D", "multistatus"))
collections = [] collections = []
for collection in write_collections: for collection in write_collections:
@ -524,7 +530,7 @@ def propfind(path, xml_request, read_collections, write_collections, user):
path, collection, props, user, write=False) path, collection, props, user, write=False)
multistatus.append(response) multistatus.append(response)
return _pretty_xml(multistatus) return client.MULTI_STATUS, _pretty_xml(multistatus)
def _propfind_response(path, item, props, user, write=False): def _propfind_response(path, item, props, user, write=False):