<!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>[12814] CalendarServer/branches/release/CalendarServer-5.2-dev/twistedcaldav/directory</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/12814">12814</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-03-05 07:40:18 -0800 (Wed, 05 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Properly decode principal URIs when searching for records.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesreleaseCalendarServer52devtwistedcaldavdirectorydirectorypy">CalendarServer/branches/release/CalendarServer-5.2-dev/twistedcaldav/directory/directory.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer52devtwistedcaldavdirectorytesttest_directorypy">CalendarServer/branches/release/CalendarServer-5.2-dev/twistedcaldav/directory/test/test_directory.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesreleaseCalendarServer52devtwistedcaldavdirectorydirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/twistedcaldav/directory/directory.py (12813 => 12814)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.2-dev/twistedcaldav/directory/directory.py 2014-03-05 15:22:47 UTC (rev 12813)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/twistedcaldav/directory/directory.py 2014-03-05 15:40:18 UTC (rev 12814)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> import pwd
</span><span class="cx"> import sys
</span><span class="cx"> import types
</span><ins>+from urllib import unquote
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="lines">@@ -234,7 +235,7 @@
</span><span class="cx"> else:
</span><span class="cx"> return None
</span><span class="cx"> elif address.startswith("/principals/"):
</span><del>- parts = address.split("/")
</del><ins>+ parts = map(unquote, address.split("/"))
</ins><span class="cx"> if len(parts) == 4:
</span><span class="cx"> if parts[2] == "__uids__":
</span><span class="cx"> guid = parts[3]
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer52devtwistedcaldavdirectorytesttest_directorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/twistedcaldav/directory/test/test_directory.py (12813 => 12814)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.2-dev/twistedcaldav/directory/test/test_directory.py 2014-03-05 15:22:47 UTC (rev 12813)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/twistedcaldav/directory/test/test_directory.py 2014-03-05 15:40:18 UTC (rev 12814)
</span><span class="lines">@@ -1086,6 +1086,85 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+class DirectoryServiceTests(TestCase):
+ """
+ Test L{DirectoryService} apis.
+ """
+
+ class StubDirectoryService(DirectoryService):
+
+ def __init__(self):
+ self._records = {}
+
+
+ def createRecord(self, recordType, guid=None, shortNames=(), authIDs=set(),
+ fullName=None, firstName=None, lastName=None, emailAddresses=set(),
+ uid=None, password=None, **kwargs):
+ """
+ Create/persist a directory record based on the given values
+ """
+
+ record = DirectoryRecord(
+ self,
+ recordType,
+ guid=guid,
+ shortNames=shortNames,
+ authIDs=authIDs,
+ fullName=fullName,
+ firstName=firstName,
+ lastName=lastName,
+ emailAddresses=emailAddresses,
+ uid=uid,
+ password=password,
+ **kwargs
+ )
+ self._records.setdefault(recordType, []).append(record)
+
+
+ def recordTypes(self):
+ return self._records.keys()
+
+
+ def listRecords(self, recordType):
+ return self._records[recordType]
+
+
+ def setUp(self):
+ self.service = self.StubDirectoryService()
+ self.service.setRealm("test")
+ self.service.baseGUID = "0E8E6EC2-8E52-4FF3-8F62-6F398B08A498"
+
+
+ def test_recordWithCalendarUserAddress_principal_uris(self):
+ """
+ Make sure that recordWithCalendarUserAddress handles percent-encoded
+ principal URIs.
+ """
+
+ self.service.createRecord(
+ DirectoryService.recordType_users,
+ guid="user01",
+ shortNames=("user 01", "User 01"),
+ fullName="User 01",
+ enabledForCalendaring=True,
+ )
+ self.service.createRecord(
+ DirectoryService.recordType_users,
+ guid="user02",
+ shortNames=("user02", "User 02"),
+ fullName="User 02",
+ enabledForCalendaring=True,
+ )
+
+ record = self.service.recordWithCalendarUserAddress("/principals/users/user%2001")
+ self.assertTrue(record is not None)
+ record = self.service.recordWithCalendarUserAddress("/principals/users/user02")
+ self.assertTrue(record is not None)
+ record = self.service.recordWithCalendarUserAddress("/principals/users/user%0202")
+ self.assertTrue(record is None)
+
+
+
</ins><span class="cx"> class DirectoryRecordTests(TestCase):
</span><span class="cx"> """
</span><span class="cx"> Test L{DirectoryRecord} apis.
</span></span></pre>
</div>
</div>
</body>
</html>