<!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>[12141] 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/12141">12141</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-12-18 19:09:42 -0800 (Wed, 18 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup auth</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhoopendirectoryservicepy">twext/trunk/twext/who/opendirectory/service.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwhoopendirectoryservicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/service.py (12140 => 12141)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/service.py 2013-12-19 02:27:55 UTC (rev 12140)
+++ twext/trunk/twext/who/opendirectory/service.py 2013-12-19 03:09:42 UTC (rev 12141)
</span><span class="lines">@@ -622,50 +622,64 @@
</span><span class="cx">
</span><span class="cx"> record = self._getUserRecord(credentials.username)
</span><span class="cx">
</span><del>- if record is not None:
</del><ins>+ if record is None:
+ return fail(UnauthorizedLogin("No such user"))
</ins><span class="cx">
</span><del>- if IUsernamePassword.providedBy(credentials):
- result, error = record.verifyPassword_error_(
- credentials.password, None
- )
- if not error and result:
- return succeed(self._adaptODRecord(record))
</del><ins>+ if IUsernamePassword.providedBy(credentials):
+ result, error = record.verifyPassword_error_(
+ credentials.password, None
+ )
</ins><span class="cx">
</span><del>- elif isinstance(credentials, DigestedCredentials):
- try:
- credentials.fields.setdefault("algorithm", "md5")
- challenge = (
- 'Digest realm="{realm}", nonce="{nonce}", '
- 'algorithm={algorithm}'
- .format(**credentials.fields)
- )
- response = credentials.fields["response"]
- except KeyError as e:
- self.log.error(
- "Error authenticating against OpenDirectory: "
- "missing digest response field {field!r} in "
- "{credentials.fields!r}",
- field=e.args[0], credentials=credentials
- )
- return fail(UnauthorizedLogin())
</del><ins>+ if error:
+ return fail(UnauthorizedLogin(error))
</ins><span class="cx">
</span><del>- result, m1, m2, error = record.verifyExtendedWithAuthenticationType_authenticationItems_continueItems_context_error_(
- "dsAuthMethodStandard:dsAuthNodeDIGEST-MD5",
- [
- credentials.username,
- challenge,
- response,
- credentials.method,
- ],
- None, None, None
</del><ins>+ if result:
+ return succeed(self._adaptODRecord(record))
+
+ elif isinstance(credentials, DigestedCredentials):
+ try:
+ credentials.fields.setdefault("algorithm", "md5")
+ challenge = (
+ 'Digest realm="{realm}", nonce="{nonce}", '
+ 'algorithm={algorithm}'
+ .format(**credentials.fields)
</ins><span class="cx"> )
</span><ins>+ response = credentials.fields["response"]
</ins><span class="cx">
</span><del>- if not error and result:
- return succeed(self._adaptODRecord(record))
</del><ins>+ except KeyError as e:
+ self.log.error(
+ "Error authenticating against OpenDirectory: "
+ "missing digest response field {field!r} in "
+ "{credentials.fields!r}",
+ field=e.args[0], credentials=credentials
+ )
+ return fail(UnauthorizedLogin("Invalid digest challenge"))
</ins><span class="cx">
</span><del>- return fail(UnauthorizedLogin())
</del><ins>+ result, m1, m2, error = record.verifyExtendedWithAuthenticationType_authenticationItems_continueItems_context_error_(
+ "dsAuthMethodStandard:dsAuthNodeDIGEST-MD5",
+ [
+ credentials.username,
+ challenge,
+ response,
+ credentials.method,
+ ],
+ None, None, None
+ )
</ins><span class="cx">
</span><ins>+ if error:
+ return fail(UnauthorizedLogin(error))
</ins><span class="cx">
</span><ins>+ if result:
+ return succeed(self._adaptODRecord(record))
+
+ else:
+ return fail(UnauthorizedLogin(
+ "Unknown credentials type: {0}".format(type(credentials))
+ ))
+
+ return fail(UnauthorizedLogin("Unknown authorization failure"))
+
+
</ins><span class="cx"> class CustomDigestCredentialFactory(DigestCredentialFactory):
</span><span class="cx"> """
</span><span class="cx"> DigestCredentialFactory without qop, to interop with OD.
</span></span></pre>
</div>
</div>
</body>
</html>