ansible-collections/community.mysql
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.mysql.git synced 2025-04-25 11:51:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix case when a account as same user but different host and password

Browse source
This commit is contained in:
Laurent Indermuehle 2023-10-12 13:46:27 +02:00
parent e607ce1974
commit 154d880846
No known key found for this signature in database
GPG key ID: 93FA944C9F34DD09
3 changed files with 36 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/module_utils/user.py
View file

@ -112,7 +112,7 @@ def get_grants(cursor, user, host):
return grants.split(", ")
def get_existing_authentication(cursor, user):
def get_existing_authentication(cursor, user, host):
# Return the plugin and auth_string if there is exactly one distinct existing plugin and auth_string.
cursor.execute("SELECT VERSION()")
srv_type = cursor.fetchone()
@ -126,12 +126,14 @@ def get_existing_authentication(cursor, user):
# when using mysql_native_password
cursor.execute("""select plugin, auth from (
select plugin, password as auth from mysql.user where user=%(user)s
and host=%(host)s
union select plugin, authentication_string as auth from mysql.user where user=%(user)s
) x group by plugin, auth limit 2
""", {'user': user})
and host=%(host)s) x group by plugin, auth limit 2
""", {'user': user, 'host': host})
else:
cursor.execute("""select plugin, authentication_string as auth from mysql.user where user=%(user)s
group by plugin, authentication_string limit 2""", {'user': user})
cursor.execute("""select plugin, authentication_string as auth
from mysql.user where user=%(user)s and host=%(host)s
group by plugin, authentication_string limit 2""", {'user': user, 'host': host})
rows = cursor.fetchall()
# Mysql_info use a DictCursor so we must convert back to a list
@ -164,7 +166,7 @@ def user_add(cursor, user, host, host_all, password, encrypted,
used_existing_password = False
if reuse_existing_password:
existing_auth = get_existing_authentication(cursor, user)
existing_auth = get_existing_authentication(cursor, user, host)
if existing_auth:
plugin = existing_auth['plugin']
plugin_hash_string = existing_auth['auth_string']