Rev 2919: Mention proxy and https in the password prompts, with tests. in http://code.launchpad.net/%7Ev-ladeuil/bzr/auth.ring
Vincent Ladeuil
v.ladeuil+lp at free.fr
Tue Oct 23 09:51:23 BST 2007
At http://code.launchpad.net/%7Ev-ladeuil/bzr/auth.ring
------------------------------------------------------------
revno: 2919
revision-id:v.ladeuil+lp at free.fr-20071023085109-60tarfj3wg23yd2a
parent: v.ladeuil+lp at free.fr-20071023072541-vlvixrrl50k3d9yc
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: auth.ring
timestamp: Tue 2007-10-23 10:51:09 +0200
message:
Mention proxy and https in the password prompts, with tests.
* bzrlib/transport/http/_urllib2_wrappers.py:
(AbstractAuthHandler.get_password): Use our specific prompt
building to address proxy and https needs.
(AbstractAuthHandler._build_password_prompt): New method, helper
to build the prompt.
(HTTPAuthHandler.build_password_prompt): Default implementation is
ok.
(ProxyAuthHandler.build_password_prompt): Prefix with 'Proxy '.
* bzrlib/tests/test_http.py:
(TestAuth.test_prompt_for_password): Check the prompt too.
* bzrlib/tests/test_config.py:
(TestAuthenticationConfig.test_default_prompts): Delete HTTP tests
which need special handling.
* bzrlib/transport/http/_urllib2_wrappers.py:
(AbstractAuthHandler.build_password_prompt): New method to build
the prompt and mention the protocol sed (http or https).
(ProxyAuthHandler.build_password_prompt): Put proxy in front of
the prompt.
* bzrlib/config.py:
(AuthenticationConfig.get_password): Simplified by taking out http
specifics (which were not enough to address all the cases anyway).
modified:
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py 2007-10-22 21:19:13 +0000
+++ b/bzrlib/config.py 2007-10-23 08:51:09 +0000
@@ -1107,23 +1107,18 @@
password = credentials['password']
else:
password = None
+ # Prompt user only if we could't find a password
if password is None:
- # Prompt user only if we could't find a password
if prompt is None:
- prompt = ('%s' % scheme.upper()
- + ' %(user)s@%(host)s%(realm)s password')
+ # Create a default prompt suitable for most of the cases
+ prompt = '%s' % scheme.upper() + ' %(user)s@%(host)s password'
# Special handling for optional fields in the prompt
if port is not None:
prompt_host = '%s:%d' % (host, port)
else:
prompt_host = host
- if realm is not None:
- prompt_realm = ", Realm: '%s'" % realm
- else:
- prompt_realm = ''
- password = ui.ui_factory.get_password(prompt, host=prompt_host,
- user=user,
- realm=prompt_realm)
+ password = ui.ui_factory.get_password(prompt,
+ host=prompt_host, user=user)
return password
def decode_password(self, password, encoding):
=== modified file 'bzrlib/tests/test_config.py'
--- a/bzrlib/tests/test_config.py 2007-10-22 15:18:24 +0000
+++ b/bzrlib/tests/test_config.py 2007-10-23 08:51:09 +0000
@@ -1310,6 +1310,7 @@
self.assertEquals(stdout.getvalue(), expected_prompt)
def test_default_prompts(self):
+ # HTTP prompts can't be tested here, see test_http.py
self._check_default_prompt('FTP %(user)s@%(host)s password: ', 'ftp')
self._check_default_prompt('FTP %(user)s@%(host)s:%(port)d password: ',
'ftp', port=10020)
@@ -1327,20 +1328,6 @@
'SMTP %(user)s@%(host)s:%(port)d password: ',
'smtp', port=10025)
- self._check_default_prompt('HTTP %(user)s@%(host)s password: ',
- 'http')
- self._check_default_prompt(
- "HTTP %(user)s@%(host)s, Realm: '%(realm)s' password: ",
- 'http', realm='bzr')
- self._check_default_prompt(
- "HTTP %(user)s@%(host)s:%(port)d, Realm: '%(realm)s' password: ",
- 'http', realm='bzr', port=10080)
-
- # FIXME: the following pass but the real implementation
- # (_urllib2_wrappers) do not use the default prompt and displays HTTP
- # instead of HTTPS
- self._check_default_prompt('HTTPS %(user)s@%(host)s password: ',
- 'https')
# FIXME: Once we have a way to declare authentication to all test servers, we
# can implement generic tests.
=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py 2007-10-22 21:19:13 +0000
+++ b/bzrlib/tests/test_http.py 2007-10-23 08:51:09 +0000
@@ -1204,6 +1204,8 @@
either TestCaseWithWebserver or TestCaseWithTwoWebservers.
"""
+ _password_prompt_prefix = ''
+
def setUp(self):
"""Set up the test environment
@@ -1268,10 +1270,13 @@
def test_prompt_for_password(self):
self.server.add_user('joe', 'foo')
t = self.get_user_transport('joe', None)
- ui.ui_factory = TestUIFactory(stdin='foo\n', stdout=StringIOWrapper())
+ stdout = StringIOWrapper()
+ ui.ui_factory = TestUIFactory(stdin='foo\n', stdout=stdout)
self.assertEqual('contents of a\n',t.get('a').read())
# stdin should be empty
self.assertEqual('', ui.ui_factory.stdin.readline())
+ self._check_password_prompt(t._unqualified_scheme, 'joe',
+ stdout.getvalue())
# And we shouldn't prompt again for a different request
# against the same transport.
self.assertEqual('contents of b\n',t.get('b').read())
@@ -1281,6 +1286,14 @@
# Only one 'Authentication Required' error should occur
self.assertEqual(1, self.server.auth_required_errors)
+ def _check_password_prompt(self, scheme, user, actual_prompt):
+ expected_prompt = (self._password_prompt_prefix
+ + ("%s %s@%s:%d, Realm: '%s' password: "
+ % (scheme.upper(),
+ user, self.server.host, self.server.port,
+ self.server.auth_realm)))
+ self.assertEquals(expected_prompt, actual_prompt)
+
def test_no_prompt_for_password_when_using_auth_config(self):
user =' joe'
password = 'foo'
@@ -1327,6 +1340,8 @@
Daughter classes MUST also inherit from TestCaseWithWebserver.
"""
_auth_header = 'Proxy-authorization'
+ _password_prompt_prefix = 'Proxy '
+
def setUp(self):
TestCaseWithWebserver.setUp(self)
=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
--- a/bzrlib/transport/http/_urllib2_wrappers.py 2007-10-22 21:19:13 +0000
+++ b/bzrlib/transport/http/_urllib2_wrappers.py 2007-10-23 08:51:09 +0000
@@ -951,9 +951,27 @@
password = auth_conf.get_password(
auth['protocol'], auth['host'], user, port=auth['port'],
path=auth['path'], realm=realm,
- prompt=self.password_prompt)
+ prompt=self.build_password_prompt(auth))
return password
+ def _build_password_prompt(self, auth):
+ """Build a prompt taking the protocol used into account.
+
+ The AuthHandler is used by http and https, we want that information in
+ the prompt, so we build the prompt from the authentication dict which
+ contains all the needed parts.
+
+ Also, hhtp and proxy AuthHandlers present different prompts to the
+ user. The daughter classes hosuld implements a public
+ build_password_prompt using this method.
+ """
+ prompt = '%s' % auth['protocol'].upper() + ' %(user)s@%(host)s'
+ realm = auth['realm']
+ if realm is not None:
+ prompt += ", Realm: '%s'" % realm
+ prompt += ' password'
+ return prompt
+
def http_request(self, request):
"""Insert an authentication header if information is available"""
auth = self.get_auth(request)
@@ -1122,8 +1140,6 @@
the auth request attribute.
"""
- # FIXME: should mention http/https as part of the prompt
- password_prompt = 'HTTP %(user)s@%(host)s%(realm)s password'
auth_required_header = 'www-authenticate'
auth_header = 'Authorization'
@@ -1135,6 +1151,9 @@
"""Set the auth params for the request"""
request.auth = auth
+ def build_password_prompt(self, auth):
+ return self._build_password_prompt(auth)
+
def http_error_401(self, req, fp, code, msg, headers):
return self.auth_required(req, headers)
@@ -1147,8 +1166,6 @@
the proxy_auth request attribute..
"""
- # FIXME: should mention http/https as part of the prompt
- password_prompt = 'Proxy %(user)s@%(host)s%(realm)s password'
auth_required_header = 'proxy-authenticate'
# FIXME: the correct capitalization is Proxy-Authorization,
# but python-2.4 urllib2.Request insist on using capitalize()
@@ -1163,6 +1180,11 @@
"""Set the auth params for the request"""
request.proxy_auth = auth
+ def build_password_prompt(self, auth):
+ prompt = self._build_password_prompt(auth)
+ prompt = 'Proxy ' + prompt
+ return prompt
+
def http_error_407(self, req, fp, code, msg, headers):
return self.auth_required(req, headers)
More information about the bazaar-commits
mailing list