<!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>[14364] 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/14364">14364</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-02-03 18:09:55 -0800 (Tue, 03 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>More fixes for missing sharers.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavresourcepy">CalendarServer/trunk/twistedcaldav/resource.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavsharingpy">CalendarServer/trunk/twistedcaldav/sharing.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstorebridgepy">CalendarServer/trunk/twistedcaldav/storebridge.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_sharingpy">CalendarServer/trunk/twistedcaldav/test/test_sharing.py</a></li>
<li><a href="#CalendarServertrunktxweb2davresourcepy">CalendarServer/trunk/txweb2/dav/resource.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/resource.py (14363 => 14364)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/resource.py 2015-02-02 21:09:23 UTC (rev 14363)
+++ CalendarServer/trunk/twistedcaldav/resource.py 2015-02-04 02:09:55 UTC (rev 14364)
</span><span class="lines">@@ -776,7 +776,7 @@
</span><span class="cx"> else:
</span><span class="cx"> home = self._newStoreObject.ownerHome()
</span><span class="cx"> principal = (yield self.principalForUID(home.uid()))
</span><del>- returnValue(element.HRef(principal.principalURL()))
</del><ins>+ returnValue(element.HRef(principal.principalURL()) if principal else None)
</ins><span class="cx"> else:
</span><span class="cx"> parent = (yield self.locateParent(request, request.urlForResource(self)))
</span><span class="cx"> if parent and isinstance(parent, CalDAVResource):
</span><span class="lines">@@ -1162,7 +1162,8 @@
</span><span class="cx"> sharedParent = None
</span><span class="cx"> if self.isShareeResource():
</span><span class="cx"> # A sharee collection's quota root is the resource owner's root
</span><del>- sharedParent = (yield request.locateResource(parentForURL(self._share_url)))
</del><ins>+ if self._share_url:
+ sharedParent = (yield request.locateResource(parentForURL(self._share_url)))
</ins><span class="cx"> else:
</span><span class="cx"> parent = (yield self.locateParent(request, request.urlForResource(self)))
</span><span class="cx"> if isCalendarCollectionResource(parent) or isAddressBookCollectionResource(parent):
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavsharingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/sharing.py (14363 => 14364)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/sharing.py 2015-02-02 21:09:23 UTC (rev 14363)
+++ CalendarServer/trunk/twistedcaldav/sharing.py 2015-02-04 02:09:55 UTC (rev 14364)
</span><span class="lines">@@ -424,8 +424,7 @@
</span><span class="cx"> if principal:
</span><span class="cx"> if request:
</span><span class="cx"> ownerPrincipal = (yield self.ownerPrincipal(request))
</span><del>- owner = ownerPrincipal.principalURL()
- if owner == principal.principalURL():
</del><ins>+ if ownerPrincipal is None or ownerPrincipal.principalURL() == principal.principalURL():
</ins><span class="cx"> returnValue(None)
</span><span class="cx"> returnValue(principal.principalURL())
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstorebridgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/storebridge.py (14363 => 14364)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/storebridge.py 2015-02-02 21:09:23 UTC (rev 14363)
+++ CalendarServer/trunk/twistedcaldav/storebridge.py 2015-02-04 02:09:55 UTC (rev 14364)
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx">
</span><span class="cx"> def owner_url(self):
</span><span class="cx"> if self.isShareeResource():
</span><del>- return joinURL(self._share_url, "/")
</del><ins>+ return joinURL(self._share_url, "/") if self._share_url else ""
</ins><span class="cx"> else:
</span><span class="cx"> return self.url()
</span><span class="cx">
</span><span class="lines">@@ -3920,15 +3920,21 @@
</span><span class="cx">
</span><span class="cx"> if jsondata["notification-type"] == "invite-notification":
</span><span class="cx"> ownerPrincipal = yield self.principalForUID(jsondata["owner"])
</span><del>- ownerCN = ownerPrincipal.displayName()
- ownerHomeURL = ownerPrincipal.calendarHomeURLs()[0] if jsondata["shared-type"] == "calendar" else ownerPrincipal.addressBookHomeURLs()[0]
-
- # FIXME: use urn:uuid always?
- if jsondata["shared-type"] == "calendar":
- owner = ownerPrincipal.principalURL()
</del><ins>+ if ownerPrincipal is None:
+ ownerCN = ""
+ ownerCollectionURL = ""
+ owner = "urn:x-uid:" + jsondata["owner"]
</ins><span class="cx"> else:
</span><del>- owner = "urn:x-uid:" + ownerPrincipal.principalUID()
</del><ins>+ ownerCN = ownerPrincipal.displayName()
+ ownerHomeURL = ownerPrincipal.calendarHomeURLs()[0] if jsondata["shared-type"] == "calendar" else ownerPrincipal.addressBookHomeURLs()[0]
+ ownerCollectionURL = urljoin(ownerHomeURL, jsondata["ownerName"])
</ins><span class="cx">
</span><ins>+ # FIXME: use urn:uuid always?
+ if jsondata["shared-type"] == "calendar":
+ owner = ownerPrincipal.principalURL()
+ else:
+ owner = "urn:x-uid:" + ownerPrincipal.principalUID()
+
</ins><span class="cx"> shareePrincipal = yield self.principalForUID(jsondata["sharee"])
</span><span class="cx">
</span><span class="cx"> if "supported-components" in jsondata:
</span><span class="lines">@@ -3952,7 +3958,7 @@
</span><span class="cx"> invitationBindStatusToXMLMap[jsondata["status"]](),
</span><span class="cx"> customxml.InviteAccess(invitationBindModeToXMLMap[jsondata["access"]]()),
</span><span class="cx"> customxml.HostURL(
</span><del>- element.HRef.fromString(urljoin(ownerHomeURL, jsondata["ownerName"])),
</del><ins>+ element.HRef.fromString(ownerCollectionURL),
</ins><span class="cx"> ),
</span><span class="cx"> customxml.Organizer(
</span><span class="cx"> element.HRef.fromString(owner),
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_sharingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_sharing.py (14363 => 14364)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_sharing.py 2015-02-02 21:09:23 UTC (rev 14363)
+++ CalendarServer/trunk/twistedcaldav/test/test_sharing.py 2015-02-04 02:09:55 UTC (rev 14364)
</span><span class="lines">@@ -102,6 +102,66 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def _doPROPFINDHome(self, resultcode=responsecode.MULTI_STATUS):
+ body = """<?xml version="1.0" encoding="UTF-8"?>
+<A:propfind xmlns:A="DAV:">
+ <A:prop>
+ <A:add-member/>
+ <C:allowed-sharing-modes xmlns:C="http://calendarserver.org/ns/"/>
+ <D:autoprovisioned xmlns:D="http://apple.com/ns/ical/"/>
+ <E:bulk-requests xmlns:E="http://me.com/_namespace/"/>
+ <D:calendar-color xmlns:D="http://apple.com/ns/ical/"/>
+ <B:calendar-description xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <B:calendar-free-busy-set xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <D:calendar-order xmlns:D="http://apple.com/ns/ical/"/>
+ <B:calendar-timezone xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <A:current-user-privilege-set/>
+ <B:default-alarm-vevent-date xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <B:default-alarm-vevent-datetime xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <A:displayname/>
+ <C:getctag xmlns:C="http://calendarserver.org/ns/"/>
+ <C:invite xmlns:C="http://calendarserver.org/ns/"/>
+ <D:language-code xmlns:D="http://apple.com/ns/ical/"/>
+ <D:location-code xmlns:D="http://apple.com/ns/ical/"/>
+ <A:owner/>
+ <C:pre-publish-url xmlns:C="http://calendarserver.org/ns/"/>
+ <C:publish-url xmlns:C="http://calendarserver.org/ns/"/>
+ <C:push-transports xmlns:C="http://calendarserver.org/ns/"/>
+ <C:pushkey xmlns:C="http://calendarserver.org/ns/"/>
+ <A:quota-available-bytes/>
+ <A:quota-used-bytes/>
+ <D:refreshrate xmlns:D="http://apple.com/ns/ical/"/>
+ <A:resource-id/>
+ <A:resourcetype/>
+ <B:schedule-calendar-transp xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <B:schedule-default-calendar-URL xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <C:source xmlns:C="http://calendarserver.org/ns/"/>
+ <C:subscribed-strip-alarms xmlns:C="http://calendarserver.org/ns/"/>
+ <C:subscribed-strip-attachments xmlns:C="http://calendarserver.org/ns/"/>
+ <C:subscribed-strip-todos xmlns:C="http://calendarserver.org/ns/"/>
+ <B:supported-calendar-component-set xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <B:supported-calendar-component-sets xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <A:supported-report-set/>
+ <A:sync-token/>
+ </A:prop>
+</A:propfind>
+"""
+ authPrincipal = yield self.actualRoot.findPrincipalForAuthID("user02")
+ request = SimpleStoreRequest(self, "PROPFIND", "/calendars/__uids__/user02/", content=body, authPrincipal=authPrincipal)
+ request.headers.setHeader("content-type", MimeType("text", "xml"))
+ request.headers.setHeader("depth", "1")
+ response = yield self.send(request)
+ response = IResponse(response)
+ self.assertEqual(response.code, resultcode)
+
+ if response.stream:
+ data = yield allDataFromStream(response.stream)
+ returnValue(data)
+ else:
+ returnValue(None)
+
+
+ @inlineCallbacks
</ins><span class="cx"> def _getResource(self):
</span><span class="cx"> request = SimpleStoreRequest(self, "GET", "/calendars/__uids__/user01/calendar/")
</span><span class="cx"> resource = yield request.locateResource("/calendars/__uids__/user01/calendar/")
</span><span class="lines">@@ -1234,6 +1294,9 @@
</span><span class="cx"> record = yield self.userRecordWithShortName("user01")
</span><span class="cx"> yield self.changeRecord(record, self.directory.fieldName.hasCalendars, False)
</span><span class="cx">
</span><ins>+ data = yield self._doPROPFINDHome()
+ self.assertTrue(data is not None)
+
</ins><span class="cx"> resource = (yield self._getResourceSharer(href))
</span><span class="cx"> propInvite = yield resource.inviteProperty(None)
</span><span class="cx"> self.assertEquals(self._clearUIDElementValue(propInvite), customxml.Invite(
</span><span class="lines">@@ -1297,6 +1360,9 @@
</span><span class="cx"> yield self.directory.removeRecords(((yield self.userUIDFromShortName("user01")),))
</span><span class="cx"> self.assertTrue((yield self.userUIDFromShortName("user01")) is None)
</span><span class="cx">
</span><ins>+ data = yield self._doPROPFINDHome()
+ self.assertTrue(data is not None)
+
</ins><span class="cx"> resource = (yield self._getResourceSharer(href))
</span><span class="cx"> propInvite = yield resource.inviteProperty(None)
</span><span class="cx"> self.assertEquals(self._clearUIDElementValue(propInvite), customxml.Invite(
</span><span class="lines">@@ -1314,6 +1380,33 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def test_shareeNotificationWithMissingSharer(self):
+
+ yield self.resource.upgradeToShare()
+
+ yield self._doPOST("""<?xml version="1.0" encoding="utf-8" ?>
+ <CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+ <CS:set>
+ <D:href>mailto:user02@example.com</D:href>
+ <CS:summary>My Shared Calendar</CS:summary>
+ <CS:read-write/>
+ </CS:set>
+ </CS:share>
+ """)
+
+ yield self.directory.removeRecords(((yield self.userUIDFromShortName("user01")),))
+ self.assertTrue((yield self.userUIDFromShortName("user01")) is None)
+
+ request = SimpleStoreRequest(self, "GET", "/calendars/__uids__/user02/notification/")
+ notification = yield request.locateResource("/calendars/__uids__/user02/notification/")
+ names = yield notification.listChildren()
+ self.assertEqual(len(names), 1)
+ note_child = yield notification.getChild(names[0])
+ note = yield note_child.text()
+ self.assertTrue(isinstance(note, str))
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_hideInvalidSharers(self):
</span><span class="cx">
</span><span class="cx"> yield self.resource.upgradeToShare()
</span></span></pre></div>
<a id="CalendarServertrunktxweb2davresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/dav/resource.py (14363 => 14364)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txweb2/dav/resource.py 2015-02-02 21:09:23 UTC (rev 14363)
+++ CalendarServer/trunk/txweb2/dav/resource.py 2015-02-04 02:09:55 UTC (rev 14364)
</span><span class="lines">@@ -706,7 +706,7 @@
</span><span class="cx"> def gotChildren(listChildrenResult):
</span><span class="cx"> children[:] = list(listChildrenResult)
</span><span class="cx"> getChild()
</span><del>- maybeDeferred(self.listChildren).addCallback(gotChildren)
</del><ins>+ maybeDeferred(self.listChildren).addCallback(gotChildren).addErrback(completionDeferred.errback)
</ins><span class="cx">
</span><span class="cx"> return completionDeferred
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>