a-c-m
/
community.crypto
mirror of https://github.com/ansible-collections/community.crypto.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

module will now fail safely if python-dateutil package is not found

pull/743/head
Austin Lucas Lake 2024-05-10 19:47:34 -07:00
parent 6347b8c500
commit 18f1c161df
No known key found for this signature in database
GPG Key ID: 6A37FA54CFCFA4DB
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/modules/gpg_keypair.py
View File

@ -113,6 +113,7 @@ options:
- If O(expire_date=<n>y), the key expires in V(n) years. - If O(expire_date=<n>y), the key expires in V(n) years.
- Also excepts dates in ISO formats. - Also excepts dates in ISO formats.
- If left unspecified, any created GPG keys never expire. - If left unspecified, any created GPG keys never expire.
- The module will fail if O(expire_date) is specified, but the python-dateutil package is not found.
type: str type: str
name: name:
description: description:
@ -206,7 +207,6 @@ fingerprints:
from itertools import chain, permutations from itertools import chain, permutations
import re import re
import dateutil.parser as dp
from ansible.module_utils.common.process import get_bin_path from ansible.module_utils.common.process import get_bin_path
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
@ -368,10 +368,13 @@ def generate_keypair(module, params, matching_keys, check_mode):
def run_module(module, params, check_mode=False): def run_module(module, params, check_mode=False):
if params['expire_date']: if params['expire_date']:
try: try:
import dateutil.parser as dp
dp.isoparse(params['expire_date']) dp.isoparse(params['expire_date'])
except ImportError:
module.fail_json('The python-dateutil package was not found. Install it from PyPI to so that this module can validate the expire_date parameter.')
except ValueError: except ValueError:
if not (params['expire_date'].isnumeric() or (params['expire_date'][:-1].isnumeric() and params['expire_date'][-1] in ['w', 'm', 'y'])): if not (params['expire_date'].isnumeric() or (params['expire_date'][:-1].isnumeric() and params['expire_date'][-1] in ['w', 'm', 'y'])):
module.fail_json('Invalid format for expire date') module.fail_json('Invalid format for expire date.')
validate_key(module, params['key_type'], params['key_curve'], params['key_usage']) validate_key(module, params['key_type'], params['key_curve'], params['key_usage'])
for i, subkey in enumerate(params['subkeys']): for i, subkey in enumerate(params['subkeys']):