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.

Sign up for GitHub

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

Jump to bottom

openssl_pkcs12: Add a check for parsed pkcs12 files #145

Merged
merged 6 commits into from
Nov 23, 2020
Merged

openssl_pkcs12: Add a check for parsed pkcs12 files #145

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1349ff2
openssl_pkcs12: Add a check for parsed pkcs12 files
Nov 20, 2020
88d9c27
Add changelog fragment
Nov 20, 2020
64890dd
openssl_pkcs12: Report changed state when a pkcs12 file is dumped
Nov 23, 2020
ad30f6d
Add a basic test for dumping a pkcs12 file
Nov 23, 2020
7e8495e
Update changelog fragment
Nov 23, 2020
93004c2
Add test for dumped pkcs12 file in check mode
Nov 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelogs/fragments/145-add-check-for-parsed-pkcs12-files.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
bugfixes:
- openssl_pkcs12 - Add a check for parsed PKCS#12 files to prevent permanent
Normo marked this conversation as resolved.
Show resolved Hide resolved
changed state in check mode (https://github.com/ansible-collections/community.crypto/issues/143).
11 changes: 11 additions & 0 deletions plugins/modules/openssl_pkcs12.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,17 @@ def _check_pkey_passphrase():
return False
elif bool(self.pkcs12.get_friendlyname()) != bool(pkcs12_friendly_name):
return False
elif module.params['action'] == 'parse' and os.path.exists(self.src) and os.path.exists(self.path):
try:
pkey, cert, other_certs, friendly_name = self.parse()
except crypto.Error:
return False
expected_content = to_bytes(
''.join([to_native(pem) for pem in [pkey, cert] + other_certs if pem is not None])
)
dumped_content = load_file_if_exists(self.path, ignore_errors=True)
if expected_content != dumped_content:
return False
else:
return False

Expand Down