<!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>[12223] 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/12223">12223</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-02 18:23:19 -0800 (Thu, 02 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Work on OD digest</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhocheckerpy">twext/trunk/twext/who/checker.py</a></li>
<li><a href="#twexttrunktwextwhoopendirectory__init__py">twext/trunk/twext/who/opendirectory/__init__.py</a></li>
<li><a href="#twexttrunktwextwhoopendirectory_servicepy">twext/trunk/twext/who/opendirectory/_service.py</a></li>
<li><a href="#twexttrunktwextwhotestauth_resourcerpy">twext/trunk/twext/who/test/auth_resource.rpy</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwhocheckerpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/checker.py (12222 => 12223)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/checker.py 2014-01-03 01:55:45 UTC (rev 12222)
+++ twext/trunk/twext/who/checker.py 2014-01-03 02:23:19 UTC (rev 12223)
</span><span class="lines">@@ -135,75 +135,3 @@
</span><span class="cx"> returnValue(record)
</span><span class="cx">
</span><span class="cx"> raise UnauthorizedLogin("Incorrect password")
</span><del>-
-
-
-
-
-# class Yuck(object):
-# def requestAvatarId(self, credentials):
-# odRecord = self._getUserRecord(credentials.username)
-
-# if odRecord is None:
-# return fail(UnauthorizedLogin("No such user"))
-
-# if 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("Invalid digest challenge"))
-
-# result, m1, m2, error = odRecord.verifyExtendedWithAuthenticationType_authenticationItems_continueItems_context_error_(
-# u"dsAuthMethodStandard:dsAuthNodeDIGEST-MD5",
-# [
-# credentials.username,
-# challenge,
-# response,
-# credentials.method,
-# ],
-# None, None, None
-# )
-
-# if error:
-# return fail(UnauthorizedLogin(error))
-
-# if result:
-# return succeed(DirectoryRecord(self, odRecord))
-
-# else:
-# return fail(UnauthorizedLogin(
-# "Unknown credentials type: {0}".format(type(credentials))
-# ))
-
-# return fail(UnauthorizedLogin("Unknown authorization failure"))
-
-
-
-
-
-
-
-# from twisted.web.guard import DigestCredentialFactory
-
-# class CustomDigestCredentialFactory(DigestCredentialFactory):
-# """
-# DigestCredentialFactory without qop, to interop with OD.
-# """
-
-# def getChallenge(self, address):
-# result = DigestCredentialFactory.getChallenge(self, address)
-# del result["qop"]
-# return result
</del></span></pre></div>
<a id="twexttrunktwextwhoopendirectory__init__py"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/__init__.py (12222 => 12223)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/__init__.py 2014-01-03 01:55:45 UTC (rev 12222)
+++ twext/trunk/twext/who/opendirectory/__init__.py 2014-01-03 02:23:19 UTC (rev 12223)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> "OpenDirectoryDataError",
</span><span class="cx"> "DirectoryService",
</span><span class="cx"> "DirectoryRecord",
</span><ins>+ "NoQOPDigestCredentialFactory",
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -32,4 +33,5 @@
</span><span class="cx"> OpenDirectoryError, OpenDirectoryConnectionError, OpenDirectoryQueryError,
</span><span class="cx"> OpenDirectoryDataError,
</span><span class="cx"> DirectoryService,
</span><ins>+ NoQOPDigestCredentialFactory,
</ins><span class="cx"> )
</span></span></pre></div>
<a id="twexttrunktwextwhoopendirectory_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/_service.py (12222 => 12223)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/_service.py 2014-01-03 01:55:45 UTC (rev 12222)
+++ twext/trunk/twext/who/opendirectory/_service.py 2014-01-03 02:23:19 UTC (rev 12223)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx">
</span><span class="cx"> from twisted.python.constants import Names, NamedConstant
</span><span class="cx"> from twisted.internet.defer import succeed, fail
</span><ins>+from twisted.web.guard import DigestCredentialFactory
</ins><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx">
</span><span class="lines">@@ -584,13 +585,39 @@
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+ print("username = {0!r}".format(username))
+ print("realm = {0!r}".format(realm))
+ print("uri = {0!r}".format(uri))
+ print("nonce = {0!r}".format(nonce))
+ print("cnonce = {0!r}".format(cnonce))
+ print("algorithm = {0!r}".format(algorithm))
+ print("nc = {0!r}".format(nc))
+ print("qop = {0!r}".format(qop))
+ print("response = {0!r}".format(response))
+ print("method = {0!r}".format(method))
+ print("challenge = {0!r}".format(challenge))
+
</ins><span class="cx"> result, m1, m2, error = self._odRecord.verifyExtendedWithAuthenticationType_authenticationItems_continueItems_context_error_(
</span><del>- ODAuthMethod.digestMD5.value
</del><ins>+ ODAuthMethod.digestMD5.value,
</ins><span class="cx"> [username, challenge, response, method],
</span><span class="cx"> None, None, None
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+ print(result, m1, m2, error)
+
</ins><span class="cx"> if error:
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx"> return result
</span><ins>+
+
+
+class NoQOPDigestCredentialFactory(DigestCredentialFactory):
+ """
+ DigestCredentialFactory without qop, to interop with OD.
+ """
+
+ def getChallenge(self, address):
+ result = DigestCredentialFactory.getChallenge(self, address)
+ del result["qop"]
+ return result
</ins></span></pre></div>
<a id="twexttrunktwextwhotestauth_resourcerpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/auth_resource.rpy (12222 => 12223)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/auth_resource.rpy 2014-01-03 01:55:45 UTC (rev 12222)
+++ twext/trunk/twext/who/test/auth_resource.rpy 2014-01-03 02:23:19 UTC (rev 12223)
</span><span class="lines">@@ -20,13 +20,15 @@
</span><span class="cx"> from twisted.web.resource import IResource
</span><span class="cx"> from twisted.web.guard import (
</span><span class="cx"> HTTPAuthSessionWrapper,
</span><del>- # BasicCredentialFactory,
- DigestCredentialFactory,
</del><ins>+ BasicCredentialFactory,
+ # DigestCredentialFactory,
</ins><span class="cx"> )
</span><span class="cx"> from twisted.web.static import Data
</span><span class="cx">
</span><del>-from twext.who.test.test_xml import xmlService as DirectoryService
-# from twext.who.checker import UsernamePasswordCredentialChecker
</del><ins>+# from twext.who.test.test_xml import xmlService as DirectoryService
+from twext.who.opendirectory import DirectoryService
+from twext.who.opendirectory import NoQOPDigestCredentialFactory as DigestCredentialFactory
+from twext.who.checker import UsernamePasswordCredentialChecker
</ins><span class="cx"> from twext.who.checker import HTTPDigestCredentialChecker
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -42,7 +44,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-directory = DirectoryService("/tmp/auth.xml")
</del><ins>+# directory = DirectoryService("/tmp/auth.xml")
+directory = DirectoryService()
</ins><span class="cx">
</span><span class="cx"> checkers = [
</span><span class="cx"> HTTPDigestCredentialChecker(directory),
</span></span></pre>
</div>
</div>
</body>
</html>