<!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>[12888] CalendarServer/branches/users/sagen/move2who-2/txdav</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/12888">12888</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-03-12 14:28:35 -0700 (Wed, 12 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get config for OD service in a backwards compatible way</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who2txdavdpsserverpy">CalendarServer/branches/users/sagen/move2who-2/txdav/dps/server.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who2txdavwhoaugmentpy">CalendarServer/branches/users/sagen/move2who-2/txdav/who/augment.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who2txdavwhodirectorypy">CalendarServer/branches/users/sagen/move2who-2/txdav/who/directory.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who2txdavdpsserverpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-2/txdav/dps/server.py (12887 => 12888)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-2/txdav/dps/server.py 2014-03-12 21:22:57 UTC (rev 12887)
+++ CalendarServer/branches/users/sagen/move2who-2/txdav/dps/server.py 2014-03-12 21:28:35 UTC (rev 12888)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twext.who.aggregate import DirectoryService as AggregateDirectoryService
</span><span class="cx"> from twext.who.expression import MatchType, MatchFlags, Operand
</span><del>-from twext.who.idirectory import RecordType
</del><ins>+from twext.who.idirectory import RecordType, DirectoryConfigurationError
</ins><span class="cx"> from twext.who.ldap import DirectoryService as LDAPDirectoryService
</span><span class="cx"> from twisted.application import service
</span><span class="cx"> from twisted.application.strports import service as strPortsService
</span><span class="lines">@@ -454,17 +454,19 @@
</span><span class="cx"> txdav.dps.client.DirectoryService
</span><span class="cx"> """
</span><span class="cx">
</span><del>- # FIXME: this needs to talk to its own separate database. In fact,
</del><ins>+ # MOVE2WHO FIXME: this needs to talk to its own separate database. In fact,
</ins><span class="cx"> # don't pass store=None if you already have called storeFromConfig()
</span><span class="cx"> # within this process. Pass the existing store in here.
</span><span class="cx"> pool, txnFactory = getDBPool(config)
</span><span class="cx"> if store is None:
</span><span class="cx"> store = storeFromConfig(config, txnFactory, None)
</span><span class="cx">
</span><del>- # directoryType = config.DirectoryProxy.DirectoryType
- directoryType = config.DirectoryService.type
</del><ins>+ directoryType = config.DirectoryService.type.lower()
</ins><span class="cx">
</span><del>- if "XML" in directoryType:
</del><ins>+ # MOVE2WHO FIXME:
+ # Set the appropriate record types on each service
+
+ if "xml" in directoryType:
</ins><span class="cx"> xmlFile = config.DirectoryService.params.xmlFile
</span><span class="cx"> xmlFile = fullServerPath(config.DataRoot, xmlFile)
</span><span class="cx"> # path = kwds.pop("path", "")
</span><span class="lines">@@ -472,41 +474,32 @@
</span><span class="cx"> log.error("Path not found for XML directory: {p}", p=xmlFile)
</span><span class="cx"> fp = FilePath(xmlFile)
</span><span class="cx"> primaryDirectory = XMLDirectoryService(fp)
</span><ins>+ log.debug(
+ "Using XML for {types}",
+ types=(", ".join([rt.name for rt in primaryDirectory.recordTypes()]))
+ )
</ins><span class="cx">
</span><ins>+ elif "opendirectory" in directoryType:
+ from twext.who.opendirectory import DirectoryService as ODDirectoryService
+ primaryDirectory = ODDirectoryService()
</ins><span class="cx">
</span><del>- # FIXME: implement the other service types
</del><ins>+ elif "ldap" in directoryType:
+ params = config.DirectoryService.params
+ if params.credentials.dn and params.credentials.password:
+ creds = UsernamePassword(params.credentials.dn,
+ params.credentials.password)
+ else:
+ creds = None
+ primaryDirectory = LDAPDirectoryService(
+ params.uri,
+ params.rdnSchema.base,
+ creds=creds
+ )
</ins><span class="cx">
</span><del>- # args = config.DirectoryProxy.Arguments
- # kwds = config.DirectoryProxy.Keywords
</del><ins>+ else:
+ log.error("Invalid DirectoryType: {dt}", dt=directoryType)
+ raise DirectoryConfigurationError
</ins><span class="cx">
</span><del>-
- # if directoryType == "OD":
- # from twext.who.opendirectory import DirectoryService as ODDirectoryService
- # primaryDirectory = ODDirectoryService(*args, **kwds)
-
- # elif directoryType == "LDAP":
- # authDN = kwds.pop("authDN", "")
- # password = kwds.pop("password", "")
- # if authDN and password:
- # creds = UsernamePassword(authDN, password)
- # else:
- # creds = None
- # kwds["credentials"] = creds
- # debug = kwds.pop("debug", "")
- # primaryDirectory = LDAPDirectoryService(
- # *args, _debug=debug, **kwds
- # )
-
- # elif directoryType == "XML":
- # path = kwds.pop("path", "")
- # if not path or not os.path.exists(path):
- # log.error("Path not found for XML directory: {p}", p=path)
- # fp = FilePath(path)
- # primaryDirectory = XMLDirectoryService(fp, *args, **kwds)
-
- # else:
- # log.error("Invalid DirectoryType: {dt}", dt=directoryType)
-
</del><span class="cx"> #
</span><span class="cx"> # Setup the Augment Service
</span><span class="cx"> #
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who2txdavwhoaugmentpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-2/txdav/who/augment.py (12887 => 12888)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-2/txdav/who/augment.py 2014-03-12 21:22:57 UTC (rev 12887)
+++ CalendarServer/branches/users/sagen/move2who-2/txdav/who/augment.py 2014-03-12 21:28:35 UTC (rev 12888)
</span><span class="lines">@@ -154,6 +154,11 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def recordWithShortName(self, recordType, shortName):
</span><ins>+ # log.debug(
+ # "Augment - recordWithShortName {rt}, {n}",
+ # rt=recordType.name,
+ # n=shortName
+ # )
</ins><span class="cx"> # MOVE2WHO, REMOVE THIS:
</span><span class="cx"> if not isinstance(shortName, unicode):
</span><span class="cx"> log.warn("Need to change shortName to unicode")
</span><span class="lines">@@ -161,6 +166,13 @@
</span><span class="cx">
</span><span class="cx"> record = yield self._directory.recordWithShortName(recordType, shortName)
</span><span class="cx"> record = yield self.augment(record)
</span><ins>+ # log.debug(
+ # "Augment - recordWithShortName {rt}, {n} returned {r}, {u}",
+ # rt=recordType.name,
+ # n=shortName,
+ # r=record.recordType.name,
+ # u=record.uid
+ # )
</ins><span class="cx"> returnValue(record)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who2txdavwhodirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-2/txdav/who/directory.py (12887 => 12888)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-2/txdav/who/directory.py 2014-03-12 21:22:57 UTC (rev 12887)
+++ CalendarServer/branches/users/sagen/move2who-2/txdav/who/directory.py 2014-03-12 21:28:35 UTC (rev 12888)
</span><span class="lines">@@ -20,15 +20,16 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> import uuid
</span><del>-from twext.python.log import Logger
</del><span class="cx">
</span><del>-from twisted.internet.defer import inlineCallbacks, returnValue
</del><ins>+from twext.python.log import Logger
</ins><span class="cx"> from twext.who.expression import (
</span><span class="cx"> MatchType, Operand, MatchExpression, CompoundExpression, MatchFlags
</span><span class="cx"> )
</span><span class="cx"> from twext.who.idirectory import RecordType as BaseRecordType
</span><del>-from txdav.who.idirectory import RecordType as DAVRecordType
</del><span class="cx"> from twisted.cred.credentials import UsernamePassword
</span><ins>+from twisted.internet.defer import inlineCallbacks, returnValue
+from txdav.caldav.datastore.scheduling.cuaddress import normalizeCUAddr
+from txdav.who.idirectory import RecordType as DAVRecordType
</ins><span class="cx"> from txweb2.auth.digest import DigestedCredentials
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -58,8 +59,6 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def recordWithCalendarUserAddress(self, address):
</span><del>- # FIXME: Circular
- from txdav.caldav.datastore.scheduling.cuaddress import normalizeCUAddr
</del><span class="cx"> address = normalizeCUAddr(address)
</span><span class="cx"> record = None
</span><span class="cx"> if address.startswith("urn:uuid:"):
</span></span></pre>
</div>
</div>
</body>
</html>