<!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>[13232] twext/trunk/twext/who</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/13232">13232</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-04-09 15:25:43 -0700 (Wed, 09 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Start to get ldap members( ) working</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhodirectorypy">twext/trunk/twext/who/directory.py</a></li>
<li><a href="#twexttrunktwextwholdap_servicepy">twext/trunk/twext/who/ldap/_service.py</a></li>
<li><a href="#twexttrunktwextwhotesttest_directorypy">twext/trunk/twext/who/test/test_directory.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwhodirectorypy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/directory.py (13231 => 13232)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/directory.py        2014-04-09 19:33:34 UTC (rev 13231)
+++ twext/trunk/twext/who/directory.py        2014-04-09 22:25:43 UTC (rev 13232)
</span><span class="lines">@@ -418,10 +418,10 @@
</span><span class="cx">
</span><span class="cx"> def __repr__(self):
</span><span class="cx"> return (
</span><del>- "<{self.__class__.__name__} ({recordType}){shortName}>".format(
</del><ins>+ "<{self.__class__.__name__} ({recordType}){uid}>".format(
</ins><span class="cx"> self=self,
</span><span class="cx"> recordType=describe(self.recordType),
</span><del>- shortName=self.shortNames[0],
</del><ins>+ uid=self.uid,
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextwholdap_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/_service.py (13231 => 13232)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/_service.py        2014-04-09 19:33:34 UTC (rev 13231)
+++ twext/trunk/twext/who/ldap/_service.py        2014-04-09 22:25:43 UTC (rev 13232)
</span><span class="lines">@@ -304,6 +304,10 @@
</span><span class="cx">
</span><span class="cx"> @raises: L{LDAPConnectionError} if unable to connect.
</span><span class="cx"> """
</span><ins>+
+ # FIXME: ldap connection objects are not thread safe, so let's set up
+ # a connection pool
+
</ins><span class="cx"> if not hasattr(self, "_connection"):
</span><span class="cx"> self.log.info("Connecting to LDAP at {log_source.url}")
</span><span class="cx"> connection = ldap.initialize(self.url)
</span><span class="lines">@@ -372,8 +376,7 @@
</span><span class="cx"> self.log.debug("Authenticating {dn}", dn=dn)
</span><span class="cx"> connection = ldap.initialize(self.url)
</span><span class="cx">
</span><del>- # FIXME: Use trace_file option to wire up debug logging when
- # Twisted adopts the new logging stuff.
</del><ins>+ # FIXME: Use a separate connection pool perhaps
</ins><span class="cx">
</span><span class="cx"> for option, value in (
</span><span class="cx"> (ldap.OPT_TIMEOUT, self._timeout),
</span><span class="lines">@@ -411,9 +414,13 @@
</span><span class="cx"> self.log.info("Performing LDAP query: {query}", query=queryString)
</span><span class="cx">
</span><span class="cx"> try:
</span><del>- reply = connection.search_s(
- self._baseDN, ldap.SCOPE_SUBTREE, queryString # FIXME: attrs
</del><ins>+ reply = yield deferToThread(
+ connection.search_s,
+ self._baseDN,
+ ldap.SCOPE_SUBTREE,
+ queryString # FIXME: attrs
</ins><span class="cx"> )
</span><ins>+
</ins><span class="cx"> except ldap.FILTER_ERROR as e:
</span><span class="cx"> self.log.error(
</span><span class="cx"> "Unable to perform query {0!r}: {1}"
</span><span class="lines">@@ -421,6 +428,34 @@
</span><span class="cx"> )
</span><span class="cx"> raise LDAPQueryError("Unable to perform query", e)
</span><span class="cx">
</span><ins>+ records = yield self._recordsFromReply(reply)
+ returnValue(records)
+
+
+ @inlineCallbacks
+ def _recordWithDN(self, dn):
+ """
+ @param dn: The DN of the record to search for
+ @type dn: C{str}
+ """
+ connection = yield self._connect()
+
+ self.log.info("Performing LDAP DN query: {dn}", dn=dn)
+
+ reply = yield deferToThread(
+ connection.search_s,
+ dn,
+ ldap.SCOPE_SUBTREE,
+ "(objectClass=*)" # FIXME: attrs
+ )
+ records = self._recordsFromReply(reply)
+ if len(records):
+ returnValue(records[0])
+ else:
+ returnValue(None)
+
+
+ def _recordsFromReply(self, reply):
</ins><span class="cx"> records = []
</span><span class="cx">
</span><span class="cx"> for dn, recordData in reply:
</span><span class="lines">@@ -447,11 +482,11 @@
</span><span class="cx"> fieldNames = self._attributeToFieldNameMap.get(attribute)
</span><span class="cx">
</span><span class="cx"> if fieldNames is None:
</span><del>- self.log.debug(
- "Unmapped LDAP attribute {attribute!r} in record "
- "data: {recordData!r}",
- attribute=attribute, recordData=recordData,
- )
</del><ins>+ # self.log.debug(
+ # "Unmapped LDAP attribute {attribute!r} in record "
+ # "data: {recordData!r}",
+ # attribute=attribute, recordData=recordData,
+ # )
</ins><span class="cx"> continue
</span><span class="cx">
</span><span class="cx"> for fieldName in fieldNames:
</span><span class="lines">@@ -475,11 +510,8 @@
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx">
</span><del>- # Skip any results missing the required fields
- if (
- (self.fieldName.uid not in fields) or
- (self.fieldName.shortNames not in fields)
- ):
</del><ins>+ # Skip any results missing the uid
+ if self.fieldName.uid not in fields:
</ins><span class="cx"> continue
</span><span class="cx">
</span><span class="cx"> # Set record type and dn fields
</span><span class="lines">@@ -494,7 +526,7 @@
</span><span class="cx">
</span><span class="cx"> self.log.debug("LDAP results: {records}", records=records)
</span><span class="cx">
</span><del>- returnValue(records)
</del><ins>+ return records
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def recordsFromNonCompoundExpression(self, expression, records=None):
</span><span class="lines">@@ -542,13 +574,19 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def members(self):
</span><ins>+
</ins><span class="cx"> if self.recordType != self.service.recordType.group:
</span><span class="cx"> returnValue(())
</span><span class="cx">
</span><del>- raise NotImplementedError()
</del><ins>+ members = set()
+ for dn in getattr(self, "memberDNs", []):
+ record = yield self.service._recordWithDN(dn)
+ members.add(record)
</ins><span class="cx">
</span><ins>+ returnValue(members)
</ins><span class="cx">
</span><del>- @inlineCallbacks
</del><ins>+
+ # @inlineCallbacks
</ins><span class="cx"> def groups(self):
</span><span class="cx"> raise NotImplementedError()
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextwhotesttest_directorypy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_directory.py (13231 => 13232)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_directory.py        2014-04-09 19:33:34 UTC (rev 13231)
+++ twext/trunk/twext/who/test/test_directory.py        2014-04-09 22:25:43 UTC (rev 13232)
</span><span class="lines">@@ -829,7 +829,7 @@
</span><span class="cx"> wsanchez = self.makeRecord(self.fields_wsanchez)
</span><span class="cx">
</span><span class="cx"> self.assertEquals(
</span><del>- "<DirectoryRecord (user)wsanchez>",
</del><ins>+ "<DirectoryRecord (user)UID:wsanchez>",
</ins><span class="cx"> repr(wsanchez)
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>