Merge pull request #1347 from castrapel/dyn2

Dyn

lemur/plugins/lemur_acme/plugin.py

@@ -104,7 +104,11 @@ def request_certificate(acme_client, authorizations, csr, order):
             authorization_resource, _ = acme_client.poll(authz)
 
     deadline = datetime.datetime.now() + datetime.timedelta(seconds=90)
+    try:
         orderr = acme_client.finalize_order(order, deadline)
+    except AcmeError:
+        current_app.logger.error("Unable to resolve Acme order: {}".format(order), exc_info=True)
+        raise
     pem_certificate = OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_PEM,
                                            OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM,
                                                                            orderr.fullchain_pem)).decode()
@@ -382,3 +386,7 @@ class ACMEIssuerPlugin(IssuerPlugin):
             if option.get('name') == 'certificate':
                 acme_root = option.get('value')
         return acme_root, "", [role]
+
+    def cancel_ordered_certificate(self, pending_cert, **kwargs):
+        # Needed to override issuer function.
+        pass

requirements-dev.txt

@@ -21,7 +21,7 @@ pycodestyle==2.3.1        # via flake8
 pyflakes==1.6.0           # via flake8
 pyyaml==3.12              # via aspy.yaml, pre-commit
 requests-toolbelt==0.8.0  # via twine
-requests==2.19.0          # via requests-toolbelt, twine
+requests==2.19.1          # via requests-toolbelt, twine
 six==1.11.0               # via cfgv, pre-commit
 toml==0.9.4               # via pre-commit
 tqdm==4.23.4              # via twine

requirements-tests.txt

@@ -8,9 +8,9 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.1.5       # via pytest
 attrs==18.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
-boto3==1.7.37             # via moto
+boto3==1.7.38             # via moto
 boto==2.48.0              # via moto
-botocore==1.10.37         # via boto3, moto, s3transfer
+botocore==1.10.38         # via boto3, moto, s3transfer
 certifi==2018.4.16        # via requests
 cffi==1.11.5              # via cryptography
 chardet==3.0.4            # via requests
@@ -49,7 +49,7 @@ python-dateutil==2.6.1    # via botocore, faker, freezegun, moto
 pytz==2018.4              # via moto
 pyyaml==3.12              # via pyaml
 requests-mock==1.5.0
-requests==2.19.0          # via aws-xray-sdk, docker, moto, requests-mock, responses
+requests==2.19.1          # via aws-xray-sdk, docker, moto, requests-mock, responses
 responses==0.9.0          # via moto
 s3transfer==0.1.13        # via boto3
 six==1.11.0               # via cryptography, docker, docker-pycreds, faker, freezegun, mock, more-itertools, moto, pytest, python-dateutil, requests-mock, responses, websocket-client

requirements.txt

@@ -13,8 +13,8 @@ asn1crypto==0.24.0        # via cryptography
 asyncpool==1.0
 bcrypt==3.1.4             # via flask-bcrypt, paramiko
 blinker==1.4              # via flask-mail, flask-principal, raven
-boto3==1.7.37
-botocore==1.10.37         # via boto3, s3transfer
+boto3==1.7.38
+botocore==1.10.38         # via boto3, s3transfer
 certifi==2018.4.16
 cffi==1.11.5              # via bcrypt, cryptography, pynacl
 click==6.7                # via flask