diff --git a/plugins/module_utils/implementations/mysql/hash.py b/plugins/module_utils/implementations/mysql/hash.py index c9b515f..93125b5 100644 --- a/plugins/module_utils/implementations/mysql/hash.py +++ b/plugins/module_utils/implementations/mysql/hash.py @@ -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()) diff --git a/plugins/module_utils/user.py b/plugins/module_utils/user.py index 074ece4..89cda33 100644 --- a/plugins/module_utils/user.py +++ b/plugins/module_utils/user.py @@ -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: