<!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>[13020] 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/13020">13020</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-03-28 09:28:17 -0700 (Fri, 28 Mar 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove Lion wiki compatibility, remove old wiki test, add new wiki test</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4calendarserverprovisionrootpy">CalendarServer/branches/users/sagen/move2who-4/calendarserver/provision/root.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavstdconfigpy">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/stdconfig.py</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavwhotesttest_wikipy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/test/test_wiki.py</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytesttest_wikipy">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/test_wiki.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4calendarserverprovisionrootpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/provision/root.py (13019 => 13020)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/provision/root.py        2014-03-28 03:33:30 UTC (rev 13019)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/provision/root.py        2014-03-28 16:28:17 UTC (rev 13020)
</span><span class="lines">@@ -21,12 +21,10 @@
</span><span class="cx"> 
</span><span class="cx"> from calendarserver.platform.darwin.wiki import uidForAuthToken
</span><span class="cx"> from twext.python.log import Logger
</span><del>-from twext.who.idirectory import RecordType
</del><span class="cx"> from twisted.cred.error import LoginFailed, UnauthorizedLogin
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, succeed
</span><span class="cx"> from twisted.python.reflect import namedClass
</span><span class="cx"> from twisted.web.error import Error as WebError
</span><del>-from twisted.web.xmlrpc import Proxy
</del><span class="cx"> from twistedcaldav.cache import DisabledCache
</span><span class="cx"> from twistedcaldav.cache import MemcacheResponseCache, MemcacheChangeNotifier
</span><span class="cx"> from twistedcaldav.cache import _CachedResponseResource
</span><span class="lines">@@ -233,18 +231,9 @@
</span><span class="cx"> 
</span><span class="cx">                     record = None
</span><span class="cx">                     try:
</span><del>-                        if wikiConfig.LionCompatibility:
</del><ins>+                        uid = (yield uidForAuthToken(token))
+                        if uid == &quot;unauthenticated&quot;:
</ins><span class="cx">                             uid = None
</span><del>-                            proxy = Proxy(wikiConfig[&quot;URL&quot;])
-                            username = (yield proxy.callRemote(wikiConfig[&quot;UserMethod&quot;], token))
-                            directory = request.site.resource.getDirectory()
-                            record = yield directory.recordWithShortName(RecordType.user, username)
-                            if record is not None:
-                                uid = record.uid
-                        else:
-                            uid = (yield uidForAuthToken(token))
-                            if uid == &quot;unauthenticated&quot;:
-                                uid = None
</del><span class="cx"> 
</span><span class="cx">                     except WebError, w:
</span><span class="cx">                         uid = None
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytesttest_wikipy"></a>
<div class="delfile"><h4>Deleted: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/test_wiki.py (13019 => 13020)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/test_wiki.py        2014-03-28 03:33:30 UTC (rev 13019)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/test_wiki.py        2014-03-28 16:28:17 UTC (rev 13020)
</span><span class="lines">@@ -1,116 +0,0 @@
</span><del>-##
-# Copyright (c) 2005-2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-from twistedcaldav.test.util import TestCase
-from twistedcaldav.directory.wiki import (
-    WikiDirectoryService, WikiDirectoryRecord, getWikiAccess
-)
-from twisted.internet.defer import inlineCallbacks, succeed
-from twisted.web.xmlrpc import Fault
-from txweb2.http import HTTPError
-from txweb2 import responsecode
-from twistedcaldav.config import config
-from twisted.web.error import Error as WebError
-
-class WikiTestCase(TestCase):
-    &quot;&quot;&quot;
-    Test the Wiki Directory Service
-    &quot;&quot;&quot;
-
-    def test_enabled(self):
-        service = WikiDirectoryService()
-        service.realmName = &quot;Test&quot;
-        record = WikiDirectoryRecord(service,
-            WikiDirectoryService.recordType_wikis,
-            &quot;test&quot;,
-            None
-        )
-        self.assertTrue(record.enabled)
-        self.assertTrue(record.enabledForCalendaring)
-
-
-    @inlineCallbacks
-    def test_getWikiAccessLion(self):
-        &quot;&quot;&quot;
-        XMLRPC Faults result in HTTPErrors
-        &quot;&quot;&quot;
-        self.patch(config.Authentication.Wiki, &quot;LionCompatibility&quot;, True)
-
-        def successful(self, user, wiki):
-            return succeed(&quot;read&quot;)
-
-        def fault2(self, user, wiki):
-            raise Fault(2, &quot;Bad session&quot;)
-
-        def fault12(self, user, wiki):
-            raise Fault(12, &quot;Non-existent wiki&quot;)
-
-        def fault13(self, user, wiki):
-            raise Fault(13, &quot;Non-existent wiki&quot;)
-
-        access = (yield getWikiAccess(&quot;user&quot;, &quot;wiki&quot;, method=successful))
-        self.assertEquals(access, &quot;read&quot;)
-
-        for (method, code) in (
-            (fault2, responsecode.FORBIDDEN),
-            (fault12, responsecode.NOT_FOUND),
-            (fault13, responsecode.SERVICE_UNAVAILABLE),
-        ):
-            try:
-                access = (yield getWikiAccess(&quot;user&quot;, &quot;wiki&quot;, method=method))
-            except HTTPError, e:
-                self.assertEquals(e.response.code, code)
-            except:
-                self.fail(&quot;Incorrect exception&quot;)
-            else:
-                self.fail(&quot;Didn't raise exception&quot;)
-
-
-    @inlineCallbacks
-    def test_getWikiAccess(self):
-        &quot;&quot;&quot;
-        Non-200 GET responses result in HTTPErrors
-        &quot;&quot;&quot;
-        self.patch(config.Authentication.Wiki, &quot;LionCompatibility&quot;, False)
-
-        def successful(user, wiki, host=None, port=None):
-            return succeed(&quot;read&quot;)
-
-        def forbidden(user, wiki, host=None, port=None):
-            raise WebError(403, message=&quot;Unknown user&quot;)
-
-        def notFound(user, wiki, host=None, port=None):
-            raise WebError(404, message=&quot;Non-existent wiki&quot;)
-
-        def other(user, wiki, host=None, port=None):
-            raise WebError(500, &quot;Error&quot;)
-
-        access = (yield getWikiAccess(&quot;user&quot;, &quot;wiki&quot;, method=successful))
-        self.assertEquals(access, &quot;read&quot;)
-
-        for (method, code) in (
-            (forbidden, responsecode.FORBIDDEN),
-            (notFound, responsecode.NOT_FOUND),
-            (other, responsecode.SERVICE_UNAVAILABLE),
-        ):
-            try:
-                access = (yield getWikiAccess(&quot;user&quot;, &quot;wiki&quot;, method=method))
-            except HTTPError, e:
-                self.assertEquals(e.response.code, code)
-            except:
-                self.fail(&quot;Incorrect exception&quot;)
-            else:
-                self.fail(&quot;Didn't raise exception&quot;)
</del></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/stdconfig.py (13019 => 13020)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/stdconfig.py        2014-03-28 03:33:30 UTC (rev 13019)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/stdconfig.py        2014-03-28 16:28:17 UTC (rev 13020)
</span><span class="lines">@@ -454,10 +454,6 @@
</span><span class="cx">         &quot;Wiki&quot;: {
</span><span class="cx">             &quot;Enabled&quot;: False,
</span><span class="cx">             &quot;Cookie&quot;: &quot;cc.collabd_session_guid&quot;,
</span><del>-            &quot;URL&quot;: &quot;http://127.0.0.1:8089/RPC2&quot;,
-            &quot;UserMethod&quot;: &quot;userForSession&quot;,
-            &quot;WikiMethod&quot;: &quot;accessLevelForUserWikiCalendar&quot;,
-            &quot;LionCompatibility&quot;: False,
</del><span class="cx">             &quot;CollabHost&quot;: &quot;localhost&quot;,
</span><span class="cx">             &quot;CollabPort&quot;: 4444,
</span><span class="cx">         },
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhotesttest_wikipy"></a>
<div class="addfile"><h4>Added: CalendarServer/branches/users/sagen/move2who-4/txdav/who/test/test_wiki.py (0 => 13020)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/test/test_wiki.py                                (rev 0)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/test/test_wiki.py        2014-03-28 16:28:17 UTC (rev 13020)
</span><span class="lines">@@ -0,0 +1,116 @@
</span><ins>+##
+# Copyright (c) 2014 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from __future__ import print_function
+from __future__ import absolute_import
+
+&quot;&quot;&quot;
+Tests for L{txdav.who.wiki}.
+&quot;&quot;&quot;
+
+
+from twisted.trial import unittest
+from twisted.internet.defer import inlineCallbacks, succeed
+from twistedcaldav.test.util import StoreTestCase
+
+from ..wiki import DirectoryService, WikiAccessLevel
+import txdav.who.wiki
+
+
+class WikiIndividualServiceTestCase(unittest.TestCase):
+    &quot;&quot;&quot;
+    Instantiate a wiki service directly
+    &quot;&quot;&quot;
+
+    @inlineCallbacks
+    def test_service(self):
+        service = DirectoryService(&quot;realm&quot;, &quot;localhost&quot;, 4444)
+        record = yield service.recordWithUID(u&quot;[wiki]test&quot;)
+        self.assertEquals(
+            record.shortNames[0],
+            u&quot;test&quot;
+        )
+
+
+
+class WikiAggregateServiceTestCase(StoreTestCase):
+    &quot;&quot;&quot;
+    Get a wiki service as part of directoryFromConfig
+    &quot;&quot;&quot;
+
+    def configure(self):
+        &quot;&quot;&quot;
+        Override configuration hook to turn on wiki service.
+        &quot;&quot;&quot;
+        from twistedcaldav.config import config
+
+        super(WikiAggregateServiceTestCase, self).configure()
+        self.patch(config.Authentication.Wiki, &quot;Enabled&quot;, True)
+
+
+    @inlineCallbacks
+    def test_service(self):
+        record = yield self.directory.recordWithUID(u&quot;[wiki]test&quot;)
+        self.assertEquals(
+            record.shortNames[0],
+            u&quot;test&quot;
+        )
+
+
+
+class AccessForRecordTestCase(StoreTestCase):
+    &quot;&quot;&quot;
+    Exercise accessForRecord
+    &quot;&quot;&quot;
+
+    def configure(self):
+        &quot;&quot;&quot;
+        Override configuration hook to turn on wiki service.
+        &quot;&quot;&quot;
+        from twistedcaldav.config import config
+
+        super(AccessForRecordTestCase, self).configure()
+        self.patch(config.Authentication.Wiki, &quot;Enabled&quot;, True)
+        self.patch(
+            txdav.who.wiki,
+            &quot;accessForUserToWiki&quot;,
+            self.stubAccessForUserToWiki
+        )
+
+
+    def stubAccessForUserToWiki(self, *args, **kwds):
+        return succeed(self.access)
+
+
+    @inlineCallbacks
+    def test_accessForRecord(self):
+        record = yield self.directory.recordWithUID(u&quot;[wiki]test&quot;)
+
+        self.access = &quot;no-access&quot;
+        access = yield record.accessForRecord(None)
+        self.assertEquals(access, WikiAccessLevel.none)
+
+        self.access = &quot;read&quot;
+        access = yield record.accessForRecord(None)
+        self.assertEquals(access, WikiAccessLevel.read)
+
+        self.access = &quot;write&quot;
+        access = yield record.accessForRecord(None)
+        self.assertEquals(access, WikiAccessLevel.write)
+
+        self.access = &quot;admin&quot;
+        access = yield record.accessForRecord(None)
+        self.assertEquals(access, WikiAccessLevel.write)
</ins></span></pre>
</div>
</div>

</body>
</html>