[CalendarServer-changes] [6421] CalendarServer/trunk/twistedcaldav/storebridge.py

source_changes at macosforge.org source_changes at macosforge.org
Wed Oct 13 13:31:21 PDT 2010


Revision: 6421
          http://trac.macosforge.org/projects/calendarserver/changeset/6421
Author:   cdaboo at apple.com
Date:     2010-10-13 13:31:20 -0700 (Wed, 13 Oct 2010)
Log Message:
-----------
Handle case of attendees that are not valid principals on the server.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/storebridge.py

Modified: CalendarServer/trunk/twistedcaldav/storebridge.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/storebridge.py	2010-10-13 20:27:22 UTC (rev 6420)
+++ CalendarServer/trunk/twistedcaldav/storebridge.py	2010-10-13 20:31:20 UTC (rev 6421)
@@ -524,7 +524,8 @@
     def accessControlList(self, *a, **kw):
         """
         All principals identified as ATTENDEEs on the event for this dropbox
-        may read all its children. Also include proxies of ATTENDEEs.
+        may read all its children. Also include proxies of ATTENDEEs. Ignore
+        unknown attendees.
         """
         d = super(CalendarObjectDropbox, self).accessControlList(*a, **kw)
         def moreACLs(originalACL):
@@ -538,6 +539,8 @@
                 principal = self.principalForCalendarUserAddress(
                     calendarUserAddress
                 )
+                if principal is None:
+                    continue
                 principalURL = principal.principalURL()
                 writePrivileges = [
                     davxml.Privilege(davxml.Read()),
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101013/c3aec759/attachment.html>


More information about the calendarserver-changes mailing list