[CalendarServer-changes] [1003] CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py

[source_changes at macosforge.org]

Revision: 1003
          http://trac.macosforge.org/projects/calendarserver/changeset/1003
Author:   wsanchez at apple.com
Date:     2007-01-09 17:23:02 -0800 (Tue, 09 Jan 2007)

Log Message:
-----------
Log OD errors during verifyCredentials and return False

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py

Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2007-01-10 01:22:21 UTC (rev 1002)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2007-01-10 01:23:02 UTC (rev 1003)
@@ -191,7 +191,11 @@
 
     def verifyCredentials(self, credentials):
         if isinstance(credentials, UsernamePassword):
-            return opendirectory.authenticateUserBasic(self.service.directory, self.shortName, credentials.password)
+            try:
+                return opendirectory.authenticateUserBasic(self.service.directory, self.shortName, credentials.password)
+            except opendirectory.ODError, e:
+                log.err("OpenDirectory error while performing basic authentication for user %s: %r" % (self.shortName, e))
+                return False
 
         return super(OpenDirectoryRecord, self).verifyCredentials(credentials)
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070109/39613418/attachment.html