[CalendarServer-changes] [1263] CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource. patch

[source_changes at macosforge.org]

Revision: 1263
          http://trac.macosforge.org/projects/calendarserver/changeset/1263
Author:   cdaboo at apple.com
Date:     2007-02-24 10:11:52 -0800 (Sat, 24 Feb 2007)

Log Message:
-----------
Fix principal-match failing to match a group containing the principal being tested.

Modified Paths:
--------------
    CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch

Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch	2007-02-24 05:24:41 UTC (rev 1262)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch	2007-02-24 18:11:52 UTC (rev 1263)
@@ -887,9 +887,13 @@
  
                  if name == "resourcetype":
                      if self.isCollection():
-@@ -1673,6 +2025,24 @@
+@@ -1671,8 +2023,27 @@
+         if self.principalURL() == uri:
+             return True
          else:
-             return uri in self.groupMembers()
+-            return uri in self.groupMembers()
++            member_uris = [member.principalURL() for member in self.groupMembers()]
++            return uri in member_uris
  
 +class DAVPrincipalCollectionResource (DAVResource):
 +    """
@@ -912,7 +916,7 @@
  class AccessDeniedError(Exception):
      def __init__(self, errors):
          """ 
-@@ -1712,6 +2082,37 @@
+@@ -1712,6 +2083,37 @@
  davxml.registerElement(TwistedACLInheritable)
  davxml.ACE.allowed_children[(twisted_dav_namespace, "inheritable")] = (0, 1)
  

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070224/898703eb/attachment.html