public_git
/
speedtest-cli
mirror of https://github.com/sivel/speedtest-cli.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

403 error fix 

Fixing the 403 error by making all requests use HTTPS instead of HTTP. Also removing the --secure flag as it's now enabled by default.
This commit is contained in:
Loukios 2022-10-17 23:19:18 +01:00 committed by GitHub
parent 22210ca352
commit b5df4bf507
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
speedtest.py
View File

@ -688,7 +688,7 @@ def build_user_agent():
return user_agent return user_agent
def build_request(url, data=None, headers=None, bump='0', secure=False): def build_request(url, data=None, headers=None, bump='0', secure=True):
"""Build a urllib2 request object """Build a urllib2 request object
This function automatically adds a User-Agent header to all requests This function automatically adds a User-Agent header to all requests
@ -946,7 +946,7 @@ class SpeedtestResults(object):
""" """
def __init__(self, download=0, upload=0, ping=0, server=None, client=None, def __init__(self, download=0, upload=0, ping=0, server=None, client=None,
opener=None, secure=False): opener=None, secure=True):
self.download = download self.download = download
self.upload = upload self.upload = upload
self.ping = ping self.ping = ping
@ -1087,7 +1087,7 @@ class Speedtest(object):
"""Class for performing standard speedtest.net testing operations""" """Class for performing standard speedtest.net testing operations"""
def __init__(self, config=None, source_address=None, timeout=10, def __init__(self, config=None, source_address=None, timeout=10,
secure=False, shutdown_event=None): secure=True, shutdown_event=None):
self.config = {} self.config = {}
self._source_address = source_address self._source_address = source_address
@ -1770,9 +1770,6 @@ def parse_args():
parser.add_argument('--source', help='Source IP address to bind to') parser.add_argument('--source', help='Source IP address to bind to')
parser.add_argument('--timeout', default=10, type=PARSER_TYPE_FLOAT, parser.add_argument('--timeout', default=10, type=PARSER_TYPE_FLOAT,
help='HTTP timeout in seconds. Default 10') help='HTTP timeout in seconds. Default 10')
parser.add_argument('--secure', action='store_true',
help='Use HTTPS instead of HTTP when communicating '
'with speedtest.net operated servers')
parser.add_argument('--no-pre-allocate', dest='pre_allocate', parser.add_argument('--no-pre-allocate', dest='pre_allocate',
action='store_const', default=True, const=False, action='store_const', default=True, const=False,
help='Do not pre allocate upload data. Pre allocation ' help='Do not pre allocate upload data. Pre allocation '
@ -1884,8 +1881,7 @@ def shell():
try: try:
speedtest = Speedtest( speedtest = Speedtest(
source_address=args.source, source_address=args.source,
timeout=args.timeout, timeout=args.timeout
secure=args.secure
) )
except (ConfigRetrievalError,) + HTTP_ERRORS: except (ConfigRetrievalError,) + HTTP_ERRORS:
printer('Cannot retrieve speedtest configuration', error=True) printer('Cannot retrieve speedtest configuration', error=True)