<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14944] CalendarServer/trunk/txdav</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14944">14944</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-07-02 13:17:48 -0700 (Thu, 02 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure trashed shared calendars have their group sharee list removed as well as individual sharees.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavwhogroupspy">CalendarServer/trunk/txdav/who/groups.py</a></li>
<li><a href="#CalendarServertrunktxdavwhotesttest_group_shareespy">CalendarServer/trunk/txdav/who/test/test_group_sharees.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (14943 => 14944)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2504,6 +2504,24 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ 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
</ins><span class="cx"> def allInvitations(self):
</span><span class="cx"> """
</span><span class="cx"> Get list of all invitations (non-direct) to this object.
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhogroupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/groups.py (14943 => 14944)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -184,8 +184,10 @@
</span><span class="cx"> homeID = rows[0][0]
</span><span class="cx"> home = yield self.transaction.calendarHomeWithResourceID(homeID)
</span><span class="cx"> calendar = yield home.childWithID(self.calendarID)
</span><del>- group = (yield self.transaction.groupByID(self.groupID))
- yield calendar.reconcileGroupSharee(group.groupUID)
</del><ins>+ # 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)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhotesttest_group_shareespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/test_group_sharees.py (14943 => 14944)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -509,3 +509,164 @@
</span><span class="cx"> yield calendar.uninviteUIDFromShare("group06")
</span><span class="cx"> noinvites = yield calendar.sharingInvites()
</span><span class="cx"> self.assertEqual(len(noinvites), 0)
</span><ins>+
+
+ @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)
</ins></span></pre>
</div>
</div>
</body>
</html>