<!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>[14946] 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/14946">14946</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-07-06 08:18:42 -0700 (Mon, 06 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix group sharing with multiple groups.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.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 (14945 => 14946)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-07-06 15:16:47 UTC (rev 14945)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-07-06 15:18:42 UTC (rev 14946)
</span><span class="lines">@@ -82,7 +82,8 @@
</span><span class="cx"> UnknownTimezone, SetComponentOptions
</span><span class="cx"> from txdav.common.datastore.sql import CommonHome, CommonHomeChild, \
</span><span class="cx"> CommonObjectResource, ECALENDARTYPE
</span><del>-from txdav.common.datastore.sql_directory import GroupsRecord
</del><ins>+from txdav.common.datastore.sql_directory import GroupsRecord, \
+ GroupMembershipRecord
</ins><span class="cx"> from txdav.common.datastore.sql_tables import _ATTACHMENTS_MODE_NONE, \
</span><span class="cx"> _ATTACHMENTS_MODE_READ, _ATTACHMENTS_MODE_WRITE, _BIND_MODE_DIRECT, \
</span><span class="cx"> _BIND_MODE_GROUP, _BIND_MODE_GROUP_READ, _BIND_MODE_GROUP_WRITE, \
</span><span class="lines">@@ -2127,34 +2128,53 @@
</span><span class="cx">
</span><span class="cx"> # First check that the actual group membership has changed
</span><span class="cx"> if (yield self.updateShareeGroupLink(groupUID)):
</span><del>- group = yield self._txn.groupByUID(groupUID)
- memberUIDs = yield self._txn.groupMemberUIDs(group.groupID)
</del><ins>+
+ # First find all the members of all the groups being shared to
+ groupMembers = yield GroupMembershipRecord.query(
+ self._txn,
+ GroupMembershipRecord.groupID.In(
+ GroupShareeRecord.queryExpr(
+ expr=GroupShareeRecord.calendarID == self.id(),
+ attributes=[GroupShareeRecord.groupID, ]
+ )
+ ),
+ distinct=True,
+ )
+ memberUIDs = set([grp.memberUID for grp in groupMembers])
+
+ # Find each currently bound group sharee UID along with their bind mode
</ins><span class="cx"> boundUIDs = set()
</span><del>-
</del><span class="cx"> home = self._homeSchema
</span><span class="cx"> bind = self._bindSchema
</span><span class="cx"> rows = yield Select(
</span><del>- [home.OWNER_UID],
- From=home,
- Where=home.RESOURCE_ID.In(
- Select(
- [bind.HOME_RESOURCE_ID],
- From=bind,
- Where=(bind.CALENDAR_RESOURCE_ID == self._resourceID).And(
- (bind.BIND_MODE == _BIND_MODE_GROUP)
- .Or(bind.BIND_MODE == _BIND_MODE_GROUP_READ)
- .Or(bind.BIND_MODE == _BIND_MODE_GROUP_WRITE)
- )
- )
</del><ins>+ [home.OWNER_UID, bind.BIND_MODE],
+ From=bind.join(home, on=bind.HOME_RESOURCE_ID == home.RESOURCE_ID),
+ Where=(bind.CALENDAR_RESOURCE_ID == self._resourceID).And(
+ bind.BIND_MODE.In((_BIND_MODE_GROUP, _BIND_MODE_GROUP_READ, _BIND_MODE_GROUP_WRITE))
</ins><span class="cx"> )
</span><span class="cx"> ).on(self._txn)
</span><del>- for [shareeHomeUID] in rows:
</del><ins>+ for shareeHomeUID, shareeBindMode in rows:
+
</ins><span class="cx"> if shareeHomeUID in memberUIDs:
</span><ins>+ # Group sharee still referenced via a group - make a note of it
</ins><span class="cx"> boundUIDs.add(shareeHomeUID)
</span><del>- else:
</del><ins>+
+ elif shareeBindMode == _BIND_MODE_GROUP:
+ # Group only sharee is no longer referenced by any group - uninvite them
</ins><span class="cx"> yield self.uninviteUIDFromShare(shareeHomeUID)
</span><span class="cx"> changed = True
</span><span class="cx">
</span><ins>+ else:
+ # Group+individual sharee is no longer referenced by a group so update the bind
+ # mode to reflect just the individual mode
+ yield super(Calendar, self).inviteUIDToShare(
+ shareeHomeUID,
+ {
+ _BIND_MODE_GROUP_READ: _BIND_MODE_READ,
+ _BIND_MODE_GROUP_WRITE: _BIND_MODE_WRITE,
+ }.get(shareeBindMode),
+ )
+
</ins><span class="cx"> for memberUID in memberUIDs - boundUIDs:
</span><span class="cx"> # Never reconcile the sharer
</span><span class="cx"> if memberUID != self._home.uid():
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhotesttest_group_shareespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/test_group_sharees.py (14945 => 14946)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/test_group_sharees.py 2015-07-06 15:16:47 UTC (rev 14945)
+++ CalendarServer/trunk/txdav/who/test/test_group_sharees.py 2015-07-06 15:18:42 UTC (rev 14946)
</span><span class="lines">@@ -28,7 +28,8 @@
</span><span class="cx"> from txdav.who.directory import CalendarDirectoryRecordMixin
</span><span class="cx"> from txdav.who.groups import GroupCacher, GroupShareeReconciliationWork
</span><span class="cx"> import os
</span><del>-from txdav.common.datastore.sql_tables import _BIND_MODE_GROUP
</del><ins>+from txdav.common.datastore.sql_tables import _BIND_MODE_GROUP, _BIND_MODE_WRITE, \
+ _BIND_MODE_GROUP_READ
</ins><span class="cx"> from txdav.common.datastore.sql_tables import _BIND_MODE_READ
</span><span class="cx"> from txdav.common.datastore.sql_tables import _BIND_STATUS_INVITED
</span><span class="cx">
</span><span class="lines">@@ -68,6 +69,7 @@
</span><span class="cx"> requirements = {
</span><span class="cx"> "user01" : None,
</span><span class="cx"> "user02" : None,
</span><ins>+ "user03" : None,
</ins><span class="cx"> "user06" : None,
</span><span class="cx"> "user07" : None,
</span><span class="cx"> "user08" : None,
</span><span class="lines">@@ -670,3 +672,177 @@
</span><span class="cx"> self.assertEqual(len(wps), 0)
</span><span class="cx"> yield self.commit()
</span><span class="cx"> yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)
</span><ins>+
+
+ @inlineCallbacks
+ def test_multiple_groups_remove_from_one_group(self):
+ """
+ Test that a multi-group share each containing the same user still lists the user
+ when they are removed from one group.
+ """
+
+ @inlineCallbacks
+ def expandedMembers(self, records=None, seen=None):
+
+ if self.uid == "group05":
+ 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(), "group05")
+ self.assertEqual(len(wps), 0)
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group06")
+ self.assertEqual(len(wps), 0)
+
+ # Invite
+ calendar = yield self.calendarUnderTest(home="user03", name="calendar")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 0)
+ self.assertFalse(calendar.isShared())
+
+ shareeViews = yield calendar.inviteUIDToShare("group05", _BIND_MODE_WRITE)
+ self.assertEqual(len(shareeViews), 2)
+ shareeViews = yield calendar.inviteUIDToShare("group06", _BIND_MODE_READ)
+ self.assertEqual(len(shareeViews), 1)
+
+ calendar = yield self.calendarUnderTest(home="user03", name="calendar")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 2)
+ for invite in invites:
+ shareeView = yield calendar.shareeView(invite.shareeUID)
+ self.assertEqual(invite.ownerUID, "user03")
+ self.assertEqual(invite.uid, shareeView.shareName())
+ self.assertEqual(invite.mode, _BIND_MODE_GROUP)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_WRITE)
+ 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), 2)
+
+ # Change group membership
+ self.patch(CalendarDirectoryRecordMixin, "expandedMembers", expandedMembers)
+
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group05")
+ self.assertEqual(len(wps), 1)
+ yield self.commit()
+ yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)
+
+ calendar = yield self.calendarUnderTest(home="user03", name="calendar")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 1)
+ for invite in invites:
+ self.assertEqual(invite.shareeUID, "user02")
+ shareeView = yield calendar.shareeView(invite.shareeUID)
+ self.assertEqual(invite.ownerUID, "user03")
+ 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, ])
+
+ # Uninvite
+ calendar = yield self.calendarUnderTest(home="user03", name="calendar")
+ yield calendar.uninviteUIDFromShare("group05")
+ yield calendar.uninviteUIDFromShare("group06")
+ noinvites = yield calendar.sharingInvites()
+ self.assertEqual(len(noinvites), 0)
+
+
+ @inlineCallbacks
+ def test_multiple_groups_with_individual_remove_from_one_group(self):
+ """
+ Test that a multi-group share each containing the same user still lists the user
+ when they are removed from one group.
+ """
+
+ @inlineCallbacks
+ def expandedMembers(self, records=None, seen=None):
+
+ if self.uid == "group05":
+ 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(), "group05")
+ self.assertEqual(len(wps), 0)
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group06")
+ self.assertEqual(len(wps), 0)
+
+ # Invite
+ calendar = yield self.calendarUnderTest(home="user03", name="calendar")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 0)
+ self.assertFalse(calendar.isShared())
+
+ shareeView = yield calendar.inviteUIDToShare("user01", _BIND_MODE_READ)
+ self.assertTrue(shareeView is not None)
+ shareeViews = yield calendar.inviteUIDToShare("group05", _BIND_MODE_WRITE)
+ self.assertEqual(len(shareeViews), 2)
+ shareeViews = yield calendar.inviteUIDToShare("group06", _BIND_MODE_READ)
+ self.assertEqual(len(shareeViews), 1)
+
+ calendar = yield self.calendarUnderTest(home="user03", name="calendar")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 2)
+ for invite in invites:
+ shareeView = yield calendar.shareeView(invite.shareeUID)
+ self.assertEqual(invite.ownerUID, "user03")
+ self.assertEqual(invite.uid, shareeView.shareName())
+ if invite.shareeUID == "user01":
+ self.assertEqual(invite.mode, _BIND_MODE_GROUP_READ)
+ else:
+ self.assertEqual(invite.mode, _BIND_MODE_GROUP)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_WRITE)
+ 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), 2)
+
+ # Change group membership
+ self.patch(CalendarDirectoryRecordMixin, "expandedMembers", expandedMembers)
+
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group05")
+ self.assertEqual(len(wps), 1)
+ yield self.commit()
+ yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)
+
+ calendar = yield self.calendarUnderTest(home="user03", name="calendar")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 2)
+ for invite in invites:
+ shareeView = yield calendar.shareeView(invite.shareeUID)
+ self.assertEqual(invite.ownerUID, "user03")
+ self.assertEqual(invite.uid, shareeView.shareName())
+ if invite.shareeUID == "user01":
+ self.assertEqual(invite.mode, _BIND_MODE_READ)
+ else:
+ 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, ])
+
+ # Uninvite
+ calendar = yield self.calendarUnderTest(home="user03", name="calendar")
+ yield calendar.uninviteUIDFromShare("user01")
+ yield calendar.uninviteUIDFromShare("group05")
+ yield calendar.uninviteUIDFromShare("group06")
+ noinvites = yield calendar.sharingInvites()
+ self.assertEqual(len(noinvites), 0)
</ins></span></pre>
</div>
</div>
</body>
</html>