Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openssl_certificate: Handle dump() in check_mode #38386

Merged
merged 1 commit into from
Apr 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 23 additions & 10 deletions lib/ansible/modules/crypto/openssl_certificate.py
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,7 @@ def __init__(self, module):
self.notAfter = module.params['selfsigned_notAfter']
self.digest = module.params['selfsigned_digest']
self.version = module.params['selfsigned_version']
self.serial_number = randint(1000, 99999)
self.csr = crypto_utils.load_certificate_request(self.csr_path)
self.privatekey = crypto_utils.load_privatekey(
self.privatekey_path, self.privatekey_passphrase
Expand All @@ -442,7 +443,7 @@ def generate(self, module):

if not self.check(module, perms_required=False) or self.force:
cert = crypto.X509()
cert.set_serial_number(randint(1000, 99999))
cert.set_serial_number(self.serial_number)
if self.notBefore:
cert.set_notBefore(self.notBefore)
else:
Expand Down Expand Up @@ -474,18 +475,30 @@ def generate(self, module):
if module.set_fs_attributes_if_different(file_args, False):
self.changed = True

def dump(self):
def dump(self, check_mode=False):

result = {
'changed': self.changed,
'filename': self.path,
'privatekey': self.privatekey_path,
'csr': self.csr_path,
'notBefore': self.cert.get_notBefore(),
'notAfter': self.cert.get_notAfter(),
'serial_number': self.cert.get_serial_number(),
'csr': self.csr_path
}

if check_mode:
now = datetime.datetime.utcnow()
ten = now.replace(now.year + 10)
result.update({
'notBefore': self.notBefore if self.notBefore else now.strftime("%Y%m%d%H%M%SZ"),
'notAfter': self.notAfter if self.notAfter else ten.strftime("%Y%m%d%H%M%SZ"),
'serial_number': self.serial_number,
})
else:
result.update({
'notBefore': self.cert.get_notBefore(),
'notAfter': self.cert.get_notAfter(),
'serial_number': self.cert.get_serial_number(),
})

return result


Expand Down Expand Up @@ -708,7 +721,7 @@ def check(self, module, perms_required=True):

return parent_check and assertonly_check

def dump(self):
def dump(self, check_mode=False):

result = {
'changed': self.changed,
Expand Down Expand Up @@ -773,7 +786,7 @@ def generate(self, module):
if module.set_fs_attributes_if_different(file_args, False):
self.changed = True

def dump(self):
def dump(self, check_mode=False):

result = {
'changed': self.changed,
Expand Down Expand Up @@ -859,7 +872,7 @@ def main():
if module.params['state'] == 'present':

if module.check_mode:
result = certificate.dump()
result = certificate.dump(check_mode=True)
result['changed'] = module.params['force'] or not certificate.check(module)
module.exit_json(**result)

Expand All @@ -870,7 +883,7 @@ def main():
else:

if module.check_mode:
result = certificate.dump()
result = certificate.dump(check_mode=True)
result['changed'] = os.path.exists(module.params['path'])
module.exit_json(**result)

Expand Down
9 changes: 9 additions & 0 deletions test/integration/targets/openssl_certificate/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@
selfsigned_digest: sha256
register: selfsigned_certificate_idempotence

- name: Generate selfsigned certificate (check mode)
openssl_certificate:
path: '{{ output_dir }}/cert.pem'
csr_path: '{{ output_dir }}/csr.csr'
privatekey_path: '{{ output_dir }}/privatekey.pem'
provider: selfsigned
selfsigned_digest: sha256
check_mode: yes

- name: Check selfsigned certificate
openssl_certificate:
path: '{{ output_dir }}/cert.pem'
Expand Down