Allow missing owner
This commit is contained in:
parent
2e1b51e3c1
commit
72c57a042d
@ -129,7 +129,12 @@ class CalendarHTTPHandler(server.BaseHTTPRequestHandler):
|
||||
attributes = posixpath.normpath(self.path.strip("/")).split("/")
|
||||
if len(attributes) >= 2:
|
||||
path = "%s/%s" % (attributes[0], attributes[1])
|
||||
return ical.Calendar(path)
|
||||
elif len(attributes) == 1: # no owner
|
||||
path = attributes[0]
|
||||
else:
|
||||
return
|
||||
|
||||
return ical.Calendar(path)
|
||||
|
||||
def _decode(self, text):
|
||||
"""Try to decode text according to various parameters."""
|
||||
|
@ -56,6 +56,9 @@ def _sha1(hash_value, password):
|
||||
|
||||
def has_right(owner, user, password):
|
||||
"""Check if ``user``/``password`` couple is valid."""
|
||||
if owner is None: # no owner - everybody is allowed
|
||||
return True
|
||||
|
||||
for line in open(FILENAME).readlines():
|
||||
if line.strip():
|
||||
login, hash_value = line.strip().split(":")
|
||||
|
@ -135,8 +135,16 @@ class Calendar(object):
|
||||
|
||||
def __init__(self, path):
|
||||
"""Initialize the calendar with ``cal`` and ``user`` parameters."""
|
||||
|
||||
split_path = path.split("/")
|
||||
|
||||
self.encoding = "utf-8"
|
||||
self.owner = path.split("/")[0]
|
||||
|
||||
if len(split_path) > 1:
|
||||
self.owner = split_path[0]
|
||||
else:
|
||||
self.owner = None
|
||||
|
||||
self.path = os.path.join(FOLDER, path.replace("/", os.path.sep))
|
||||
|
||||
@staticmethod
|
||||
|
@ -51,7 +51,7 @@ def _response(code):
|
||||
def name_from_path(path):
|
||||
"""Return Radicale item name from ``path``."""
|
||||
path_parts = path.strip("/").split("/")
|
||||
return path_parts[-1] if len(path_parts) > 2 else None
|
||||
return path_parts[-1] if len(path_parts) >= 2 else None
|
||||
|
||||
|
||||
def delete(path, calendar):
|
||||
@ -129,7 +129,8 @@ def propfind(path, xml_request, calendar, depth):
|
||||
tag = ET.Element(_tag("D", "collection"))
|
||||
element.append(tag)
|
||||
elif tag == _tag("D", "owner"):
|
||||
element.text = calendar.owner
|
||||
if calendar.owner:
|
||||
element.text = calendar.owner
|
||||
elif tag == _tag("D", "getcontenttype"):
|
||||
element.text = "text/calendar"
|
||||
elif tag == _tag("CS", "getctag") and is_calendar:
|
||||
|
Loading…
Reference in New Issue
Block a user