<!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>[12597] CalendarServer/trunk/txdav/dps</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/12597">12597</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-02-06 16:31:27 -0800 (Thu, 06 Feb 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Adds verifyPlaintextPassword to DPS</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavdpsclientpy">CalendarServer/trunk/txdav/dps/client.py</a></li>
<li><a href="#CalendarServertrunktxdavdpscommandspy">CalendarServer/trunk/txdav/dps/commands.py</a></li>
<li><a href="#CalendarServertrunktxdavdpsserverpy">CalendarServer/trunk/txdav/dps/server.py</a></li>
<li><a href="#CalendarServertrunktxdavdpstesttest_clientpy">CalendarServer/trunk/txdav/dps/test/test_client.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavdpsclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/client.py (12596 => 12597)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/client.py        2014-02-06 23:36:27 UTC (rev 12596)
+++ CalendarServer/trunk/txdav/dps/client.py        2014-02-07 00:31:27 UTC (rev 12597)
</span><span class="lines">@@ -27,9 +27,9 @@
</span><span class="cx"> from twisted.internet.protocol import ClientCreator
</span><span class="cx"> from twisted.protocols import amp
</span><span class="cx"> from txdav.dps.commands import (
</span><del>-    RecordWithShortNameCommand, RecordWithUIDCommand,
-    RecordWithGUIDCommand, RecordsWithRecordTypeCommand,
-    RecordsWithEmailAddressCommand
</del><ins>+    RecordWithShortNameCommand, RecordWithUIDCommand, RecordWithGUIDCommand,
+    RecordsWithRecordTypeCommand, RecordsWithEmailAddressCommand,
+    VerifyPlaintextPasswordCommand
</ins><span class="cx"> )
</span><span class="cx"> import txdav.who.idirectory
</span><span class="cx"> from zope.interface import implementer
</span><span class="lines">@@ -169,10 +169,15 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class DirectoryRecord(BaseDirectoryRecord):
</span><del>-    pass
</del><span class="cx"> 
</span><ins>+    def verifyPlaintextPassword(self, password):
+        return self.service._call(
+            VerifyPlaintextPasswordCommand,
+            lambda x: x['authenticated'],
+            uid=self.uid.encode(&quot;utf-8&quot;),
+            password=password.encode(&quot;utf-8&quot;)
+        )
</ins><span class="cx"> 
</span><del>-
</del><span class="cx"> # Test client:
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -181,14 +186,16 @@
</span><span class="cx">     ds = DirectoryService(None)
</span><span class="cx">     record = (yield ds.recordWithShortName(RecordType.user, &quot;wsanchez&quot;))
</span><span class="cx">     print(&quot;short name: {r}&quot;.format(r=record))
</span><del>-    record = (yield ds.recordWithUID(&quot;__dre__&quot;))
</del><ins>+    record = (yield ds.recordWithUID(&quot;sagen&quot;))
</ins><span class="cx">     print(&quot;uid: {r}&quot;.format(r=record))
</span><ins>+    &quot;&quot;&quot;
</ins><span class="cx">     record = (yield ds.recordWithGUID(&quot;A3B1158F-0564-4F5B-81E4-A89EA5FF81B0&quot;))
</span><span class="cx">     print(&quot;guid: {r}&quot;.format(r=record))
</span><span class="cx">     records = (yield ds.recordsWithRecordType(RecordType.user))
</span><span class="cx">     print(&quot;recordType: {r}&quot;.format(r=records))
</span><span class="cx">     records = (yield ds.recordsWithEmailAddress(&quot;cdaboo@bitbucket.calendarserver.org&quot;))
</span><span class="cx">     print(&quot;emailAddress: {r}&quot;.format(r=records))
</span><ins>+    &quot;&quot;&quot;
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> def succeeded(result):
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpscommandspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/commands.py (12596 => 12597)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/commands.py        2014-02-06 23:36:27 UTC (rev 12596)
+++ CalendarServer/trunk/txdav/dps/commands.py        2014-02-07 00:31:27 UTC (rev 12597)
</span><span class="lines">@@ -80,3 +80,13 @@
</span><span class="cx">     response = [
</span><span class="cx">         ('success', amp.Boolean()),
</span><span class="cx">     ]
</span><ins>+
+
+class VerifyPlaintextPasswordCommand(amp.Command):
+    arguments = [
+        ('uid', amp.String()),
+        ('password', amp.String()),
+    ]
+    response = [
+        ('authenticated', amp.Boolean()),
+    ]
</ins></span></pre></div>
<a id="CalendarServertrunktxdavdpsserverpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/server.py (12596 => 12597)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/server.py        2014-02-06 23:36:27 UTC (rev 12596)
+++ CalendarServer/trunk/txdav/dps/server.py        2014-02-07 00:31:27 UTC (rev 12597)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> from txdav.dps.commands import (
</span><span class="cx">     RecordWithShortNameCommand, RecordWithUIDCommand, RecordWithGUIDCommand,
</span><span class="cx">     RecordsWithRecordTypeCommand, RecordsWithEmailAddressCommand,
</span><ins>+    VerifyPlaintextPasswordCommand
</ins><span class="cx">     # UpdateRecordsCommand, RemoveRecordsCommand
</span><span class="cx"> )
</span><span class="cx"> from txdav.who.xml import DirectoryService as XMLDirectoryService
</span><span class="lines">@@ -155,8 +156,24 @@
</span><span class="cx">         returnValue(response)
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+    @VerifyPlaintextPasswordCommand.responder
+    @inlineCallbacks
+    def verifyPlaintextPassword(self, uid, password):
+        uid = uid.decode(&quot;utf-8&quot;)
+        log.debug(&quot;VerifyPlaintextPassword: {u}&quot;, u=uid)
+        record = (yield self._directory.recordWithUID(uid))
+        authenticated = False
+        if record is not None:
+            authenticated = (yield record.verifyPlaintextPassword(password))
+        response = {
+            &quot;authenticated&quot;: authenticated,
+        }
+        log.debug(&quot;Responding with: {response}&quot;, response=response)
+        returnValue(response)
</ins><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
+
</ins><span class="cx"> class DirectoryProxyAMPFactory(Factory):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     &quot;&quot;&quot;
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpstesttest_clientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/test/test_client.py (12596 => 12597)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/test/test_client.py        2014-02-06 23:36:27 UTC (rev 12596)
+++ CalendarServer/trunk/txdav/dps/test/test_client.py        2014-02-07 00:31:27 UTC (rev 12597)
</span><span class="lines">@@ -99,3 +99,16 @@
</span><span class="cx">         ))
</span><span class="cx">         self.assertEquals(len(records), 1)
</span><span class="cx">         self.assertEquals(records[0].shortNames, [u&quot;cdaboo&quot;])
</span><ins>+
+
+    @inlineCallbacks
+    def test_verifyPlaintextPassword(self):
+        record = (yield self.directory.recordWithUID(&quot;__dre__&quot;))
+
+        # Correct password
+        authenticated = (yield record.verifyPlaintextPassword(&quot;erd&quot;))
+        self.assertTrue(authenticated)
+
+        # Incorrect password
+        authenticated = (yield record.verifyPlaintextPassword(&quot;wrong&quot;))
+        self.assertFalse(authenticated)
</ins></span></pre>
</div>
</div>

</body>
</html>