This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2703

phabricator: follow-up phab auth improvements with backwards compat mode
ClosedPublic

Authored by durin42 on Mar 6 2018, 2:00 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGb434965f984e: phabricator: follow-up phab auth improvements with backwards compat mode
rHGd289ea66a356: phabricator: follow-up phab auth improvements with backwards compat mode
Summary

We'll rip this out before we ship 4.6, but this gives people a window
to migrate.

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 6 2018, 2:00 PM
indygreg accepted this revision.Mar 6 2018, 7:02 PM
This revision is now accepted and ready to land.Mar 6 2018, 7:02 PM
Closed by commit rHGd289ea66a356: phabricator: follow-up phab auth improvements with backwards compat mode (authored by durin42). · Explain WhyMar 8 2018, 2:19 PM
This revision was automatically updated to reflect the committed changes.
mharbison72 added a subscriber: mharbison72.Mar 8 2018, 2:49 PM
mharbison72 added inline comments.
contrib/phabricator.py
107

This wants a repo.ui

durin42 marked an inline comment as done.Mar 8 2018, 2:59 PM
durin42 added inline comments.
contrib/phabricator.py
107

Ouch. Amended the change for that, thanks.

Revision Contents
Changeset List

PathPackages
Mcontrib/phabricator.py (17 lines)

Diff 6731

contrib/phabricator.py

for k, v in items(obj): for k, v in items(obj):
if prefix: if prefix:
process('%s[%s]' % (prefix, k), v) process('%s[%s]' % (prefix, k), v)
else: else:
process(k, v) process(k, v)
process('', params) process('', params)
return util.urlreq.urlencode(flatparams) return util.urlreq.urlencode(flatparams)
def readlegacytoken(repo):
"""Transitional support for old phabricator tokens.
Remove before the 4.6 release.
"""
token = ui.config('phabricator', 'token')
mharbison72Unsubmitted
Not Done

This wants a repo.ui

mharbison72: This wants a `repo.ui`
durin42AuthorUnsubmitted
Not Done

Ouch. Amended the change for that, thanks.

durin42: Ouch. Amended the change for that, thanks.
if token:
repo.ui.warn(_('phabricator.token is deprecated - please '
'migrate to the phabricator.auth section.\n'))
return token
def readurltoken(repo): def readurltoken(repo):
"""return conduit url, token and make sure they exist """return conduit url, token and make sure they exist
Currently read from [phabricator] config section. In the future, it might Currently read from [phabricator] config section. In the future, it might
make sense to read from .arcconfig and .arcrc as well. make sense to read from .arcconfig and .arcrc as well.
""" """
url = repo.ui.config('phabricator', 'url') url = repo.ui.config('phabricator', 'url')
if not url: if not url:
for group, auth in groups.iteritems(): for group, auth in groups.iteritems():
if url != auth.get('url'): if url != auth.get('url'):
continue continue
token = auth.get('token') token = auth.get('token')
if token: if token:
break break
if not token: if not token:
token = readlegacytoken(repo)
if not token:
raise error.Abort(_('Can\'t find conduit token associated to %s') raise error.Abort(_('Can\'t find conduit token associated to %s')
% (url,)) % (url,))
return url, token return url, token
def callconduit(repo, name, params): def callconduit(repo, name, params):
"""call Conduit API, params is a dict. return json.loads result, or None""" """call Conduit API, params is a dict. return json.loads result, or None"""
host, token = readurltoken(repo) host, token = readurltoken(repo)
url, authinfo = util.url('/'.join([host, 'api', name])).authinfo() url, authinfo = util.url('/'.join([host, 'api', name])).authinfo()
repo.ui.debug('Conduit Call: %s %s\n' % (url, params)) repo.ui.debug('Conduit Call: %s %s\n' % (url, params))