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

Fix user_is_locked and remove host_all option.

Browse source 
Signed-off-by: E.S. Rosenberg a.k.a. Keeper of the Keys <es.rosenberg+github@gmail.com>
This commit is contained in:
E.S. Rosenberg a.k.a. Keeper of the Keys 2025-03-05 16:06:32 +02:00
parent d839871d1e
commit fbeeff5ca7
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
plugins/module_utils/user.py
View file

@ -52,16 +52,14 @@ def user_exists(cursor, user, host, host_all):
return count[0] > 0 return count[0] > 0
def user_is_locked(cursor, user, host, host_all): def user_is_locked(cursor, user, host):
if host_all: cursor.execute("SHOW CREATE USER %s@%s", (user, host))
cursor.execute("SHOW CREATE USER %s", (user,))
else:
cursor.execute("SHOW CREATE USER %s@%s", (user, host))
# Unless I am very much mistaken there should only be 1 answer to this query ever. # Per discussions on irc:libera.chat:#maria the query may return up to 2 rows but "ACCOUNT LOCK" should always be in the first row.
result = cursor.fetchone() result = cursor.fetchone()
if result[0].endswith('ACCOUNT LOCK'): # ACCOUNT LOCK does not have to be the last option in the CREATE USER query.
if result[0].find('ACCOUNT LOCK') > 0:
return True return True
return False return False
@ -554,7 +552,7 @@ def user_mod(cursor, user, host, host_all, password, encrypted,
if attribute_support: if attribute_support:
final_attributes = attributes_get(cursor, user, host) final_attributes = attributes_get(cursor, user, host)
if user_is_locked(cursor, user, host, False) != locked: if user_is_locked(cursor, user, host) != locked:
if locked: if locked:
cursor.execute("ALTER USER %s@%s ACCOUNT LOCK", (user, host)) cursor.execute("ALTER USER %s@%s ACCOUNT LOCK", (user, host))
msg = 'User locked' msg = 'User locked'