Merge branch '2.3' into 2.4

2020-06-02 10:41:08 +03:00
parent 922630f76f cb8b4546cb
commit 727aeb4a08
7 changed files with 82 additions and 61 deletions
--- a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
+++ b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
@ -1401,6 +1401,10 @@ static int gw_backend_close(DCB* dcb)
    {
        MYSQL_session client;
        gw_get_shared_session_auth_info(dcb, &client);
+
+        // Don't use the actual client SHA1. This prevents the password from being used with the constant
+        // null scramble we use in these cases.
+        memset(client.client_sha1, 0, sizeof(client.client_sha1));
        memset(proto->scramble, 0, sizeof(proto->scramble));
        dcb_write(dcb, gw_generate_auth_response(&client, proto, false, false, 0));
    }