Mirrors/ansible-collection-famedly-base
2
0
Fork 0
mirror of https://github.com/famedly/ansible-collection-base synced 2024-11-10 06:24:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(gpg_secretstore): clear exception on unknown subkey

Browse source
This commit is contained in:
transcaffeine 2023-12-31 17:20:58 +01:00
parent 8bcc12dfd1
commit af7cd13af9
No known key found for this signature in database
GPG key ID: 03624C433676E465
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/module_utils/gpg_utils.py
View file

@ -162,9 +162,13 @@ class SecretStore:
with open(file, "rb") as f:
recipient_subkeys = self.__gpg.get_recipients(f.read())
for recipient_subkey in recipient_subkeys:
recipients.append(
self.__gpg.list_keys(keys=recipient_subkey).fingerprints[0]
)
found_keys = self.__gpg.list_keys(keys=recipient_subkey)
if found_keys and found_keys.fingerprints and len(found_keys.fingerprints) > 0:
recipients.append(
found_keys.fingerprints[0]
)
else:
raise GPGException(f"Can not find primary key in keyring for encryption subkey {recipient_subkey}")
return recipients
except FileNotFoundError:
raise FileNotFoundError

5
plugins/modules/gpg_secretstore.py
View file

@ -190,6 +190,7 @@ from ansible.module_utils.basic import AnsibleModule, missing_required_lib
from ansible_collections.famedly.base.plugins.module_utils.gpg_utils import (
SecretStore,
RecipientsMismatchError,
GPGException,
check_secretstore_import_errors,
)
@ -438,6 +439,10 @@ def main():
result["action"] = "update"
result["changed"] = True
except GPGException as e:
result["msg"] = "GPG Exception: " + str(e)
failed = True
if module.params["secret_fact"]:
result["ansible_facts"][module.params["secret_fact"]] = result["secret"]