ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-25 11:51:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

openssl_certificate: Return self.cert.get_VALUES() (#33970)

Browse source 
Currently when we make up the return value, we take values based of the
parameters rather than the generated openssl_certificate itself.

This commits returns the actual certificate values making it all time
accurate.
This commit is contained in:
Yanis Guenane 2017-12-18 10:04:34 +01:00 • committed by Abhijeet Kasurde
parent a2810f44a8
commit a724b8e722
3 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/modules/crypto/openssl_certificate.py
View file

@ -378,7 +378,6 @@ class SelfSignedCertificate(Certificate):
def __init__(self, module):
super(SelfSignedCertificate, self).__init__(module)
self.serial_number = randint(1000, 99999)
self.notBefore = module.params['selfsigned_notBefore']
self.notAfter = module.params['selfsigned_notAfter']
self.digest = module.params['selfsigned_digest']
@ -387,7 +386,6 @@ class SelfSignedCertificate(Certificate):
self.privatekey = crypto_utils.load_privatekey(
self.privatekey_path, self.privatekey_passphrase
)
self.cert = None
def generate(self, module):
@ -403,7 +401,7 @@ class SelfSignedCertificate(Certificate):
if not self.check(module, perms_required=False) or self.force:
cert = crypto.X509()
cert.set_serial_number(self.serial_number)
cert.set_serial_number(randint(1000, 99999))
if self.notBefore:
cert.set_notBefore(self.notBefore)
else:
@ -420,11 +418,11 @@ class SelfSignedCertificate(Certificate):
cert.add_extensions(self.csr.get_extensions())
cert.sign(self.privatekey, self.digest)
self.certificate = cert
self.cert = cert
try:
with open(self.path, 'wb') as cert_file:
cert_file.write(crypto.dump_certificate(crypto.FILETYPE_PEM, self.certificate))
cert_file.write(crypto.dump_certificate(crypto.FILETYPE_PEM, self.cert))
except EnvironmentError as exc:
raise CertificateError(exc)
@ -441,9 +439,9 @@ class SelfSignedCertificate(Certificate):
'filename': self.path,
'privatekey': self.privatekey_path,
'csr': self.csr_path,
'notBefore': self.notBefore,
'notAfter': self.notAfter,
'serial_number': self.serial_number,
'notBefore': self.cert.get_notBefore(),
'notAfter': self.cert.get_notAfter(),
'serial_number': self.cert.get_serial_number(),
}
return result