( )⚙ D5736 tests: port test-hgweb-auth.py to Python 3

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5736

tests: port test-hgweb-auth.py to Python 3
ClosedPublic

Authored by durin42 on Jan 29 2019, 3:12 PM.

Details

Reviewers
pulkit
indygreg
Group Reviewers
hg-reviewers
Commits
rHG30dd20a56f3e: tests: port test-hgweb-auth.py to Python 3
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Jan 29 2019, 3:12 PM
indygreg accepted this revision.Jan 29 2019, 4:47 PM
indygreg added a subscriber: indygreg.

Excellent! I had poked at this test a few days ago without much luck. Your solutions are much cleaner.

This revision is now accepted and ready to land.Jan 29 2019, 4:47 PM
Closed by commit rHG30dd20a56f3e: tests: port test-hgweb-auth.py to Python 3 (authored by durin42). · Explain WhyJan 29 2019, 4:48 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/python3-whitelist (1 line)
Mtests/test-hgweb-auth.py (151 lines)

Diff 13551

contrib/python3-whitelist

test-help-hide.t test-help-hide.t
test-help.t test-help.t
test-hg-parseurl.py test-hg-parseurl.py
test-hghave.t test-hghave.t
test-hgignore.t test-hgignore.t
test-hgk.t test-hgk.t
test-hgrc.t test-hgrc.t
test-hgweb-annotate-whitespace.t test-hgweb-annotate-whitespace.t
test-hgweb-auth.py
test-hgweb-bundle.t test-hgweb-bundle.t
test-hgweb-commands.t test-hgweb-commands.t
test-hgweb-csp.t test-hgweb-csp.t
test-hgweb-descend-empties.t test-hgweb-descend-empties.t
test-hgweb-diffs.t test-hgweb-diffs.t
test-hgweb-empty.t test-hgweb-empty.t
test-hgweb-filelog.t test-hgweb-filelog.t
test-hgweb-no-path-info.t test-hgweb-no-path-info.t

tests/test-hgweb-auth.py

