[CalendarServer-changes] [13363] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Apr 23 14:45:44 PDT 2014
Revision: 13363
http://trac.calendarserver.org//changeset/13363
Author: gaya at apple.com
Date: 2014-04-23 14:45:44 -0700 (Wed, 23 Apr 2014)
Log Message:
-----------
handle group attendees when group is missing from or reappears in the directory
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/ical.py
CalendarServer/trunk/txdav/caldav/datastore/sql.py
CalendarServer/trunk/txdav/who/groups.py
CalendarServer/trunk/txdav/who/test/test_group_attendees.py
CalendarServer/trunk/txdav/who/util.py
Modified: CalendarServer/trunk/twistedcaldav/ical.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/ical.py 2014-04-23 16:47:07 UTC (rev 13362)
+++ CalendarServer/trunk/twistedcaldav/ical.py 2014-04-23 21:45:44 UTC (rev 13363)
@@ -3765,12 +3765,9 @@
-def normalize_iCalStr(icalstr, sort=False):
+def normalize_iCalStr(icalstr):
"""
Normalize a string representation of ical data for easy test comparison.
-
- @param sort: Whether to sort the output
- @type sort: L{boolean}
"""
icalstr = str(icalstr).replace("\r\n ", "")
@@ -3780,8 +3777,6 @@
pos = line.find(";X-CALENDARSERVER-DTSTAMP=")
if pos != -1:
lines[ctr] = line[:pos] + line[pos + len(";X-CALENDARSERVER-DTSTAMP=") + 16:]
- if sort:
- lines.sort()
icalstr = "\r\n".join(lines)
return icalstr + "\r\n"
Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2014-04-23 16:47:07 UTC (rev 13362)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2014-04-23 21:45:44 UTC (rev 13363)
@@ -1950,9 +1950,11 @@
groupRecord = yield self.directoryService().recordWithCalendarUserAddress(groupCUA)
if groupRecord:
members = yield groupRecord.expandedMembers()
- groupCUAToAttendeeMemberPropMap[groupRecord.canonicalCalendarUserAddress()] = set(
+ groupCUAToAttendeeMemberPropMap[groupRecord.canonicalCalendarUserAddress()] = frozenset(
[member.attendeeProperty(params={"MEMBER": groupCUA}) for member in members]
)
+ else:
+ groupCUAToAttendeeMemberPropMap[groupCUA] = frozenset()
# sync group attendee members if inserting or group changed
changed = False
@@ -1984,52 +1986,51 @@
From=ga,
Where=ga.RESOURCE_ID == self._resourceID,
).on(self._txn)
- oldGAs = dict(rows)
+ groupIDToMembershipHashMap = dict(rows)
- for groupCUA, memberAttendeeProps in groupCUAToAttendeeMemberPropMap.iteritems():
+ for groupCUA in groupCUAToAttendeeMemberPropMap:
groupRecord = yield self.directoryService().recordWithCalendarUserAddress(groupCUA)
- if groupRecord:
- members = set([(
- yield self.directoryService().recordWithCalendarUserAddress(
- memberAttendeeProp.value()
- )
- ) for memberAttendeeProp in memberAttendeeProps
- ])
+ if groupRecord is not None:
+ groupUID = groupRecord.uid
+ else:
+ #FIXME: here to avoid circular import
+ from txdav.who.util import uidFromCalendarUserAddress
+ groupUID = uidFromCalendarUserAddress(groupCUA)
+ groupID, _ignore_name, membershipHash, _ignore_modDate = yield self._txn.groupByUID(groupUID)
- membershipHashContent = hashlib.md5()
- for memberUID in sorted([member.uid for member in members]):
- membershipHashContent.update(memberUID)
- membershipHash = membershipHashContent.hexdigest()
-
- groupID, _ignore_name, _ignoreMembershipHash, _ignore_modDate = yield self._txn.groupByUID(groupRecord.uid)
-
- if groupID in oldGAs:
- if oldGAs[groupID] != membershipHash:
- yield Update({
- ga.MEMBERSHIP_HASH: membershipHash,
- },
- Where=(ga.RESOURCE_ID == self._resourceID).And(
- ga.GROUP_ID == groupID
- )
- ).on(self._txn)
- changed = True
- del oldGAs[groupID]
- else:
- yield Insert({
- ga.RESOURCE_ID: self._resourceID,
- ga.GROUP_ID: groupID,
+ if groupID in groupIDToMembershipHashMap:
+ if groupIDToMembershipHashMap[groupID] != membershipHash:
+ yield Update({
ga.MEMBERSHIP_HASH: membershipHash,
- }
+ },
+ Where=(ga.RESOURCE_ID == self._resourceID).And(
+ ga.GROUP_ID == groupID
+ )
).on(self._txn)
changed = True
+ del groupIDToMembershipHashMap[groupID]
+ else:
+ yield Insert({
+ ga.RESOURCE_ID: self._resourceID,
+ ga.GROUP_ID: groupID,
+ ga.MEMBERSHIP_HASH: membershipHash,
+ }
+ ).on(self._txn)
+ changed = True
- for groupID in oldGAs:
+ if groupIDToMembershipHashMap:
+ groupIDsToRemove = groupIDToMembershipHashMap.keys()
yield Delete(
From=ga,
Where=(ga.RESOURCE_ID == self._resourceID).And(
- ga.GROUP_ID == groupID
+ ga.GROUP_ID.In(
+ Parameter(
+ "groupIDsToRemove",
+ len(groupIDsToRemove)
+ )
+ )
)
- ).on(self._txn)
+ ).on(self._txn, groupIDsToRemove=groupIDsToRemove)
changed = True
returnValue(changed)
Modified: CalendarServer/trunk/txdav/who/groups.py
===================================================================
--- CalendarServer/trunk/txdav/who/groups.py 2014-04-23 16:47:07 UTC (rev 13362)
+++ CalendarServer/trunk/txdav/who/groups.py 2014-04-23 21:45:44 UTC (rev 13363)
@@ -308,57 +308,56 @@
self.log.debug("Faulting in group: {g}", g=groupUID)
record = (yield self.directory.recordWithUID(groupUID))
if record is None:
- # the group has disappeared from the directory - OK
- # FIXME: If group reappears, it will not be used in existing events
- self.log.info("Group has disappeared: {g}", g=groupUID)
+ # the group has disappeared from the directory
+ self.log.info("Group is missing: {g}", g=groupUID)
else:
self.log.debug("Got group record: {u}", u=record.uid)
- groupID, _ignore_cachedName, cachedMembershipHash, _ignore_modified = (
+ groupID, cachedName, cachedMembershipHash, _ignore_modified = (
yield txn.groupByUID(
groupUID,
create=(record is not None)
)
)
- wp = None
+ wps = tuple()
if groupID:
if record is not None:
- membershipHashContent = hashlib.md5()
members = yield record.expandedMembers()
- members = list(members)
- members.sort(cmp=lambda x, y: cmp(x.uid, y.uid))
- for member in members:
- membershipHashContent.update(str(member.uid))
- membershipHash = membershipHashContent.hexdigest()
+ name = record.fullNames[0]
+ else:
+ members = frozenset()
+ name = cachedName
- if cachedMembershipHash != membershipHash:
- membershipChanged = True
- self.log.debug(
- "Group '{group}' changed", group=record.fullNames[0]
- )
- else:
- membershipChanged = False
+ membershipHashContent = hashlib.md5()
+ members = list(members)
+ members.sort(cmp=lambda x, y: cmp(x.uid, y.uid))
+ for member in members:
+ membershipHashContent.update(str(member.uid))
+ membershipHash = membershipHashContent.hexdigest()
- yield txn.updateGroup(groupUID, record.fullNames[0], membershipHash)
-
- if membershipChanged:
- newMemberUIDs = set()
- for member in members:
- newMemberUIDs.add(member.uid)
- yield self.synchronizeMembers(txn, groupID, newMemberUIDs)
-
- else:
- # FIXME: Use schema's delete cascade
- yield self.synchronizeMembers(txn, groupID, set())
- yield txn.deleteGroup(groupID)
+ if cachedMembershipHash != membershipHash:
membershipChanged = True
+ self.log.debug(
+ "Group '{group}' changed", group=name
+ )
+ else:
+ membershipChanged = False
+ if membershipChanged or record is not None:
+ # also updates group mod date
+ yield txn.updateGroup(groupUID, name, membershipHash)
+
if membershipChanged:
- wp = yield self.scheduleEventReconciliations(txn, groupID)
+ newMemberUIDs = set()
+ for member in members:
+ newMemberUIDs.add(member.uid)
+ yield self.synchronizeMembers(txn, groupID, newMemberUIDs)
- returnValue(wp)
+ wps = yield self.scheduleEventReconciliations(txn, groupID)
+ returnValue(wps)
+
@inlineCallbacks
def synchronizeMembers(self, txn, groupID, newMemberUIDs):
numRemoved = numAdded = 0
@@ -412,9 +411,8 @@
Where=ga.GROUP_ID == groupID,
).on(txn)
- wp = None
- if rows:
- eventID = rows[0][0]
+ wps = []
+ for [eventID] in rows:
notBefore = (
datetime.datetime.utcnow() +
@@ -434,8 +432,9 @@
groupID=groupID,
notBefore=notBefore
)
+ wps.append(wp)
- returnValue(wp)
+ returnValue(tuple(wps))
@inlineCallbacks
Modified: CalendarServer/trunk/txdav/who/test/test_group_attendees.py
===================================================================
--- CalendarServer/trunk/txdav/who/test/test_group_attendees.py 2014-04-23 16:47:07 UTC (rev 13362)
+++ CalendarServer/trunk/txdav/who/test/test_group_attendees.py 2014-04-23 21:45:44 UTC (rev 13363)
@@ -23,7 +23,7 @@
from twisted.internet.defer import inlineCallbacks, returnValue
from twisted.trial import unittest
from twistedcaldav.config import config
-from twistedcaldav.ical import Component, normalize_iCalStr
+from twistedcaldav.ical import Component, normalize_iCalStr, ignoredComponents
from txdav.caldav.datastore.test.util import buildCalendarStore, populateCalendarsFrom, CommonCommonTests
from txdav.who.directory import CalendarDirectoryRecordMixin
from txdav.who.groups import GroupCacher
@@ -93,13 +93,41 @@
self.assertEqual(count, expected_count)
- # better error output
def _assertICalStrEqual(self, iCalStr1, iCalStr2):
- if normalize_iCalStr(iCalStr1, sort=True) != normalize_iCalStr(iCalStr2, sort=True):
- self.assertEqual(normalize_iCalStr(iCalStr1), normalize_iCalStr(iCalStr2))
- self.assertTrue(False)
+ def orderMemberValues(event):
+ for component in event.subcomponents():
+ if component.name() in ignoredComponents:
+ continue
+
+ # remove all values and add them again
+ # this is sort of a hack, better pycalendar has ordering
+ for attendeeProp in tuple(component.properties("ATTENDEE")):
+ if attendeeProp.hasParameter("MEMBER"):
+ parameterValues = tuple(attendeeProp.parameterValues("MEMBER"))
+ for paramterValue in parameterValues:
+ attendeeProp.removeParameterValue("MEMBER", paramterValue)
+ attendeeProp.setParameter("MEMBER", sorted(parameterValues))
+
+ self.assertEqual(
+ orderMemberValues(
+ Component.fromString(
+ normalize_iCalStr(
+ iCalStr1
+ )
+ )
+ ),
+ orderMemberValues(
+ Component.fromString(
+ normalize_iCalStr(
+ iCalStr2
+ )
+ )
+ )
+ )
+
+
@inlineCallbacks
def test_simplePUT(self):
"""
@@ -394,7 +422,6 @@
yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000009", 1)
- #TODO: Change to multigroup case
@inlineCallbacks
def test_groupChange(self):
"""
@@ -480,8 +507,8 @@
self.patch(CalendarDirectoryRecordMixin, "expandedMembers", expandedMembers)
groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
- wp = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
- self.assertEqual(wp, None)
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
+ self.assertEqual(len(wps), 0)
calendar = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000002")
vcalendar1 = Component.fromString(data_put_1)
@@ -498,9 +525,10 @@
self.patch(CalendarDirectoryRecordMixin, "expandedMembers", unpatchedExpandedMembers)
groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
- wp = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
yield self.commit()
- yield wp.whenExecuted()
+ self.assertEqual(len(wps), 1)
+ yield wps[0].whenExecuted()
cobj1 = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000002")
vcalendar3 = yield cobj1.component()
@@ -511,9 +539,10 @@
self.patch(CalendarDirectoryRecordMixin, "expandedMembers", expandedMembers)
groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
- wp = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
yield self.commit()
- yield wp.whenExecuted()
+ self.assertEqual(len(wps), 1)
+ yield wps[0].whenExecuted()
cobj1 = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000002")
vcalendar3 = yield cobj1.component()
@@ -527,6 +556,15 @@
@inlineCallbacks
+ def test_multieventGroupChange(self):
+ """
+ Test that every event associated with a group chagnes when the group changes
+ """
+
+ self.fail("FIXME: implement this test")
+
+
+ @inlineCallbacks
def test_groupRemovalFromDirectory(self):
"""
Test that removing a group from the directory also removes the expanded attendees.
@@ -619,8 +657,8 @@
ATTENDEE;CN=Group 02;CUTYPE=GROUP;EMAIL=group02 at example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000002
ATTENDEE;CN=Group 03;CUTYPE=GROUP;EMAIL=group03 at example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000003
ATTENDEE;CN=User 06;EMAIL=user06 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006
-ATTENDEE;CN=User 07;EMAIL=user07 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000003","urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007
-ATTENDEE;CN=User 08;EMAIL=user08 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000003","urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008
+ATTENDEE;CN=User 07;EMAIL=user07 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002","urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007
+ATTENDEE;CN=User 08;EMAIL=user08 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002","urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008
ATTENDEE;CN=User 09;EMAIL=user09 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000009
CREATED:20060101T150000Z
ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000001
@@ -655,9 +693,10 @@
# cache group
groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
- wp = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000002")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000002")
yield self.commit()
- yield wp.whenExecuted()
+ self.assertEqual(len(wps), 1)
+ yield wps[0].whenExecuted()
cobj1 = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000001")
vcalendar3 = yield cobj1.component()
@@ -667,9 +706,10 @@
self.patch(DirectoryService, "recordWithUID", recordWithUID)
groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
- wp = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000002")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000002")
yield self.commit()
- yield wp.whenExecuted()
+ self.assertEqual(len(wps), 1)
+ yield wps[0].whenExecuted()
cobj1 = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000001")
vcalendar4 = yield cobj1.component()
@@ -686,10 +726,10 @@
self.patch(DirectoryService, "recordWithUID", unpatchedRecordWithUID)
groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
- wp = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000002")
- self.assertNotEqual(wp, None)
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000002")
+ self.assertEqual(len(wps), 1)
yield self.commit()
- yield wp.whenExecuted()
+ yield wps[0].whenExecuted()
cobj1 = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000001")
vcalendar5 = yield cobj1.component()
@@ -811,12 +851,14 @@
# cache groups
groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
- wp = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000002")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000002")
yield self.commit()
- yield wp.whenExecuted()
- wp = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000003")
+ self.assertEqual(len(wps), 1)
+ yield wps[0].whenExecuted()
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000003")
yield self.commit()
- yield wp.whenExecuted()
+ self.assertEqual(len(wps), 1)
+ yield wps[0].whenExecuted()
cobj1 = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000001")
vcalendar3 = yield cobj1.component()
@@ -836,10 +878,10 @@
yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000009", 1)
# groups did not change so no work proposals
- wp = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000002")
- self.assertEqual(wp, None)
- wp = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000003")
- self.assertEqual(wp, None)
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000002")
+ self.assertEqual(len(wps), 0)
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000003")
+ self.assertEqual(len(wps), 0)
cal1 = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000009")
cobjs = yield cal1.objectResources()
Modified: CalendarServer/trunk/txdav/who/util.py
===================================================================
--- CalendarServer/trunk/txdav/who/util.py 2014-04-23 16:47:07 UTC (rev 13362)
+++ CalendarServer/trunk/txdav/who/util.py 2014-04-23 21:45:44 UTC (rev 13363)
@@ -34,6 +34,7 @@
from twisted.python.filepath import FilePath
from twisted.python.reflect import namedClass
from twistedcaldav.config import fullServerPath
+from txdav.caldav.datastore.scheduling.cuaddress import normalizeCUAddr
from txdav.who.augment import AugmentedDirectoryService
from txdav.who.delegates import DirectoryService as DelegateDirectoryService
from txdav.who.idirectory import (
@@ -42,6 +43,7 @@
)
from txdav.who.wiki import DirectoryService as WikiDirectoryService
from txdav.who.xml import DirectoryService as XMLDirectoryService
+from uuid import UUID
log = Logger()
@@ -240,3 +242,34 @@
raise
return augmented
+
+
+
+def uidFromCalendarUserAddress(address):
+ """
+ Get a uid from a calendar user address
+ May return None
+ """
+
+ address = normalizeCUAddr(address)
+
+ if address.startswith("urn:x-uid:"):
+ return address[10:]
+
+ elif address.startswith("urn:uuid:"):
+ try:
+ UUID(address[9:])
+ except ValueError:
+ log.info("Invalid GUID: {guid}", guid=address[9:])
+ else:
+ return address[9:]
+
+ elif address.startswith("mailto:"):
+ return address[7:]
+
+ elif address.startswith("/principals/"):
+ parts = address.split("/")
+ if len(parts) == 4:
+ return parts[3]
+
+ return None
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140423/1e32cd0f/attachment-0001.html>
More information about the calendarserver-changes
mailing list