<!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>[14130] CalendarServer/branches/release/CalendarServer-6.0-dev/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/14130">14130</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-11-02 09:10:06 -0800 (Sun, 02 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pull in <a href="http://trac.calendarserver.org//changeset/14116">rev 14116</a> from trunk -- anonymous access to wiki calendar fix</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesreleaseCalendarServer60devtxdavdpsclientpy">CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/dps/client.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer60devtxdavdpsserverpy">CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/dps/server.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer60devtxdavwhotesttest_wikipy">CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/who/test/test_wiki.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer60devtxdavwhowikipy">CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/who/wiki.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesreleaseCalendarServer60devtxdavdpsclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/dps/client.py (14129 => 14130)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/dps/client.py 2014-10-31 20:56:06 UTC (rev 14129)
+++ CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/dps/client.py 2014-11-02 17:10:06 UTC (rev 14130)
</span><span class="lines">@@ -517,7 +517,7 @@
</span><span class="cx"> WikiAccessForUIDCommand,
</span><span class="cx"> self._convertAccess,
</span><span class="cx"> wikiUID=self.uid.encode("utf-8"),
</span><del>- uid=record.uid.encode("utf-8")
</del><ins>+ uid=record.uid.encode("utf-8") if record else ""
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer60devtxdavdpsserverpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/dps/server.py (14129 => 14130)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/dps/server.py 2014-10-31 20:56:06 UTC (rev 14129)
+++ CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/dps/server.py 2014-11-02 17:10:06 UTC (rev 14130)
</span><span class="lines">@@ -530,8 +530,11 @@
</span><span class="cx"> log.debug("WikiAccessForUID: {w} {u}", w=wikiUID, u=uid)
</span><span class="cx"> access = WikiAccessLevel.none
</span><span class="cx"> wikiRecord = (yield self._directory.recordWithUID(wikiUID))
</span><del>- userRecord = (yield self._directory.recordWithUID(uid))
- if wikiRecord is not None and userRecord is not None:
</del><ins>+ if uid:
+ userRecord = (yield self._directory.recordWithUID(uid))
+ else:
+ userRecord = None
+ if wikiRecord is not None:
</ins><span class="cx"> access = (yield wikiRecord.accessForRecord(userRecord))
</span><span class="cx"> response = {
</span><span class="cx"> "access": access.name.encode("utf-8"),
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer60devtxdavwhotesttest_wikipy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/who/test/test_wiki.py (14129 => 14130)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/who/test/test_wiki.py 2014-10-31 20:56:06 UTC (rev 14129)
+++ CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/who/test/test_wiki.py 2014-11-02 17:10:06 UTC (rev 14130)
</span><span class="lines">@@ -26,7 +26,9 @@
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, succeed
</span><span class="cx"> from twistedcaldav.test.util import StoreTestCase
</span><span class="cx">
</span><del>-from ..wiki import DirectoryService, WikiAccessLevel
</del><ins>+from ..wiki import (
+ DirectoryService, WikiAccessLevel, getWikiACL, RecordType, DirectoryRecord
+)
</ins><span class="cx"> import txdav.who.wiki
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -95,6 +97,7 @@
</span><span class="cx"> return succeed(self.access)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_accessForRecord(self):
</span><span class="cx"> record = yield self.directory.recordWithUID(u"wiki-test")
</span><span class="lines">@@ -114,3 +117,63 @@
</span><span class="cx"> self.access = "admin"
</span><span class="cx"> access = yield record.accessForRecord(None)
</span><span class="cx"> self.assertEquals(access, WikiAccessLevel.write)
</span><ins>+
+
+
+# Test getWikiACL()
+# Currently stubs out enough functionality to test that an unauthenticated
+# request can support read access when generating an ACL element
+# TODO: add tests which have auth'd principals in the request
+
+class FakeRequest(object):
+
+ def __init__(self):
+ self.authnUser = None
+
+
+class FakeResource(object):
+
+ def __init__(self, record):
+ self.record = record
+
+
+def stubAccessForRecord(self, record):
+ return succeed(self.access)
+
+
+class GetWikiACLTestCase(StoreTestCase):
+ """
+ Exercise getWikiACL
+ """
+
+ def configure(self):
+ """
+ Override configuration hook to turn on wiki service.
+ """
+ from twistedcaldav.config import config
+
+ super(GetWikiACLTestCase, self).configure()
+ self.patch(config.Authentication.Wiki, "Enabled", True)
+ self.patch(
+ txdav.who.wiki.DirectoryRecord,
+ "accessForRecord",
+ stubAccessForRecord
+ )
+
+ @inlineCallbacks
+ def test_getWikiACL(self):
+ fields = {
+ self.directory.fieldName.uid: u"wiki-1",
+ self.directory.fieldName.shortNames: [u"wiki-one",],
+ self.directory.fieldName.recordType: RecordType.macOSXServerWiki,
+ }
+ record = DirectoryRecord(self.directory, fields)
+ resource = FakeResource(record)
+ request = FakeRequest()
+
+ record.access = WikiAccessLevel.read
+ result = yield getWikiACL(resource, request)
+ self.assertEqual(
+ result.children[0].children[0].children[0].name,
+ "unauthenticated"
+ )
</ins></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer60devtxdavwhowikipy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/who/wiki.py (14129 => 14130)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/who/wiki.py 2014-10-31 20:56:06 UTC (rev 14129)
+++ CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/who/wiki.py 2014-11-02 17:10:06 UTC (rev 14130)
</span><span class="lines">@@ -282,7 +282,11 @@
</span><span class="cx"> if access == WikiAccessLevel.read:
</span><span class="cx"> request.wikiACL = davxml.ACL(
</span><span class="cx"> davxml.ACE(
</span><del>- request.authnUser.principalElement(),
</del><ins>+ (
+ request.authnUser.principalElement() if
+ request.authnUser is not None else
+ davxml.Principal(davxml.Unauthenticated())
+ ),
</ins><span class="cx"> davxml.Grant(
</span><span class="cx"> davxml.Privilege(davxml.Read()),
</span><span class="cx"> davxml.Privilege(davxml.ReadCurrentUserPrivilegeSet()),
</span><span class="lines">@@ -311,7 +315,11 @@
</span><span class="cx"> elif access == WikiAccessLevel.write:
</span><span class="cx"> request.wikiACL = davxml.ACL(
</span><span class="cx"> davxml.ACE(
</span><del>- request.authnUser.principalElement(),
</del><ins>+ (
+ request.authnUser.principalElement() if
+ request.authnUser is not None else
+ davxml.Principal(davxml.Unauthenticated())
+ ),
</ins><span class="cx"> davxml.Grant(
</span><span class="cx"> davxml.Privilege(davxml.Read()),
</span><span class="cx"> davxml.Privilege(davxml.ReadCurrentUserPrivilegeSet()),
</span></span></pre>
</div>
</div>
</body>
</html>