[CalendarServer-changes] [2118] CalendarServer/branches/users/cdaboo/server2server-2113

source_changes at macosforge.org source_changes at macosforge.org
Mon Feb 4 14:31:07 PST 2008


Revision: 2118
          http://trac.macosforge.org/projects/calendarserver/changeset/2118
Author:   cdaboo at apple.com
Date:     2008-02-04 14:30:49 -0800 (Mon, 04 Feb 2008)

Log Message:
-----------
Option for unauthenticated freebusy URL access.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/server2server-2113/conf/caldavd-test.plist
    CalendarServer/branches/users/cdaboo/server2server-2113/conf/caldavd.plist
    CalendarServer/branches/users/cdaboo/server2server-2113/twistedcaldav/config.py
    CalendarServer/branches/users/cdaboo/server2server-2113/twistedcaldav/freebusyurl.py

Modified: CalendarServer/branches/users/cdaboo/server2server-2113/conf/caldavd-test.plist
===================================================================
--- CalendarServer/branches/users/cdaboo/server2server-2113/conf/caldavd-test.plist	2008-02-04 21:07:59 UTC (rev 2117)
+++ CalendarServer/branches/users/cdaboo/server2server-2113/conf/caldavd-test.plist	2008-02-04 22:30:49 UTC (rev 2118)
@@ -354,6 +354,8 @@
   	<true/>
   	<key>Time Period</key>
   	<integer>14</integer>
+  	<key>Anonymous Access</key>
+  	<false/>
   </dict>
 
   <!--

Modified: CalendarServer/branches/users/cdaboo/server2server-2113/conf/caldavd.plist
===================================================================
--- CalendarServer/branches/users/cdaboo/server2server-2113/conf/caldavd.plist	2008-02-04 21:07:59 UTC (rev 2117)
+++ CalendarServer/branches/users/cdaboo/server2server-2113/conf/caldavd.plist	2008-02-04 22:30:49 UTC (rev 2118)
@@ -290,6 +290,8 @@
   	<true/>
   	<key>Time Period</key>
   	<integer>14</integer>
+  	<key>Anonymous Access</key>
+  	<false/>
   </dict>
 
 </dict>

Modified: CalendarServer/branches/users/cdaboo/server2server-2113/twistedcaldav/config.py
===================================================================
--- CalendarServer/branches/users/cdaboo/server2server-2113/twistedcaldav/config.py	2008-02-04 21:07:59 UTC (rev 2117)
+++ CalendarServer/branches/users/cdaboo/server2server-2113/twistedcaldav/config.py	2008-02-04 22:30:49 UTC (rev 2118)
@@ -155,8 +155,9 @@
     },
 
     "FreeBusyURL": {
-        "Enabled"         : False, # Per-user free-busy-url protocol
-        "Time Period"     : 14,    # Number of days into the future to generate f-b data if no explicit time-range is specified
+        "Enabled"          : False, # Per-user free-busy-url protocol
+        "Time Period"      : 14,    # Number of days into the future to generate f-b data if no explicit time-range is specified
+        "Anonymous Access" : False, # Allow anonymous read access to free-busy URL
     },
 
     #

Modified: CalendarServer/branches/users/cdaboo/server2server-2113/twistedcaldav/freebusyurl.py
===================================================================
--- CalendarServer/branches/users/cdaboo/server2server-2113/twistedcaldav/freebusyurl.py	2008-02-04 21:07:59 UTC (rev 2117)
+++ CalendarServer/branches/users/cdaboo/server2server-2113/twistedcaldav/freebusyurl.py	2008-02-04 22:30:49 UTC (rev 2118)
@@ -66,7 +66,7 @@
         self.parent = parent
 
     def defaultAccessControlList(self):
-        return davxml.ACL(
+        aces = (
             # DAV:Read, CalDAV:schedule for all principals (does not include anonymous)
             davxml.ACE(
                 davxml.Principal(davxml.Authenticated()),
@@ -77,6 +77,18 @@
                 davxml.Protected(),
             ),
         )
+        if config.ServerToServer["Anonymous Access"]:
+            aces += (
+                # DAV:Read, for unauthenticated principals
+                davxml.ACE(
+                    davxml.Principal(davxml.Unauthenticated()),
+                    davxml.Grant(
+                        davxml.Privilege(davxml.Read()),
+                    ),
+                    davxml.Protected(),
+                ),
+            )
+        return davxml.ACL(*aces)
 
     def resourceType(self):
         return davxml.ResourceType.freebusyurl

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080204/335e24b0/attachment-0001.html


More information about the calendarserver-changes mailing list