<!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>[13585] CalendarServer/trunk/twistedcaldav</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/13585">13585</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-05-30 19:16:51 -0700 (Fri, 30 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure sharing POSTs fail when sharing is off. Don't allow a missing shared collection to cause a 500 error.</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_resourcepy">CalendarServer/trunk/twistedcaldav/test/test_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 (13584 => 13585)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/resource.py        2014-05-31 01:24:52 UTC (rev 13584)
+++ CalendarServer/trunk/twistedcaldav/resource.py        2014-05-31 02:16:51 UTC (rev 13585)
</span><span class="lines">@@ -858,7 +858,7 @@
</span><span class="cx"> Return the DAV:owner property value (MUST be a DAV:href or None).
</span><span class="cx"> """
</span><span class="cx">
</span><del>- if hasattr(self, "_newStoreObject"):
</del><ins>+ if getattr(self, "_newStoreObject", None) is not None:
</ins><span class="cx"> if not hasattr(self._newStoreObject, "ownerHome"):
</span><span class="cx"> home = self._newStoreObject.parentCollection().ownerHome()
</span><span class="cx"> else:
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavsharingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/sharing.py (13584 => 13585)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/sharing.py        2014-05-31 01:24:52 UTC (rev 13584)
+++ CalendarServer/trunk/twistedcaldav/sharing.py        2014-05-31 02:16:51 UTC (rev 13585)
</span><span class="lines">@@ -557,6 +557,13 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def _xmlHandleInvite(self, request, docroot):
</span><ins>+ # Sharing must be enabled for this collection
+ if not self.canBeShared():
+ raise HTTPError(ErrorResponse(
+ responsecode.FORBIDDEN,
+ (customxml.calendarserver_namespace, "valid-request"),
+ "Sharing not supported on this resource",
+ ))
</ins><span class="cx"> yield self.authorize(request, (element.Read(), element.Write()))
</span><span class="cx"> result = (yield self._handleInvite(request, docroot))
</span><span class="cx"> returnValue(result)
</span><span class="lines">@@ -702,6 +709,13 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def _xmlHandleInviteReply(self, request, docroot):
</span><ins>+ # Sharing must be enabled for this collection
+ if not self.canShare():
+ raise HTTPError(ErrorResponse(
+ responsecode.FORBIDDEN,
+ (customxml.calendarserver_namespace, "valid-request"),
+ "Sharing not supported on this resource",
+ ))
</ins><span class="cx"> yield self.authorize(request, (element.Read(), element.Write()))
</span><span class="cx"> result = (yield self._handleInviteReply(request, docroot))
</span><span class="cx"> returnValue(result)
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstorebridgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/storebridge.py (13584 => 13585)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/storebridge.py        2014-05-31 01:24:52 UTC (rev 13584)
+++ CalendarServer/trunk/twistedcaldav/storebridge.py        2014-05-31 02:16:51 UTC (rev 13585)
</span><span class="lines">@@ -1318,6 +1318,10 @@
</span><span class="cx"> returnValue(result)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def canBeShared(self):
+ return config.Sharing.Enabled and config.Sharing.Calendars.Enabled
+
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def storeResourceData(self, newchild, component, returnChangedData=False):
</span><span class="cx">
</span><span class="lines">@@ -2823,6 +2827,10 @@
</span><span class="cx"> returnValue(response)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def canBeShared(self):
+ return False
+
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def http_PUT(self, request):
</span><span class="cx">
</span><span class="lines">@@ -3296,6 +3304,10 @@
</span><span class="cx"> return carddavxml.AddressData
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def canBeShared(self):
+ return config.Sharing.Enabled and config.Sharing.AddressBooks.Enabled
+
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def storeResourceData(self, newchild, component, returnChangedData=False):
</span><span class="cx">
</span><span class="lines">@@ -3566,6 +3578,10 @@
</span><span class="cx"> returnValue(response)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def canBeShared(self):
+ return config.Sharing.Enabled and config.Sharing.AddressBooks.Enabled
+
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def http_PUT(self, request):
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_resourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_resource.py (13584 => 13585)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_resource.py        2014-05-31 01:24:52 UTC (rev 13584)
+++ CalendarServer/trunk/twistedcaldav/test/test_resource.py        2014-05-31 02:16:51 UTC (rev 13585)
</span><span class="lines">@@ -160,6 +160,26 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def test_isOwnerYes_noStoreObject(self):
+ """
+ L{CalDAVResource.isOwner} returns C{True} for authenticated requests
+ with a principal that matches the resource's owner.
+ """
+ site = None
+ request = SimpleRequest(site, "GET", "/not/a/real/url/")
+ request.authzUser = request.authnUser = StubPrincipal("/yes-i-am-the-owner/")
+ parent = CalDAVResource()
+ parent.owner = lambda igreq: HRef("/yes-i-am-the-owner/")
+ rsrc = CalDAVResource()
+ rsrc._newStoreObject = None
+
+ request._rememberResource(parent, "/not/a/real/")
+ request._rememberResource(rsrc, "/not/a/real/url/")
+
+ self.assertEquals((yield rsrc.isOwner(request)), True)
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_isOwnerAdmin(self):
</span><span class="cx"> """
</span><span class="cx"> L{CalDAVResource.isOwner} returns C{True} for authenticated requests
</span></span></pre>
</div>
</div>
</body>
</html>