Merge lp:~jelmer/bzr/missing-get-revdelta into lp:~bzr/bzr/trunk-old

[Jelmer Vernooij]

[Jelmer Vernooij (jelmer)]

The attached patch allows AuthHandlers in the HTTP code to indicate that
they do not require a username.

This means it's possible to use GSSAPI authentication without a username in
the URL.

Cheers,

 Jelmer

=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
--- bzrlib/transport/http/_urllib2_wrappers.py	2009-02-17 14:46:26 +0000
+++ bzrlib/transport/http/_urllib2_wrappers.py	2009-02-18 16:23:31 +0000
@@ -987,6 +987,7 @@
     # classes:
     # - auth_required_header:  the header received from the server
     # - auth_header: the header sent in the request
+    # - requires_username: whether the auth mechanism requires a username
 
     def __init__(self):
         # We want to know when we enter into an try/fail cycle of
@@ -1034,7 +1035,7 @@
                 # We already tried that, give up
                 return None
 
-            if auth.get('user', None) is None:
+            if self.requires_username and auth.get('user', None) is None:
                 # Without a known user, we can't authenticate
                 return None
 
@@ -1158,6 +1159,8 @@
 
     handler_order = 480
 
+    requires_username = False
+
     def auth_match(self, header, auth):
         scheme = header.lower()
         if scheme != 'negotiate':
@@ -1203,6 +1206,8 @@
 
     auth_regexp = re.compile('realm="([^"]*)"', re.I)
 
+    requires_username = True
+
     def build_auth_header(self, auth, request):
         raw = '%s:%s' % (auth['user'], auth['password'])
         auth_header = 'Basic ' + raw.encode('base64').strip()
@@ -1260,6 +1265,8 @@
     # Before basic as digest is a bit more secure
     handler_order = 490
 
+    requires_username = True
+
     def auth_params_reusable(self, auth):
         # If the auth scheme is known, it means a previous
         # authentication was successful, all information is