[CalendarServer-changes] [4010] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 4010
          http://trac.macosforge.org/projects/calendarserver/changeset/4010
Author:   cdaboo at apple.com
Date:     2009-04-13 13:59:08 -0700 (Mon, 13 Apr 2009)
Log Message:
-----------
Proxies should have DAV:read-current-user-privilege-set turned on.

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

Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run	2009-04-13 20:54:34 UTC (rev 4009)
+++ CalendarServer/trunk/run	2009-04-13 20:59:08 UTC (rev 4010)
@@ -724,7 +724,7 @@
 
 caldavtester="${top}/CalDAVTester";
 
-svn_get "CalDAVTester" "${caldavtester}" "${svn_uri_base}/CalDAVTester/trunk" 3967;
+svn_get "CalDAVTester" "${caldavtester}" "${svn_uri_base}/CalDAVTester/trunk" 4009;
 
 #
 # PyFlakes

Modified: CalendarServer/trunk/twistedcaldav/directory/calendar.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/calendar.py	2009-04-13 20:54:34 UTC (rev 4009)
+++ CalendarServer/trunk/twistedcaldav/directory/calendar.py	2009-04-13 20:59:08 UTC (rev 4010)
@@ -386,17 +386,24 @@
         
         if config.EnableProxyPrincipals:
             aces += (
-                # DAV:read access for this principal's calendar-proxy-read users.
+                # DAV:read/DAV:read-current-user-privilege-set access for this principal's calendar-proxy-read users.
                 davxml.ACE(
                     davxml.Principal(davxml.HRef(joinURL(myPrincipal.principalURL(), "calendar-proxy-read/"))),
-                    davxml.Grant(davxml.Privilege(davxml.Read())),
+                    davxml.Grant(
+                        davxml.Privilege(davxml.Read()),
+                        davxml.Privilege(davxml.ReadCurrentUserPrivilegeSet()),
+                    ),
                     davxml.Protected(),
                     TwistedACLInheritable(),
                 ),
-                # DAV:read/DAV:write access for this principal's calendar-proxy-write users.
+                # DAV:read/DAV:read-current-user-privilege-set/DAV:write access for this principal's calendar-proxy-write users.
                 davxml.ACE(
                     davxml.Principal(davxml.HRef(joinURL(myPrincipal.principalURL(), "calendar-proxy-write/"))),
-                    davxml.Grant(davxml.Privilege(davxml.Read()), davxml.Privilege(davxml.Write())),
+                    davxml.Grant(
+                        davxml.Privilege(davxml.Read()),
+                        davxml.Privilege(davxml.ReadCurrentUserPrivilegeSet()),
+                        davxml.Privilege(davxml.Write()),
+                    ),
                     davxml.Protected(),
                     TwistedACLInheritable(),
                 ),
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090413/a6783c96/attachment.html>