implement rfc6764 /.well-known/{card,cal}dav addresses

those are required vor DAVDroid around 0.6.2.

the patch requires a do_get_head mechanism in the Resource class, which
can be used in general for non-collection resources to implement their
own responses.

diff --git a/calypso/__init__.py b/calypso/__init__.py
index c8c52605d58ce525fb28955b7ec472d02788577c..960ad828eaba65b6c0a14e96f84f2ded419300b8 100644 (file)
--- a/calypso/__init__.py
+++ b/calypso/__init__.py
@@ -150,6 +150,9 @@ def identify_resource(path):
     """Return a Resource object corresponding to the path (this is used for
     everything that is not a collection, like Principal and HomeSet objects)"""
 
+    if path in ("/.well-known/carddav", "/.well-known/caldav"):
+        return principal.WellKnownDav()
+
     try:
         left, right = config.get('server', 'user_principal').split('%(user)s')
     except ValueError:
@@ -357,6 +360,9 @@ class CollectionHTTPHandler(server.BaseHTTPRequestHandler):
                 if is_get:
                     answer_text = self._collection.text
                 etag = self._collection.etag
+            elif self._resource:
+                self._resource.do_get_head(self, context, is_get)
+                return
             else:
                 self.send_calypso_response(client.NOT_FOUND, 0)
                 self.end_headers()

diff --git a/calypso/principal.py b/calypso/principal.py
index 65e8d4f0567aa151ac09c9b91593228d3f1ac4f0..f6880c418e836835a01a63e424b39417fd869cc8 100644 (file)
--- a/calypso/principal.py
+++ b/calypso/principal.py
@@ -19,8 +19,25 @@ class Resource(acl.Entity):
         responded with to a propfind of a given depth"""
         return [self]
 
+    def do_get_head(self, request, context, is_get):
+        """Handle an incoming GET or HEAD request. See
+        CollectionHTTPHandler.do_get_head for what this usually should do."""
+        request.send_calypso_response(404, 0)
+        request.end_headers()
+
     urlpath = None # this should be present ... implement as abstract property?
 
+class WellKnownDav(Resource):
+    def has_right(self, user):
+        return True
+
+    def do_get_head(self, request, context, is_get):
+        """According to RFC6764, redirect to a context path (from where
+        current-user-principal can be discovered)"""
+        request.send_calypso_response(303, 0)
+        request.send_header("Location", config.get("server", "base_prefix"))
+        request.end_headers()
+
 class Principal(Resource):
     def __init__(self, username):
         self.username = username