[CalendarServer-changes] [15026] twext/trunk/twext/who/ldap/_service.py

[source_changes at macosforge.org]

Revision: 15026
          http://trac.calendarserver.org//changeset/15026
Author:   sagen at apple.com
Date:     2015-08-03 14:58:46 -0700 (Mon, 03 Aug 2015)
Log Message:
-----------
When encountering a bogus UUID value, log it and continue on

Modified Paths:
--------------
    twext/trunk/twext/who/ldap/_service.py

Modified: twext/trunk/twext/who/ldap/_service.py
===================================================================
--- twext/trunk/twext/who/ldap/_service.py	2015-08-03 20:49:39 UTC (rev 15025)
+++ twext/trunk/twext/who/ldap/_service.py	2015-08-03 21:58:46 UTC (rev 15026)
@@ -627,7 +627,7 @@
                     ldap.dn.str2dn(rdn.lower()) +
                     ldap.dn.str2dn(self._baseDN.lower())
                 )
-                filteredQuery=self._addExtraFilter(recordType, queryString)
+                filteredQuery = self._addExtraFilter(recordType, queryString)
                 self.log.debug(
                     "Performing LDAP query: {rdn} {query} {recordType}{limit}{timeout}",
                     rdn=rdn,
@@ -804,9 +804,15 @@
                                     newValues.append(v)
                                 else:
                                     newValues.append(unicode(v, "utf-8"))
-                            # newValues = [unicode(v, "utf-8") for v in values]
                         else:
-                            newValues = [valueType(v) for v in values]
+                            try:
+                                newValues = [valueType(v) for v in values]
+                            except Exception, e:
+                                self.log.warn(
+                                    "Can't parse value {name} {values} ({error})",
+                                    name=fieldName, values=values, error=str(e)
+                                )
+                                continue
 
                         if self.fieldName.isMultiValue(fieldName):
                             fields[fieldName] = newValues
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150803/421e93ad/attachment.html>