[CalendarServer-changes] [3597] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 3597
          http://trac.macosforge.org/projects/calendarserver/changeset/3597
Author:   wsanchez at apple.com
Date:     2009-01-19 15:23:00 -0800 (Mon, 19 Jan 2009)
Log Message:
-----------
Add accessControlList() to ReadOnlyResourceMixIn and use it in RootResource.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/calendar.py
    CalendarServer/trunk/twistedcaldav/extensions.py
    CalendarServer/trunk/twistedcaldav/root.py

Added Paths:
-----------
    CalendarServer/trunk/calendarserver/provision/

Modified: CalendarServer/trunk/twistedcaldav/directory/calendar.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/calendar.py	2009-01-19 23:19:13 UTC (rev 3596)
+++ CalendarServer/trunk/twistedcaldav/directory/calendar.py	2009-01-19 23:23:00 UTC (rev 3597)
@@ -60,11 +60,7 @@
     def defaultAccessControlList(self):
         return config.ProvisioningResourceACL
 
-    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 DirectoryCalendarHomeProvisioningResource (DirectoryCalendarProvisioningResource):
     """
     Resource which provisions calendar home collections as needed.    

Modified: CalendarServer/trunk/twistedcaldav/extensions.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/extensions.py	2009-01-19 23:19:13 UTC (rev 3596)
+++ CalendarServer/trunk/twistedcaldav/extensions.py	2009-01-19 23:23:00 UTC (rev 3597)
@@ -906,6 +906,13 @@
     def writeProperty(self, property, request):
         raise HTTPError(self.readOnlyResponse)
 
+    def accessControlList(
+        self, request, inheritance=True, expanding=False, inherited_aces=None
+    ):
+        # Permissions here are fixed, and are not subject to                    
+        # inheritance rules, etc.                                               
+        return succeed(self.defaultAccessControlList())
+
 class XMLResponse (Response):
     """
     XML L{Response} object.

Modified: CalendarServer/trunk/twistedcaldav/root.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/root.py	2009-01-19 23:19:13 UTC (rev 3596)
+++ CalendarServer/trunk/twistedcaldav/root.py	2009-01-19 23:23:00 UTC (rev 3597)
@@ -40,7 +40,7 @@
 
 log = Logger()
 
-class RootResource (DirectoryPrincipalPropertySearchMixIn, DAVFile):
+class RootResource (ReadOnlyResourceMixIn, DirectoryPrincipalPropertySearchMixIn, DAVFile):
     """
     A special root resource that contains support checking SACLs
     as well as adding responseFilters.
@@ -91,13 +91,6 @@
     def defaultAccessControlList(self):
         return config.RootResourceACL
 
-    def accessControlList(
-        self, request, inheritance=True, expanding=False, inherited_aces=None
-    ):
-        # Permissions here are fixed, and are not subject to
-        # inheritance rules, etc.
-        return succeed(self.defaultAccessControlList())
-
     @inlineCallbacks
     def checkSacl(self, request):
         """
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090119/18cfcecd/attachment.html>