<!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>[13264] twext/trunk/twext/who/opendirectory</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/13264">13264</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-04-11 19:44:55 -0700 (Fri, 11 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>_queryStringAndRecordTypesFromExpression always returns recordTypes (instead of None for default types)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhoopendirectory_servicepy">twext/trunk/twext/who/opendirectory/_service.py</a></li>
<li><a href="#twexttrunktwextwhoopendirectorytesttest_servicepy">twext/trunk/twext/who/opendirectory/test/test_service.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwhoopendirectory_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/_service.py (13263 => 13264)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/_service.py 2014-04-11 18:33:28 UTC (rev 13263)
+++ twext/trunk/twext/who/opendirectory/_service.py 2014-04-12 02:44:55 UTC (rev 13264)
</span><span class="lines">@@ -86,6 +86,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class OpenDirectoryDataError(OpenDirectoryError):
</span><span class="cx"> """
</span><span class="cx"> OpenDirectory data error.
</span><span class="lines">@@ -210,15 +211,19 @@
</span><span class="cx"> self._node = node
</span><span class="cx">
</span><span class="cx">
</span><del>- def _queryStringAndRecordTypesFromMatchExpression(self, expression):
</del><ins>+ def _queryStringAndRecordTypeFromMatchExpression(self, expression, recordTypes):
</ins><span class="cx"> """
</span><span class="cx"> Generates an LDAP query string from a match expression.
</span><span class="cx">
</span><span class="cx"> @param expression: A match expression.
</span><span class="cx"> @type expression: L{MatchExpression}
</span><span class="cx">
</span><del>- @return: tuple(LDAP query string, recordTypes)
- @rtype: (C{unicode}, set())
</del><ins>+ @param recordTypes: allowed Open Directory record type strings
+ or None for default record type strings
+ @type recordTypes: set(str)
+
+ @return: tuple(LDAP query string, Open Directory record type string)
+ @rtype: tuple(C{unicode}, C{unicode})
</ins><span class="cx"> """
</span><span class="cx"> matchType = ODMatchType.fromMatchType(expression.matchType)
</span><span class="cx"> if matchType is None:
</span><span class="lines">@@ -237,7 +242,7 @@
</span><span class="cx"> # raise NotImplementedError("Need to handle case sensitive")
</span><span class="cx">
</span><span class="cx"> if expression.fieldName is self.fieldName.recordType:
</span><del>- return (notOp, set([ODRecordType.fromRecordType(expression.fieldValue).value]),)
</del><ins>+ return (notOp, ODRecordType.fromRecordType(expression.fieldValue).value)
</ins><span class="cx">
</span><span class="cx"> if expression.fieldName is self.fieldName.uid:
</span><span class="cx"> odAttr = ODAttribute.guid
</span><span class="lines">@@ -259,35 +264,48 @@
</span><span class="cx"> matchType.queryString.format(
</span><span class="cx"> notOp=notOp, attribute=odAttr.value, value=value
</span><span class="cx"> ),
</span><del>- None,
</del><ins>+ None if recordTypes else set([t.value for t in ODRecordType.iterconstants()]),
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><del>- def _queryStringAndRecordTypesFromCompoundExpression(self, expression):
</del><ins>+ def _queryStringAndRecordTypesFromCompoundExpression(self, expression, recordTypes):
</ins><span class="cx"> """
</span><span class="cx"> Generates an LDAP query string from a compound expression.
</span><span class="cx">
</span><span class="cx"> @param expression: A compound expression.
</span><span class="cx"> @type expression: L{MatchExpression}
</span><span class="cx">
</span><del>- @return: tuple(LDAP query string, recordTypes)
- @rtype: (C{unicode}, set())
</del><ins>+ @param recordTypes: allowed Open Directory record type strings
+ or None for default record type strings
+ @type recordTypes: set(str)
+
+ @return: tuple(LDAP query string, set(Open Directory record type strings))
+ @rtype: (C{unicode}, set(C{unicode}))
</ins><span class="cx"> """
</span><ins>+ if recordTypes is None:
+ recordTypes = set([t.value for t in ODRecordType.iterconstants()])
+
</ins><span class="cx"> queryTokens = []
</span><del>- recordTypes = set()
-
</del><span class="cx"> for subExpression in expression.expressions:
</span><del>- queryToken, subExpRecordTypes = self._queryStringAndRecordTypesFromExpression(subExpression)
</del><ins>+ queryToken, subExpRecordTypes = self._queryStringAndRecordTypesFromExpression(
+ subExpression, recordTypes
+ )
</ins><span class="cx"> if subExpRecordTypes:
</span><del>- if expression.operand is Operand.AND:
- recordTypes |= subExpRecordTypes
- elif queryToken == u"!": #NOR
- recordTypes |= set([t.value for t in ODRecordType.iterconstants()]) - subExpRecordTypes
</del><ins>+ if not isinstance(subExpRecordTypes, set):
+ if bool(expression.operand is Operand.AND) != bool(queryToken): # AND or NOR
+ if expression.operand is Operand.AND:
+ recordTypes = recordTypes & set([subExpRecordTypes])
+ else:
+ recordTypes = recordTypes - set([subExpRecordTypes])
+ queryToken = None
+ else:
+ raise QueryNotSupportedError(
+ "Record type matches must AND or NOR"
+ )
</ins><span class="cx"> else:
</span><del>- raise QueryNotSupportedError(
- "Record type matches must AND or NOR"
- )
- else:
</del><ins>+ recordTypes = subExpRecordTypes
+
+ if queryToken:
</ins><span class="cx"> queryTokens.append(queryToken)
</span><span class="cx">
</span><span class="cx"> if queryTokens:
</span><span class="lines">@@ -301,10 +319,10 @@
</span><span class="cx"> queryTokens[:0] = (u"(")
</span><span class="cx"> queryTokens.append(u")")
</span><span class="cx">
</span><del>- return (u"".join(queryTokens), recordTypes if recordTypes else None,)
</del><ins>+ return (u"".join(queryTokens), recordTypes)
</ins><span class="cx">
</span><span class="cx">
</span><del>- def _queryStringAndRecordTypesFromExpression(self, expression):
</del><ins>+ def _queryStringAndRecordTypesFromExpression(self, expression, recordTypes=None):
</ins><span class="cx"> """
</span><span class="cx"> Converts either a MatchExpression or a CompoundExpression into an LDAP
</span><span class="cx"> query string.
</span><span class="lines">@@ -312,15 +330,23 @@
</span><span class="cx"> @param expression: An expression.
</span><span class="cx"> @type expression: L{MatchExpression} or L{CompoundExpression}
</span><span class="cx">
</span><del>- @return: tuple(LDAP query string, recordTypes)
- @rtype: (C{unicode}, set())
</del><ins>+ @param recordTypes: allowed Open Directory record type strings
+ or None for default record type strings
+ @type recordTypes: set(str)
+
+ @return: tuple(LDAP query string, set(Open Directory record type strings))
+ @rtype: (C{unicode}, set(C{unicode}))
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> if isinstance(expression, MatchExpression):
</span><del>- return self._queryStringAndRecordTypesFromMatchExpression(expression)
</del><ins>+ return self._queryStringAndRecordTypeFromMatchExpression(
+ expression, recordTypes
+ )
</ins><span class="cx">
</span><span class="cx"> if isinstance(expression, CompoundExpression):
</span><del>- return self._queryStringAndRecordTypesFromCompoundExpression(expression)
</del><ins>+ return self._queryStringAndRecordTypesFromCompoundExpression(
+ expression, recordTypes
+ )
</ins><span class="cx">
</span><span class="cx"> raise QueryNotSupportedError(
</span><span class="cx"> "Unknown expression type: {0!r}".format(expression)
</span><span class="lines">@@ -334,20 +360,16 @@
</span><span class="cx"> @param expression: A compound expression.
</span><span class="cx"> @type expression: L{CompoundExpression}
</span><span class="cx">
</span><del>- @return: A native OpenDirectory query.
</del><ins>+ @return: A native OpenDirectory query or None if query will return no records
</ins><span class="cx"> @rtype: L{ODQuery}
</span><span class="cx"> """
</span><span class="cx">
</span><del>- queryString, recordTypes = self._queryStringAndRecordTypesFromExpression(expression)
- supportedRecordTypes = set([t.value for t in ODRecordType.iterconstants()])
- if recordTypes:
- recordTypes = supportedRecordTypes & recordTypes
- if not recordTypes:
- raise QueryNotSupportedError(
- "Query for unsupported record types: {0!r}".format(recordTypes - supportedRecordTypes)
- )
- else:
- recordTypes = supportedRecordTypes
</del><ins>+ queryString, recordTypes = self._queryStringAndRecordTypesFromExpression(
+ expression,
+ set([t.value for t in ODRecordType.iterconstants()])
+ )
+ if not recordTypes:
+ return None
</ins><span class="cx">
</span><span class="cx"> attributes = [a.value for a in ODAttribute.iterconstants()]
</span><span class="cx"> maxResults = 0
</span><span class="lines">@@ -357,7 +379,7 @@
</span><span class="cx"> recordTypes,
</span><span class="cx"> None,
</span><span class="cx"> ODMatchType.compound.value if queryString else ODMatchType.any.value,
</span><del>- queryString if queryString else None,
</del><ins>+ queryString,
</ins><span class="cx"> attributes,
</span><span class="cx"> maxResults,
</span><span class="cx"> None
</span><span class="lines">@@ -489,6 +511,9 @@
</span><span class="cx"> # We can call scheduleInRunLoop:forMode:, which will call back to
</span><span class="cx"> # its delegate...
</span><span class="cx">
</span><ins>+ if query is None:
+ return succeed(tuple())
+
</ins><span class="cx"> odRecords, error = query.resultsAllowingPartial_error_(False, None)
</span><span class="cx">
</span><span class="cx"> if error:
</span><span class="lines">@@ -762,7 +787,6 @@
</span><span class="cx"> return succeed(result)
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> @inlineCallbacks
</span><span class="cx"> def members(self):
</span><span class="cx"> members = set()
</span></span></pre></div>
<a id="twexttrunktwextwhoopendirectorytesttest_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/test/test_service.py (13263 => 13264)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/test/test_service.py 2014-04-11 18:33:28 UTC (rev 13263)
+++ twext/trunk/twext/who/opendirectory/test/test_service.py 2014-04-12 02:44:55 UTC (rev 13264)
</span><span class="lines">@@ -76,8 +76,11 @@
</span><span class="cx"> matchType=matchType
</span><span class="cx"> )
</span><span class="cx"> queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
</span><del>- self.assertEquals(recordTypes, None)
</del><span class="cx"> self.assertEquals(
</span><ins>+ recordTypes,
+ set([u"dsRecTypeStandard:Groups", u"dsRecTypeStandard:Users"])
+ )
+ self.assertEquals(
</ins><span class="cx"> queryString,
</span><span class="cx"> u"({attribute}{expected})".format(
</span><span class="cx"> attribute=ODAttribute.shortName.value, expected=expected
</span><span class="lines">@@ -96,8 +99,11 @@
</span><span class="cx"> flags=MatchFlags.NOT
</span><span class="cx"> )
</span><span class="cx"> queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
</span><del>- self.assertEquals(recordTypes, None)
</del><span class="cx"> self.assertEquals(
</span><ins>+ recordTypes,
+ set([u"dsRecTypeStandard:Groups", u"dsRecTypeStandard:Users"])
+ )
+ self.assertEquals(
</ins><span class="cx"> queryString,
</span><span class="cx"> u"(!{attribute}=xyzzy)".format(
</span><span class="cx"> attribute=ODAttribute.shortName.value,
</span><span class="lines">@@ -117,8 +123,11 @@
</span><span class="cx"> flags=MatchFlags.caseInsensitive
</span><span class="cx"> )
</span><span class="cx"> queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
</span><del>- self.assertEquals(recordTypes, None)
</del><span class="cx"> self.assertEquals(
</span><ins>+ recordTypes,
+ set([u"dsRecTypeStandard:Groups", u"dsRecTypeStandard:Users"])
+ )
+ self.assertEquals(
</ins><span class="cx"> queryString,
</span><span class="cx"> u"???????({attribute}=xyzzy)".format(
</span><span class="cx"> attribute=ODAttribute.shortName.value,
</span><span class="lines">@@ -141,8 +150,11 @@
</span><span class="cx"> u"\\xyzzy: a/b/(c)* ~~ >=< ~~ &| \0!!"
</span><span class="cx"> )
</span><span class="cx"> queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
</span><del>- self.assertEquals(recordTypes, None)
</del><span class="cx"> self.assertEquals(
</span><ins>+ recordTypes,
+ set([u"dsRecTypeStandard:Groups", u"dsRecTypeStandard:Users"])
+ )
+ self.assertEquals(
</ins><span class="cx"> queryString,
</span><span class="cx"> u"({attribute}={expected})".format(
</span><span class="cx"> attribute=ODAttribute.fullName.value,
</span><span class="lines">@@ -185,8 +197,11 @@
</span><span class="cx"> Operand.AND
</span><span class="cx"> )
</span><span class="cx"> queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
</span><del>- self.assertEquals(recordTypes, None)
</del><span class="cx"> self.assertEquals(
</span><ins>+ recordTypes,
+ set([u"dsRecTypeStandard:Groups", u"dsRecTypeStandard:Users"])
+ )
+ self.assertEquals(
</ins><span class="cx"> queryString,
</span><span class="cx"> (
</span><span class="cx"> u"(&(dsAttrTypeStandard:GeneratedUID=*a*)"
</span><span class="lines">@@ -216,8 +231,11 @@
</span><span class="cx"> Operand.OR
</span><span class="cx"> )
</span><span class="cx"> queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
</span><del>- self.assertEquals(recordTypes, None)
</del><span class="cx"> self.assertEquals(
</span><ins>+ recordTypes,
+ set([u"dsRecTypeStandard:Groups", u"dsRecTypeStandard:Users"])
+ )
+ self.assertEquals(
</ins><span class="cx"> queryString,
</span><span class="cx"> (
</span><span class="cx"> u"(|(dsAttrTypeStandard:RecordName=*a*)"
</span><span class="lines">@@ -255,7 +273,7 @@
</span><span class="cx"> Operand.AND
</span><span class="cx"> )
</span><span class="cx"> queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
</span><del>- self.assertEquals(set(recordTypes), set([u"dsRecTypeStandard:Groups", u"dsRecTypeStandard:Users"]))
</del><ins>+ self.assertEquals(recordTypes, set())
</ins><span class="cx"> self.assertEquals(
</span><span class="cx"> queryString,
</span><span class="cx"> u"(dsAttrTypeStandard:RecordName=xyzzy)"
</span><span class="lines">@@ -266,7 +284,7 @@
</span><span class="cx"> [
</span><span class="cx"> MatchExpression(
</span><span class="cx"> service.fieldName.shortNames,
</span><del>- u"xyzzy",
</del><ins>+ u"xxxxx",
</ins><span class="cx"> matchType=MatchType.equals
</span><span class="cx"> ),
</span><span class="cx"> CompoundExpression(
</span><span class="lines">@@ -278,23 +296,25 @@
</span><span class="cx"> matchType=MatchType.equals
</span><span class="cx"> ),
</span><span class="cx"> MatchExpression(
</span><del>- service.fieldName.recordType,
- service.recordType.user,
</del><ins>+ service.fieldName.shortNames,
+ u"yyyyy",
</ins><span class="cx"> matchType=MatchType.equals
</span><span class="cx"> ),
</span><span class="cx"> ],
</span><span class="cx"> Operand.AND
</span><span class="cx"> ),
</span><span class="cx"> ],
</span><del>- Operand.AND
</del><ins>+ Operand.OR
</ins><span class="cx"> )
</span><span class="cx"> queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
</span><del>- self.assertEquals(set(recordTypes), set([u"dsRecTypeStandard:Groups", u"dsRecTypeStandard:Users"]))
</del><ins>+ self.assertEquals(set(recordTypes), set([u"dsRecTypeStandard:Groups", ]))
</ins><span class="cx"> self.assertEquals(
</span><span class="cx"> queryString,
</span><del>- u"(dsAttrTypeStandard:RecordName=xyzzy)"
</del><ins>+ u"("
+ u"|(dsAttrTypeStandard:RecordName=xxxxx)"
+ u"(dsAttrTypeStandard:RecordName=yyyyy)"
+ u")"
</ins><span class="cx"> )
</span><del>-
</del><span class="cx"> # NOR expression
</span><span class="cx"> expression = CompoundExpression(
</span><span class="cx"> [
</span></span></pre>
</div>
</div>
</body>
</html>