Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Increase timeouts

This commit is contained in:
Curtis Castrapel 2018-08-17 15:36:56 -07:00
parent 43ae6c39e3
commit 9f64f0523b
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lemur/plugins/lemur_acme/plugin.py
View File

@ -164,7 +164,7 @@ class AcmeHandler(object):
current_app.logger.debug("Connecting with directory at {0}".format(directory_url)) current_app.logger.debug("Connecting with directory at {0}".format(directory_url))
net = ClientNetwork(key, account=None) net = ClientNetwork(key, account=None, timeout=3600)
client = BackwardsCompatibleClientV2(net, key, directory_url) client = BackwardsCompatibleClientV2(net, key, directory_url)
registration = client.new_account_and_tos(messages.NewRegistration.from_data(email=email)) registration = client.new_account_and_tos(messages.NewRegistration.from_data(email=email))
current_app.logger.debug("Connected: {0}".format(registration.uri)) current_app.logger.debug("Connected: {0}".format(registration.uri))
@ -424,15 +424,13 @@ class ACMEIssuerPlugin(IssuerPlugin):
}) })
for entry in pending: for entry in pending:
# Recreate acme client for each cert
acme_client, _ = self.acme.setup_acme_client(pending_cert.authority)
try: try:
entry["authorizations"] = self.acme.finalize_authorizations( entry["authorizations"] = self.acme.finalize_authorizations(
acme_client, entry["acme_client"],
entry["authorizations"], entry["authorizations"],
) )
pem_certificate, pem_certificate_chain = self.acme.request_certificate( pem_certificate, pem_certificate_chain = self.acme.request_certificate(
acme_client, entry["acme_client"],
entry["authorizations"], entry["authorizations"],
entry["order"] entry["order"]
) )
@ -455,7 +453,7 @@ class ACMEIssuerPlugin(IssuerPlugin):
}) })
# Ensure DNS records get deleted # Ensure DNS records get deleted
self.acme.cleanup_dns_challenges( self.acme.cleanup_dns_challenges(
acme_client, entry["acme_client"],
entry["authorizations"], entry["authorizations"],
) )
return certs return certs

4
requirements-docs.txt
View File

@ -15,8 +15,8 @@ asyncpool==1.0
babel==2.6.0 # via sphinx babel==2.6.0 # via sphinx
bcrypt==3.1.4 bcrypt==3.1.4
blinker==1.4 blinker==1.4
boto3==1.7.78 boto3==1.7.79
botocore==1.10.78 botocore==1.10.79
certifi==2018.8.13 certifi==2018.8.13
cffi==1.11.5 cffi==1.11.5
chardet==3.0.4 chardet==3.0.4

6
requirements-tests.txt
View File

@ -8,9 +8,9 @@ asn1crypto==0.24.0 # via cryptography
atomicwrites==1.1.5 # via pytest atomicwrites==1.1.5 # via pytest
attrs==18.1.0 # via pytest attrs==18.1.0 # via pytest
aws-xray-sdk==0.95 # via moto aws-xray-sdk==0.95 # via moto
boto3==1.7.78 # via moto boto3==1.7.79 # via moto
boto==2.49.0 # via moto boto==2.49.0 # via moto
botocore==1.10.78 # via boto3, moto, s3transfer botocore==1.10.79 # via boto3, moto, s3transfer
certifi==2018.8.13 # via requests certifi==2018.8.13 # via requests
cffi==1.11.5 # via cryptography cffi==1.11.5 # via cryptography
chardet==3.0.4 # via requests chardet==3.0.4 # via requests
@ -43,7 +43,7 @@ pluggy==0.7.1 # via pytest
py==1.5.4 # via pytest py==1.5.4 # via pytest
pyaml==17.12.1 # via moto pyaml==17.12.1 # via moto
pycparser==2.18 # via cffi pycparser==2.18 # via cffi
pycryptodome==3.6.5 # via python-jose pycryptodome==3.6.6 # via python-jose
pyflakes==2.0.0 pyflakes==2.0.0
pytest-flask==0.10.0 pytest-flask==0.10.0
pytest-mock==1.10.0 pytest-mock==1.10.0

4
requirements.txt
View File

@ -13,8 +13,8 @@ asn1crypto==0.24.0 # via cryptography
asyncpool==1.0 asyncpool==1.0
bcrypt==3.1.4 # via flask-bcrypt, paramiko bcrypt==3.1.4 # via flask-bcrypt, paramiko
blinker==1.4 # via flask-mail, flask-principal, raven blinker==1.4 # via flask-mail, flask-principal, raven
boto3==1.7.78 boto3==1.7.79
botocore==1.10.78 # via boto3, s3transfer botocore==1.10.79 # via boto3, s3transfer
certifi==2018.8.13 certifi==2018.8.13
cffi==1.11.5 # via bcrypt, cryptography, pynacl cffi==1.11.5 # via bcrypt, cryptography, pynacl
chardet==3.0.4 # via requests chardet==3.0.4 # via requests