Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/url.py @ 15005:4a43e23b8c55 stable 1.9.1
hgweb: do not ignore [auth] if url has a username (issue2822)
The [auth] section was ignored when handling URLs like:
http://user@example.com/foo
Instead, we look in [auth] for an entry matching the URL and supplied user
name. Entries without username can match URL with a username. Prefix length
ties are resolved in favor of entries matching the username. With:
foo.prefix = http://example.org
foo.username = user
foo.password = password
bar.prefix = http://example.org/bar
and the input URL:
http://user@example.org/bar
the 'bar' entry will be selected because of prefix length, therefore prompting
for a password. This behaviour ensure that entries selection is consistent when
looking for credentials or for certificates, and that certificates can be
picked even if their entries do no define usernames while the URL does.
Additionally, entries without a username matched against a username are
returned as if they did have requested username set to avoid prompting again
for a username if the password is not set.
v2: reparse the URL in readauthforuri() to handle HTTP and HTTPS similarly.
v3: allow unset usernames to match URL usernames to pick certificates. Resolve
prefix length ties in favor of entries with usernames.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 01 Aug 2011 23:58:50 +0200 |
parents | e7525a555a64 |
children | d0424f39984c 0593e8f81c71 |
comparison
equal
deleted
inserted
replaced
15004:d06b9c55ddab | 15005:4a43e23b8c55 |
---|---|
23 user, passwd = authinfo | 23 user, passwd = authinfo |
24 if user and passwd: | 24 if user and passwd: |
25 self._writedebug(user, passwd) | 25 self._writedebug(user, passwd) |
26 return (user, passwd) | 26 return (user, passwd) |
27 | 27 |
28 if not user: | 28 if not user or not passwd: |
29 res = httpconnectionmod.readauthforuri(self.ui, authuri) | 29 res = httpconnectionmod.readauthforuri(self.ui, authuri) |
30 if res: | 30 if res: |
31 group, auth = res | 31 group, auth = res |
32 user, passwd = auth.get('username'), auth.get('password') | 32 user, passwd = auth.get('username'), auth.get('password') |
33 self.ui.debug("using auth.%s.* for authentication\n" % group) | 33 self.ui.debug("using auth.%s.* for authentication\n" % group) |