[CalendarServer-changes] [14944] CalendarServer/trunk/txdav
source_changes at macosforge.org
source_changes at macosforge.org
Thu Jul 2 13:17:48 PDT 2015
Revision: 14944
http://trac.calendarserver.org//changeset/14944
Author: cdaboo at apple.com
Date: 2015-07-02 13:17:48 -0700 (Thu, 02 Jul 2015)
Log Message:
-----------
Make sure trashed shared calendars have their group sharee list removed as well as individual sharees.
Modified Paths:
--------------
CalendarServer/trunk/txdav/caldav/datastore/sql.py
CalendarServer/trunk/txdav/who/groups.py
CalendarServer/trunk/txdav/who/test/test_group_sharees.py
Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-07-02 19:57:13 UTC (rev 14943)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-07-02 20:17:48 UTC (rev 14944)
@@ -2504,6 +2504,24 @@
@inlineCallbacks
+ def ownerDeleteShare(self):
+ """
+ This share is being deleted (by the owner) - we also need to clean up the group sharees.
+ """
+
+ yield super(Calendar, self).ownerDeleteShare()
+
+ # Delete referenced group sharees. Note that whilst the table uses an on delete cascade,
+ # we do need to remove the sharees for the case where the calendar is trashed and not
+ # removed. Since the cascade is not triggered in that case and we have to do it by hand.
+ gs = schema.GROUP_SHAREE
+ yield Delete(
+ From=gs,
+ Where=(gs.CALENDAR_ID == self._resourceID),
+ ).on(self._txn)
+
+
+ @inlineCallbacks
def allInvitations(self):
"""
Get list of all invitations (non-direct) to this object.
Modified: CalendarServer/trunk/txdav/who/groups.py
===================================================================
--- CalendarServer/trunk/txdav/who/groups.py 2015-07-02 19:57:13 UTC (rev 14943)
+++ CalendarServer/trunk/txdav/who/groups.py 2015-07-02 20:17:48 UTC (rev 14944)
@@ -184,8 +184,10 @@
homeID = rows[0][0]
home = yield self.transaction.calendarHomeWithResourceID(homeID)
calendar = yield home.childWithID(self.calendarID)
- group = (yield self.transaction.groupByID(self.groupID))
- yield calendar.reconcileGroupSharee(group.groupUID)
+ # Might be None if the calendar is in the trash or was removed before the work started
+ if calendar is not None:
+ group = (yield self.transaction.groupByID(self.groupID))
+ yield calendar.reconcileGroupSharee(group.groupUID)
Modified: CalendarServer/trunk/txdav/who/test/test_group_sharees.py
===================================================================
--- CalendarServer/trunk/txdav/who/test/test_group_sharees.py 2015-07-02 19:57:13 UTC (rev 14943)
+++ CalendarServer/trunk/txdav/who/test/test_group_sharees.py 2015-07-02 20:17:48 UTC (rev 14944)
@@ -509,3 +509,164 @@
yield calendar.uninviteUIDFromShare("group06")
noinvites = yield calendar.sharingInvites()
self.assertEqual(len(noinvites), 0)
+
+
+ @inlineCallbacks
+ def test_group_change_trashed_calendar(self):
+ """
+ Test that group shares are properly cleaned when a calendar is trashed.
+ """
+
+ self.patch(config, "EnableTrashCollection", True)
+
+ @inlineCallbacks
+ def expandedMembers(self, records=None, seen=None):
+
+ if self.uid == "group02":
+ returnValue(frozenset())
+ else:
+ returnValue((yield unpatchedExpandedMembers(self, records, seen)))
+
+ unpatchedExpandedMembers = CalendarDirectoryRecordMixin.expandedMembers
+
+ # setup group cacher
+ groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
+ groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
+ self.assertEqual(len(groupsToRefresh), 0)
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group02")
+ self.assertEqual(len(wps), 0)
+
+ yield self._check_notifications("user01", [])
+
+ # New calendar for sharing
+ home = yield self.homeUnderTest(name="user01")
+ yield home.createCalendarWithName("shared")
+ yield self.commit()
+
+ # Invite
+ calendar = yield self.calendarUnderTest(home="user01", name="shared")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 0)
+ self.assertFalse(calendar.isShared())
+
+ yield self._check_notifications("user01", [])
+ shareeViews = yield calendar.inviteUIDToShare("group02", _BIND_MODE_READ)
+ self.assertEqual(len(shareeViews), 3)
+ calendar = yield self.calendarUnderTest(home="user01", name="shared")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 3)
+ for invite in invites:
+ shareeView = yield calendar.shareeView(invite.shareeUID)
+ self.assertEqual(invite.ownerUID, "user01")
+ self.assertEqual(invite.uid, shareeView.shareName())
+ self.assertEqual(invite.mode, _BIND_MODE_GROUP)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_READ)
+ self.assertEqual(invite.status, _BIND_STATUS_INVITED)
+ self.assertEqual(invite.summary, None)
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
+
+ groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
+ self.assertEqual(len(groupsToRefresh), 1)
+ yield self.commit()
+
+ # Trash the collection
+ calendar = yield self.calendarUnderTest(home="user01", name="shared")
+ yield calendar.remove()
+ self.assertTrue(calendar.isInTrash())
+ trash_id = calendar.id()
+ yield self.commit()
+
+ home = yield self.homeUnderTest(name="user01")
+ calendar = yield home.childWithID(trash_id, onlyInTrash=True)
+ self.assertTrue(calendar.isInTrash())
+ invitations = yield calendar.allInvitations()
+ self.assertEqual(len(invitations), 0)
+ yield self.commit()
+
+ # 1 group member
+ self.patch(CalendarDirectoryRecordMixin, "expandedMembers", expandedMembers)
+
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group02")
+ self.assertEqual(len(wps), 0)
+ yield self.commit()
+ yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)
+
+
+ @inlineCallbacks
+ def test_group_change_removed_calendar(self):
+ """
+ Test that group shares are properly cleaned when a calendar is removed (and not trashed).
+ """
+
+ self.patch(config, "EnableTrashCollection", False)
+
+ @inlineCallbacks
+ def expandedMembers(self, records=None, seen=None):
+
+ if self.uid == "group02":
+ returnValue(frozenset())
+ else:
+ returnValue((yield unpatchedExpandedMembers(self, records, seen)))
+
+ unpatchedExpandedMembers = CalendarDirectoryRecordMixin.expandedMembers
+
+ # setup group cacher
+ groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
+ groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
+ self.assertEqual(len(groupsToRefresh), 0)
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group02")
+ self.assertEqual(len(wps), 0)
+
+ yield self._check_notifications("user01", [])
+
+ # New calendar for sharing
+ home = yield self.homeUnderTest(name="user01")
+ yield home.createCalendarWithName("shared")
+ yield self.commit()
+
+ # Invite
+ calendar = yield self.calendarUnderTest(home="user01", name="shared")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 0)
+ self.assertFalse(calendar.isShared())
+
+ yield self._check_notifications("user01", [])
+ shareeViews = yield calendar.inviteUIDToShare("group02", _BIND_MODE_READ)
+ self.assertEqual(len(shareeViews), 3)
+ calendar = yield self.calendarUnderTest(home="user01", name="shared")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 3)
+ for invite in invites:
+ shareeView = yield calendar.shareeView(invite.shareeUID)
+ self.assertEqual(invite.ownerUID, "user01")
+ self.assertEqual(invite.uid, shareeView.shareName())
+ self.assertEqual(invite.mode, _BIND_MODE_GROUP)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_READ)
+ self.assertEqual(invite.status, _BIND_STATUS_INVITED)
+ self.assertEqual(invite.summary, None)
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
+
+ groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
+ self.assertEqual(len(groupsToRefresh), 1)
+ yield self.commit()
+
+ # Remove the collection
+ calendar = yield self.calendarUnderTest(home="user01", name="shared")
+ remove_id = calendar.id()
+ yield calendar.remove()
+ yield self.commit()
+
+ home = yield self.homeUnderTest(name="user01")
+ calendar = yield home.childWithID(remove_id)
+ self.assertTrue(calendar is None)
+ calendar = yield home.childWithID(remove_id, onlyInTrash=True)
+ self.assertTrue(calendar is None)
+ yield self.commit()
+
+ # 1 group member
+ self.patch(CalendarDirectoryRecordMixin, "expandedMembers", expandedMembers)
+
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group02")
+ self.assertEqual(len(wps), 0)
+ yield self.commit()
+ yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150702/8808c56c/attachment-0001.html>
More information about the calendarserver-changes
mailing list