cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Mark path as type='path', do not leak login_password by error (#3396)

Browse source
This commit is contained in:
Michael Scherer 2016-04-11 23:22:51 +02:00 committed by Matt Clay
parent c0179330c9
commit 8b125f8c2c
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/modules/database/mysql/mysql_user.py
View file

@ -481,7 +481,7 @@ def main():
module = AnsibleModule( module = AnsibleModule(
argument_spec = dict( argument_spec = dict(
login_user=dict(default=None), login_user=dict(default=None),
login_password=dict(default=None), login_password=dict(default=None, no_log=True),
login_host=dict(default="localhost"), login_host=dict(default="localhost"),
login_port=dict(default=3306, type='int'), login_port=dict(default=3306, type='int'),
login_unix_socket=dict(default=None), login_unix_socket=dict(default=None),
@ -496,11 +496,11 @@ def main():
check_implicit_admin=dict(default=False, type='bool'), check_implicit_admin=dict(default=False, type='bool'),
update_password=dict(default="always", choices=["always", "on_create"]), update_password=dict(default="always", choices=["always", "on_create"]),
connect_timeout=dict(default=30, type='int'), connect_timeout=dict(default=30, type='int'),
config_file=dict(default="~/.my.cnf"), config_file=dict(default="~/.my.cnf", type='path'),
sql_log_bin=dict(default=True, type='bool'), sql_log_bin=dict(default=True, type='bool'),
ssl_cert=dict(default=None), ssl_cert=dict(default=None, type='path'),
ssl_key=dict(default=None), ssl_key=dict(default=None, type='path'),
ssl_ca=dict(default=None), ssl_ca=dict(default=None, type='path'),
), ),
supports_check_mode=True supports_check_mode=True
) )
@ -524,7 +524,6 @@ def main():
db = 'mysql' db = 'mysql'
sql_log_bin = module.params["sql_log_bin"] sql_log_bin = module.params["sql_log_bin"]
config_file = os.path.expanduser(os.path.expandvars(config_file))
if not mysqldb_found: if not mysqldb_found:
module.fail_json(msg="the python mysqldb module is required") module.fail_json(msg="the python mysqldb module is required")