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

Merge pull request #189 from deronnax/revert#00674fe

Browse Source 
revert of 00674fe
This commit is contained in:
Guillaume Ayoub 2014-07-28 10:49:29 +02:00
commit bbe7588156
2 changed files with 57 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
radicale/__init__.py
View File

@ -305,7 +305,7 @@ class Application(object):
status, headers, answer = NOT_ALLOWED status, headers, answer = NOT_ALLOWED
if ((status, headers, answer) == NOT_ALLOWED and if ((status, headers, answer) == NOT_ALLOWED and
not is_authenticated and not auth.is_authenticated(user, password) and
config.get("auth", "type") != "None"): config.get("auth", "type") != "None"):
# Unknown or unauthorized user # Unknown or unauthorized user
log.LOGGER.info("%s refused" % (user or "Anonymous user")) log.LOGGER.info("%s refused" % (user or "Anonymous user"))

135
radicale/xmlutils.py
View File

@ -227,19 +227,14 @@ def propfind(path, xml_request, collections, user=None):
_tag("D", "displayname"), _tag("D", "displayname"),
_tag("D", "owner"), _tag("D", "owner"),
_tag("D", "getetag"), _tag("D", "getetag"),
_tag("D", "current-user-principal"),
_tag("A", "calendar-color"), _tag("A", "calendar-color"),
_tag("CS", "getctag")] _tag("CS", "getctag")]
# Writing answer # Writing answer
multistatus = ET.Element(_tag("D", "multistatus")) multistatus = ET.Element(_tag("D", "multistatus"))
if collections: for collection in collections:
for collection in collections: response = _propfind_response(path, collection, props, user)
response = _propfind_response(path, collection, props, user)
multistatus.append(response)
else:
response = _propfind_response(path, None, props, user)
multistatus.append(response) multistatus.append(response)
return _pretty_xml(multistatus) return _pretty_xml(multistatus)
@ -255,11 +250,8 @@ def _propfind_response(path, item, props, user):
response = ET.Element(_tag("D", "response")) response = ET.Element(_tag("D", "response"))
href = ET.Element(_tag("D", "href")) href = ET.Element(_tag("D", "href"))
if item: uri = item.url if is_collection else "%s/%s" % (path, item.name)
uri = item.url if is_collection else "%s/%s" % (path, item.name) href.text = _href(uri.replace("//", "/"))
href.text = _href(uri.replace("//", "/"))
else:
href.text = _href(path)
response.append(href) response.append(href)
propstat404 = ET.Element(_tag("D", "propstat")) propstat404 = ET.Element(_tag("D", "propstat"))
@ -275,28 +267,16 @@ def _propfind_response(path, item, props, user):
for tag in props: for tag in props:
element = ET.Element(tag) element = ET.Element(tag)
is404 = False is404 = False
if tag in (_tag("D", "principal-URL"), if tag == _tag("D", "getetag"):
_tag("D", "current-user-principal")): element.text = item.etag
if user: elif tag == _tag("D", "principal-URL"):
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 = ET.Element(_tag("D", "href"))
tag.text = _href("/") tag.text = _href(path)
element.append(tag) element.append(tag)
elif tag in (_tag("C", "calendar-home-set"), elif tag in (_tag("D", "principal-collection-set"),
_tag("CR", "addressbook-home-set")): _tag("C", "calendar-user-address-set"),
if user and path == "/%s/" % user: _tag("CR", "addressbook-home-set"),
tag = ET.Element(_tag("D", "href")) _tag("C", "calendar-home-set")):
tag.text = _href(path)
element.append(tag)
else:
is404 = True
elif tag == _tag("C", "calendar-user-address-set"):
tag = ET.Element(_tag("D", "href")) tag = ET.Element(_tag("D", "href"))
tag.text = _href(path) tag.text = _href(path)
element.append(tag) element.append(tag)
@ -314,6 +294,13 @@ def _propfind_response(path, item, props, user):
comp.set("name", component) comp.set("name", component)
element.append(comp) element.append(comp)
# pylint: enable=W0511 # 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"): elif tag == _tag("D", "current-user-privilege-set"):
privilege = ET.Element(_tag("D", "privilege")) privilege = ET.Element(_tag("D", "privilege"))
privilege.append(ET.Element(_tag("D", "all"))) privilege.append(ET.Element(_tag("D", "all")))
@ -331,55 +318,45 @@ def _propfind_response(path, item, props, user):
report_tag.text = report_name report_tag.text = report_name
supported.append(report_tag) supported.append(report_tag)
element.append(supported) element.append(supported)
# item related properties elif is_collection:
elif item: if tag == _tag("D", "getcontenttype"):
if tag == _tag("D", "getetag"): element.text = item.mimetype
element.text = item.etag
elif is_collection:
if tag == _tag("D", "getcontenttype"):
element.text = item.mimetype
elif tag == _tag("D", "resourcetype"):
if item.is_principal:
tag = ET.Element(_tag("D", "principal"))
element.append(tag)
if item.is_leaf(item.path) or (
not item.exists and item.resource_type):
# 2nd case happens when the collection is not stored yet,
# but the resource type is guessed
if item.resource_type == "addressbook":
tag = ET.Element(_tag("CR", item.resource_type))
else:
tag = ET.Element(_tag("C", item.resource_type))
element.append(tag)
tag = ET.Element(_tag("D", "collection"))
element.append(tag)
elif tag == _tag("D", "owner") and item.owner_url:
element.text = item.owner_url
elif tag == _tag("CS", "getctag"):
element.text = item.etag
elif tag == _tag("C", "calendar-timezone"):
element.text = ical.serialize(
item.tag, item.headers, item.timezones)
elif tag == _tag("D", "displayname"):
element.text = item.name
elif tag == _tag("A", "calendar-color"):
element.text = item.color
else:
human_tag = _tag_from_clark(tag)
if human_tag in collection_props:
element.text = collection_props[human_tag]
else:
is404 = True
# Not for collections
elif tag == _tag("D", "getcontenttype"):
element.text = "%s; component=%s" % (
item.mimetype, item.tag.lower())
elif tag == _tag("D", "resourcetype"): elif tag == _tag("D", "resourcetype"):
# resourcetype must be returned empty for non-collection elements if item.is_principal:
pass tag = ET.Element(_tag("D", "principal"))
element.append(tag)
if item.is_leaf(item.path) or (
not item.exists and item.resource_type):
# 2nd case happens when the collection is not stored yet,
# but the resource type is guessed
if item.resource_type == "addressbook":
tag = ET.Element(_tag("CR", item.resource_type))
else:
tag = ET.Element(_tag("C", item.resource_type))
element.append(tag)
tag = ET.Element(_tag("D", "collection"))
element.append(tag)
elif tag == _tag("D", "owner") and item.owner_url:
element.text = item.owner_url
elif tag == _tag("CS", "getctag"):
element.text = item.etag
elif tag == _tag("C", "calendar-timezone"):
element.text = ical.serialize(
item.tag, item.headers, item.timezones)
elif tag == _tag("D", "displayname"):
element.text = item.name
elif tag == _tag("A", "calendar-color"):
element.text = item.color
else: else:
is404 = True human_tag = _tag_from_clark(tag)
# Not for items if human_tag in collection_props:
element.text = collection_props[human_tag]
else:
is404 = True
# Not for collections
elif tag == _tag("D", "getcontenttype"):
element.text = "%s; component=%s" % (
item.mimetype, item.tag.lower())
elif tag == _tag("D", "resourcetype"): elif tag == _tag("D", "resourcetype"):
# resourcetype must be returned empty for non-collection elements # resourcetype must be returned empty for non-collection elements
pass pass