<!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>[12503] CalendarServer/trunk</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/12503">12503</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-01-31 11:42:44 -0800 (Fri, 31 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>First pass at an AMP directory call</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertapcaldavpy">CalendarServer/trunk/calendarserver/tap/caldav.py</a></li>
<li><a href="#CalendarServertrunktxdavdpsprotocolpy">CalendarServer/trunk/txdav/dps/protocol.py</a></li>
<li><a href="#CalendarServertrunktxdavdpsservicepy">CalendarServer/trunk/txdav/dps/service.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertapcaldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/caldav.py (12502 => 12503)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/caldav.py 2014-01-31 19:01:07 UTC (rev 12502)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py 2014-01-31 19:42:44 UTC (rev 12503)
</span><span class="lines">@@ -77,6 +77,7 @@
</span><span class="cx"> UpgradeDatabaseSchemaStep, UpgradeDatabaseAddressBookDataStep,
</span><span class="cx"> UpgradeAcquireLockStep, UpgradeReleaseLockStep, UpgradeDatabaseNotificationDataStep)
</span><span class="cx"> from txdav.common.datastore.work.revision_cleanup import scheduleFirstFindMinRevision
</span><ins>+from txdav.dps.service import DirectoryProxyServiceMaker
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav import memcachepool
</span><span class="cx"> from twistedcaldav.config import config, ConfigurationError
</span><span class="lines">@@ -1264,6 +1265,11 @@
</span><span class="cx"> except ImportError:
</span><span class="cx"> print("Manhole access could not enabled because manhole_tap could not be imported")
</span><span class="cx">
</span><ins>+ # Optionally enable Directory Proxy
+ if config.DirectoryProxy.Enabled:
+ dps = DirectoryProxyServiceMaker().makeService(None)
+ dps.setServiceParent(result)
+
</ins><span class="cx"> def decorateTransaction(txn):
</span><span class="cx"> txn._pushDistributor = pushDistributor
</span><span class="cx"> txn._rootResource = result.rootResource
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpsprotocolpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/protocol.py (12502 => 12503)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/protocol.py 2014-01-31 19:01:07 UTC (rev 12502)
+++ CalendarServer/trunk/txdav/dps/protocol.py 2014-01-31 19:42:44 UTC (rev 12503)
</span><span class="lines">@@ -14,9 +14,9 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-# import twext.who
</del><ins>+from twext.who.idirectory import RecordType
</ins><span class="cx"> from twisted.protocols import amp
</span><del>-from twisted.internet.defer import succeed
</del><ins>+from twisted.internet.defer import succeed, inlineCallbacks, returnValue
</ins><span class="cx"> from twext.python.log import Logger
</span><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="lines">@@ -30,15 +30,28 @@
</span><span class="cx"> response = [('result', amp.String())]
</span><span class="cx">
</span><span class="cx">
</span><ins>+class RecordWithShortNameCommand(amp.Command):
+ arguments = [
+ ('recordType', amp.String()),
+ ('shortName', amp.String()),
+ ]
+ response = [
+ ('fullNames', amp.ListOf(amp.String())),
+ ('shortNames', amp.ListOf(amp.String())),
+ ('emailAddresses', amp.ListOf(amp.String())),
+ ]
</ins><span class="cx">
</span><ins>+
+
</ins><span class="cx"> class DirectoryProxyAMPProtocol(amp.AMP):
</span><span class="cx"> """
</span><span class="cx"> """
</span><span class="cx">
</span><del>- def __init__(self):
</del><ins>+ def __init__(self, directory):
</ins><span class="cx"> """
</span><span class="cx"> """
</span><span class="cx"> amp.AMP.__init__(self)
</span><ins>+ self._directory = directory
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @DirectoryProxyAMPCommand.responder
</span><span class="lines">@@ -58,6 +71,22 @@
</span><span class="cx"> return succeed(response)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @RecordWithShortNameCommand.responder
+ @inlineCallbacks
+ def recordWithShortName(self, recordType, shortName):
+ log.debug("RecordWithShortName: {r} {n}", r=recordType, n=shortName)
+ record = (yield self._directory.recordWithShortName(
+ RecordType.lookupByName(recordType), shortName)
+ )
+ response = {
+ "fullNames": [i.encode("utf-8") for i in record.fullNames],
+ "shortNames": [i.encode("utf-8") for i in record.shortNames],
+ "emailAddresses": [i.encode("utf-8") for i in record.emailAddresses],
+ }
+ log.debug("Responding with: {response}", response=response)
+ returnValue(response)
+
+
</ins><span class="cx"> #
</span><span class="cx"> # A test AMP client
</span><span class="cx"> #
</span><span class="lines">@@ -73,19 +102,19 @@
</span><span class="cx"> d = creator.connectUNIX("data/Logs/state/directory-proxy.sock")
</span><span class="cx">
</span><span class="cx"> def connected(ampProto):
</span><del>- return ampProto.callRemote(DirectoryProxyAMPCommand, command=command)
</del><ins>+ import sys
+ shortName = sys.argv[1]
+ return ampProto.callRemote(
+ RecordWithShortNameCommand,
+ shortName=shortName,
+ recordType=RecordType.user.description.encode("utf-8"))
</ins><span class="cx"> d.addCallback(connected)
</span><span class="cx">
</span><del>- def resulted(result):
- return result['result']
- d.addCallback(resulted)
-
- def done(result):
</del><ins>+ def gotResults(result):
</ins><span class="cx"> print('Done: %s' % (result,))
</span><span class="cx"> reactor.stop()
</span><del>- d.addCallback(done)
</del><ins>+ d.addCallback(gotResults)
</ins><span class="cx"> reactor.run()
</span><span class="cx">
</span><span class="cx"> if __name__ == '__main__':
</span><span class="cx"> makeRequest()
</span><del>-
</del></span></pre></div>
<a id="CalendarServertrunktxdavdpsservicepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/service.py (12502 => 12503)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/service.py 2014-01-31 19:01:07 UTC (rev 12502)
+++ CalendarServer/trunk/txdav/dps/service.py 2014-01-31 19:42:44 UTC (rev 12503)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-import twext.who
</del><ins>+from twext.who.xml import DirectoryService
</ins><span class="cx"> from twisted.python.usage import Options, UsageError
</span><span class="cx"> from twisted.plugin import IPlugin
</span><span class="cx"> from twisted.application import service
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> from twisted.application.strports import service as strPortsService
</span><span class="cx"> from twisted.internet.protocol import Factory
</span><span class="cx"> from twext.python.log import Logger
</span><ins>+from twisted.python.filepath import FilePath
</ins><span class="cx">
</span><span class="cx"> from .protocol import DirectoryProxyAMPProtocol
</span><span class="cx">
</span><span class="lines">@@ -36,8 +37,11 @@
</span><span class="cx"> protocol = DirectoryProxyAMPProtocol
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def __init__(self, directory):
+ self._directory = directory
+
</ins><span class="cx"> def buildProtocol(self, addr):
</span><del>- return DirectoryProxyAMPProtocol()
</del><ins>+ return DirectoryProxyAMPProtocol(self._directory)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -148,7 +152,9 @@
</span><span class="cx"> else:
</span><span class="cx"> setproctitle("CalendarServer Directory Proxy Service")
</span><span class="cx">
</span><ins>+ directory = DirectoryService(FilePath("foo.xml"))
+
</ins><span class="cx"> desc = "unix:{path}:mode=660".format(
</span><span class="cx"> path=config.DirectoryProxy.SocketPath
</span><span class="cx"> )
</span><del>- return strPortsService(desc, DirectoryProxyAMPFactory())
</del><ins>+ return strPortsService(desc, DirectoryProxyAMPFactory(directory))
</ins></span></pre>
</div>
</div>
</body>
</html>