[CalendarServer-changes] [564] CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/ static.py

[source_changes at macosforge.org]

Revision: 564
          http://trac.macosforge.org/projects/calendarserver/changeset/564
Author:   wsanchez at apple.com
Date:     2006-11-22 14:17:30 -0800 (Wed, 22 Nov 2006)

Log Message:
-----------
minor

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

Modified: CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/static.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/static.py	2006-11-22 22:06:22 UTC (rev 563)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/static.py	2006-11-22 22:17:30 UTC (rev 564)
@@ -396,7 +396,7 @@
 
     def defaultAccessControlList(self):
         return davxml.ACL(
-            # Allow any authenticated user to schedule
+            # CalDAV:schedule for any authenticated user
             davxml.ACE(
                 davxml.Principal(davxml.Authenticated()),
                 davxml.Grant(
@@ -502,14 +502,7 @@
     ##
 
     def defaultAccessControlList(self):
-        return davxml.ACL(
-            # Read access for authenticated users.
-            davxml.ACE(
-                davxml.Principal(davxml.Authenticated()),
-                davxml.Grant(davxml.Privilege(davxml.Read())),
-                davxml.Protected(),
-            ),
-        )
+        return readOnlyACL
 
 class CalendarHomeTypeProvisioningFile (ReadOnlyResourceMixIn, DAVFile):
     """
@@ -570,14 +563,7 @@
     ##
 
     def defaultAccessControlList(self):
-        return davxml.ACL(
-            # Read access for authenticated users.
-            davxml.ACE(
-                davxml.Principal(davxml.Authenticated()),
-                davxml.Grant(davxml.Privilege(davxml.Read())),
-                davxml.Protected(),
-            ),
-        )
+        return readOnlyACL
 
 class CalendarHomeFile (CalDAVFile):
     """
@@ -686,12 +672,12 @@
         myPrincipal = self.record.principalResource()
 
         return davxml.ACL(
-            # Read access for authenticated users.
+            # DAV:read access for authenticated users.
             davxml.ACE(
                 davxml.Principal(davxml.Authenticated()),
                 davxml.Grant(davxml.Privilege(davxml.Read())),
             ),
-            # Inheritable all access to resource's associated principal.
+            # Inheritable DAV:all access for the resource's associated principal.
             davxml.ACE(
                 davxml.Principal(davxml.HRef(myPrincipal.principalURL())),
                 davxml.Grant(davxml.Privilege(davxml.All())),
@@ -755,13 +741,14 @@
 
     def defaultAccessControlList(self):
         return davxml.ACL(
-            # Read access for this principal only.
+            # DAV:read access for this principal only.
             davxml.ACE(
                 davxml.Principal(davxml.HRef(self.principalURL())),
                 davxml.Grant(davxml.Privilege(davxml.Read())),
                 davxml.Protected(),
             ),
         )
+
     ##
     # CalDAV
     ##
@@ -929,6 +916,15 @@
     # Otherwise, there is no child
     return (None, ())
 
+# DAV:read access for authenticated users.
+readOnlyACL = davxml.ACL(
+    readOnlyACE = davxml.ACE(
+        davxml.Principal(davxml.Authenticated()),
+        davxml.Grant(davxml.Privilege(davxml.Read())),
+        davxml.Protected(),
+    ),
+)
+
 def _schedulePrivilegeSet():
     edited = False
 

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