[CalendarServer-changes] [72] CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted

[source_changes at macosforge.org]

Revision: 72
Author:   cdaboo at apple.com
Date:     2006-08-28 07:19:10 -0700 (Mon, 28 Aug 2006)

Log Message:
-----------
Fix for missing PROPFIND authentication and access control. URL returned from findChildren is now
absolute so no need to prefix with request URL.

Added Paths:
-----------
    CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.propfind.patch
    CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.report_principal_match.patch
    CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.report_principal_property_search.patch

Added: CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.propfind.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.propfind.patch	                        (rev 0)
+++ CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.propfind.patch	2006-08-28 14:19:10 UTC (rev 72)
@@ -0,0 +1,36 @@
+Index: twisted/web2/dav/method/propfind.py
+===================================================================
+--- twisted/web2/dav/method/propfind.py	(revision 17951)
++++ twisted/web2/dav/method/propfind.py	(working copy)
+@@ -48,6 +48,13 @@
+         raise HTTPError(responsecode.NOT_FOUND)
+ 
+     #
++    # Check authentication and access controls
++    #
++    x = waitForDeferred(self.securityCheck(request, (davxml.Read(),)))
++    yield x
++    x.getResult()
++
++    #
+     # Read request body
+     #
+     try:
+@@ -99,7 +106,7 @@
+ 
+     resources = [(self, None)]
+ 
+-    d = self.findChildren(depth, request, lambda x, y: resources.append((x, y)))
++    d = self.findChildren(depth, request, lambda x, y: resources.append((x, y)), (davxml.Read(),))
+     ign = waitForDeferred(d)
+     yield ign
+     ign.getResult()
+@@ -108,8 +115,6 @@
+         if uri is None:
+             uri = normalizeURL(request_uri)
+             if self.isCollection() and not uri.endswith("/"): uri += "/"
+-        else:
+-            uri = joinURL(request_uri, uri)
+ 
+         resource_properties = waitForDeferred(resource.listProperties(request))
+         yield resource_properties

Added: CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.report_principal_match.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.report_principal_match.patch	                        (rev 0)
+++ CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.report_principal_match.patch	2006-08-28 14:19:10 UTC (rev 72)
@@ -0,0 +1,22 @@
+Index: twisted/web2/dav/method/report_principal_match.py
+===================================================================
+--- twisted/web2/dav/method/report_principal_match.py	(revision 17951)
++++ twisted/web2/dav/method/report_principal_match.py	(working copy)
+@@ -104,7 +104,7 @@
+                     prop_common.responseForHref(
+                         request,
+                         responses,
+-                        davxml.HRef.fromString(joinURL(request.uri, uri)),
++                        davxml.HRef.fromString(uri),
+                         child,
+                         propertiesForResource,
+                         propElement
+@@ -133,7 +133,7 @@
+                             prop_common.responseForHref(
+                                 request,
+                                 responses,
+-                                davxml.HRef.fromString(joinURL(request.uri, uri)),
++                                davxml.HRef.fromString(uri),
+                                 child,
+                                 propertiesForResource,
+                                 propElement

Added: CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.report_principal_property_search.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.report_principal_property_search.patch	                        (rev 0)
+++ CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.report_principal_property_search.patch	2006-08-28 14:19:10 UTC (rev 72)
@@ -0,0 +1,13 @@
+Index: twisted/web2/dav/method/report_principal_property_search.py
+===================================================================
+--- twisted/web2/dav/method/report_principal_property_search.py	(revision 18009)
++++ twisted/web2/dav/method/report_principal_property_search.py	(working copy)
+@@ -150,7 +150,7 @@
+                     prop_common.responseForHref(
+                         request,
+                         responses,
+-                        davxml.HRef.fromString(joinURL(ruri, uri)),
++                        davxml.HRef.fromString(uri),
+                         child,
+                         propertiesForResource,
+                         propElement

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20060828/0a86cf8b/attachment.html