This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2599

url: more bytes/unicodes fussing in url.py around auth handling
ClosedPublic

Authored by durin42 on Mar 3 2018, 2:31 PM.

Details

Reviewers
pulkit
yuja
Group Reviewers
hg-reviewers
Commits
rHG8381126bf43c: url: more bytes/unicodes fussing in url.py around auth handling
Summary

Once again, these methods are a little annoying to handle because they
can get unicodes or bytes depending on who's calling. I think we can
probably clean this up a TON once we can run something like pytype and
do typechecking of our Python, but until then this is going to be the
easy way out. This fixes test-http-bundle1.t.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Mar 3 2018, 2:31 PM
yuja accepted this revision.Mar 3 2018, 2:43 PM
This revision is now accepted and ready to land.Mar 3 2018, 2:43 PM
Closed by commit rHG8381126bf43c: url: more bytes/unicodes fussing in url.py around auth handling (authored by durin42). · Explain WhyMar 3 2018, 3:15 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/python3-whitelist (1 line)
Mmercurial/url.py (8 lines)

Diff 6463

contrib/python3-whitelist

test-histedit-fold.t test-histedit-fold.t
test-histedit-no-change.t test-histedit-no-change.t
test-histedit-non-commute-abort.t test-histedit-non-commute-abort.t
test-histedit-non-commute.t test-histedit-non-commute.t
test-histedit-obsolete.t test-histedit-obsolete.t
test-histedit-outgoing.t test-histedit-outgoing.t
test-histedit-templates.t test-histedit-templates.t
test-http-branchmap.t test-http-branchmap.t
test-http-bundle1.t
test-http-clone-r.t test-http-clone-r.t
test-identify.t test-identify.t
test-imports-checker.t test-imports-checker.t
test-inherit-mode.t test-inherit-mode.t
test-issue1089.t test-issue1089.t
test-issue1102.t test-issue1102.t
test-issue1175.t test-issue1175.t
test-issue1306.t test-issue1306.t

mercurial/url.py

if not user or not passwd: if not user or not passwd:
res = httpconnectionmod.readauthforuri(self.ui, authuri, user) res = httpconnectionmod.readauthforuri(self.ui, authuri, user)
if res: if res:
group, auth = res group, auth = res
user, passwd = auth.get('username'), auth.get('password') user, passwd = auth.get('username'), auth.get('password')
self.ui.debug("using auth.%s.* for authentication\n" % group) self.ui.debug("using auth.%s.* for authentication\n" % group)
if not user or not passwd: if not user or not passwd:
u = util.url(authuri) u = util.url(pycompat.bytesurl(authuri))
u.query = None u.query = None
if not self.ui.interactive(): if not self.ui.interactive():
raise error.Abort(_('http authorization required for %s') % raise error.Abort(_('http authorization required for %s') %
util.hidepassword(bytes(u))) util.hidepassword(bytes(u)))
self.ui.write(_("http authorization required for %s\n") % self.ui.write(_("http authorization required for %s\n") %
util.hidepassword(bytes(u))) util.hidepassword(bytes(u)))
self.ui.write(_("realm: %s\n") % realm) self.ui.write(_("realm: %s\n") % pycompat.bytesurl(realm))
if user: if user:
self.ui.write(_("user: %s\n") % user) self.ui.write(_("user: %s\n") % user)
else: else:
user = self.ui.prompt(_("user:"), default=None) user = self.ui.prompt(_("user:"), default=None)
if not passwd: if not passwd:
passwd = self.ui.getpass() passwd = self.ui.getpass()
self.retried = 0 self.retried = 0
return urlreq.httpbasicauthhandler.http_error_auth_reqed( return urlreq.httpbasicauthhandler.http_error_auth_reqed(
self, auth_header, host, req, headers) self, auth_header, host, req, headers)
def retry_http_basic_auth(self, host, req, realm): def retry_http_basic_auth(self, host, req, realm):
user, pw = self.passwd.find_user_password( user, pw = self.passwd.find_user_password(
realm, urllibcompat.getfullurl(req)) realm, urllibcompat.getfullurl(req))
if pw is not None: if pw is not None:
raw = "%s:%s" % (user, pw) raw = "%s:%s" % (pycompat.bytesurl(user), pycompat.bytesurl(pw))
auth = 'Basic %s' % base64.b64encode(raw).strip() auth = r'Basic %s' % pycompat.strurl(base64.b64encode(raw).strip())
if req.get_header(self.auth_header, None) == auth: if req.get_header(self.auth_header, None) == auth:
return None return None
self.auth = auth self.auth = auth
req.add_unredirected_header(self.auth_header, auth) req.add_unredirected_header(self.auth_header, auth)
return self.parent.open(req) return self.parent.open(req)
else: else:
return None return None