def interactive(self): def interactive(self):
return False return False
origui = myui.load() origui = myui.load()
def writeauth(items): def writeauth(items):
ui = origui.copy() ui = origui.copy()
for name, value in items.items(): for name, value in items.items():
ui.setconfig('auth', name, value) ui.setconfig(b'auth', name, value)
return ui return ui
def _stringifyauthinfo(ai):
if ai is None:
return ai
realm, authuris, user, passwd = ai
return (pycompat.strurl(realm),
[pycompat.strurl(u) for u in authuris],
pycompat.strurl(user),
pycompat.strurl(passwd),
)
def test(auth, urls=None): def test(auth, urls=None):
print('CFG:', pycompat.sysstr(stringutil.pprint(auth, bprefix=True))) print('CFG:', pycompat.sysstr(stringutil.pprint(auth, bprefix=True)))
prefixes = set() prefixes = set()
for k in auth: for k in auth:
prefixes.add(k.split('.', 1)[0]) prefixes.add(k.split(b'.', 1)[0])
for p in prefixes: for p in prefixes:
for name in ('.username', '.password'): for name in (b'.username', b'.password'):
if (p + name) not in auth: if (p + name) not in auth:
auth[p + name] = p auth[p + name] = p
auth = dict((k, v) for k, v in auth.items() if v is not None) auth = dict((k, v) for k, v in auth.items() if v is not None)
ui = writeauth(auth) ui = writeauth(auth)
def _test(uri): def _test(uri):
print('URI:', uri) print('URI:', pycompat.strurl(uri))
try: try:
pm = url.passwordmgr(ui, urlreq.httppasswordmgrwithdefaultrealm()) pm = url.passwordmgr(ui, urlreq.httppasswordmgrwithdefaultrealm())
u, authinfo = util.url(uri).authinfo() u, authinfo = util.url(uri).authinfo()
if authinfo is not None: if authinfo is not None:
pm.add_password(*authinfo) pm.add_password(*_stringifyauthinfo(authinfo))
print(' ', pm.find_user_password('test', u)) print(' ', tuple(pycompat.strurl(a) for a in
pm.find_user_password('test',
pycompat.strurl(u))))
except error.Abort: except error.Abort:
print(' ','abort') print(' ','abort')
if not urls: if not urls:
urls = [ urls = [
'http://example.org/foo', b'http://example.org/foo',
'http://example.org/foo/bar', b'http://example.org/foo/bar',
'http://example.org/bar', b'http://example.org/bar',
'https://example.org/foo', b'https://example.org/foo',
'https://example.org/foo/bar', b'https://example.org/foo/bar',
'https://example.org/bar', b'https://example.org/bar',
'https://x@example.org/bar', b'https://x@example.org/bar',
'https://y@example.org/bar', b'https://y@example.org/bar',
] ]
for u in urls: for u in urls:
_test(u) _test(u)
print('\n*** Test in-uri schemes\n') print('\n*** Test in-uri schemes\n')
test({'x.prefix': 'http://example.org'}) test({b'x.prefix': b'http://example.org'})
test({'x.prefix': 'https://example.org'}) test({b'x.prefix': b'https://example.org'})
test({'x.prefix': 'http://example.org', 'x.schemes': 'https'}) test({b'x.prefix': b'http://example.org', b'x.schemes': b'https'})
test({'x.prefix': 'https://example.org', 'x.schemes': 'http'}) test({b'x.prefix': b'https://example.org', b'x.schemes': b'http'})
print('\n*** Test separately configured schemes\n') print('\n*** Test separately configured schemes\n')
test({'x.prefix': 'example.org', 'x.schemes': 'http'}) test({b'x.prefix': b'example.org', b'x.schemes': b'http'})
test({'x.prefix': 'example.org', 'x.schemes': 'https'}) test({b'x.prefix': b'example.org', b'x.schemes': b'https'})
test({'x.prefix': 'example.org', 'x.schemes': 'http https'}) test({b'x.prefix': b'example.org', b'x.schemes': b'http https'})
print('\n*** Test prefix matching\n') print('\n*** Test prefix matching\n')
test({'x.prefix': 'http://example.org/foo', test({b'x.prefix': b'http://example.org/foo',
'y.prefix': 'http://example.org/bar'}) b'y.prefix': b'http://example.org/bar'})
test({'x.prefix': 'http://example.org/foo', test({b'x.prefix': b'http://example.org/foo',
'y.prefix': 'http://example.org/foo/bar'}) b'y.prefix': b'http://example.org/foo/bar'})
test({'x.prefix': '*', 'y.prefix': 'https://example.org/bar'}) test({b'x.prefix': b'*', b'y.prefix': b'https://example.org/bar'})
print('\n*** Test user matching\n') print('\n*** Test user matching\n')
test({'x.prefix': 'http://example.org/foo', test({b'x.prefix': b'http://example.org/foo',
'x.username': None, b'x.username': None,
'x.password': 'xpassword'}, b'x.password': b'xpassword'},
urls=['http://y@example.org/foo']) urls=[b'http://y@example.org/foo'])
test({'x.prefix': 'http://example.org/foo', test({b'x.prefix': b'http://example.org/foo',
'x.username': None, b'x.username': None,
'x.password': 'xpassword', b'x.password': b'xpassword',
'y.prefix': 'http://example.org/foo', b'y.prefix': b'http://example.org/foo',
'y.username': 'y', b'y.username': b'y',
'y.password': 'ypassword'}, b'y.password': b'ypassword'},
urls=['http://y@example.org/foo']) urls=[b'http://y@example.org/foo'])
test({'x.prefix': 'http://example.org/foo/bar', test({b'x.prefix': b'http://example.org/foo/bar',
'x.username': None, b'x.username': None,
'x.password': 'xpassword', b'x.password': b'xpassword',
'y.prefix': 'http://example.org/foo', b'y.prefix': b'http://example.org/foo',
'y.username': 'y', b'y.username': b'y',
'y.password': 'ypassword'}, b'y.password': b'ypassword'},
urls=['http://y@example.org/foo/bar']) urls=[b'http://y@example.org/foo/bar'])
print('\n*** Test user matching with name in prefix\n') print('\n*** Test user matching with name in prefix\n')
# prefix, username and URL have the same user # prefix, username and URL have the same user
test({'x.prefix': 'https://example.org/foo', test({b'x.prefix': b'https://example.org/foo',
'x.username': None, b'x.username': None,
'x.password': 'xpassword', b'x.password': b'xpassword',
'y.prefix': 'http://y@example.org/foo', b'y.prefix': b'http://y@example.org/foo',
'y.username': 'y', b'y.username': b'y',
'y.password': 'ypassword'}, b'y.password': b'ypassword'},
urls=['http://y@example.org/foo']) urls=[b'http://y@example.org/foo'])
# Prefix has a different user from username and URL # Prefix has a different user from username and URL
test({'y.prefix': 'http://z@example.org/foo', test({b'y.prefix': b'http://z@example.org/foo',
'y.username': 'y', b'y.username': b'y',
'y.password': 'ypassword'}, b'y.password': b'ypassword'},
urls=['http://y@example.org/foo']) urls=[b'http://y@example.org/foo'])
# Prefix has a different user from URL; no username # Prefix has a different user from URL; no username
test({'y.prefix': 'http://z@example.org/foo', test({b'y.prefix': b'http://z@example.org/foo',
'y.password': 'ypassword'}, b'y.password': b'ypassword'},
urls=['http://y@example.org/foo']) urls=[b'http://y@example.org/foo'])
# Prefix and URL have same user, but doesn't match username # Prefix and URL have same user, but doesn't match username
test({'y.prefix': 'http://y@example.org/foo', test({b'y.prefix': b'http://y@example.org/foo',
'y.username': 'z', b'y.username': b'z',
'y.password': 'ypassword'}, b'y.password': b'ypassword'},
urls=['http://y@example.org/foo']) urls=[b'http://y@example.org/foo'])
# Prefix and URL have the same user; no username # Prefix and URL have the same user; no username
test({'y.prefix': 'http://y@example.org/foo', test({b'y.prefix': b'http://y@example.org/foo',
'y.password': 'ypassword'}, b'y.password': b'ypassword'},
urls=['http://y@example.org/foo']) urls=[b'http://y@example.org/foo'])
# Prefix user, but no URL user or username # Prefix user, but no URL user or username
test({'y.prefix': 'http://y@example.org/foo', test({b'y.prefix': b'http://y@example.org/foo',
'y.password': 'ypassword'}, b'y.password': b'ypassword'},
urls=['http://example.org/foo']) urls=[b'http://example.org/foo'])
def testauthinfo(fullurl, authurl): def testauthinfo(fullurl, authurl):
print('URIs:', fullurl, authurl) print('URIs:', fullurl, authurl)
pm = urlreq.httppasswordmgrwithdefaultrealm() pm = urlreq.httppasswordmgrwithdefaultrealm()
pm.add_password(*util.url(fullurl).authinfo()[1]) ai = _stringifyauthinfo(util.url(pycompat.bytesurl(fullurl)).authinfo()[1])
pm.add_password(*ai)
print(pm.find_user_password('test', authurl)) print(pm.find_user_password('test', authurl))
print('\n*** Test urllib2 and util.url\n') print('\n*** Test urllib2 and util.url\n')
testauthinfo('http://user@example.com:8080/foo', 'http://example.com:8080/foo') testauthinfo('http://user@example.com:8080/foo', 'http://example.com:8080/foo')