internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-07-31 03:44:41 +00:00
Code Issues Projects Releases Wiki Activity

user: Use IPAAnsibleModule method to validate arguments.

Browse Source 
Use the IPAAnsibleModule.params_fail_if_used method to validate
arguments provided by user.
This commit is contained in:
Rafael Guterres Jeffman
2021-09-30 21:20:13 -03:00
parent 5a67aa7714
commit 2ec65e91df
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/modules/ipauser.py
View File

@@ -597,6 +597,7 @@ def check_parameters( # pylint: disable=unused-argument
userauthtype, userclass, radius, radiususer, departmentnumber, userauthtype, userclass, radius, radiususer, departmentnumber,
employeenumber, employeetype, preferredlanguage, certificate, employeenumber, employeetype, preferredlanguage, certificate,
certmapdata, noprivate, nomembers, preserve, update_password): certmapdata, noprivate, nomembers, preserve, update_password):
invalid = []
if state == "present": if state == "present":
if action == "member": if action == "member":
invalid = ["first", "last", "fullname", "displayname", "initials", invalid = ["first", "last", "fullname", "displayname", "initials",
@@ -608,11 +609,6 @@ def check_parameters( # pylint: disable=unused-argument
"departmentnumber", "employeenumber", "employeetype", "departmentnumber", "employeenumber", "employeetype",
"preferredlanguage", "noprivate", "nomembers", "preferredlanguage", "noprivate", "nomembers",
"preserve", "update_password"] "preserve", "update_password"]
for x in invalid:
if vars()[x] is not None:
module.fail_json(
msg="Argument '%s' can not be used with action "
"'%s'" % (x, action))
else: else:
invalid = ["first", "last", "fullname", "displayname", "initials", invalid = ["first", "last", "fullname", "displayname", "initials",
@@ -628,16 +624,13 @@ def check_parameters( # pylint: disable=unused-argument
invalid.extend(["principal", "manager", invalid.extend(["principal", "manager",
"certificate", "certmapdata", "certificate", "certmapdata",
]) ])
for x in invalid:
if vars()[x] is not None:
module.fail_json(
msg="Argument '%s' can not be used with state '%s'" %
(x, state))
if state != "absent" and preserve is not None: if state != "absent" and preserve is not None:
module.fail_json( module.fail_json(
msg="Preserve is only possible for state=absent") msg="Preserve is only possible for state=absent")
module.params_fail_used_invalid(invalid, state, action)
if certmapdata is not None: if certmapdata is not None:
for x in certmapdata: for x in certmapdata:
certificate = x.get("certificate") certificate = x.get("certificate")