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

Merge pull request #95 from chripo/easy-connect

Browse Source 
Easy connect
This commit is contained in:
Guillaume Ayoub 2014-02-05 12:38:09 +01:00
commit 00674fe8b0
2 changed files with 87 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
radicale/__init__.py
View File

@ -283,10 +283,14 @@ class Application(object):
read_allowed_items, write_allowed_items = \
self.collect_allowed_items(items, user)
is_authenticated = auth.is_authenticated(user, password)
if ((read_allowed_items or write_allowed_items)
and (not user or auth.is_authenticated(user, password))) or \
and (not user or is_authenticated)) or \
(is_authenticated and function == self.propfind) or \
function == self.options or not items:
# Collections found, or OPTIONS request, or no items at all
# Collections found, or authenticated PROPFIND request,
# or OPTIONS request, or no items at all
status, headers, answer = function(
environ, read_allowed_items, write_allowed_items, content,
user)
@ -294,7 +298,7 @@ class Application(object):
status, headers, answer = NOT_ALLOWED
if ((status, headers, answer) == NOT_ALLOWED and
not auth.is_authenticated(user, password) and
not is_authenticated and
config.get("auth", "type") != "None"):
# Unknown or unauthorized user
log.LOGGER.info("%s refused" % (user or "Anonymous user"))

51
radicale/xmlutils.py
View File

@ -227,15 +227,20 @@ def propfind(path, xml_request, collections, user=None):
_tag("D", "displayname"),
_tag("D", "owner"),
_tag("D", "getetag"),
_tag("D", "current-user-principal"),
_tag("A", "calendar-color"),
_tag("CS", "getctag")]
# Writing answer
multistatus = ET.Element(_tag("D", "multistatus"))
if collections:
for collection in collections:
response = _propfind_response(path, collection, props, user)
multistatus.append(response)
else:
response = _propfind_response(path, None, props, user)
multistatus.append(response)
return _pretty_xml(multistatus)
@ -250,8 +255,11 @@ def _propfind_response(path, item, props, user):
response = ET.Element(_tag("D", "response"))
href = ET.Element(_tag("D", "href"))
if item:
uri = item.url if is_collection else "%s/%s" % (path, item.name)
href.text = _href(uri.replace("//", "/"))
else:
href.text = _href(path)
response.append(href)
propstat404 = ET.Element(_tag("D", "propstat"))
@ -267,16 +275,28 @@ def _propfind_response(path, item, props, user):
for tag in props:
element = ET.Element(tag)
is404 = False
if tag == _tag("D", "getetag"):
element.text = item.etag
elif tag == _tag("D", "principal-URL"):
if tag in (_tag("D", "principal-URL"),
_tag("D", "current-user-principal")):
if user:
tag = ET.Element(_tag("D", "href"))
tag.text = _href("%s/" % user)
else:
is404 = True
tag = ET.Element(_tag("D", "unauthenticated"))
element.append(tag)
elif tag == _tag("D", "principal-collection-set"):
tag = ET.Element(_tag("D", "href"))
tag.text = _href("/")
element.append(tag)
elif tag in (_tag("C", "calendar-home-set"),
_tag("CR", "addressbook-home-set")):
if user and path == "/%s/" % user:
tag = ET.Element(_tag("D", "href"))
tag.text = _href(path)
element.append(tag)
elif tag in (_tag("D", "principal-collection-set"),
_tag("C", "calendar-user-address-set"),
_tag("CR", "addressbook-home-set"),
_tag("C", "calendar-home-set")):
else:
is404 = True
elif tag == _tag("C", "calendar-user-address-set"):
tag = ET.Element(_tag("D", "href"))
tag.text = _href(path)
element.append(tag)
@ -294,13 +314,6 @@ def _propfind_response(path, item, props, user):
comp.set("name", component)
element.append(comp)
# pylint: enable=W0511
elif tag == _tag("D", "current-user-principal") and user:
tag = ET.Element(_tag("D", "href"))
if item.resource_type == "addressbook":
tag.text = _href("/%s/addressbook.vcf/" % user)
else:
tag.text = _href("/%s/calendar.ics/" % user)
element.append(tag)
elif tag == _tag("D", "current-user-privilege-set"):
privilege = ET.Element(_tag("D", "privilege"))
privilege.append(ET.Element(_tag("D", "all")))
@ -318,6 +331,10 @@ def _propfind_response(path, item, props, user):
report_tag.text = report_name
supported.append(report_tag)
element.append(supported)
# item related properties
elif item:
if tag == _tag("D", "getetag"):
element.text = item.etag
elif is_collection:
if tag == _tag("D", "getcontenttype"):
element.text = item.mimetype
@ -362,6 +379,12 @@ def _propfind_response(path, item, props, user):
pass
else:
is404 = True
# Not for items
elif tag == _tag("D", "resourcetype"):
# resourcetype must be returned empty for non-collection elements
pass
else:
is404 = True
if is404:
prop404.append(element)