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

put 0x in function

Browse source
This commit is contained in:
Matthieu Bourgain 2024-04-19 16:09:24 +02:00
commit c07d9b682d
No known key found for this signature in database
GPG key ID: 33BA95C808890C39
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/module_utils/implementations/mysql/hash.py
View file

@ -113,4 +113,5 @@ def mysql_sha256_password_hash_hex(password, salt):
iteration = 1000 * count
digest = _sha256_digest(password, salt, iteration)
return "$A${0:>03}{1}{2}".format(count, salt, digest).encode().hex().upper()
generated_hash = "$A${0:>03}{1}{2}".format(count, salt, digest).encode()
return "0x{0}".format(generated_hash.hex().upper())

4
plugins/module_utils/user.py
View file

@ -191,7 +191,7 @@ def user_add(cursor, user, host, host_all, password, encrypted,
generated_hash_string = mysql_sha256_password_hash_hex(password=plugin_auth_string, salt=salt)
else:
module.fail_json(msg="salt not handled for %s authentication plugin" % plugin)
query_with_args = "CREATE USER %s@%s IDENTIFIED WITH %s AS 0x%s", (user, host, plugin, generated_hash_string)
query_with_args = "CREATE USER %s@%s IDENTIFIED WITH %s AS %s", (user, host, plugin, generated_hash_string)
else:
query_with_args = "CREATE USER %s@%s IDENTIFIED WITH %s BY %s", (user, host, plugin, plugin_auth_string)
elif plugin:
@ -372,7 +372,7 @@ def user_mod(cursor, user, host, host_all, password, encrypted,
generated_hash_string = mysql_sha256_password_hash_hex(password=plugin_auth_string, salt=salt)
else:
module.fail_json(msg="salt not handled for %s authentication plugin" % plugin)
query_with_args = "ALTER USER %s@%s IDENTIFIED WITH %s AS 0x%s", (user, host, plugin, generated_hash_string)
query_with_args = "ALTER USER %s@%s IDENTIFIED WITH %s AS %s", (user, host, plugin, generated_hash_string)
else:
query_with_args = "ALTER USER %s@%s IDENTIFIED WITH %s BY %s", (user, host, plugin, plugin_auth_string)
else: