This is an archive of the discontinued Mercurial Phabricator instance.

Differential D800

phabricator: handle non-JSON response gracefully
ClosedPublic

Authored by mjpieters on Sep 22 2017, 1:55 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX694bf743c160: phabricator: handle non-JSON response gracefully
Summary

Tested by trying to connect to a non-phabricator URL that responds with HTML to
a POST request and by trying to run hg ssl when not on the corp network.

Depends on D799

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

mjpieters created this revision.Sep 22 2017, 1:55 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 22 2017, 1:55 PM
quark accepted this revision.Sep 22 2017, 1:58 PM
This revision is now accepted and ready to land.Sep 22 2017, 1:58 PM
Closed by commit rFBHGX694bf743c160: phabricator: handle non-JSON response gracefully (authored by Martijn Pieters <mjpieters@fb.com>). · Explain WhySep 26 2017, 5:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mphabricator/conduit.py (7 lines)

Diff 2041

phabricator/conduit.py

# packaged for both corp and prod environments. # packaged for both corp and prod environments.
headers = ( headers = (
('Connection', 'Keep-Alive'), ('Connection', 'Keep-Alive'),
('Content-Type', 'application/x-www-form-urlencoded'), ('Content-Type', 'application/x-www-form-urlencoded'),
) )
url = self._url + method url = self._url + method
try: try:
response = urlgrabber.urlopen(url, headers=headers, data=req_data) response = urlgrabber.urlopen(url, headers=headers, data=req_data)
response = json.load(response)
except URLGrabError as ex: except URLGrabError as ex:
raise Client(ex.errno, str(ex)) raise Client(ex.errno, str(ex))
try:
response = json.load(response)
except ValueError:
# Can't decode the data, not valid JSON (html error page perhaps?)
raise ClientError(-1, 'did not receive a valid JSON response')
if response['error_code'] is not None: if response['error_code'] is not None:
raise ClientError(response['error_code'], response['error_info']) raise ClientError(response['error_code'], response['error_info'])
return response['result'] return response['result']
class MockClient(object): class MockClient(object):
def __init__(self, **kwargs): def __init__(self, **kwargs):
pass pass