[CalendarServer-changes] [917] CalendarServer/branches/users/dreid/sudoers-2

[source_changes at macosforge.org]

Revision: 917
          http://trac.macosforge.org/projects/calendarserver/changeset/917
Author:   dreid at apple.com
Date:     2007-01-04 13:37:55 -0800 (Thu, 04 Jan 2007)

Log Message:
-----------
dead simple patch to fix group membership lookup, this is poorly factored and uses locateResource probably unecessarily.

Modified Paths:
--------------
    CalendarServer/branches/users/dreid/sudoers-2/conf/accounts-test.xml
    CalendarServer/branches/users/dreid/sudoers-2/lib-patches/Twisted/twisted.web2.dav.resource.patch

Modified: CalendarServer/branches/users/dreid/sudoers-2/conf/accounts-test.xml
===================================================================
--- CalendarServer/branches/users/dreid/sudoers-2/conf/accounts-test.xml	2007-01-04 20:43:30 UTC (rev 916)
+++ CalendarServer/branches/users/dreid/sudoers-2/conf/accounts-test.xml	2007-01-04 21:37:55 UTC (rev 917)
@@ -47,4 +47,13 @@
     <password>resource%02d</password>
     <name>Room %02d</name>
   </resource>
+
+  <group>
+    <uid>group01</uid>
+    <password>group01</password>
+    <name>Group 01</name>
+    <members>
+      <member type="user">user01</member>
+    </members>
+  </group>
 </accounts>

Modified: CalendarServer/branches/users/dreid/sudoers-2/lib-patches/Twisted/twisted.web2.dav.resource.patch
===================================================================
--- CalendarServer/branches/users/dreid/sudoers-2/lib-patches/Twisted/twisted.web2.dav.resource.patch	2007-01-04 20:43:30 UTC (rev 916)
+++ CalendarServer/branches/users/dreid/sudoers-2/lib-patches/Twisted/twisted.web2.dav.resource.patch	2007-01-04 21:37:55 UTC (rev 917)
@@ -548,6 +548,19 @@
          # Compare two HRefs and do group membership test as well
          if principal1 == principal2:
              yield True
+@@ -1296,9 +1392,9 @@
+         def testGroup(group):
+             # Get principal resource for principal2
+             if group and isinstance(group, DAVPrincipalResource):
+-                members = group.groupMembers()
+-                if principal1 in members:
+-                    return True
++                for member in group.groupMembers():
++                    if member.principalURL() == principal1:
++                        return True
+                 
+             return False
+ 
 @@ -1426,7 +1522,7 @@
                  log.err("DAV:self ACE is set on non-principal resource %r" % (self,))
                  yield None

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070104/72de7e44/attachment.html