Ticket #468: calendarserver_CardDavMATE.diff

http_headers.py

@@ -1531 +1531 @@
     'Set-Cookie2':(tokenize, parseSetCookie2),
     'Vary':(tokenize, filterTokens),
     'WWW-Authenticate': (lambda h: tokenize(h, foldCase=False),
-                         parseWWWAuthenticate,)
+                         parseWWWAuthenticate,),
+
+    # begin CardDavMATE section
+    'Access-Control-Allow-Origin':(last,),
+    'Access-Control-Allow-Methods':(last,),
+    'Access-Control-Allow-Headers':(last,),
+    'Access-Control-Allow-Credentials':(last,)
+    # end CardDavMATE section
 }
 
 generator_response_headers = {
@@ -1545 +1552 @@
     'Set-Cookie':(generateSetCookie,),
     'Set-Cookie2':(generateSetCookie2,),
     'Vary':(generateList, singleHeader),
-    'WWW-Authenticate':(generateWWWAuthenticate,)
+    'WWW-Authenticate':(generateWWWAuthenticate,),
+
+    # begin CardDavMATE section
+    'Access-Control-Allow-Origin':(str, singleHeader),
+    'Access-Control-Allow-Methods':(str, singleHeader),
+    'Access-Control-Allow-Headers':(str, singleHeader),
+    'Access-Control-Allow-Credentials':(str, singleHeader)
+    # end CardDavMATE section
 }
 
 parser_entity_headers = {

server.py

@@ -58 +58 @@
         response.headers.setHeader('server', VERSION)
     if not response.headers.hasHeader('date'):
         response.headers.setHeader('date', time.time())
+
+    # begin CardDavMATE section
+    if not response.headers.hasHeader('Access-Control-Allow-Origin'):
+        response.headers.setHeader('Access-Control-Allow-Origin', '*')
+    if not response.headers.hasHeader('Access-Control-Allow-Methods'):
+        response.headers.setHeader('Access-Control-Allow-Methods','GET,POST,OPTIONS,PROPFIND,REPORT,PUT,DELETE')
+    if not response.headers.hasHeader('Access-Control-Allow-Headers'):
+        response.headers.setHeader('Access-Control-Allow-Headers','User-Agent,Authorization,Content-type,Depth,If-match,If-None-Match,X-client')
+    if not response.headers.hasHeader('Access-Control-Allow-Credentials'):
+        response.headers.setHeader('Access-Control-Allow-Credentials','true')
+    # end CardDavMATE section
+
     return response
 defaultHeadersFilter.handleErrors = True
 
@@ -354 +366 @@
         example. This would also be the place to do any CONNECT
         processing."""
 
-        if self.method == "OPTIONS" and self.uri == "*":
+        if self.method == "OPTIONS":
             response = http.Response(responsecode.OK)
             response.headers.setHeader('allow', ('GET', 'HEAD', 'OPTIONS', 'TRACE'))
             return response