<!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>[12915] CalendarServer/branches/users/sagen/move2who-4/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/12915">12915</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-03-14 13:39:02 -0700 (Fri, 14 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get auth working again</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavdpstesttest_clientpy">CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavwhoaugmentpy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/augment.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavwhodirectorypy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4txdavdpstesttest_clientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py (12914 => 12915)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py 2014-03-14 19:23:36 UTC (rev 12914)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py 2014-03-14 20:39:02 UTC (rev 12915)
</span><span class="lines">@@ -30,21 +30,26 @@
</span><span class="cx">
</span><span class="cx"> testMode = "xml" # "xml" or "od"
</span><span class="cx"> if testMode == "xml":
</span><ins>+ testShortName = u"wsanchez"
+ testUID = u"__wsanchez__"
+ testPassword = u"zehcnasw"
</ins><span class="cx"> from txdav.who.xml import DirectoryService as XMLDirectoryService
</span><span class="cx">
</span><span class="cx"> # Mix in the calendar-specific service methods
</span><del>- class CalendarXMLDirectorySerivce(
</del><ins>+ class CalendarXMLDirectoryService(
</ins><span class="cx"> XMLDirectoryService,
</span><span class="cx"> CalendarDirectoryServiceMixin
</span><span class="cx"> ):
</span><span class="cx"> pass
</span><span class="cx">
</span><span class="cx"> elif testMode == "od":
</span><del>- odpw = "secret"
</del><ins>+ testShortName = u"becausedigest"
+ testUID = u"381D56CA-3B89-4AA1-942A-D4BFBC4F6F69"
+ testPassword = u"password"
</ins><span class="cx"> from twext.who.opendirectory import DirectoryService as OpenDirectoryService
</span><span class="cx">
</span><span class="cx"> # Mix in the calendar-specific service methods
</span><del>- class CalendarODDirectorySerivce(
</del><ins>+ class CalendarODDirectoryService(
</ins><span class="cx"> OpenDirectoryService,
</span><span class="cx"> CalendarDirectoryServiceMixin
</span><span class="cx"> ):
</span><span class="lines">@@ -63,9 +68,9 @@
</span><span class="cx"> # The "remote" directory service
</span><span class="cx"> if testMode == "xml":
</span><span class="cx"> path = os.path.join(os.path.dirname(__file__), "test.xml")
</span><del>- remoteDirectory = CalendarXMLDirectorySerivce(FilePath(path))
</del><ins>+ remoteDirectory = CalendarXMLDirectoryService(FilePath(path))
</ins><span class="cx"> elif testMode == "od":
</span><del>- remoteDirectory = CalendarODDirectorySerivce()
</del><ins>+ remoteDirectory = CalendarODDirectoryService()
</ins><span class="cx">
</span><span class="cx"> # Connect the two services directly via an IOPump
</span><span class="cx"> client = AMP()
</span><span class="lines">@@ -90,42 +95,42 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_uid(self):
</span><del>- record = (yield self.directory.recordWithUID("__dre__"))
- self.assertEquals(record.shortNames, [u"dre"])
</del><ins>+ record = (yield self.directory.recordWithUID(testUID))
+ self.assertTrue(testShortName in record.shortNames)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_shortName(self):
</span><span class="cx"> record = (yield self.directory.recordWithShortName(
</span><span class="cx"> RecordType.user,
</span><del>- "wsanchez"
</del><ins>+ testShortName
</ins><span class="cx"> ))
</span><del>- self.assertEquals(record.shortNames, [u'wsanchez', u'wilfredo_sanchez'])
</del><ins>+ self.assertEquals(record.uid, testUID)
</ins><span class="cx">
</span><span class="cx">
</span><del>- @inlineCallbacks
</del><span class="cx"> def test_guid(self):
</span><del>- record = (yield self.directory.recordWithGUID(
- "A3B1158F-0564-4F5B-81E4-A89EA5FF81B0"
- ))
- self.assertEquals(record.shortNames, [u'dre'])
</del><ins>+ if testMode == "od":
+ record = (yield self.directory.recordWithGUID(testUID))
+ self.assertTrue(testShortName in record.shortNames)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_recordType(self):
</span><del>- records = (yield self.directory.recordsWithRecordType(
- RecordType.user
- ))
- self.assertEquals(len(records), 9)
</del><ins>+ if testMode != "od":
+ records = (yield self.directory.recordsWithRecordType(
+ RecordType.user
+ ))
+ self.assertEquals(len(records), 9)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_emailAddress(self):
</span><del>- records = (yield self.directory.recordsWithEmailAddress(
- "cdaboo@bitbucket.calendarserver.org"
- ))
- self.assertEquals(len(records), 1)
- self.assertEquals(records[0].shortNames, [u"cdaboo"])
</del><ins>+ if testMode == "xml":
+ records = (yield self.directory.recordsWithEmailAddress(
+ "cdaboo@bitbucket.calendarserver.org"
+ ))
+ self.assertEquals(len(records), 1)
+ self.assertEquals(records[0].shortNames, [u"cdaboo"])
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -133,33 +138,26 @@
</span><span class="cx"> records = (yield self.directory.recordsMatchingTokens(
</span><span class="cx"> [u"anche"]
</span><span class="cx"> ))
</span><del>- self.assertEquals(len(records), 2)
- self.assertEquals(
- set([u"__dre__", u"__wsanchez__"]),
- set([r.uid for r in records])
- )
</del><ins>+ matchingShortNames = set()
+ for r in records:
+ for shortName in r.shortNames:
+ matchingShortNames.add(shortName)
+ self.assertTrue("dre" in matchingShortNames)
+ self.assertTrue("wsanchez" in matchingShortNames)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_verifyPlaintextPassword(self):
</span><del>- if testMode == "xml":
- expectations = (
- ("erd", True), # Correct
- ("wrong", False) # Incorrect
</del><ins>+ expectations = (
+ (testPassword, True), # Correct
+ ("wrong", False) # Incorrect
+ )
+ record = (
+ yield self.directory.recordWithShortName(
+ RecordType.user,
+ testShortName
</ins><span class="cx"> )
</span><del>- record = (
- yield self.directory.recordWithShortName(RecordType.user, "dre")
- )
- elif testMode == "od":
- expectations = (
- (odpw, True), # Correct
- ("wrong", False) # Incorrect
- )
- record = (
- yield self.directory.recordWithGUID(
- "D0B38B00-4166-11DD-B22C-A07C87F02F6A"
- )
- )
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx"> for password, answer in expectations:
</span><span class="cx"> authenticated = (yield record.verifyPlaintextPassword(password))
</span><span class="lines">@@ -168,26 +166,16 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_verifyHTTPDigest(self):
</span><del>- if testMode == "xml":
- username = "dre"
- expectations = (
- ("erd", True), # Correct
- ("wrong", False) # Incorrect
</del><ins>+ expectations = (
+ (testPassword, True), # Correct
+ ("wrong", False) # Incorrect
+ )
+ record = (
+ yield self.directory.recordWithShortName(
+ RecordType.user,
+ testShortName
</ins><span class="cx"> )
</span><del>- record = (
- yield self.directory.recordWithShortName(RecordType.user, "dre")
- )
- elif testMode == "od":
- username = "sagen"
- expectations = (
- (odpw, True), # Correct
- ("wrong", False) # Incorrect
- )
- record = (
- yield self.directory.recordWithGUID(
- "D0B38B00-4166-11DD-B22C-A07C87F02F6A"
- )
- )
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx"> realm = "host.example.com"
</span><span class="cx"> nonce = "128446648710842461101646794502"
</span><span class="lines">@@ -201,13 +189,13 @@
</span><span class="cx"> ("auth", "00000001", "/rrD6TqPA3lHRmg+fw/vyU6oWoQgzK7h9yWrsCmv/lE="),
</span><span class="cx"> ):
</span><span class="cx"> response = calcResponse(
</span><del>- calcHA1(algorithm, username, realm, password, nonce, cnonce),
</del><ins>+ calcHA1(algorithm, testShortName, realm, password, nonce, cnonce),
</ins><span class="cx"> calcHA2(algorithm, method, uri, qop, None),
</span><span class="cx"> algorithm, nonce, nc, cnonce, qop)
</span><span class="cx">
</span><span class="cx"> authenticated = (
</span><span class="cx"> yield record.verifyHTTPDigest(
</span><del>- username, realm, uri, nonce, cnonce, algorithm, nc, qop,
</del><ins>+ testShortName, realm, uri, nonce, cnonce, algorithm, nc, qop,
</ins><span class="cx"> response, method
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhoaugmentpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/augment.py (12914 => 12915)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/augment.py 2014-03-14 19:23:36 UTC (rev 12914)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/augment.py 2014-03-14 20:39:02 UTC (rev 12915)
</span><span class="lines">@@ -66,6 +66,14 @@
</span><span class="cx"> returnValue(augmented)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def verifyPlaintextPassword(self, password):
+ return self._baseRecord.verifyPlaintextPassword(password)
+
+
+ def verifyHTTPDigest(self, *args):
+ return self._baseRecord.verifyHTTPDigest(*args)
+
+
</ins><span class="cx"> @implementer(IDirectoryService, IStoreDirectoryService)
</span><span class="cx"> class AugmentedDirectoryService(BaseDirectoryService,
</span><span class="cx"> CalendarDirectoryServiceMixin):
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhodirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py (12914 => 12915)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py 2014-03-14 19:23:36 UTC (rev 12914)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py 2014-03-14 20:39:02 UTC (rev 12915)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> def verifyCredentials(self, credentials):
</span><span class="cx">
</span><span class="cx"> # XYZZY REMOVE THIS, it bypasses all authentication!:
</span><del>- returnValue(True)
</del><ins>+ # returnValue(True)
</ins><span class="cx">
</span><span class="cx"> if isinstance(credentials, UsernamePassword):
</span><span class="cx"> log.debug("UsernamePassword")
</span></span></pre>
</div>
</div>
</body>
</html>