This is an archive of the discontinued Mercurial Phabricator instance.

Differential D605

phabricator: add a config to use curl for communication
ClosedPublic

Authored by quark on Sep 1 2017, 3:21 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG8b659b7388c0: phabricator: add a config to use curl for communication
Summary

Not sure why, but I got phabsend hang on work network pretty frequently.
The traceback indicates it hangs at _sslobj.do_handshake():

File "mercurial/sslutil.py", line 404, in wrapsocket
  sslsocket = sslcontext.wrap_socket(sock, server_hostname=serverhostname)
File "/usr/lib/python2.7/ssl.py", line 363, in wrap_socket
  _context=self)
File "/usr/lib/python2.7/ssl.py", line 611, in __init__
  self.do_handshake()
File "/usr/lib/python2.7/ssl.py", line 840, in do_handshake
  self._sslobj.do_handshake()

I had tried adding timeout in various places but they seem not effective.
It seems easier to just allow shelling out to curl with retry and timeout
flags.

This could also be helpful for people with an older Python installed without
modern security (SNI).

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

quark created this revision.Sep 1 2017, 3:21 PM
quark updated this revision to Diff 1548.Sep 1 2017, 3:24 PM
quark updated this revision to Diff 1568.Sep 1 2017, 8:29 PM
Closed by commit rHG8b659b7388c0: phabricator: add a config to use curl for communication (authored by quark). · Explain WhySep 3 2017, 10:20 AM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Sep 3 2017, 10:22 AM
yuja added inline comments.
contrib/phabricator.py
122

Maybe it's better to insert -- for extra safety.

Revision Contents
Changeset List

PathPackages
Mcontrib/phabricator.py (19 lines)

Diff 1590

contrib/phabricator.py

# API token. Get it from https://$HOST/conduit/login/ # API token. Get it from https://$HOST/conduit/login/
token = cli-xxxxxxxxxxxxxxxxxxxxxxxxxxxx token = cli-xxxxxxxxxxxxxxxxxxxxxxxxxxxx
# Repo callsign. If a repo has a URL https://$HOST/diffusion/FOO, then its # Repo callsign. If a repo has a URL https://$HOST/diffusion/FOO, then its
# callsign is "FOO". # callsign is "FOO".
callsign = FOO callsign = FOO
# curl command to use. If not set (default), use builtin HTTP library to
# communicate. If set, use the specified curl command. This could be useful
# if you need to specify advanced options that is not easily supported by
# the internal library.
curlcmd = curl --connect-timeout 2 --retry 3 --silent
""" """
from __future__ import absolute_import from __future__ import absolute_import
import itertools import itertools
import json import json
import operator import operator
import re import re
raise error.Abort(_('config %s.%s is required') % (section, name)) raise error.Abort(_('config %s.%s is required') % (section, name))
values.append(value) values.append(value)
return values return values
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()
urlopener = urlmod.opener(repo.ui, authinfo)
repo.ui.debug('Conduit Call: %s %s\n' % (url, params)) repo.ui.debug('Conduit Call: %s %s\n' % (url, params))
params = params.copy() params = params.copy()
params['api.token'] = token params['api.token'] = token
request = util.urlreq.request(url, data=urlencodenested(params)) data = urlencodenested(params)
curlcmd = repo.ui.config('phabricator', 'curlcmd')
if curlcmd:
sin, sout = util.popen2('%s -d @- %s' % (curlcmd, util.shellquote(url)))
yujaUnsubmitted
Not Done

Maybe it's better to insert -- for extra safety.

yuja: Maybe it's better to insert `--` for extra safety.
sin.write(data)
sin.close()
body = sout.read()
else:
urlopener = urlmod.opener(repo.ui, authinfo)
request = util.urlreq.request(url, data=data)
body = urlopener.open(request).read() body = urlopener.open(request).read()
repo.ui.debug('Conduit Response: %s\n' % body) repo.ui.debug('Conduit Response: %s\n' % body)
parsed = json.loads(body) parsed = json.loads(body)
if parsed.get(r'error_code'): if parsed.get(r'error_code'):
msg = (_('Conduit Error (%s): %s') msg = (_('Conduit Error (%s): %s')
% (parsed[r'error_code'], parsed[r'error_info'])) % (parsed[r'error_code'], parsed[r'error_info']))
raise error.Abort(msg) raise error.Abort(msg)
return parsed[r'result'] return parsed[r'result']