<!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>[13145] CalendarServer/branches/users/sagen/move2who-4</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/13145">13145</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-04-03 13:33:05 -0700 (Thu, 03 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix principal.groupMemberships() to include delegate sub-principal groups</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectoryprincipalpy">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavcaldavdatastoreschedulingitippy">CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/scheduling/itip.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavcaldavdatastoreschedulingschedulerpy">CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/scheduling/scheduler.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavdpsclientpy">CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectoryprincipalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py (13144 => 13145)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py 2014-04-03 17:59:12 UTC (rev 13144)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py 2014-04-03 20:33:05 UTC (rev 13145)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> from twistedcaldav.extensions import DirectoryElement
</span><span class="cx"> from twistedcaldav.resource import CalendarPrincipalCollectionResource, CalendarPrincipalResource
</span><span class="cx"> from txdav.caldav.datastore.scheduling.cuaddress import normalizeCUAddr
</span><ins>+from txdav.who.delegates import RecordType as DelegateRecordType
</ins><span class="cx"> from txdav.who.directory import CalendarDirectoryRecordMixin
</span><span class="cx"> from txdav.xml import element as davxml
</span><span class="cx"> from txweb2 import responsecode
</span><span class="lines">@@ -1003,20 +1004,28 @@
</span><span class="cx"> proxyFors = set()
</span><span class="cx">
</span><span class="cx"> if config.EnableProxyPrincipals:
</span><del>- childName = "calendar-proxy-{rw}-for".format(
- rw=("write" if readWrite else "read")
</del><ins>+ proxyRecordType = (
+ DelegateRecordType.writeDelegatorGroup if readWrite else
+ DelegateRecordType.readDelegatorGroup
</ins><span class="cx"> )
</span><del>- proxyForGroup = yield self.getChild(childName)
- if proxyForGroup:
- proxyFors = yield proxyForGroup.groupMembers()
</del><ins>+ proxyGroupRecord = yield self.record.service.recordWithShortName(
+ proxyRecordType, self.record.uid
+ )
+ if proxyGroupRecord is not None:
+ proxyForRecords = yield proxyGroupRecord.members()
</ins><span class="cx">
</span><span class="cx"> uids = set()
</span><del>- for principal in tuple(proxyFors):
- if principal.principalUID() in uids:
- proxyFors.remove(principal)
</del><ins>+ for record in tuple(proxyForRecords):
+ if record.uid in uids:
+ proxyForRecords.remove(record)
</ins><span class="cx"> else:
</span><del>- uids.add(principal.principalUID())
</del><ins>+ uids.add(record.uid)
</ins><span class="cx">
</span><ins>+ for record in proxyForRecords:
+ principal = yield self.parent.principalForRecord(record)
+ if principal is not None:
+ proxyFors.add(principal)
+
</ins><span class="cx"> returnValue(proxyFors)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1062,32 +1071,20 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def groupMemberships(self, infinity=False):
</span><span class="cx">
</span><del>- # cache = getattr(self.record.service, "groupMembershipCache", None)
- # if cache:
- # log.debug("groupMemberships is using groupMembershipCache")
- # guids = (yield self.record.cachedGroups())
- # groups = set()
- # for guid in guids:
- # principal = yield self.parent.principalForUID(guid)
- # if principal:
- # groups.add(principal)
- # else:
</del><span class="cx"> groups = yield self._getRelatives("groups", infinity=infinity)
</span><span class="cx">
</span><del>- # MOVE2WHO
- # if config.EnableProxyPrincipals:
- # # Get proxy group UIDs and map to principal resources
- # proxies = []
- # memberships = (yield self._calendar_user_proxy_index().getMemberships(self.principalUID()))
- # for uid in memberships:
- # subprincipal = yield self.parent.principalForUID(uid)
- # if subprincipal:
- # proxies.append(subprincipal)
- # else:
- # yield self._calendar_user_proxy_index().removeGroup(uid)
</del><ins>+ if config.EnableProxyPrincipals:
+ for readWrite, proxyType in (
+ (True, "calendar-proxy-write"),
+ (False, "calendar-proxy-read")
+ ):
+ proxyFors = yield self.proxyFor(readWrite)
+ for proxyFor in proxyFors:
+ subPrincipal = yield self.parent.principalForUID(
+ "{}#{}".format(proxyFor.record.uid, proxyType)
+ )
+ groups.add(subPrincipal)
</ins><span class="cx">
</span><del>- # groups.update(proxies)
-
</del><span class="cx"> returnValue(groups)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1452,7 +1449,6 @@
</span><span class="cx"> if config.EnableProxyPrincipals:
</span><span class="cx"> return (
</span><span class="cx"> "calendar-proxy-read", "calendar-proxy-write",
</span><del>- "calendar-proxy-read-for", "calendar-proxy-write-for",
</del><span class="cx"> )
</span><span class="cx"> else:
</span><span class="cx"> return ()
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavcaldavdatastoreschedulingitippy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/scheduling/itip.py (13144 => 13145)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/scheduling/itip.py 2014-04-03 17:59:12 UTC (rev 13144)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/scheduling/itip.py 2014-04-03 20:33:05 UTC (rev 13145)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> "iTipGenerator",
</span><span class="cx"> ]
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class iTipProcessing(object):
</span><span class="cx">
</span><span class="cx"> @staticmethod
</span><span class="lines">@@ -951,8 +952,6 @@
</span><span class="cx"> @staticmethod
</span><span class="cx"> def generateAttendeeReply(original, attendee, changedRids=None, force_decline=False):
</span><span class="cx">
</span><del>- print("XYZZY generateAttendeeReply", original, attendee)
-
</del><span class="cx"> # Start with a copy of the original as we may have to modify bits of it
</span><span class="cx"> itip = original.duplicate()
</span><span class="cx"> itip.replaceProperty(Property("PRODID", iCalendarProductID))
</span><span class="lines">@@ -972,7 +971,6 @@
</span><span class="cx"> if component.name() in ignoredComponents:
</span><span class="cx"> continue
</span><span class="cx"> if not component.getAttendeeProperty((attendee,)):
</span><del>- print("XYZZY removing componeont", component, attendee)
</del><span class="cx"> itip.removeComponent(component)
</span><span class="cx">
</span><span class="cx"> # No alarms
</span><span class="lines">@@ -1018,7 +1016,6 @@
</span><span class="cx"> if component.name() == "VPOLL":
</span><span class="cx"> iTipGenerator.generateVPOLLReply(component, attendee)
</span><span class="cx">
</span><del>- print("XYZZY AFTER", itip)
</del><span class="cx"> return itip
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavcaldavdatastoreschedulingschedulerpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/scheduling/scheduler.py (13144 => 13145)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/scheduling/scheduler.py 2014-04-03 17:59:12 UTC (rev 13144)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/scheduling/scheduler.py 2014-04-03 20:33:05 UTC (rev 13145)
</span><span class="lines">@@ -320,10 +320,6 @@
</span><span class="cx"> # Verify that there is a single ATTENDEE property
</span><span class="cx"> attendees = self.calendar.getAttendees()
</span><span class="cx">
</span><del>- # FIXME, how can this be None?
- if attendees is None:
- print("XYZZY Attendees is None", self.calendar)
-
</del><span class="cx"> # Must have only one
</span><span class="cx"> if len(attendees) != 1:
</span><span class="cx"> log.error("Wrong number of ATTENDEEs in calendar data: %s" % (str(self.calendar),))
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavdpsclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py (13144 => 13145)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py 2014-04-03 17:59:12 UTC (rev 13144)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py 2014-04-03 20:33:05 UTC (rev 13145)
</span><span class="lines">@@ -59,15 +59,12 @@
</span><span class="cx">
</span><span class="cx"> ## MOVE2WHO TODOs:
</span><span class="cx"> ## SACLs
</span><del>-## Wiki
</del><span class="cx"> ## LDAP
</span><span class="cx"> ## Tests from old twistedcaldav/directory
</span><span class="cx"> ## Cmd line tools
</span><span class="cx"> ## Store based directory service (records in the store, i.e.
</span><span class="cx"> ## locations/resources)
</span><span class="cx"> ## Separate store for DPS (augments and delegates separate from calendar data)
</span><del>-## calverify needs deferreds, including:
-## component.normalizeCalendarUserAddresses
</del><span class="cx"> ## Store autoAcceptGroups in the group db?
</span><span class="cx">
</span><span class="cx"> @implementer(IDirectoryService, IStoreDirectoryService)
</span></span></pre>
</div>
</div>
</body>
</html>