internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-08-01 04:14:42 +00:00
Code Issues Projects Releases Wiki Activity

pwpolicy: Fix new bool checks for IPA prior to 4.9.10

Browse Source 
With 4.9.10, the value of bools have been changed from "TRUE" and
"FALSE" to real bool values.

With IPA < 4.9.10 the new bool checks distcheck and usercheck failed
the tests for enabling the checks with a "already enabled" error.

A new version check altogether with providing the ansible module for
gen_args has been added. The values True and False are now transformed
into "TRUE" and "FALSE" for IPA < 4.9.10.

The function bool_param has been renamed to bool_or_empty_param to match
the int_or_empty_param and to have a more explaining name.
This commit is contained in:
Thomas Woerner
2023-01-16 16:35:02 +01:00
parent 6cac891287
commit 9108065ea7
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/modules/ipapwpolicy.py
View File

@@ -171,7 +171,8 @@ def find_pwpolicy(module, name):
return None return None
def gen_args(maxlife, minlife, history, minclasses, minlength, priority, def gen_args(module,
maxlife, minlife, history, minclasses, minlength, priority,
maxfail, failinterval, lockouttime, maxrepeat, maxsequence, maxfail, failinterval, lockouttime, maxrepeat, maxsequence,
dictcheck, usercheck, gracelimit): dictcheck, usercheck, gracelimit):
_args = {} _args = {}
@@ -198,9 +199,19 @@ def gen_args(maxlife, minlife, history, minclasses, minlength, priority,
if maxsequence is not None: if maxsequence is not None:
_args["ipapwdmaxrsequence"] = maxsequence _args["ipapwdmaxrsequence"] = maxsequence
if dictcheck is not None: if dictcheck is not None:
_args["ipapwddictcheck"] = dictcheck if module.ipa_check_version("<", "4.9.10"):
# Allowed values: "TRUE", "FALSE", ""
_args["ipapwddictcheck"] = "TRUE" if dictcheck is True else \
"FALSE" if dictcheck is False else dictcheck
else:
_args["ipapwddictcheck"] = dictcheck
if usercheck is not None: if usercheck is not None:
_args["ipapwdusercheck"] = usercheck if module.ipa_check_version("<", "4.9.10"):
# Allowed values: "TRUE", "FALSE", ""
_args["ipapwdusercheck"] = "TRUE" if usercheck is True else \
"FALSE" if usercheck is False else usercheck
else:
_args["ipapwdusercheck"] = usercheck
if gracelimit is not None: if gracelimit is not None:
_args["passwordgracelimit"] = gracelimit _args["passwordgracelimit"] = gracelimit
@@ -349,7 +360,7 @@ def main():
maxsequence = int_or_empty_param(maxsequence, "maxsequence") maxsequence = int_or_empty_param(maxsequence, "maxsequence")
gracelimit = int_or_empty_param(gracelimit, "gracelimit") gracelimit = int_or_empty_param(gracelimit, "gracelimit")
def bool_param(value, param): # pylint: disable=R1710 def bool_or_empty_param(value, param): # pylint: disable=R1710
# As of Ansible 2.14, values True, False, Yes an No, with variable # As of Ansible 2.14, values True, False, Yes an No, with variable
# capitalization are accepted by Ansible. # capitalization are accepted by Ansible.
if not value: if not value:
@@ -362,8 +373,8 @@ def main():
msg="Invalid value '%s' for argument '%s'." % (value, param) msg="Invalid value '%s' for argument '%s'." % (value, param)
) )
dictcheck = bool_param(dictcheck, "dictcheck") dictcheck = bool_or_empty_param(dictcheck, "dictcheck")
usercheck = bool_param(usercheck, "usercheck") usercheck = bool_or_empty_param(usercheck, "usercheck")
# Ensure gracelimit has proper limit. # Ensure gracelimit has proper limit.
if gracelimit: if gracelimit:
@@ -392,7 +403,8 @@ def main():
# Create command # Create command
if state == "present": if state == "present":
# Generate args # Generate args
args = gen_args(maxlife, minlife, history, minclasses, args = gen_args(ansible_module,
maxlife, minlife, history, minclasses,
minlength, priority, maxfail, failinterval, minlength, priority, maxfail, failinterval,
lockouttime, maxrepeat, maxsequence, dictcheck, lockouttime, maxrepeat, maxsequence, dictcheck,
usercheck, gracelimit) usercheck, gracelimit)