<!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>[13026] CalendarServer/branches/users/sagen/move2who-4</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/13026">13026</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-03-28 12:08:49 -0700 (Fri, 28 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add tests to investigate recordsFromExpression failure over AMP</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytestaccountsxml">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/accounts.xml</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytestresourcesxml">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/resources.xml</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavdpstesttest_clientpy">CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytestaccountsxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/accounts.xml (13025 => 13026)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/accounts.xml        2014-03-28 18:08:37 UTC (rev 13025)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/accounts.xml        2014-03-28 19:08:49 UTC (rev 13026)
</span><span class="lines">@@ -242,6 +242,7 @@
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><span class="cx"> <uid>__sagen1__</uid>
</span><ins>+ <short-name>sagen</short-name>
</ins><span class="cx"> <short-name>sagen1</short-name>
</span><span class="cx"> <full-name>Morgen Sagen</full-name>
</span><span class="cx"> <password>negas</password>
</span><span class="lines">@@ -259,6 +260,7 @@
</span><span class="cx"> <record type="user">
</span><span class="cx"> <uid>__dre1__</uid>
</span><span class="cx"> <short-name>dre1</short-name>
</span><ins>+ <short-name>dre</short-name>
</ins><span class="cx"> <full-name>Andre LaBranche</full-name>
</span><span class="cx"> <password>erd</password>
</span><span class="cx"> <email>dre@bitbucket.calendarserver.org</email>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytestresourcesxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/resources.xml (13025 => 13026)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/resources.xml        2014-03-28 18:08:37 UTC (rev 13025)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/resources.xml        2014-03-28 19:08:49 UTC (rev 13026)
</span><span class="lines">@@ -75,4 +75,9 @@
</span><span class="cx"> <full-name>Disabled Record</full-name>
</span><span class="cx"> <email>disabled@example.com</email>
</span><span class="cx"> </record>
</span><ins>+ <record type="location">
+ <uid>__sanchezoffice__</uid>
+ <short-name>sanchezoffice</short-name>
+ <full-name>Sanchez Office</full-name>
+ </record>
</ins><span class="cx"> </directory>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavdpstesttest_clientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py (13025 => 13026)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py        2014-03-28 18:08:37 UTC (rev 13025)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py        2014-03-28 19:08:49 UTC (rev 13026)
</span><span class="lines">@@ -16,8 +16,10 @@
</span><span class="cx">
</span><span class="cx"> import os
</span><span class="cx">
</span><del>-from twext.who.expression import Operand, MatchType, MatchFlags
-from twext.who.idirectory import RecordType
</del><ins>+from twext.who.expression import (
+ Operand, MatchType, MatchFlags, MatchExpression, CompoundExpression
+)
+from twext.who.idirectory import RecordType, FieldName
</ins><span class="cx"> from twisted.cred.credentials import calcResponse, calcHA1, calcHA2
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, succeed
</span><span class="cx"> from twisted.protocols.amp import AMP
</span><span class="lines">@@ -27,6 +29,8 @@
</span><span class="cx"> from txdav.dps.client import DirectoryService
</span><span class="cx"> from txdav.dps.server import DirectoryProxyAMPProtocol
</span><span class="cx"> from txdav.who.directory import CalendarDirectoryServiceMixin
</span><ins>+from twistedcaldav.test.util import StoreTestCase
+from twistedcaldav.config import config
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> testMode = "xml" # "xml" or "od"
</span><span class="lines">@@ -59,7 +63,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class DPSClientTest(unittest.TestCase):
</del><ins>+class DPSClientSingleDirectoryTest(unittest.TestCase):
</ins><span class="cx">
</span><span class="cx"> def setUp(self):
</span><span class="cx">
</span><span class="lines">@@ -204,6 +208,18 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def test_recordsFromMatchExpression(self):
+ expression = MatchExpression(
+ FieldName.uid,
+ testUID,
+ MatchType.equals,
+ MatchFlags.none
+ )
+ records = yield self.directory.recordsFromExpression(expression)
+ self.assertEquals(len(records), 1)
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_verifyPlaintextPassword(self):
</span><span class="cx"> expectations = (
</span><span class="cx"> (testPassword, True), # Correct
</span><span class="lines">@@ -257,3 +273,223 @@
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> self.assertEquals(authenticated, answer)
</span><ins>+
+
+
+
+
+class DPSClientAugmentedAggregateDirectoryTest(StoreTestCase):
+
+ wsanchezUID = u"6423F94A-6B76-4A3A-815B-D52CFD77935D"
+
+ @inlineCallbacks
+ def setUp(self):
+ yield super(DPSClientAugmentedAggregateDirectoryTest, self).setUp()
+
+ # The "local" directory service
+ self.client = DirectoryService(None)
+
+ # The "remote" directory service
+ remoteDirectory = self.directory
+
+ # Connect the two services directly via an IOPump
+ client = AMP()
+ server = DirectoryProxyAMPProtocol(remoteDirectory)
+ pump = returnConnected(server, client)
+
+ # Replace the normal _getConnection method with one that bypasses any
+ # actual networking
+ self.patch(self.client, "_getConnection", lambda: succeed(client))
+
+ # Wrap the normal _call method with one that flushes the IOPump
+ # afterwards
+ origCall = self.client._call
+
+ def newCall(*args, **kwds):
+ d = origCall(*args, **kwds)
+ pump.flush()
+ return d
+
+ self.patch(self.client, "_call", newCall)
+
+
+ def configure(self):
+ """
+ Override configuration hook to turn on wiki.
+ """
+ super(DPSClientAugmentedAggregateDirectoryTest, self).configure()
+ self.patch(config.Authentication.Wiki, "Enabled", True)
+
+
+ @inlineCallbacks
+ def test_uid(self):
+ record = (yield self.client.recordWithUID(self.wsanchezUID))
+ self.assertTrue(u"wsanchez" in record.shortNames)
+
+
+ @inlineCallbacks
+ def test_shortName(self):
+ record = (yield self.client.recordWithShortName(
+ RecordType.user,
+ u"wsanchez"
+ ))
+ self.assertEquals(record.uid, self.wsanchezUID)
+
+
+ def test_guid(self):
+ record = yield self.client.recordWithGUID(self.wsanchezUID)
+ self.assertTrue(u"wsanchez" in record.shortNames)
+
+
+ @inlineCallbacks
+ def test_recordType(self):
+ records = (yield self.client.recordsWithRecordType(
+ RecordType.user
+ ))
+ self.assertEquals(len(records), 31)
+
+
+ @inlineCallbacks
+ def test_emailAddress(self):
+ records = (yield self.client.recordsWithEmailAddress(
+ u"wsanchez@example.com"
+ ))
+ self.assertEquals(len(records), 1)
+ self.assertEquals(records[0].shortNames, [u"wsanchez"])
+
+
+ @inlineCallbacks
+ def test_recordsMatchingTokens(self):
+ records = (yield self.client.recordsMatchingTokens(
+ [u"anche"]
+ ))
+ matchingShortNames = set()
+ for r in records:
+ for shortName in r.shortNames:
+ matchingShortNames.add(shortName)
+ self.assertTrue("dre" in matchingShortNames)
+ self.assertTrue("wsanchez" in matchingShortNames)
+
+
+ @inlineCallbacks
+ def test_recordsMatchingFields_anyType(self):
+ fields = (
+ (u"fullNames", "anche", MatchFlags.caseInsensitive, MatchType.contains),
+ (u"fullNames", "morgen", MatchFlags.caseInsensitive, MatchType.contains),
+ )
+ records = (yield self.client.recordsMatchingFields(
+ fields, operand=Operand.OR, recordType=None
+ ))
+ matchingShortNames = set()
+ for r in records:
+ for shortName in r.shortNames:
+ matchingShortNames.add(shortName)
+ self.assertTrue("sagen" in matchingShortNames)
+ self.assertTrue("dre" in matchingShortNames)
+ self.assertTrue("wsanchez" in matchingShortNames)
+ self.assertTrue("sanchezoffice" in matchingShortNames)
+
+
+ @inlineCallbacks
+ def test_recordsMatchingFields_oneType(self):
+ fields = (
+ (u"fullNames", "anche", MatchFlags.caseInsensitive, MatchType.contains),
+ )
+ records = (yield self.client.recordsMatchingFields(
+ fields, operand=Operand.OR, recordType=RecordType.user
+ ))
+ matchingShortNames = set()
+ for r in records:
+ for shortName in r.shortNames:
+ matchingShortNames.add(shortName)
+ self.assertTrue("dre" in matchingShortNames)
+ self.assertTrue("wsanchez" in matchingShortNames)
+ # This location should *not* appear in the results
+ self.assertFalse("sanchezoffice" in matchingShortNames)
+
+
+ @inlineCallbacks
+ def test_recordsMatchingFields_unsupportedField(self):
+ fields = (
+ (u"fullNames", "anche", MatchFlags.caseInsensitive, MatchType.contains),
+ # This should be ignored:
+ (u"foo", "bar", MatchFlags.caseInsensitive, MatchType.contains),
+ )
+ records = (yield self.client.recordsMatchingFields(
+ fields, operand=Operand.OR, recordType=None
+ ))
+ matchingShortNames = set()
+ for r in records:
+ for shortName in r.shortNames:
+ matchingShortNames.add(shortName)
+ self.assertTrue("dre" in matchingShortNames)
+ self.assertTrue("wsanchez" in matchingShortNames)
+ self.assertTrue("sanchezoffice" in matchingShortNames)
+
+
+ @inlineCallbacks
+ def test_recordsFromMatchExpression(self):
+ expression = MatchExpression(
+ FieldName.uid,
+ u"wsanchez",
+ MatchType.equals,
+ MatchFlags.none
+ )
+ records = yield self.client.recordsFromExpression(expression)
+ self.assertEquals(len(records), 1)
+
+
+ @inlineCallbacks
+ def test_verifyPlaintextPassword(self):
+ expectations = (
+ (u"zehcnasw", True), # Correct
+ ("wrong", False) # Incorrect
+ )
+ record = (
+ yield self.client.recordWithShortName(
+ RecordType.user,
+ u"wsanchez"
+ )
+ )
+
+ for password, answer in expectations:
+ authenticated = (yield record.verifyPlaintextPassword(password))
+ self.assertEquals(authenticated, answer)
+
+
+ @inlineCallbacks
+ def test_verifyHTTPDigest(self):
+ expectations = (
+ (u"zehcnasw", True), # Correct
+ ("wrong", False) # Incorrect
+ )
+ record = (
+ yield self.client.recordWithShortName(
+ RecordType.user,
+ u"wsanchez"
+ )
+ )
+
+ realm = "host.example.com"
+ nonce = "128446648710842461101646794502"
+ algorithm = "md5"
+ uri = "http://host.example.com"
+ method = "GET"
+
+ for password, answer in expectations:
+ for qop, nc, cnonce in (
+ ("", "", ""),
+ ("auth", "00000001", "/rrD6TqPA3lHRmg+fw/vyU6oWoQgzK7h9yWrsCmv/lE="),
+ ):
+ response = calcResponse(
+ calcHA1(algorithm, u"wsanchez", realm, password, nonce, cnonce),
+ calcHA2(algorithm, method, uri, qop, None),
+ algorithm, nonce, nc, cnonce, qop)
+
+ authenticated = (
+ yield record.verifyHTTPDigest(
+ u"wsanchez", realm, uri, nonce, cnonce, algorithm, nc, qop,
+ response, method
+ )
+ )
+ self.assertEquals(authenticated, answer)
</ins></span></pre>
</div>
</div>
</body>
</html>