[CalendarServer-changes] [8911] CalDAVClientLibrary/trunk/caldavclientlibrary/client/clientsession. py

[source_changes at macosforge.org]

Revision: 8911
          http://trac.macosforge.org/projects/calendarserver/changeset/8911
Author:   cdaboo at apple.com
Date:     2012-03-18 11:39:22 -0700 (Sun, 18 Mar 2012)
Log Message:
-----------
Handle multiple auth methods in a single WWW-Authenticate header.

Modified Paths:
--------------
    CalDAVClientLibrary/trunk/caldavclientlibrary/client/clientsession.py

Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/client/clientsession.py
===================================================================
--- CalDAVClientLibrary/trunk/caldavclientlibrary/client/clientsession.py	2012-03-18 08:24:23 UTC (rev 8910)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/client/clientsession.py	2012-03-18 18:39:22 UTC (rev 8911)
@@ -797,13 +797,15 @@
 
     def getAuthorizor(self, first_time, wwwhdrs):
         
-        for item in wwwhdrs:
-            if item.lower().startswith("basic"):
-                return Basic(self.user, self.pswd), False
-            elif item.lower().startswith("digest"):
-                return Digest(self.user, self.pswd, wwwhdrs), False
-            elif item.lower().startswith("negotiate") and Kerberos is not None:
-                return Kerberos(self.user), False
+        for witem in wwwhdrs:
+            for item in witem.split(","):
+                item = item.strip() 
+                if item.lower().startswith("basic"):
+                    return Basic(self.user, self.pswd), False
+                elif item.lower().startswith("digest"):
+                    return Digest(self.user, self.pswd, wwwhdrs), False
+                elif item.lower().startswith("negotiate") and Kerberos is not None:
+                    return Kerberos(self.user), False
         else:
             return None, True
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120318/359b9ab3/attachment.html>