From 738e62e4499a5aadae640742ca2ec6327848bcff Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Mon, 11 Apr 2016 23:22:51 +0200 Subject: Mark path as type='path', do not leak login_password by error (#3396) --- database/mysql/mysql_user.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'database') diff --git a/database/mysql/mysql_user.py b/database/mysql/mysql_user.py index 0a3e1ff0..81fd81ee 100644 --- a/database/mysql/mysql_user.py +++ b/database/mysql/mysql_user.py @@ -474,7 +474,7 @@ def main(): module = AnsibleModule( argument_spec = dict( login_user=dict(default=None), - login_password=dict(default=None), + login_password=dict(default=None, no_log=True), login_host=dict(default="localhost"), login_port=dict(default=3306, type='int'), login_unix_socket=dict(default=None), @@ -489,11 +489,11 @@ def main(): check_implicit_admin=dict(default=False, type='bool'), update_password=dict(default="always", choices=["always", "on_create"]), 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'), - ssl_cert=dict(default=None), - ssl_key=dict(default=None), - ssl_ca=dict(default=None), + ssl_cert=dict(default=None, type='path'), + ssl_key=dict(default=None, type='path'), + ssl_ca=dict(default=None, type='path'), ), supports_check_mode=True ) @@ -517,7 +517,6 @@ def main(): db = 'mysql' sql_log_bin = module.params["sql_log_bin"] - config_file = os.path.expanduser(os.path.expandvars(config_file)) if not mysqldb_found: module.fail_json(msg="the python mysqldb module is required") -- cgit v1.2.1