Fix authentication to work with CouchDB 0.11.x.

atomatt · atomatt · commit f9a485dc42f2 · 2010-03-05T13:13:00.000Z
CouchDB doesn't send a www-authenticate header any more so all we can do is
assume it's basic auth and retry the request.
diff --git a/couchdb/http.py b/couchdb/http.py
@@ -210,12 +210,14 @@ def _retry():
 
         # Handle authentication challenge
         if status == 401:
-            auth_header = resp.getheader('www-authenticate', '')
-            if auth_header:
-                if self._authenticate(auth_header, headers, credentials):
-                    resp.read() # read the 401 response
-                    resp = _try_request()
-                    status = resp.status
+            # Assume basic auth (CouchDB 0.11.x doesn't send a www-authenticate
+            # header).
+            authorization = basic_auth(credentials)
+            if authorization:
+                resp.read() # read the 401 response
+                headers['Authorization'] = authorization
+                resp = _try_request()
+                status = resp.status
 
         # Handle conditional response
         if status == 304 and method in ('GET', 'HEAD'):
@@ -301,17 +303,6 @@ def _clean_cache(self):
         ls = sorted(self.cache.iteritems(), key=cache_sort)
         self.cache = dict(ls[-CACHE_SIZE[0]:])
 
-    def _authenticate(self, info, headers, credentials):
-        # Naive Basic authentication support
-        match = re.match(r'''(\w*)\s+realm=['"]([^'"]+)['"]''', info)
-        if match:
-            scheme, realm = match.groups()
-            if scheme.lower() == 'basic':
-                headers['Authorization'] = 'Basic %s' % b64encode(
-                    '%s:%s' % credentials
-                )
-                return True
-
     def _get_connection(self, url):
         scheme, host = urlsplit(url, 'http', False)[:2]
         self.lock.acquire()
@@ -425,6 +416,12 @@ def extract_credentials(url):
     return urlunsplit(parts), (username, password)
 
 
+def basic_auth(credentials):
+    if credentials == (None, None):
+        return None
+    return 'Basic %s' % b64encode('%s:%s' % credentials)
+
+
 def quote(string, safe=''):
     if isinstance(string, unicode):
         string = string.encode('utf-8')
