<!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>[12403] twext/trunk/twext/who/ldap</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/12403">12403</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-20 13:38:20 -0800 (Mon, 20 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>More wild cards.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwholdap_servicepy">twext/trunk/twext/who/ldap/_service.py</a></li>
<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="twexttrunktwextwholdap_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/_service.py (12402 => 12403)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/_service.py 2014-01-20 20:53:35 UTC (rev 12402)
+++ twext/trunk/twext/who/ldap/_service.py 2014-01-20 21:38:20 UTC (rev 12403)
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx"> def _recordsFromQueryString(self, queryString):
</span><span class="cx"> connection = yield self._connect()
</span><span class="cx">
</span><del>- self.log.debug("Performing LDAP query: {query}", query=queryString)
</del><ins>+ self.log.info("Performing LDAP query: {query}", query=queryString)
</ins><span class="cx">
</span><span class="cx"> try:
</span><span class="cx"> reply = connection.search_s(
</span></span></pre></div>
<a id="twexttrunktwextwholdaptesttest_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/test/test_service.py (12402 => 12403)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/test/test_service.py 2014-01-20 20:53:35 UTC (rev 12402)
+++ twext/trunk/twext/who/ldap/test/test_service.py 2014-01-20 21:38:20 UTC (rev 12403)
</span><span class="lines">@@ -76,22 +76,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def setUp(self):
</span><del>- 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
-
</del><span class="cx"> def matches(self, dn, attrs, upcall=MockLDAPFilterTest.matches):
</span><span class="cx"> if upcall(self, dn, attrs):
</span><span class="cx"> return True
</span><span class="lines">@@ -99,8 +83,8 @@
</span><span class="cx"> return mockldap_matches(self, dn, attrs)
</span><span class="cx">
</span><span class="cx">
</span><del>- self.patch(MockLDAPFilterTest, "_parse_expression", parse_expression)
- self.patch(MockLDAPFilterTest, "matches", matches)
</del><ins>+ self.patch(MockLDAPFilterTest, "_parse_expression", mockldap_parse)
+ self.patch(MockLDAPFilterTest, "matches", mockldap_matches)
</ins><span class="cx">
</span><span class="cx"> self.xmlSeedService = xmlService(self.mktemp())
</span><span class="cx"> self.mockData = mockDirectoryDataFromXMLService(self.xmlSeedService)
</span><span class="lines">@@ -155,23 +139,6 @@
</span><span class="cx"> test_queryNotNoIndex.todo = "?"
</span><span class="cx">
</span><span class="cx">
</span><del>- def test_queryCaseInsensitive(self):
- return (
- BaseDirectoryServiceQueryTestMixIn.test_queryCaseInsensitive(self)
- )
-
- test_queryCaseInsensitive.todo = "?"
-
-
- def test_queryCaseInsensitiveNoIndex(self):
- return (
- BaseDirectoryServiceQueryTestMixIn
- .test_queryCaseInsensitiveNoIndex(self)
- )
-
- test_queryCaseInsensitiveNoIndex.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">@@ -196,24 +163,6 @@
</span><span class="cx"> test_queryStartsWithNotNoIndex.todo = "?"
</span><span class="cx">
</span><span class="cx">
</span><del>- def test_queryStartsWithCaseInsensitive(self):
- return (
- BaseDirectoryServiceQueryTestMixIn
- .test_queryStartsWithCaseInsensitive(self)
- )
-
- test_queryStartsWithCaseInsensitive.todo = "?"
-
-
- def test_queryStartsWithCaseInsensitiveNoIndex(self):
- return (
- BaseDirectoryServiceQueryTestMixIn
- .test_queryStartsWithCaseInsensitiveNoIndex(self)
- )
-
- test_queryStartsWithCaseInsensitiveNoIndex.todo = "?"
-
-
</del><span class="cx"> def test_queryContainsNot(self):
</span><span class="cx"> return BaseDirectoryServiceQueryTestMixIn.test_queryContainsNot(self)
</span><span class="cx">
</span><span class="lines">@@ -229,25 +178,7 @@
</span><span class="cx"> test_queryContainsNotNoIndex.todo = "?"
</span><span class="cx">
</span><span class="cx">
</span><del>- def test_queryContainsCaseInsensitive(self):
- return (
- BaseDirectoryServiceQueryTestMixIn
- .test_queryContainsCaseInsensitive(self)
- )
</del><span class="cx">
</span><del>- test_queryContainsCaseInsensitive.todo = "?"
-
-
- def test_queryContainsCaseInsensitiveNoIndex(self):
- return (
- BaseDirectoryServiceQueryTestMixIn
- .test_queryContainsCaseInsensitiveNoIndex(self)
- )
-
- test_queryContainsCaseInsensitiveNoIndex.todo = "?"
-
-
-
</del><span class="cx"> class DirectoryServiceConnectionTestMixIn(object):
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_connect_defaults(self):
</span><span class="lines">@@ -437,7 +368,7 @@
</span><span class="cx"> last = None
</span><span class="cx">
</span><span class="cx">
</span><del>-def mockldap_parse_wildcard_expression(self):
</del><ins>+def mockldap_parse(self):
</ins><span class="cx"> match = self.TEST_RE.match(self.content)
</span><span class="cx">
</span><span class="cx"> if match is None:
</span><span class="lines">@@ -453,77 +384,88 @@
</span><span class="cx"> u"Operation %r is not supported" % (self.op,)
</span><span class="cx"> )
</span><span class="cx">
</span><del>- if (u"*" not in valueExpression):
- raise NotImplementedError(u"I only deal with wild cards")
</del><ins>+ def unescape(value):
+ return self.UNESCAPE_RE.sub(lambda m: chr(int(m.group(1), 16)), value)
</ins><span class="cx">
</span><del>- values = []
</del><ins>+ if (u"*" in valueExpression):
+ # Wild card expression
</ins><span class="cx">
</span><del>- 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
- ))
</del><ins>+ values = [unescape(value) for value in valueExpression.split(u"*")]
</ins><span class="cx">
</span><del>- exp = WildcardExpression()
</del><ins>+ exp = WildcardExpression()
</ins><span class="cx">
</span><del>- if not valueExpression.startswith(u"*"):
- exp.first = values.pop(0)
</del><ins>+ if not valueExpression.startswith(u"*"):
+ exp.first = values.pop(0)
</ins><span class="cx">
</span><del>- if not valueExpression.endswith(u"*"):
- exp.last = values.pop(-1)
</del><ins>+ if not valueExpression.endswith(u"*"):
+ exp.last = values.pop(-1)
</ins><span class="cx">
</span><del>- exp.middle = values
</del><ins>+ exp.middle = values
</ins><span class="cx">
</span><del>- self.value = exp
</del><ins>+ self.value = exp
</ins><span class="cx">
</span><ins>+ else:
+ self.value = unescape(valueExpression)
</ins><span class="cx">
</span><del>-def mockldap_matches(self, dn, attrs):
- exp = self.value
</del><span class="cx">
</span><del>- if not isinstance(exp, WildcardExpression):
- return False
-
</del><ins>+def mockldap_matches(self, dn, attrs):
</ins><span class="cx"> values = attrs.get(self.attr)
</span><span class="cx">
</span><span class="cx"> if values is None:
</span><span class="cx"> return False
</span><span class="cx">
</span><del>- for value in values:
- start = 0
- end = len(value)
</del><ins>+ if type(values) is unicode:
+ values = [values]
</ins><span class="cx">
</span><del>- if exp.first is not None:
- if not value.startswith(exp.first):
- continue
- start = len(exp.first)
</del><ins>+ # Case insensitive? Always true.
+ if True:
+ normalize = lambda s: s.lower()
+ else:
+ normalize = lambda s: s
</ins><span class="cx">
</span><del>- if exp.last is not None:
- if not value[start:].endswith(exp.last):
- continue
- end -= len(exp.last)
</del><ins>+ if isinstance(self.value, WildcardExpression):
+ def match_substrings_in_order(substrings, value, start, end):
+ for substring in substrings:
+ if not substring:
+ continue
</ins><span class="cx">
</span><del>- if exp.middle:
- if not match_substrings_in_order(exp.middle, value, start, end):
- continue
</del><ins>+ i = value.find(substring, start, end)
+ if i == -1:
+ # Match fails for this substring
+ return False
</ins><span class="cx">
</span><del>- return True
</del><ins>+ # Move start up past this substring substring before testing
+ # the next substring
+ start = i + len(substring)
</ins><span class="cx">
</span><del>- return False
</del><ins>+ # No mismatches
+ return True
</ins><span class="cx">
</span><ins>+ for value in values:
+ value = normalize(value)
</ins><span class="cx">
</span><del>-def match_substrings_in_order(substrings, value, start, end):
- for substring in substrings:
- if not substring:
- continue
</del><ins>+ start = 0
+ end = len(value)
</ins><span class="cx">
</span><del>- i = value.find(substring, start, end)
- if i == -1:
- # Match fails for this substring
- return False
</del><ins>+ if self.value.first is not None:
+ if not value.startswith(normalize(self.value.first)):
+ continue
+ start = len(self.value.first)
</ins><span class="cx">
</span><del>- # Move start up past this substring substring before testing the next
- start = i + len(substring)
</del><ins>+ if self.value.last is not None:
+ if not value[start:].endswith(normalize(self.value.last)):
+ continue
+ end -= len(self.value.last)
</ins><span class="cx">
</span><del>- # No mismatches
- return True
</del><ins>+ if self.value.middle:
+ if not match_substrings_in_order(
+ (normalize(s) for s in self.value.middle),
+ value, start, end
+ ):
+ continue
+
+ return True
+
+ return False
+
+ return normalize(self.value) in (normalize(s) for s in values)
</ins></span></pre>
</div>
</div>
</body>
</html>