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

Merge pull request #3396 from adq/mysql

Browse source 
Check if mysql allows login as root/nopassword before trying supplied credentials.
This commit is contained in:
Michael DeHaan 2013-07-20 09:32:00 -07:00
commit 6f64c090c2
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
database/mysql_user
View file

@ -72,6 +72,11 @@ options:
required: false required: false
default: present default: present
choices: [ "present", "absent" ] choices: [ "present", "absent" ]
check_implicit_admin:
description:
- Check if mysql allows login as root/nopassword before trying supplied credentials.
required: false
default: false
notes: notes:
- Requires the MySQLdb Python package on the remote host. For Ubuntu, this - Requires the MySQLdb Python package on the remote host. For Ubuntu, this
is as easy as apt-get install python-mysqldb. is as easy as apt-get install python-mysqldb.
@ -316,6 +321,13 @@ def load_mycnf():
creds = dict(user=user,passwd=passwd) creds = dict(user=user,passwd=passwd)
return creds return creds
def connect(module, login_user, login_password):
if module.params["login_unix_socket"]:
db_connection = MySQLdb.connect(host=module.params["login_host"], unix_socket=module.params["login_unix_socket"], user=login_user, passwd=login_password, db="mysql")
else:
db_connection = MySQLdb.connect(host=module.params["login_host"], user=login_user, passwd=login_password, db="mysql")
return db_connection.cursor()
# =========================================== # ===========================================
# Module execution. # Module execution.
# #
@ -332,6 +344,7 @@ def main():
host=dict(default="localhost"), host=dict(default="localhost"),
state=dict(default="present", choices=["absent", "present"]), state=dict(default="present", choices=["absent", "present"]),
priv=dict(default=None), priv=dict(default=None),
check_implicit_admin=dict(default=False),
) )
) )
user = module.params["user"] user = module.params["user"]
@ -339,6 +352,7 @@ def main():
host = module.params["host"] host = module.params["host"]
state = module.params["state"] state = module.params["state"]
priv = module.params["priv"] priv = module.params["priv"]
check_implicit_admin = module.params['check_implicit_admin']
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")
@ -365,12 +379,16 @@ def main():
elif login_password is None or login_user is None: elif login_password is None or login_user is None:
module.fail_json(msg="when supplying login arguments, both login_user and login_password must be provided") module.fail_json(msg="when supplying login arguments, both login_user and login_password must be provided")
cursor = None
try: try:
if module.params["login_unix_socket"]: if check_implicit_admin:
db_connection = MySQLdb.connect(host=module.params["login_host"], unix_socket=module.params["login_unix_socket"], user=login_user, passwd=login_password, db="mysql") try:
else: cursor = connect(module, 'root', '')
db_connection = MySQLdb.connect(host=module.params["login_host"], user=login_user, passwd=login_password, db="mysql") except:
cursor = db_connection.cursor() pass
if not cursor:
cursor = connect(module, login_user, login_password)
except Exception, e: except Exception, e:
module.fail_json(msg="unable to connect to database, check login_user and login_password are correct or ~/.my.cnf has the credentials") module.fail_json(msg="unable to connect to database, check login_user and login_password are correct or ~/.my.cnf has the credentials")