<!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>[13835] twext/trunk/twext/who/opendirectory/_service.py</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/13835">13835</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-08-04 17:17:30 -0700 (Mon, 04 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>deferToThread for OD queries</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhoopendirectory_servicepy">twext/trunk/twext/who/opendirectory/_service.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwhoopendirectory_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/_service.py (13834 => 13835)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/_service.py 2014-08-05 00:15:20 UTC (rev 13834)
+++ twext/trunk/twext/who/opendirectory/_service.py 2014-08-05 00:17:30 UTC (rev 13835)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> from zope.interface import implementer
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import succeed, fail, inlineCallbacks, returnValue
</span><ins>+from twisted.internet.threads import deferToThread
</ins><span class="cx"> from twisted.web.guard import DigestCredentialFactory
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="lines">@@ -52,6 +53,7 @@
</span><span class="cx"> ODSearchPath, ODRecordType, ODAttribute, ODMatchType, ODAuthMethod,
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+DEFER_TO_THREAD = True
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> #
</span><span class="lines">@@ -641,6 +643,7 @@
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
</ins><span class="cx"> def _recordsFromQuery(self, query):
</span><span class="cx"> """
</span><span class="cx"> Executes a query and generates directory records from it.
</span><span class="lines">@@ -652,23 +655,35 @@
</span><span class="cx"> @rtype: list of L{DirectoryRecord}
</span><span class="cx"> """
</span><span class="cx">
</span><del>- # FIXME: This is blocking.
</del><span class="cx"> # We can call scheduleInRunLoop:forMode:, which will call back to
</span><span class="cx"> # its delegate...
</span><span class="cx">
</span><span class="cx"> if query is None:
</span><del>- return succeed([])
</del><ins>+ returnValue(None)
</ins><span class="cx">
</span><del>- odRecords, error = query.resultsAllowingPartial_error_(False, None)
</del><ins>+ if DEFER_TO_THREAD:
+ odRecords, error = (
+ yield deferToThread(
+ query.resultsAllowingPartial_error_,
+ False,
+ None
+ )
+ )
+ else:
+ odRecords, error = query.resultsAllowingPartial_error_(False, None)
</ins><span class="cx">
</span><span class="cx"> if error:
</span><span class="cx"> self.log.error(
</span><span class="cx"> "Error while executing OpenDirectory query: {error}",
</span><span class="cx"> error=error
</span><span class="cx"> )
</span><del>- return fail(OpenDirectoryQueryError(
- "Unable to execute OpenDirectory query", error
- ))
</del><ins>+ returnValue(
+ fail(
+ OpenDirectoryQueryError(
+ "Unable to execute OpenDirectory query", error
+ )
+ )
+ )
</ins><span class="cx">
</span><span class="cx"> result = []
</span><span class="cx"> for odRecord in odRecords:
</span><span class="lines">@@ -689,7 +704,7 @@
</span><span class="cx">
</span><span class="cx"> result.append(record)
</span><span class="cx">
</span><del>- return succeed(result)
</del><ins>+ returnValue(result)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def recordsFromNonCompoundExpression(self, expression, recordTypes=None, records=None):
</span><span class="lines">@@ -974,15 +989,27 @@
</span><span class="cx"> # Verifiers for twext.who.checker stuff.
</span><span class="cx"> #
</span><span class="cx">
</span><ins>+ @inlineCallbacks
</ins><span class="cx"> def verifyPlaintextPassword(self, password):
</span><del>- result, error = self._odRecord.verifyPassword_error_(password, None)
</del><span class="cx">
</span><ins>+ if DEFER_TO_THREAD:
+ result, error = (
+ yield deferToThread(
+ self._odRecord.verifyPassword_error_,
+ password,
+ None
+ )
+ )
+ else:
+ result, error = self._odRecord.verifyPassword_error_(password, None)
+
</ins><span class="cx"> if error:
</span><del>- return succeed(False)
</del><ins>+ returnValue(False)
</ins><span class="cx">
</span><del>- return succeed(result)
</del><ins>+ returnValue(result)
</ins><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
</ins><span class="cx"> def verifyHTTPDigest(
</span><span class="cx"> self, username, realm, uri, nonce, cnonce,
</span><span class="cx"> algorithm, nc, qop, response, method,
</span><span class="lines">@@ -1016,16 +1043,26 @@
</span><span class="cx"> response=response
</span><span class="cx"> )
</span><span class="cx">
</span><del>- result, _ignore_m1, _ignore_m2, error = self._odRecord.verifyExtendedWithAuthenticationType_authenticationItems_continueItems_context_error_(
- ODAuthMethod.digestMD5.value,
- [username, challenge, responseArg, method],
- None, None, None
- )
</del><ins>+ if DEFER_TO_THREAD:
+ result, _ignore_m1, _ignore_m2, error = (
+ yield deferToThread(
+ self._odRecord.verifyExtendedWithAuthenticationType_authenticationItems_continueItems_context_error_,
+ ODAuthMethod.digestMD5.value,
+ [username, challenge, responseArg, method],
+ None, None, None
+ )
+ )
+ else:
+ result, _ignore_m1, _ignore_m2, error = self._odRecord.verifyExtendedWithAuthenticationType_authenticationItems_continueItems_context_error_(
+ ODAuthMethod.digestMD5.value,
+ [username, challenge, responseArg, method],
+ None, None, None
+ )
</ins><span class="cx">
</span><span class="cx"> if error:
</span><del>- return succeed(False)
</del><ins>+ returnValue(False)
</ins><span class="cx">
</span><del>- return succeed(result)
</del><ins>+ returnValue(result)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span></span></pre>
</div>
</div>
</body>
</html>