<!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>[12158] twext/trunk/twext/who/opendirectory/_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/12158">12158</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-12-19 16:19:14 -0800 (Thu, 19 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure field names are of the correct type.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhoopendirectory_servicepy">twext/trunk/twext/who/opendirectory/_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 (12157 => 12158)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/_service.py        2013-12-19 23:32:17 UTC (rev 12157)
+++ twext/trunk/twext/who/opendirectory/_service.py        2013-12-20 00:19:14 UTC (rev 12158)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> OpenDirectory error.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- def __init__(self, message, odError):
</del><ins>+ def __init__(self, message, odError=None):
</ins><span class="cx"> super(OpenDirectoryError, self).__init__(message)
</span><span class="cx"> self.odError = odError
</span><span class="cx">
</span><span class="lines">@@ -144,8 +144,8 @@
</span><span class="cx"> recordType = ValueConstant("dsAttrTypeStandard:RecordType")
</span><span class="cx"> recordType.fieldName = BaseFieldName.recordType
</span><span class="cx">
</span><del>- uid = ValueConstant("dsAttrTypeStandard:GeneratedUID")
- uid.fieldName = BaseFieldName.uid
</del><ins>+ # uid = ValueConstant("dsAttrTypeStandard:GeneratedUID")
+ # uid.fieldName = BaseFieldName.uid
</ins><span class="cx">
</span><span class="cx"> guid = ValueConstant("dsAttrTypeStandard:GeneratedUID")
</span><span class="cx"> guid.fieldName = BaseFieldName.guid
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> # "Failed to open local node: {error}}",
</span><span class="cx"> # error=e,
</span><span class="cx"> # )
</span><del>- # raise OpenDirectoryError(e)
</del><ins>+ # raise OpenDirectoryError("", e)
</ins><span class="cx"> # else:
</span><span class="cx"> # self._localNode = None
</span><span class="cx">
</span><span class="lines">@@ -340,7 +340,10 @@
</span><span class="cx"> "{source.nodeName!r}: {error}",
</span><span class="cx"> error=error
</span><span class="cx"> )
</span><del>- raise OpenDirectoryConnectionError(error)
</del><ins>+ raise OpenDirectoryConnectionError(
+ "Unable to connect to OpenDirectory node",
+ error
+ )
</ins><span class="cx">
</span><span class="cx"> self._session = session
</span><span class="cx"> self._node = node
</span><span class="lines">@@ -421,10 +424,12 @@
</span><span class="cx">
</span><span class="cx"> if error:
</span><span class="cx"> self.log.error(
</span><del>- "Error while forming OpenDirectory query: {error}",
</del><ins>+ "Error while forming OpenDirectory compound query: {error}",
</ins><span class="cx"> error=error
</span><span class="cx"> )
</span><del>- raise OpenDirectoryQueryError(error)
</del><ins>+ raise OpenDirectoryQueryError(
+ "Unable to form OpenDirectory compound query", error
+ )
</ins><span class="cx">
</span><span class="cx"> return query
</span><span class="cx">
</span><span class="lines">@@ -475,10 +480,12 @@
</span><span class="cx">
</span><span class="cx"> if error:
</span><span class="cx"> self.log.error(
</span><del>- "Error while forming OpenDirectory query: {error}",
</del><ins>+ "Error while forming OpenDirectory match query: {error}",
</ins><span class="cx"> error=error
</span><span class="cx"> )
</span><del>- raise OpenDirectoryQueryError(error)
</del><ins>+ raise OpenDirectoryQueryError(
+ "Unable to form OpenDirectory match query", error
+ )
</ins><span class="cx">
</span><span class="cx"> return query
</span><span class="cx">
</span><span class="lines">@@ -501,7 +508,9 @@
</span><span class="cx"> "Error while executing OpenDirectory query: {error}",
</span><span class="cx"> error=error
</span><span class="cx"> )
</span><del>- raise OpenDirectoryQueryError(error)
</del><ins>+ raise OpenDirectoryQueryError(
+ "Unable to execute OpenDirectory query", error
+ )
</ins><span class="cx">
</span><span class="cx"> for odRecord in odRecords:
</span><span class="cx"> yield DirectoryRecord(self, odRecord)
</span><span class="lines">@@ -548,10 +557,10 @@
</span><span class="cx"> )
</span><span class="cx"> if error:
</span><span class="cx"> self.log.error(
</span><del>- "Error while executing OpenDirectory query: {error}",
</del><ins>+ "Error while looking up user: {error}",
</ins><span class="cx"> error=error
</span><span class="cx"> )
</span><del>- raise OpenDirectoryQueryError("Could not look up user", error)
</del><ins>+ raise OpenDirectoryQueryError("Unable to look up user", error)
</ins><span class="cx">
</span><span class="cx"> return record
</span><span class="cx">
</span><span class="lines">@@ -662,8 +671,25 @@
</span><span class="cx"> "Error while reading OpenDirectory record: {error}",
</span><span class="cx"> error=error
</span><span class="cx"> )
</span><del>- raise OpenDirectoryDataError(error)
</del><ins>+ raise OpenDirectoryDataError(
+ "Unable to read OpenDirectory record", error
+ )
</ins><span class="cx">
</span><ins>+ def coerceType(fieldName, value):
+ # Record type field value needs to be looked up
+ if fieldName is service.fieldName.recordType:
+ return ODRecordType.lookupByValue(value).recordType
+
+ # Otherwise, cast to the valueType specified by the field name
+ valueType = service.fieldName.valueType(fieldName)
+ try:
+ return valueType(value)
+ except BaseException as e:
+ raise OpenDirectoryDataError(
+ "Unable to coerce OD value {0!r} to type {1}: {2}"
+ .format(value, valueType, e)
+ )
+
</ins><span class="cx"> fields = {}
</span><span class="cx"> for name, values in details.iteritems():
</span><span class="cx"> if name == ODAttribute.metaRecordName.value:
</span><span class="lines">@@ -678,39 +704,22 @@
</span><span class="cx"> attribute=name
</span><span class="cx"> )
</span><span class="cx"> continue
</span><ins>+
</ins><span class="cx"> fieldName = attribute.fieldName
</span><span class="cx">
</span><span class="cx"> if type(values) is bytes:
</span><del>- values = (unicode(values),)
</del><ins>+ values = (coerceType(fieldName, values),)
</ins><span class="cx"> else:
</span><del>- values = [unicode(v) for v in values]
</del><ins>+ values = tuple(coerceType(fieldName, v) for v in values)
</ins><span class="cx">
</span><span class="cx"> if service.fieldName.isMultiValue(fieldName):
</span><span class="cx"> fields[fieldName] = values
</span><span class="cx"> else:
</span><span class="cx"> assert len(values) == 1
</span><ins>+ fields[fieldName] = values[0]
</ins><span class="cx">
</span><del>- if fieldName is service.fieldName.recordType:
- fields[fieldName] = ODRecordType.lookupByValue(
- values[0]
- ).recordType
- else:
- fields[fieldName] = values[0]
</del><ins>+ # Set uid from guid
+ fields[service.fieldName.uid] = unicode(fields[service.fieldName.guid])
</ins><span class="cx">
</span><del>- # Make sure that uid and guid are both set and equal
- uid = fields.get(service.fieldName.uid, None)
- guid = fields.get(service.fieldName.guid, None)
-
- if uid is not None and guid is not None:
- if uid != guid:
- raise ValueError(
- "uid and guid must be equal ({uid} != {guid})"
- .format(uid=uid, guid=guid)
- )
- elif uid is None:
- fields[service.fieldName.uid] = guid
- elif guid is None:
- fields[service.fieldName.guid] = uid
-
</del><span class="cx"> super(DirectoryRecord, self).__init__(service, fields)
</span><span class="cx"> self._odRecord = odRecord
</span></span></pre>
</div>
</div>
</body>
</html>