<!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>[13068] 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/13068">13068</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-31 15:18:29 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move uidForAuthToken to txdav.who.wiki; get rid of calendarserver.platform.darwin.wiki.</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="#CalendarServerbranchesuserssagenmove2who4txdavwhowikipy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/wiki.py</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4calendarserverplatformdarwinwikipy">CalendarServer/branches/users/sagen/move2who-4/calendarserver/platform/darwin/wiki.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4calendarserverplatformdarwinwikipy"></a>
<div class="delfile"><h4>Deleted: CalendarServer/branches/users/sagen/move2who-4/calendarserver/platform/darwin/wiki.py (13067 => 13068)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/platform/darwin/wiki.py 2014-03-31 22:12:49 UTC (rev 13067)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/platform/darwin/wiki.py 2014-03-31 22:18:29 UTC (rev 13068)
</span><span class="lines">@@ -1,84 +0,0 @@
</span><del>-##
-# Copyright (c) 2012-2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# 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 "AS IS" 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 twext.python.log import Logger
-from twext.internet.gaiendpoint import GAIEndpoint
-from twext.internet.adaptendpoint import connect
-
-from twisted.web.client import HTTPPageGetter, HTTPClientFactory
-from twisted.internet import reactor
-from twisted.internet.defer import inlineCallbacks, returnValue
-
-import json
-
-log = Logger()
-
-
-@inlineCallbacks
-def uidForAuthToken(token, host="localhost", port=80):
- """
- Send a GET request to the web auth service to retrieve the user record
- uid associated with the provided auth token.
-
- @param token: An auth token, usually passed in via cookie when webcal
- makes a request.
- @type token: C{str}
- @return: deferred returning a uid (C{str}) if successful, or
- will raise WebAuthError otherwise.
- """
- url = "http://%s:%d/auth/verify?auth_token=%s" % (host, port, token,)
- jsonResponse = (yield _getPage(url, host, port))
- try:
- response = json.loads(jsonResponse)
- except Exception, e:
- log.error(
- "Error parsing JSON response from webauth: {resp} {error}",
- resp=jsonResponse, error=str(e)
- )
- raise WebAuthError("Could not look up token: %s" % (token,))
- if response["succeeded"]:
- returnValue(response["generated_uid"])
- else:
- raise WebAuthError("Could not look up token: %s" % (token,))
-
-
-
-def _getPage(url, host, port):
- """
- Fetch the body of the given url via HTTP, connecting to the given host
- and port.
-
- @param url: The URL to GET
- @type url: C{str}
- @param host: The hostname to connect to
- @type host: C{str}
- @param port: The port number to connect to
- @type port: C{int}
- @return: A deferred; upon 200 success the body of the response is returned,
- otherwise a twisted.web.error.Error is the result.
- """
- factory = HTTPClientFactory(url)
- factory.protocol = HTTPPageGetter
- connect(GAIEndpoint(reactor, host, port), factory)
- return factory.deferred
-
-
-
-class WebAuthError(RuntimeError):
- """
- Error in web auth
- """
</del></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4calendarserverprovisionrootpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/provision/root.py (13067 => 13068)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/provision/root.py 2014-03-31 22:12:49 UTC (rev 13067)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/provision/root.py 2014-03-31 22:18:29 UTC (rev 13068)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> "RootResource",
</span><span class="cx"> ]
</span><span class="cx">
</span><del>-from calendarserver.platform.darwin.wiki import uidForAuthToken
</del><ins>+from txdav.who.wiki import uidForAuthToken
</ins><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twisted.cred.error import LoginFailed, UnauthorizedLogin
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, succeed
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhowikipy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/wiki.py (13067 => 13068)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/wiki.py 2014-03-31 22:12:49 UTC (rev 13067)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/wiki.py 2014-03-31 22:18:29 UTC (rev 13068)
</span><span class="lines">@@ -19,10 +19,11 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> __all__ = [
</span><ins>+ "WikiAccessLevel",
</ins><span class="cx"> "DirectoryService",
</span><del>- "WikiAccessLevel",
</del><span class="cx"> ]
</span><span class="cx">
</span><ins>+import json
</ins><span class="cx"> from twext.internet.adaptendpoint import connect
</span><span class="cx"> from twext.internet.gaiendpoint import GAIEndpoint
</span><span class="cx"> from twext.internet.gaiendpoint import MultiFailure
</span><span class="lines">@@ -346,6 +347,42 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+class WebAuthError(RuntimeError):
+ """
+ Error in web auth
+ """
+
+
+
+@inlineCallbacks
+def uidForAuthToken(token, host="localhost", port=80):
+ """
+ Send a GET request to the web auth service to retrieve the user record
+ uid associated with the provided auth token.
+
+ @param token: An auth token, usually passed in via cookie when webcal
+ makes a request.
+ @type token: C{str}
+ @return: deferred returning a uid (C{str}) if successful, or
+ will raise WebAuthError otherwise.
+ """
+ url = "http://%s:%d/auth/verify?auth_token=%s" % (host, port, token,)
+ jsonResponse = (yield _getPage(url, host, port))
+ try:
+ response = json.loads(jsonResponse)
+ except Exception, e:
+ log.error(
+ "Error parsing JSON response from webauth: {resp} {error}",
+ resp=jsonResponse, error=str(e)
+ )
+ raise WebAuthError("Could not look up token: %s" % (token,))
+ if response["succeeded"]:
+ returnValue(response["generated_uid"])
+ else:
+ raise WebAuthError("Could not look up token: %s" % (token,))
+
+
+
</ins><span class="cx"> def accessForUserToWiki(user, wiki, host="localhost", port=4444):
</span><span class="cx"> """
</span><span class="cx"> Send a GET request to the wiki collabd service to retrieve the access level
</span></span></pre>
</div>
</div>
</body>
</html>