<!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>[12399] twext/trunk/twext/who/ldap/test/test_service.py</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/12399">12399</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-20 12:10:14 -0800 (Mon, 20 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Patch mockldap to handle some wild cards.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwholdaptesttest_servicepy">twext/trunk/twext/who/ldap/test/test_service.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwholdaptesttest_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/test/test_service.py (12398 => 12399)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/test/test_service.py 2014-01-20 04:35:14 UTC (rev 12398)
+++ twext/trunk/twext/who/ldap/test/test_service.py 2014-01-20 20:10:14 UTC (rev 12399)
</span><span class="lines">@@ -25,6 +25,11 @@
</span><span class="cx"> import ldap
</span><span class="cx"> from mockldap import MockLdap
</span><span class="cx">
</span><ins>+from mockldap.filter import (
+ Test as MockLDAPFilterTest,
+ UnsupportedOp as MockLDAPUnsupportedOp,
+)
+
</ins><span class="cx"> from twisted.python.constants import NamedConstant, ValueConstant
</span><span class="cx"> from twisted.python.filepath import FilePath
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="lines">@@ -71,6 +76,32 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def setUp(self):
</span><ins>+ def parse_expression(
+ self, upcall=MockLDAPFilterTest._parse_expression
+ ):
+ try:
+ # Try the stock implementation first.
+ return upcall(self)
+
+ except MockLDAPUnsupportedOp as e:
+ if (
+ len(e.args) == 1 and
+ e.args[0].startswith(u"Wildcard matches are not supported")
+ ):
+ return mockldap_parse_wildcard_expression(self)
+
+ raise
+
+ def matches(self, dn, attrs, upcall=MockLDAPFilterTest.matches):
+ if upcall(self, dn, attrs):
+ return True
+ else:
+ return mockldap_matches(self, dn, attrs)
+
+
+ self.patch(MockLDAPFilterTest, "_parse_expression", parse_expression)
+ self.patch(MockLDAPFilterTest, "matches", matches)
+
</ins><span class="cx"> self.xmlSeedService = xmlService(self.mktemp())
</span><span class="cx"> self.mockData = mockDirectoryDataFromXMLService(self.xmlSeedService)
</span><span class="cx">
</span><span class="lines">@@ -141,23 +172,6 @@
</span><span class="cx"> test_queryCaseInsensitiveNoIndex.todo = "?"
</span><span class="cx">
</span><span class="cx">
</span><del>- def test_queryStartsWith(self):
- return (
- BaseDirectoryServiceQueryTestMixIn.test_queryStartsWith(self)
- )
-
- test_queryStartsWith.todo = "?"
-
-
- def test_queryStartsWithNoIndex(self):
- return (
- BaseDirectoryServiceQueryTestMixIn
- .test_queryStartsWithNoIndex(self)
- )
-
- test_queryStartsWithNoIndex.todo = "?"
-
-
</del><span class="cx"> def test_queryStartsWithNot(self):
</span><span class="cx"> return BaseDirectoryServiceQueryTestMixIn.test_queryStartsWithNot(self)
</span><span class="cx">
</span><span class="lines">@@ -425,3 +439,88 @@
</span><span class="cx"> data[dn] = recordData
</span><span class="cx">
</span><span class="cx"> return data
</span><ins>+
+
+
+#
+# mockldap patches
+#
+
+class WildcardExpression(object):
+ first = None
+ middle = []
+ last = None
+
+
+def mockldap_parse_wildcard_expression(self):
+ match = self.TEST_RE.match(self.content)
+
+ if match is None:
+ raise ldap.FILTER_ERROR(
+ u"Failed to parse filter item %r at pos %d"
+ % (self.content, self.start)
+ )
+
+ self.attr, self.op, valueExpression = match.groups()
+
+ if self.op != "=":
+ raise MockLDAPUnsupportedOp(
+ u"Operation %r is not supported" % (self.op,)
+ )
+
+ if (u"*" not in valueExpression):
+ raise NotImplementedError(u"I only deal with wild cards")
+
+ values = []
+
+ for value in valueExpression.split(u"*"):
+ # Resolve all escaped characters
+ values.append(self.UNESCAPE_RE.sub(
+ lambda m: chr(int(m.group(1), 16)),
+ value
+ ))
+
+ exp = WildcardExpression()
+
+ if not valueExpression.startswith(u"*"):
+ exp.first = values.pop(0)
+
+ if not valueExpression.endswith(u"*"):
+ exp.last = values.pop(-1)
+
+ exp.middle = values
+
+ self.value = exp
+
+
+def mockldap_matches(self, dn, attrs):
+ exp = self.value
+
+ if not isinstance(exp, WildcardExpression):
+ return False
+
+ values = attrs.get(self.attr)
+
+ if values is None:
+ return False
+
+ for value in values:
+ if exp.first is not None:
+ if not value.startswith(exp.first):
+ continue
+ value = value[len(exp.first):]
+
+ if exp.last is not None:
+ if not value.endswith(exp.last):
+ continue
+ value = value[:-len(exp.last)]
+
+ if exp.middle:
+ for substr in exp.middle:
+ if not substr:
+ continue
+ raise NotImplementedError("middle: {0}".format(exp.middle))
+
+ return True
+
+ return False
</ins></span></pre>
</div>
</div>
</body>
</html>