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

Fix support of owner-less calendars

Browse Source
This commit is contained in:
Guillaume Ayoub
2011-04-25 20:12:37 +02:00
parent d061c09344
commit 39f7c7a96f
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
radicale/__init__.py
View File

@@ -188,6 +188,8 @@ class CalendarHTTPHandler(server.BaseHTTPRequestHandler):
# ``normpath`` should clean malformed and malicious request paths
attributes = posixpath.normpath(self.path.strip("/")).split("/")
if attributes:
if attributes[-1].endswith('.ics'):
attributes.pop()
path = "/".join(attributes[:min(len(attributes), 2)])
return ical.Calendar(path)
@@ -231,7 +233,7 @@ class CalendarHTTPHandler(server.BaseHTTPRequestHandler):
@check_rights
def do_HEAD(self):
"""Manage HEAD request."""
item_name = xmlutils.name_from_path(self.path)
item_name = xmlutils.name_from_path(self.path, self._calendar)
if item_name:
# Get calendar item
item = self._calendar.get_item(item_name)
@@ -262,7 +264,8 @@ class CalendarHTTPHandler(server.BaseHTTPRequestHandler):
@check_rights
def do_DELETE(self):
"""Manage DELETE request."""
item = self._calendar.get_item(xmlutils.name_from_path(self.path))
item = self._calendar.get_item(
xmlutils.name_from_path(self.path, self._calendar))
if item and self.headers.get("If-Match", item.etag) == item.etag:
# No ETag precondition or precondition verified, delete item
self._answer = xmlutils.delete(self.path, self._calendar)
@@ -310,7 +313,7 @@ class CalendarHTTPHandler(server.BaseHTTPRequestHandler):
@check_rights
def do_PUT(self):
"""Manage PUT request."""
item_name = xmlutils.name_from_path(self.path)
item_name = xmlutils.name_from_path(self.path, self._calendar)
item = self._calendar.get_item(item_name)
if (not item and not self.headers.get("If-Match")) or \
(item and self.headers.get("If-Match", item.etag) == item.etag):