[CalendarServer-changes] [619] CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/ directory/principal.py

[source_changes at macosforge.org]

Revision: 619
          http://trac.macosforge.org/projects/calendarserver/changeset/619
Author:   wsanchez at apple.com
Date:     2006-11-28 18:31:48 -0800 (Tue, 28 Nov 2006)

Log Message:
-----------
Add PermissionsMixIn which all classes here inherrit from.
Make the ACL for all directory resources fixed.

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/principal.py

Modified: CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/principal.py	2006-11-29 02:23:13 UTC (rev 618)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/principal.py	2006-11-29 02:31:48 UTC (rev 619)
@@ -44,7 +44,15 @@
 
 # FIXME: These should not be tied to DAVFile
 
-class DirectoryPrincipalProvisioningResource (ReadOnlyResourceMixIn, CalendarPrincipalCollectionResource, DAVFile):
+class PermissionsMixIn (ReadOnlyResourceMixIn):
+    def defaultAccessControlList(self):
+        return authReadACL
+
+    def accessControlList(self, request, inheritance=True, expanding=False, inherited_aces=None):
+        # Permissions here are fixed, and are not subject to inherritance rules, etc.
+        return succeed(self.defaultAccessControlList())
+
+class DirectoryPrincipalProvisioningResource (PermissionsMixIn, CalendarPrincipalCollectionResource, DAVFile):
     """
     Collection resource which provisions directory principals as its children.
     """
@@ -110,10 +118,7 @@
     def principalCollections(self, request):
         return succeed((self.principalCollectionURL(),))
 
-    def defaultAccessControlList(self):
-        return authReadACL
-
-class DirectoryPrincipalTypeResource (ReadOnlyResourceMixIn, CalendarPrincipalCollectionResource, DAVFile):
+class DirectoryPrincipalTypeResource (PermissionsMixIn, CalendarPrincipalCollectionResource, DAVFile):
     """
     Collection resource which provisions directory principals of a specific type as its children.
     """
@@ -176,10 +181,7 @@
     def principalCollections(self, request):
         return self._parent.principalCollections(request)
 
-    def defaultAccessControlList(self):
-        return authReadACL
-
-class DirectoryPrincipalResource (ReadOnlyResourceMixIn, CalendarPrincipalFile):
+class DirectoryPrincipalResource (PermissionsMixIn, CalendarPrincipalFile):
     """
     Directory principal resource.
     """
@@ -285,9 +287,6 @@
     def principalCollections(self, request):
         return self._parent.principalCollections(request)
 
-    def defaultAccessControlList(self):
-        return authReadACL
-
     ##
     # CalDAV
     ##

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