YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[mod] start putting timeout in certificate code

Browse source
This commit is contained in:
Laurent Peuch 2017-01-16 09:24:41 +01:00
parent fc7c35c319
commit 905a04146b
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/yunohost/certificate.py
View file

@ -37,6 +37,8 @@ import glob
from OpenSSL import crypto from OpenSSL import crypto
from datetime import datetime from datetime import datetime
from requests.exceptions import Timeout
from yunohost.vendor.acme_tiny.acme_tiny import get_crt as sign_certificate from yunohost.vendor.acme_tiny.acme_tiny import get_crt as sign_certificate
from moulinette.core import MoulinetteError from moulinette.core import MoulinetteError
@ -567,7 +569,11 @@ def _fetch_and_enable_new_certificate(domain, staging=False):
raise MoulinetteError(errno.EINVAL, m18n.n( raise MoulinetteError(errno.EINVAL, m18n.n(
'certmanager_cert_signing_failed')) 'certmanager_cert_signing_failed'))
intermediate_certificate = requests.get(INTERMEDIATE_CERTIFICATE_URL).text try:
intermediate_certificate = requests.get(INTERMEDIATE_CERTIFICATE_URL, timeout=30).text
except Timeout:
# XXX what should we do here? retry?
pass
# Now save the key and signed certificate # Now save the key and signed certificate
logger.info("Saving the key and signed certificate...") logger.info("Saving the key and signed certificate...")
@ -837,7 +843,10 @@ def _dns_ip_match_public_ip(public_ip, domain):
def _domain_is_accessible_through_HTTP(ip, domain): def _domain_is_accessible_through_HTTP(ip, domain):
try: try:
requests.head("http://" + ip, headers={"Host": domain}) requests.head("http://" + ip, headers={"Host": domain}, timeout=30)
except Timeout as e:
# XXX what should we do here? retry?
pass
except Exception as e: except Exception as e:
logger.debug("Couldn't reach domain '%s' by requesting this ip '%s' because: %s" % (domain, ip, e)) logger.debug("Couldn't reach domain '%s' by requesting this ip '%s' because: %s" % (domain, ip, e))
return False return False