<!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>[12624] 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/12624">12624</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-02-08 14:59:17 -0800 (Sat, 08 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow configuration of the various DPS services via plist</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavstdconfigpy">CalendarServer/trunk/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServertrunktxdavdpsclientpy">CalendarServer/trunk/txdav/dps/client.py</a></li>
<li><a href="#CalendarServertrunktxdavdpsserverpy">CalendarServer/trunk/txdav/dps/server.py</a></li>
<li><a href="#CalendarServertrunktxdavdpstesttest_clientpy">CalendarServer/trunk/txdav/dps/test/test_client.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (12623 => 12624)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py        2014-02-08 22:54:32 UTC (rev 12623)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py        2014-02-08 22:59:17 UTC (rev 12624)
</span><span class="lines">@@ -836,6 +836,8 @@
</span><span class="cx"> "Enabled": False,
</span><span class="cx"> "SocketPath": "directory-proxy.sock",
</span><span class="cx"> "DirectoryType": "XML", # "LDAP", "OD", "XML"
</span><ins>+ "Arguments": [],
+ "Keywords": {},
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> #
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpsclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/client.py (12623 => 12624)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/client.py        2014-02-08 22:54:32 UTC (rev 12623)
+++ CalendarServer/trunk/txdav/dps/client.py        2014-02-08 22:59:17 UTC (rev 12624)
</span><span class="lines">@@ -207,14 +207,17 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def makeEvenBetterRequest():
</span><span class="cx"> ds = DirectoryService(None)
</span><del>- record = (yield ds.recordWithShortName(RecordType.user, "wsanchez"))
</del><ins>+ record = (yield ds.recordWithShortName(RecordType.user, "sagen"))
</ins><span class="cx"> print("short name: {r}".format(r=record))
</span><ins>+ if record:
+ authenticated = (yield record.verifyPlaintextPassword("secret"))
+ print("plain auth: {a}".format(a=authenticated))
+ """
</ins><span class="cx"> record = (yield ds.recordWithUID("__dre__"))
</span><span class="cx"> print("uid: {r}".format(r=record))
</span><span class="cx"> if record:
</span><span class="cx"> authenticated = (yield record.verifyPlaintextPassword("erd"))
</span><span class="cx"> print("plain auth: {a}".format(a=authenticated))
</span><del>- """
</del><span class="cx"> record = (yield ds.recordWithGUID("A3B1158F-0564-4F5B-81E4-A89EA5FF81B0"))
</span><span class="cx"> print("guid: {r}".format(r=record))
</span><span class="cx"> records = (yield ds.recordsWithRecordType(RecordType.user))
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpsserverpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/server.py (12623 => 12624)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/server.py        2014-02-08 22:54:32 UTC (rev 12623)
+++ CalendarServer/trunk/txdav/dps/server.py        2014-02-08 22:59:17 UTC (rev 12624)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> import cPickle as pickle
</span><ins>+import os
</ins><span class="cx"> import uuid
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="lines">@@ -36,8 +37,10 @@
</span><span class="cx"> VerifyPlaintextPasswordCommand, VerifyHTTPDigestCommand,
</span><span class="cx"> # UpdateRecordsCommand, RemoveRecordsCommand
</span><span class="cx"> )
</span><ins>+from twext.who.ldap import DirectoryService as LDAPDirectoryService
</ins><span class="cx"> from txdav.who.xml import DirectoryService as XMLDirectoryService
</span><span class="cx"> from zope.interface import implementer
</span><ins>+from twisted.cred.credentials import UsernamePassword
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="lines">@@ -320,6 +323,14 @@
</span><span class="cx"> description = "Directory Proxy Service"
</span><span class="cx"> options = DirectoryProxyOptions
</span><span class="cx">
</span><ins>+ def _extractKeyword(self, key, kwds):
+ result = ""
+ if key in kwds:
+ result = kwds[key]
+ del kwds[key]
+ return result
+
+
</ins><span class="cx"> def makeService(self, options):
</span><span class="cx"> """
</span><span class="cx"> Return a service
</span><span class="lines">@@ -332,17 +343,33 @@
</span><span class="cx"> setproctitle("CalendarServer Directory Proxy Service")
</span><span class="cx">
</span><span class="cx"> directoryType = config.DirectoryProxy.DirectoryType
</span><ins>+ args = config.DirectoryProxy.Arguments
+ kwds = config.DirectoryProxy.Keywords
+
</ins><span class="cx"> if directoryType == "OD":
</span><del>- directory = ODDirectoryService()
</del><ins>+ directory = ODDirectoryService(*args, **kwds)
+
</ins><span class="cx"> elif directoryType == "LDAP":
</span><del>- pass
</del><ins>+ authDN = self._extractKeyword("authDN", kwds)
+ password = self._extractKeyword("password", kwds)
+ if authDN and password:
+ creds = UsernamePassword(authDN, password)
+ else:
+ creds = None
+ kwds["credentials"] = creds
+ debug = self._extractKeyword("debug", kwds)
+ directory = LDAPDirectoryService(*args, _debug=debug, **kwds)
+
</ins><span class="cx"> elif directoryType == "XML":
</span><del>- path = "txdav/dps/test/test.xml"
- directory = XMLDirectoryService(FilePath(path))
</del><ins>+ path = self._extractKeyword("path", kwds)
+ if not path or not os.path.exists(path):
+ log.error("Path not found for XML directory: {p}", p=path)
+ fp = FilePath(path)
+ directory = XMLDirectoryService(fp, *args, **kwds)
+
</ins><span class="cx"> else:
</span><span class="cx"> log.error("Invalid DirectoryType: {dt}", dt=directoryType)
</span><span class="cx">
</span><del>-
</del><span class="cx"> desc = "unix:{path}:mode=660".format(
</span><span class="cx"> path=config.DirectoryProxy.SocketPath
</span><span class="cx"> )
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpstesttest_clientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/test/test_client.py (12623 => 12624)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/test/test_client.py        2014-02-08 22:54:32 UTC (rev 12623)
+++ CalendarServer/trunk/txdav/dps/test/test_client.py        2014-02-08 22:59:17 UTC (rev 12624)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> if testMode == "xml":
</span><span class="cx"> from txdav.who.xml import DirectoryService as XMLDirectoryService
</span><span class="cx"> elif testMode == "od":
</span><del>- odpw = "__secret__"
</del><ins>+ odpw = "secret"
</ins><span class="cx"> from twext.who.opendirectory import DirectoryService as OpenDirectoryService
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -118,13 +118,19 @@
</span><span class="cx"> ("erd", True), # Correct
</span><span class="cx"> ("wrong", False) # Incorrect
</span><span class="cx"> )
</span><del>- record = (yield self.directory.recordWithShortName(RecordType.user, "dre"))
</del><ins>+ record = (
+ yield self.directory.recordWithShortName(RecordType.user, "dre")
+ )
</ins><span class="cx"> elif testMode == "od":
</span><span class="cx"> expectations = (
</span><span class="cx"> (odpw, True), # Correct
</span><span class="cx"> ("wrong", False) # Incorrect
</span><span class="cx"> )
</span><del>- record = (yield self.directory.recordWithGUID("D0B38B00-4166-11DD-B22C-A07C87F02F6A"))
</del><ins>+ record = (
+ yield self.directory.recordWithGUID(
+ "D0B38B00-4166-11DD-B22C-A07C87F02F6A"
+ )
+ )
</ins><span class="cx">
</span><span class="cx"> for password, answer in expectations:
</span><span class="cx"> authenticated = (yield record.verifyPlaintextPassword(password))
</span><span class="lines">@@ -139,14 +145,20 @@
</span><span class="cx"> ("erd", True), # Correct
</span><span class="cx"> ("wrong", False) # Incorrect
</span><span class="cx"> )
</span><del>- record = (yield self.directory.recordWithShortName(RecordType.user, "dre"))
</del><ins>+ record = (
+ yield self.directory.recordWithShortName(RecordType.user, "dre")
+ )
</ins><span class="cx"> elif testMode == "od":
</span><span class="cx"> username = "sagen"
</span><span class="cx"> expectations = (
</span><span class="cx"> (odpw, True), # Correct
</span><span class="cx"> ("wrong", False) # Incorrect
</span><span class="cx"> )
</span><del>- record = (yield self.directory.recordWithGUID("D0B38B00-4166-11DD-B22C-A07C87F02F6A"))
</del><ins>+ record = (
+ yield self.directory.recordWithGUID(
+ "D0B38B00-4166-11DD-B22C-A07C87F02F6A"
+ )
+ )
</ins><span class="cx">
</span><span class="cx"> realm = "host.example.com"
</span><span class="cx"> nonce = "128446648710842461101646794502"
</span></span></pre>
</div>
</div>
</body>
</html>