<!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>[14926] CalendarServer/trunk</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/14926">14926</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-06-26 17:15:48 -0700 (Fri, 26 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure group reconciliation never attempts to share a calendar with the sharer.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavicalpy">CalendarServer/trunk/twistedcaldav/ical.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavwhotestaccountsgroupAccountsxml">CalendarServer/trunk/txdav/who/test/accounts/groupAccounts.xml</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="CalendarServertrunktwistedcaldavicalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/ical.py (14925 => 14926)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/ical.py 2015-06-26 21:21:39 UTC (rev 14925)
+++ CalendarServer/trunk/twistedcaldav/ical.py 2015-06-27 00:15:48 UTC (rev 14926)
</span><span class="lines">@@ -3579,7 +3579,19 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def _reconcileGroupAttendee(self, groupCUA, memberAttendeeProps):
</span><ins>+ """
+ Make sure there are attendee properties for every member of the group, and no
+ other attendee properties marked as a member of the group. Note that attendee
+ properties already present with a MEMBER parameter are not given a MEMBER
+ parameter if they are in the group. This ensures that manually added attendees
+ are not automatically removed when they dissappear from a group.
</ins><span class="cx">
</span><ins>+ @param groupCUA: calendar user address of the group
+ @type groupCUA: L{str}
+ @param memberAttendeeProps: list of member properties
+ @type memberAttendeeProps: L{tuple}
+ """
+
</ins><span class="cx"> changed = False
</span><span class="cx"> for component in self.subcomponents(ignore=True):
</span><span class="cx"> oldAttendeeProps = tuple(component.properties("ATTENDEE"))
</span><span class="lines">@@ -3615,7 +3627,15 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def reconcileGroupAttendees(self, groupCUAToAttendeeMemberPropMap):
</span><ins>+ """
+ Reconcile the attendee properties in this L{Component}.
</ins><span class="cx">
</span><ins>+ @param groupCUAToAttendeeMemberPropMap: map of group to potential attendees
+ @type groupCUAToAttendeeMemberPropMap: L{dict}
+ """
+
+ # Reconcile the member ship list of each group attendee, keeping track of which
+ # groups are actually used
</ins><span class="cx"> changed = False
</span><span class="cx"> allMemberCUAs = set()
</span><span class="cx"> nonemptyGroupCUAs = set()
</span><span class="lines">@@ -3625,7 +3645,8 @@
</span><span class="cx"> if memberAttendeeProps:
</span><span class="cx"> nonemptyGroupCUAs.add(groupCUA)
</span><span class="cx">
</span><del>- # remove orphans
</del><ins>+ # Remove attendee properties that have a MEMBER value that contains only groups no longer
+ # used in this component
</ins><span class="cx"> for component in self.subcomponents(ignore=True):
</span><span class="cx"> for attendeeProp in tuple(component.properties("ATTENDEE")):
</span><span class="cx"> if attendeeProp.hasParameter("MEMBER"):
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (14925 => 14926)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-06-26 21:21:39 UTC (rev 14925)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-06-27 00:15:48 UTC (rev 14926)
</span><span class="lines">@@ -2156,11 +2156,13 @@
</span><span class="cx"> changed = True
</span><span class="cx">
</span><span class="cx"> for memberUID in memberUIDs - boundUIDs:
</span><del>- shareeView = yield self.shareeView(memberUID)
- newMode = _BIND_MODE_GROUP if shareeView is None else shareeView._groupModeAfterAddingOneGroupSharee()
- if newMode is not None:
- yield super(Calendar, self).inviteUIDToShare(memberUID, newMode)
- changed = True
</del><ins>+ # Never reconcile the sharer
+ if memberUID != self._home.uid():
+ shareeView = yield self.shareeView(memberUID)
+ newMode = _BIND_MODE_GROUP if shareeView is None else shareeView._groupModeAfterAddingOneGroupSharee()
+ if newMode is not None:
+ yield super(Calendar, self).inviteUIDToShare(memberUID, newMode)
+ changed = True
</ins><span class="cx">
</span><span class="cx"> returnValue(changed)
</span><span class="cx">
</span><span class="lines">@@ -2744,6 +2746,7 @@
</span><span class="cx"> if attendeeProp.parameterValue("CUTYPE") == "X-SERVER-GROUP"
</span><span class="cx"> ])
</span><span class="cx">
</span><ins>+ # Map each group attendee to a list of potential member properties
</ins><span class="cx"> groupCUAToAttendeeMemberPropMap = {}
</span><span class="cx"> for groupCUA in groupCUAs:
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhotestaccountsgroupAccountsxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/accounts/groupAccounts.xml (14925 => 14926)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/accounts/groupAccounts.xml 2015-06-26 21:21:39 UTC (rev 14925)
+++ CalendarServer/trunk/txdav/who/test/accounts/groupAccounts.xml 2015-06-27 00:15:48 UTC (rev 14926)
</span><span class="lines">@@ -136,4 +136,21 @@
</span><span class="cx"> <member-uid>group03</member-uid>
</span><span class="cx"> <member-uid>user10</member-uid>
</span><span class="cx"> </record>
</span><ins>+ <record type="group">
+ <short-name>group05</short-name>
+ <uid>group05</uid>
+ <guid>20000000-0000-0000-0000-000000000005</guid>
+ <full-name>Group 05</full-name>
+ <email>group05@example.com</email>
+ <member-uid>user01</member-uid>
+ <member-uid>user02</member-uid>
+ </record>
+ <record type="group">
+ <short-name>group06</short-name>
+ <uid>group06</uid>
+ <guid>20000000-0000-0000-0000-000000000006</guid>
+ <full-name>Group 06</full-name>
+ <email>group06@example.com</email>
+ <member-uid>user02</member-uid>
+ </record>
</ins><span class="cx"> </directory>
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhotesttest_group_shareespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/test_group_sharees.py (14925 => 14926)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/test_group_sharees.py 2015-06-26 21:21:39 UTC (rev 14925)
+++ CalendarServer/trunk/txdav/who/test/test_group_sharees.py 2015-06-27 00:15:48 UTC (rev 14926)
</span><span class="lines">@@ -348,3 +348,164 @@
</span><span class="cx"> yield calendar.uninviteUIDFromShare("group02")
</span><span class="cx"> noinvites = yield calendar.sharingInvites()
</span><span class="cx"> self.assertEqual(len(noinvites), 3)
</span><ins>+
+
+ @inlineCallbacks
+ def test_no_self_invite(self):
+ """
+ Test that group shares where the group includes the sharee work. Then remove
+ the sharee from the group and make sure it works.
+ """
+
+ record02 = yield self.transactionUnderTest().directoryService().recordWithUID("user02")
+
+ @inlineCallbacks
+ def expandedMembers(self, records=None, seen=None):
+
+ if self.uid == "group05":
+ returnValue(frozenset((record02,)))
+ 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)
+
+ yield self._check_notifications("user01", [])
+
+ # Invite
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 0)
+ self.assertFalse(calendar.isShared())
+
+ yield self._check_notifications("user01", [])
+ shareeViews = yield calendar.inviteUIDToShare("group05", _BIND_MODE_READ)
+ self.assertEqual(len(shareeViews), 1)
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 1)
+ 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, ])
+
+ # 1 group members
+ 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="user01", name="calendar")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 1)
+ 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, ])
+
+ yield self._check_notifications("user01", [])
+
+ # Uninvite
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ yield calendar.uninviteUIDFromShare("group05")
+ noinvites = yield calendar.sharingInvites()
+ self.assertEqual(len(noinvites), 0)
+
+
+ @inlineCallbacks
+ def test_no_self_invite_on_add(self):
+ """
+ Test that the sharee is not invited to their own share when they are added as a member
+ of a group to whom the calendar is shared.
+ """
+
+ record01 = yield self.transactionUnderTest().directoryService().recordWithUID("user01")
+ record02 = yield self.transactionUnderTest().directoryService().recordWithUID("user02")
+
+ @inlineCallbacks
+ def expandedMembers(self, records=None, seen=None):
+
+ if self.uid == "group06":
+ returnValue(frozenset((record01, record02,)))
+ 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(), "group06")
+ self.assertEqual(len(wps), 0)
+
+ yield self._check_notifications("user01", [])
+
+ # Invite
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 0)
+ self.assertFalse(calendar.isShared())
+
+ yield self._check_notifications("user01", [])
+ shareeViews = yield calendar.inviteUIDToShare("group06", _BIND_MODE_READ)
+ self.assertEqual(len(shareeViews), 1)
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 1)
+ 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, ])
+
+ # 1 group members
+ self.patch(CalendarDirectoryRecordMixin, "expandedMembers", expandedMembers)
+
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group06")
+ self.assertEqual(len(wps), 1)
+ yield self.commit()
+ yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)
+
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 1)
+ 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, ])
+
+ yield self._check_notifications("user01", [])
+
+ # Uninvite
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ yield calendar.uninviteUIDFromShare("group06")
+ noinvites = yield calendar.sharingInvites()
+ self.assertEqual(len(noinvites), 0)
</ins></span></pre>
</div>
</div>
</body>
</html>