From 843df2a31d71c2ef1518651175a52462ca391cdc Mon Sep 17 00:00:00 2001 From: mdr0id Date: Wed, 4 Dec 2019 07:59:53 -0800 Subject: [PATCH] update to py3 conventions, clean up code to be upstream consistent --- qa/rpc-tests/test_framework/authproxy.py | 44 ++++++++++++++---------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/qa/rpc-tests/test_framework/authproxy.py b/qa/rpc-tests/test_framework/authproxy.py index 82281f365..4584eb973 100644 --- a/qa/rpc-tests/test_framework/authproxy.py +++ b/qa/rpc-tests/test_framework/authproxy.py @@ -33,18 +33,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ -try: - import http.client as httplib -except ImportError: - import httplib +import http.client as httplib import base64 import decimal import json import logging -try: - import urlparse -except ImportError: - import urllib.parse as urlparse +import urllib.parse USER_AGENT = "AuthServiceProxy/0.1" @@ -69,8 +63,11 @@ class AuthServiceProxy(): def __init__(self, service_url, service_name=None, timeout=HTTP_TIMEOUT, connection=None): self.__service_url = service_url self.__service_name = service_name - self.__url = urlparse.urlparse(service_url) - + self.__url = urllib.parse.urlparse(service_url) + if self.__url.port is None: + port = 80 + else: + port = self.__url.port (user, passwd) = (self.__url.username, self.__url.password) try: user = user.encode('utf8') @@ -83,8 +80,15 @@ class AuthServiceProxy(): authpair = user + b':' + passwd self.__auth_header = b'Basic ' + base64.b64encode(authpair) - self.timeout = timeout - self._set_conn(connection) + if connection: + self.__conn = connection + self.timeout = connection.timeout + elif self.__url.scheme == 'https': + self.__conn = httplib.HTTPSConnection(self.__url.hostname, port, + timeout=timeout) + else: + self.__conn = httplib.HTTPConnection(self.__url.hostname, port, timeout=timeout) + def _set_conn(self, connection=None): port = 80 if self.__url.port is None else self.__url.port @@ -92,9 +96,9 @@ class AuthServiceProxy(): self.__conn = connection self.timeout = connection.timeout elif self.__url.scheme == 'https': - self.__conn = httplib.HTTPSConnection(self.__url.hostname, port, timeout=self.timeout) + self.__conn = http.client.HTTPSConnection(self.__url.hostname, port, timeout=self.timeout) else: - self.__conn = httplib.HTTPConnection(self.__url.hostname, port, timeout=self.timeout) + self.__conn = http.client.HTTPConnection(self.__url.hostname, port, timeout=self.timeout) @@ -119,11 +123,8 @@ class AuthServiceProxy(): self.__conn.request(method, path, postdata, headers) return self._get_response() except Exception as e: - # If connection was closed, try again. - # Python 3.5+ raises BrokenPipeError instead of BadStatusLine when the connection was reset. - # ConnectionResetError happens on FreeBSD with Python 3.4. - # These classes don't exist in Python 2.x, so we can't refer to them directly. - if ((isinstance(e, httplib.BadStatusLine) and e.line == "''") + if ((isinstance(e, httplib.BadStatusLine) + and e.line in ("''", "No status line received - the server has closed the connection")) or e.__class__.__name__ in ('BrokenPipeError', 'ConnectionResetError')): self.__conn.close() self.__conn.request(method, path, postdata, headers) @@ -159,6 +160,11 @@ class AuthServiceProxy(): if http_response is None: raise JSONRPCException({ 'code': -342, 'message': 'missing HTTP response from server'}) + + content_type = http_response.getheader('Content-Type') + if content_type != 'application/json': + raise JSONRPCException({ + 'code': -342, 'message': 'non-JSON HTTP response with \'%i %s\' from server' % (http_response.status, http_response.reason)}) responsedata = http_response.read().decode('utf8') response = json.loads(responsedata, parse_float=decimal.Decimal)