cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

acme_certificate: improve alternate chain handling (#60742)

Browse source 
* Improve alternate chain handling.

* Fix chain handling.
This commit is contained in:
Felix Fontein 2019-08-22 21:08:36 +02:00 committed by ansibot
parent d06930d6f6
commit d31876416b
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/ansible/modules/crypto/acme/acme_certificate.py
View file

@ -390,6 +390,11 @@ all_chains:
returned: when certificate was retrieved and I(retrieve_all_alternates) is set to C(yes)
type: list
contains:
cert:
description:
- The leaf certificate itself, in PEM format.
type: str
returned: always
chain:
description:
- The certificate chain, excluding the root, as concatenated PEM certificates.
@ -917,22 +922,19 @@ class ACMEClient(object):
except ModuleFailException as e:
self.module.warn('Error while downloading alternative certificate {0}: {1}'.format(alternate, e))
continue
alt_chain = alt_cert.get('chain', [])
if alt_chain:
alternate_chains.append(alt_chain)
else:
self.module.warn('Alternative certificate {0} chain is empty'.format(alternate))
alternate_chains.append(alt_cert)
self.all_chains = []
def _append_all_chains(chain):
def _append_all_chains(cert_data):
self.all_chains.append(dict(
chain=("\n".join(chain)).encode('utf8'),
full_chain=(cert['cert'] + "\n".join(chain)).encode('utf8'),
cert=cert_data['cert'].encode('utf8'),
chain=("\n".join(cert_data.get('chain', []))).encode('utf8'),
full_chain=(cert_data['cert'] + "\n".join(cert_data.get('chain', []))).encode('utf8'),
))
_append_all_chains(cert.get('chain', []))
_append_all_chains(cert)
for alt_chain in alternate_chains:
_append_all_chains(alt_chain.get('chain', []))
_append_all_chains(alt_chain)
if cert['cert'] is not None:
pem_cert = cert['cert']