ansible-collections/community.mysql
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.mysql.git synced 2025-04-06 10:40:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove code duplication

Browse source
This commit is contained in:
Jorge-Rodriguez 2020-07-27 20:36:24 +03:00
parent b6e42168d5
commit c62b4306f3
No known key found for this signature in database
GPG key ID: 43153D1EFD8F7D90
1 changed files with 4 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
plugins/modules/mysql_user.py
View file

@ -418,7 +418,7 @@ def do_not_mogrify_requires(query, params, tls_requires):
def get_tls_requires(cursor, user, host): def get_tls_requires(cursor, user, host):
if user: if user:
if server_suports_requires_create(cursor): if not use_old_user_mgmt(cursor):
query = "SHOW CREATE USER '%s'@'%s'" % (user, host) query = "SHOW CREATE USER '%s'@'%s'" % (user, host)
else: else:
query = "SHOW GRANTS for '%s'@'%s'" % (user, host) query = "SHOW GRANTS for '%s'@'%s'" % (user, host)
@ -458,7 +458,7 @@ def user_add(cursor, user, host, host_all, password, encrypted,
# Determine what user management method server uses # Determine what user management method server uses
old_user_mgmt = use_old_user_mgmt(cursor) old_user_mgmt = use_old_user_mgmt(cursor)
mogrify = mogrify_requires if server_suports_requires_create(cursor) else do_not_mogrify_requires mogrify = do_not_mogrify_requires if old_user_mgmt else mogrify_requires
if password and encrypted: if password and encrypted:
cursor.execute(*mogrify("CREATE USER %s@%s IDENTIFIED BY PASSWORD %s", (user, host, password), tls_requires)) cursor.execute(*mogrify("CREATE USER %s@%s IDENTIFIED BY PASSWORD %s", (user, host, password), tls_requires))
@ -666,7 +666,7 @@ def user_mod(cursor, user, host, host_all, password, encrypted,
msg = "TLS requires updated" msg = "TLS requires updated"
if module.check_mode: if module.check_mode:
return (True, msg) return (True, msg)
if server_suports_requires_create(cursor): if not old_user_mgmt:
pre_query = "ALTER USER" pre_query = "ALTER USER"
else: else:
pre_query = "GRANT %s ON *.* TO" % ",".join(get_grants(cursor, user, host)) pre_query = "GRANT %s ON *.* TO" % ",".join(get_grants(cursor, user, host))
@ -823,7 +823,7 @@ def privileges_grant(cursor, user, host, db_table, priv, tls_requires):
query = ["GRANT %s ON %s" % (priv_string, db_table)] query = ["GRANT %s ON %s" % (priv_string, db_table)]
query.append("TO %s@%s") query.append("TO %s@%s")
params = (user, host) params = (user, host)
if tls_requires and not server_suports_requires_create(cursor): if tls_requires and use_old_user_mgmt(cursor):
query, params = mogrify_requires(" ".join(query), params, tls_requires) query, params = mogrify_requires(" ".join(query), params, tls_requires)
query = [query] query = [query]
if 'REQUIRESSL' in priv and not tls_requires: if 'REQUIRESSL' in priv and not tls_requires:
@ -848,33 +848,6 @@ def convert_priv_dict_to_str(priv):
return '/'.join(priv_list) return '/'.join(priv_list)
# TLS requires on user create statement is supported since MySQL 5.7 and MariaDB 10.2
def server_suports_requires_create(cursor):
"""Check if the server supports REQUIRES on the CREATE USER statement or doesn't.
Args:
cursor (cursor): DB driver cursor object.
Returns: True if supports, False otherwise.
"""
cursor.execute("SELECT VERSION()")
version_str = cursor.fetchone()[0]
version = version_str.split(".")
if "mariadb" in version_str.lower():
# MariaDB 10.2 and later
if int(version[0]) * 1000 + int(version[1]) >= 10002:
return True
else:
return False
else:
# MySQL 5.6 and later
if int(version[0]) * 1000 + int(version[1]) >= 5007:
return True
else:
return False
# Alter user is supported since MySQL 5.6 and MariaDB 10.2.0 # Alter user is supported since MySQL 5.6 and MariaDB 10.2.0
def server_supports_alter_user(cursor): def server_supports_alter_user(cursor):
"""Check if the server supports ALTER USER statement or doesn't. """Check if the server supports ALTER USER statement or doesn't.