starred/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-01 18:56:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5118 from erikrose/certbot-auto-timeout

Browse Source 
Certbot auto timeout
This commit is contained in:
Brad Warren
2017-09-18 15:56:26 -07:00
committed by GitHub
parent 3acde31ed3 e7884898ec
commit 6aabb31eb5
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt-auto-source/letsencrypt-auto
+5 -2
View File
@@ -1361,7 +1361,8 @@ from os.path import dirname, join
import re import re
from subprocess import check_call, CalledProcessError from subprocess import check_call, CalledProcessError
from sys import argv, exit from sys import argv, exit
from urllib2 import build_opener, HTTPHandler, HTTPSHandler, HTTPError from urllib2 import build_opener, HTTPHandler, HTTPSHandler
from urllib2 import HTTPError, URLError
PUBLIC_KEY = environ.get('LE_AUTO_PUBLIC_KEY', """-----BEGIN PUBLIC KEY----- PUBLIC_KEY = environ.get('LE_AUTO_PUBLIC_KEY', """-----BEGIN PUBLIC KEY-----
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6MR8W/galdxnpGqBsYbq MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6MR8W/galdxnpGqBsYbq
@@ -1397,7 +1398,9 @@ class HttpsGetter(object):
""" """
try: try:
return self._opener.open(url).read() # socket module docs say default timeout is None: that is, no
# timeout
return self._opener.open(url, timeout=30).read()
except (HTTPError, IOError) as exc: except (HTTPError, IOError) as exc:
raise ExpectedError("Couldn't download %s." % url, exc) raise ExpectedError("Couldn't download %s." % url, exc)
letsencrypt-auto-source/pieces/fetch.py
+5 -2
View File
@@ -20,7 +20,8 @@ from os.path import dirname, join
import re import re
from subprocess import check_call, CalledProcessError from subprocess import check_call, CalledProcessError
from sys import argv, exit from sys import argv, exit
from urllib2 import build_opener, HTTPHandler, HTTPSHandler, HTTPError from urllib2 import build_opener, HTTPHandler, HTTPSHandler
from urllib2 import HTTPError, URLError
PUBLIC_KEY = environ.get('LE_AUTO_PUBLIC_KEY', """-----BEGIN PUBLIC KEY----- PUBLIC_KEY = environ.get('LE_AUTO_PUBLIC_KEY', """-----BEGIN PUBLIC KEY-----
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6MR8W/galdxnpGqBsYbq MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6MR8W/galdxnpGqBsYbq
@@ -56,7 +57,9 @@ class HttpsGetter(object):
""" """
try: try:
return self._opener.open(url).read() # socket module docs say default timeout is None: that is, no
# timeout
return self._opener.open(url, timeout=30).read()
except (HTTPError, IOError) as exc: except (HTTPError, IOError) as exc:
raise ExpectedError("Couldn't download %s." % url, exc) raise ExpectedError("Couldn't download %s." % url, exc)