[CalendarServer-changes] [7733] CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py

[source_changes at macosforge.org]

Revision: 7733
          http://trac.macosforge.org/projects/calendarserver/changeset/7733
Author:   sagen at apple.com
Date:     2011-07-07 11:42:49 -0700 (Thu, 07 Jul 2011)
Log Message:
-----------
Protect against bogus proxydb entries

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py

Modified: CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py	2011-07-07 17:48:36 UTC (rev 7732)
+++ CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py	2011-07-07 18:42:49 UTC (rev 7733)
@@ -873,10 +873,10 @@
     (where <GUID> will be that of a sub-principal, e.g.
     5A985493-EE2C-4665-94CF-4DFEA3A89500#calendar-proxy-write)
 
-    "read-proxy-for:<GUID>" : comma-separate list of principals
+    "read-proxy-for:<GUID>" : comma-separated list of principals
     who have granted read access to GUID
 
-    "write-proxy-for:<GUID>" : comma-separate list of principals
+    "write-proxy-for:<GUID>" : comma-separated list of principals
     who have granted read-write access to GUID
 
     "proxy-cache-populated" : gets set to "true" after the cache is populated,
@@ -985,6 +985,10 @@
         proxyGroups = (yield self.proxyDB.getAllGroups())
         for proxyGroup in proxyGroups:
 
+            # Protect against bogus entries in proxy db:
+            if "#" not in proxyGroup:
+                continue
+
             # Populate delegator -> delegate cache
             combinedGUIDs = set()
             for proxyGUID in (yield self.proxyDB.getMembers(proxyGroup)):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110707/f891f5e4/attachment.html>