[CalendarServer-changes] [7271] CalendarServer/trunk/calendarserver/platform/darwin/od/opendirectory .py

[source_changes at macosforge.org]

Revision: 7271
          http://trac.macosforge.org/projects/calendarserver/changeset/7271
Author:   sagen at apple.com
Date:     2011-03-29 09:13:59 -0700 (Tue, 29 Mar 2011)
Log Message:
-----------
Tweaks to debug logging for digest and basic auth

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/platform/darwin/od/opendirectory.py

Modified: CalendarServer/trunk/calendarserver/platform/darwin/od/opendirectory.py
===================================================================
--- CalendarServer/trunk/calendarserver/platform/darwin/od/opendirectory.py	2011-03-29 15:11:03 UTC (rev 7270)
+++ CalendarServer/trunk/calendarserver/platform/darwin/od/opendirectory.py	2011-03-29 16:13:59 UTC (rev 7271)
@@ -36,6 +36,7 @@
     5204, # Contact master
     5205, # Server communication error
 )
+INCORRECT_CREDENTIALS = 5000
 
 # Single-value attributes (must be converted from lists):
 SINGLE_VALUE_ATTRIBUTES = [
@@ -400,13 +401,24 @@
 
     tries = NUM_TRIES
     while tries:
+
+        log.debug("Checking basic auth for user '%s' (tries remaining: %d)" %
+            (user, tries))
+
         result, error = record.verifyPassword_error_(password, None)
         if not error:
+            log.debug("Basic auth for user '%s' result: %s" % (user, result))
             return result
 
         code = error.code()
-        log.debug("Received code %d from Basic auth call: %s" % (code, error))
 
+        if code == INCORRECT_CREDENTIALS:
+            log.debug("Basic auth for user '%s' failed due to incorrect credentials" % (user,))
+            return False
+
+        log.debug("Basic auth for user '%s' failed with code %d (%s)" %
+            (user, code, error))
+
         if code in RETRY_CODES:
             tries -= 1
         else:
@@ -435,6 +447,9 @@
     tries = NUM_TRIES
     while tries:
 
+        log.debug("Checking digest auth for user '%s' (tries remaining: %d)" %
+            (user, tries))
+
         # TODO: what are these other return values?
         result, mystery1, mystery2, error = record.verifyExtendedWithAuthenticationType_authenticationItems_continueItems_context_error_(
             DIGEST_MD5,
@@ -442,11 +457,18 @@
             None, None, None
         )
         if not error:
+            log.debug("Digest auth for user '%s' result: %s" % (user, result))
             return result
 
         code = error.code()
-        log.debug("Received code %d from Digest auth call: %s" % (code, error))
 
+        if code == INCORRECT_CREDENTIALS:
+            log.debug("Digest auth for user '%s' failed due to incorrect credentials" % (user,))
+            return False
+
+        log.debug("Digest auth for user '%s' failed with code %d (%s)" %
+            (user, code, error))
+
         if code in RETRY_CODES:
             tries -= 1
         else:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110329/d578f47a/attachment.html>