[prev in list] [next in list] [prev in thread] [next in thread]
List: calendarserver-changes
Subject: [CalendarServer-changes] [13066] CalendarServer/branches/users/sagen/move2who-4
From: source_changes () macosforge ! org
Date: 2014-03-31 22:02:34
Message-ID: 20140331220234.EE430140E29 () svn ! calendarserver ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 13066
http://trac.calendarserver.org//changeset/13066
Author: wsanchez@apple.com
Date: 2014-03-31 15:02:34 -0700 (Mon, 31 Mar 2014)
Log Message:
-----------
Move accessForUserToWiki to txdav.who.wiki
Modified Paths:
--------------
CalendarServer/branches/users/sagen/move2who-4/calendarserver/platform/darwin/wiki.py
CalendarServer/branches/users/sagen/move2who-4/txdav/who/wiki.py
Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/platform/darwin/wiki.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/platform/darwin/wiki.py 2014-03-31 \
21:25:25 UTC (rev 13065)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/platform/darwin/wiki.py 2014-03-31 \
22:02:34 UTC (rev 13066) @@ -57,28 +57,6 @@
-def accessForUserToWiki(user, wiki, host="localhost", port=4444):
- """
- Send a GET request to the wiki collabd service to retrieve the access level
- the given user (uid) has to the given wiki (in wiki short-name
- form).
-
- @param user: The UID of the user
- @type user: C{str}
- @param wiki: The short name of the wiki
- @type wiki: C{str}
- @return: deferred returning a access level (C{str}) if successful, or
- if the user is not recognized a twisted.web.error.Error with
- status FORBIDDEN will errBack; an unknown wiki will have a status
- of NOT_FOUND
- """
- url = "http://%s:%s/cal/accessLevelForUserWikiCalendar/%s/%s" % (
- host, port, user, wiki
- )
- return _getPage(url, host, port)
-
-
-
def _getPage(url, host, port):
"""
Fetch the body of the given url via HTTP, connecting to the given host
Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/wiki.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/wiki.py 2014-03-31 \
21:25:25 UTC (rev 13065)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/wiki.py 2014-03-31 \
22:02:34 UTC (rev 13066) @@ -23,7 +23,8 @@
"WikiAccessLevel",
]
-from calendarserver.platform.darwin.wiki import accessForUserToWiki
+from twext.internet.adaptendpoint import connect
+from twext.internet.gaiendpoint import GAIEndpoint
from twext.internet.gaiendpoint import MultiFailure
from twext.python.log import Logger
from twext.who.directory import (
@@ -32,11 +33,13 @@
)
from twext.who.idirectory import FieldName as BaseFieldName
from twext.who.util import ConstantsContainer
+from twisted.internet import reactor
from twisted.internet.defer import inlineCallbacks, returnValue, succeed
from twisted.python.constants import Names, NamedConstant
+from twisted.web.client import HTTPPageGetter, HTTPClientFactory
from twisted.web.error import Error as WebError
+from txdav.who.directory import CalendarDirectoryRecordMixin
from txdav.who.idirectory import FieldName
-from txdav.who.directory import CalendarDirectoryRecordMixin
from txdav.xml import element as davxml
from txweb2 import responsecode
from txweb2.auth.wrapper import UnauthorizedResponse
@@ -340,3 +343,47 @@
raise HTTPError(StatusResponse(
responsecode.SERVICE_UNAVAILABLE, "Wiki ACL lookup failed"
))
+
+
+
+def accessForUserToWiki(user, wiki, host="localhost", port=4444):
+ """
+ Send a GET request to the wiki collabd service to retrieve the access level
+ the given user (uid) has to the given wiki (in wiki short-name
+ form).
+
+ @param user: The UID of the user
+ @type user: C{str}
+ @param wiki: The short name of the wiki
+ @type wiki: C{str}
+ @return: deferred returning a access level (C{str}) if successful, or
+ if the user is not recognized a twisted.web.error.Error with
+ status FORBIDDEN will errBack; an unknown wiki will have a status
+ of NOT_FOUND
+ """
+ url = "http://%s:%s/cal/accessLevelForUserWikiCalendar/%s/%s" % (
+ host, port, user, wiki
+ )
+ return _getPage(url, host, port)
+
+
+
+# FIXME: Why don't we use twisted.web.
+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
[Attachment #5 (text/html)]
<!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>[13066] 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/13066">13066</a></dd> <dt>Author</dt> \
<dd>wsanchez@apple.com</dd> <dt>Date</dt> <dd>2014-03-31 15:02:34 -0700 (Mon, 31 Mar \
2014)</dd> </dl>
<h3>Log Message</h3>
<pre>Move accessForUserToWiki to txdav.who.wiki</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4calendarserverplatformdarwinwik \
ipy">CalendarServer/branches/users/sagen/move2who-4/calendarserver/platform/darwin/wiki.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavwhowikipy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/wiki.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4calendarserverplatformdarwinwikipy"></a>
<div class="modfile"><h4>Modified: \
CalendarServer/branches/users/sagen/move2who-4/calendarserver/platform/darwin/wiki.py \
(13065 => 13066)</h4> <pre class="diff"><span>
<span class="info">--- \
CalendarServer/branches/users/sagen/move2who-4/calendarserver/platform/darwin/wiki.py 2014-03-31 \
21:25:25 UTC (rev 13065)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/platform/darwin/wiki.py 2014-03-31 \
22:02:34 UTC (rev 13066) </span><span class="lines">@@ -57,28 +57,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def accessForUserToWiki(user, wiki, host="localhost", \
port=4444):
- """
- Send a GET request to the wiki collabd service to retrieve the access level
- the given user (uid) has to the given wiki (in wiki short-name
- form).
-
- @param user: The UID of the user
- @type user: C{str}
- @param wiki: The short name of the wiki
- @type wiki: C{str}
- @return: deferred returning a access level (C{str}) if successful, or
- if the user is not recognized a twisted.web.error.Error with
- status FORBIDDEN will errBack; an unknown wiki will have a status
- of NOT_FOUND
- """
- url = "http://%s:%s/cal/accessLevelForUserWikiCalendar/%s/%s" % (
- host, port, user, wiki
- )
- return _getPage(url, host, port)
-
-
-
</del><span class="cx"> def _getPage(url, host, port):
</span><span class="cx"> """
</span><span class="cx"> Fetch the body of the given url via HTTP, connecting to \
the given host </span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhowikipy"></a>
<div class="modfile"><h4>Modified: \
CalendarServer/branches/users/sagen/move2who-4/txdav/who/wiki.py (13065 => \
13066)</h4> <pre class="diff"><span>
<span class="info">--- \
CalendarServer/branches/users/sagen/move2who-4/txdav/who/wiki.py 2014-03-31 21:25:25 \
UTC (rev 13065)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/wiki.py 2014-03-31 \
22:02:34 UTC (rev 13066) </span><span class="lines">@@ -23,7 +23,8 @@
</span><span class="cx"> "WikiAccessLevel",
</span><span class="cx"> ]
</span><span class="cx">
</span><del>-from calendarserver.platform.darwin.wiki import accessForUserToWiki
</del><ins>+from twext.internet.adaptendpoint import connect
+from twext.internet.gaiendpoint import GAIEndpoint
</ins><span class="cx"> from twext.internet.gaiendpoint import MultiFailure
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twext.who.directory import (
</span><span class="lines">@@ -32,11 +33,13 @@
</span><span class="cx"> )
</span><span class="cx"> from twext.who.idirectory import FieldName as BaseFieldName
</span><span class="cx"> from twext.who.util import ConstantsContainer
</span><ins>+from twisted.internet import reactor
</ins><span class="cx"> from twisted.internet.defer import inlineCallbacks, \
returnValue, succeed </span><span class="cx"> from twisted.python.constants import \
Names, NamedConstant </span><ins>+from twisted.web.client import HTTPPageGetter, \
HTTPClientFactory </ins><span class="cx"> from twisted.web.error import Error as \
WebError </span><ins>+from txdav.who.directory import CalendarDirectoryRecordMixin
</ins><span class="cx"> from txdav.who.idirectory import FieldName
</span><del>-from txdav.who.directory import CalendarDirectoryRecordMixin
</del><span class="cx"> from txdav.xml import element as davxml
</span><span class="cx"> from txweb2 import responsecode
</span><span class="cx"> from txweb2.auth.wrapper import UnauthorizedResponse
</span><span class="lines">@@ -340,3 +343,47 @@
</span><span class="cx"> raise HTTPError(StatusResponse(
</span><span class="cx"> responsecode.SERVICE_UNAVAILABLE, "Wiki ACL \
lookup failed" </span><span class="cx"> ))
</span><ins>+
+
+
+def accessForUserToWiki(user, wiki, host="localhost", port=4444):
+ """
+ Send a GET request to the wiki collabd service to retrieve the access level
+ the given user (uid) has to the given wiki (in wiki short-name
+ form).
+
+ @param user: The UID of the user
+ @type user: C{str}
+ @param wiki: The short name of the wiki
+ @type wiki: C{str}
+ @return: deferred returning a access level (C{str}) if successful, or
+ if the user is not recognized a twisted.web.error.Error with
+ status FORBIDDEN will errBack; an unknown wiki will have a status
+ of NOT_FOUND
+ """
+ url = "http://%s:%s/cal/accessLevelForUserWikiCalendar/%s/%s" % (
+ host, port, user, wiki
+ )
+ return _getPage(url, host, port)
+
+
+
+# FIXME: Why don't we use twisted.web.
+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
</ins></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
calendarserver-changes mailing list
calendarserver-changes@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/calendarserver-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic