Bug#20712046: SHOW PROCESSLIST AND PERFORMANCE_SCHEMA TABLES DO NOT MASK PASSWORD FROM QUERY

If a rewritten version of a given query exists
(to hide passwords etc.), use that instead of
the original query in

a) SHOW PROCESSLIST
b) information_schema.processlist
c) performance_schema.threads

in addition to the support for
d) performance_schema.events_statements_current
e) performance_schema.events_statements_history
f) performance_schema.events_statements_history_long

v5.6

Approved by: Karthik Kamath <[email protected]>

Author: Tatiana Azundris Nuernberg

mysql-test/include/check_ftwrl_incompatible.inc

@@ -6,6 +6,8 @@
 #   $con_aux1      Name of the 1st aux connection to be used by this script.
 #   $con_aux2      Name of the 2nd aux connection to be used by this script.
 #   $statement     The statement to be checked.
+#   $waitfor       Wait for this statement in process-list. If empty,
+#                  use $statement. Reset at end of include.
 #   $cleanup_stmt1 The 1st statement to be run in order to revert effects
 #                  of statement to be checked.
 #   $cleanup_stmt2 The 2nd statement to be run in order to revert effects
@@ -66,14 +68,26 @@ connection $con_aux1;
 
 --enable_result_log
 --enable_query_log
+if (!$waitfor)
+{
+let $wait_condition=
+  select count(*) = 1 from information_schema.processlist
+  where (state = "Waiting for global read lock" or
+         state = "Waiting for commit lock") and
+         info = "$statement";
+}
+if ($waitfor)
+{
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
   where (state = "Waiting for global read lock" or
          state = "Waiting for commit lock") and
-        info = "$statement";
+         info = "$waitfor";
+}
 --source include/wait_condition.inc
 --disable_result_log
 --disable_query_log
+let $waitfor=;
 
 if ($success)
 {

mysql-test/suite/perfschema/r/stage_mdl_procedure.result

@@ -15,7 +15,7 @@ test.f1()
 drop procedure test.p1;
 call dump_one_thread('user1');
 username	event_name	sql_text
-user1	statement/sql/select	select test.f1()
+user1	statement/sql/select	call test.p1()
 username	event_name	nesting_event_type
 username	event_name	nesting_event_type
 user1	stage/sql/executing	STATEMENT

mysql-test/t/flush_read_lock.test

@@ -1496,6 +1496,7 @@ let $skip_3rd_check= ;
 --echo # 31.d.I) SET PASSWORD is incompatible with FTWRL as it changes data.
 create user mysqltest_u1;
 let $statement= set password for 'mysqltest_u1' = password('');
+let $waitfor= SET PASSWORD FOR `mysqltest_u1`@`%`=<secret>;
 let $cleanup_stmt1= ;
 --echo # Skip last part of compatibility testing as our helper debug
 --echo # sync-point doesn't work for SET statements.

sql/log_event.cc

@@ -4802,6 +4802,7 @@ int Query_log_event::do_apply_event(Relay_log_info const *rli,
             to fix this if any refactoring happens here sometime.
           */
           thd->set_query((char*) query_arg, q_len_arg, thd->charset());
+          thd->reset_query_for_display();
         }
       }
       if (time_zone_len)
@@ -13693,6 +13694,7 @@ int Rows_query_log_event::do_apply_event(Relay_log_info const *rli)
   DBUG_ASSERT(rli->info_thd == thd);
   /* Set query for writing Rows_query log event into binlog later.*/
   thd->set_query(m_rows_query, (uint32) strlen(m_rows_query));
+  thd->set_query_for_display(m_rows_query, strlen(m_rows_query));
 
   DBUG_ASSERT(rli->rows_query_ev == NULL);
 

sql/sp_instr.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -829,6 +829,8 @@ bool sp_instr_stmt::execute(THD *thd, uint *nextp)
 
   DBUG_PRINT("info", ("query: '%.*s'", (int) m_query.length, m_query.str));
 
+  thd->set_query_for_display(m_query.str, m_query.length);
+
   const CSET_STRING query_backup= thd->query_string;
 
 #if defined(ENABLED_PROFILING)

sql/sql_class.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -4674,10 +4674,6 @@ void THD::set_query(const CSET_STRING &string_arg)
   mysql_mutex_lock(&LOCK_thd_data);
   set_query_inner(string_arg);
   mysql_mutex_unlock(&LOCK_thd_data);
-
-#ifdef HAVE_PSI_THREAD_INTERFACE
-  PSI_THREAD_CALL(set_thread_info)(query(), query_length());
-#endif
 }
 
 /** Assign a new value to thd->query and thd->query_id.  */

sql/sql_class.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights
+/* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights
    reserved.
 
    This program is free software; you can redistribute it and/or modify
@@ -4028,6 +4028,13 @@ class THD :public MDL_context_owner,
     Assign a new value to thd->query and thd->query_id and mysys_var.
     Protected with LOCK_thd_data mutex.
   */
+  void set_query_for_display(const char *query_arg, size_t query_length_arg) {
+    MYSQL_SET_STATEMENT_TEXT(m_statement_psi, query_arg, query_length_arg);
+#ifdef HAVE_PSI_THREAD_INTERFACE
+    PSI_THREAD_CALL(set_thread_info)(query_arg, query_length_arg);
+#endif
+  }
+  void reset_query_for_display(void) { set_query_for_display(NULL, 0); }
   void set_query(char *query_arg, uint32 query_length_arg,
                  const CHARSET_INFO *cs_arg)
   {
@@ -4038,8 +4045,9 @@ class THD :public MDL_context_owner,
     set_query(CSET_STRING(query_arg, query_length_arg, charset()));
   }
   void set_query(const CSET_STRING &str); /* Mutex protected */
-  void reset_query()               /* Mutex protected */
-  { set_query(CSET_STRING()); }
+  void reset_query() {             /* Mutex protected */
+    set_query(CSET_STRING());
+    rewritten_query.free(); }
   void set_query_and_id(char *query_arg, uint32 query_length_arg,
                         const CHARSET_INFO *cs, query_id_t new_query_id);
   void set_query_id(query_id_t new_query_id);

sql/sql_parse.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -3186,8 +3186,10 @@ case SQLCOM_PREPARE:
   case SQLCOM_SLAVE_START:
   {
     mysql_mutex_lock(&LOCK_active_mi);
-    if (active_mi != NULL)
+    if (active_mi != NULL) {
+      DEBUG_SYNC(thd, "begin_start_slave");
       res= start_slave(thd, active_mi, 1 /* net report*/);
+    }
     else
       my_message(ER_SLAVE_CONFIGURATION, ER(ER_SLAVE_CONFIGURATION),
                  MYF(0));
@@ -5046,6 +5048,7 @@ case SQLCOM_PREPARE:
     {
       thd->killed= THD::NOT_KILLED;
       thd->mysys_var->abort= 0;
+      thd->reset_query_for_display();
     }
     if (thd->is_error() || (thd->variables.option_bits & OPTION_MASTER_SQL_ERROR))
       trans_rollback_stmt(thd);
@@ -6346,15 +6349,18 @@ void mysql_parse(THD *thd, char *rawbuf, uint length,
       {
         lex->safe_to_cache_query= false; // see comments below
 
-        MYSQL_SET_STATEMENT_TEXT(thd->m_statement_psi,
-                                 thd->rewritten_query.c_ptr_safe(),
-                                 thd->rewritten_query.length());
-      }
-      else
-      {
+        thd->set_query_for_display(thd->rewritten_query.c_ptr_safe(),
+                                   thd->rewritten_query.length());
+      } else if (thd->slave_thread) {
+        /*
+          In the slave, we add the information to pfs.events_statements_history,
+          but not to pfs.threads, as that is what the test suite expects.
+        */
         MYSQL_SET_STATEMENT_TEXT(thd->m_statement_psi,
                                  thd->query(),
                                  thd->query_length());
+      } else {
+        thd->set_query_for_display(thd->query(), thd->query_length());
       }
 
       if (!(opt_log_raw || thd->slave_thread))
@@ -6472,9 +6478,7 @@ void mysql_parse(THD *thd, char *rawbuf, uint length,
         SQL injection, finding the source of the SQL injection is critical, so the
         design choice is to log the query text of broken queries (a).
       */
-      MYSQL_SET_STATEMENT_TEXT(thd->m_statement_psi,
-                               thd->query(),
-                               thd->query_length());
+      thd->set_query_for_display(thd->query(), thd->query_length());
 
       /* Instrument this broken statement as "statement/sql/error" */
       thd->m_statement_psi= MYSQL_REFINE_STATEMENT(thd->m_statement_psi,
@@ -6513,6 +6517,8 @@ void mysql_parse(THD *thd, char *rawbuf, uint length,
     parser_state->m_lip.found_semicolon= NULL;
   }
 
+  DEBUG_SYNC(thd, "query_rewritten");
+
   DBUG_VOID_RETURN;
 }
 

sql/sql_show.cc

@@ -2168,8 +2168,17 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
         /* Lock THD mutex that protects its data when looking at it. */
         if (tmp->query())
         {
-          uint length= min<uint>(max_query_length, tmp->query_length());
-          char *q= thd->strmake(tmp->query(),length);
+          const char *query_str;
+          size_t query_length;
+          if ((query_length = tmp->rewritten_query.length()) > 0) {
+            query_str = tmp->rewritten_query.c_ptr();
+          } else {
+            query_length = tmp->query_length();
+            query_str = tmp->query();
+          }
+
+          uint length= min<uint>(max_query_length, query_length);
+          char *q= thd->strmake(query_str, length);
           /* Safety: in case strmake failed, we set length to 0. */
           thd_info->query_string=
             CSET_STRING(q, q ? length : 0, tmp->query_charset());
@@ -2309,9 +2318,18 @@ int fill_schema_processlist(THD* thd, TABLE_LIST* tables, Item* cond)
       /* INFO */
       if (tmp->query())
       {
+        const char *query_str;
+        size_t query_length;
+
+        if ((query_length = tmp->rewritten_query.length()) > 0) {
+          query_str = tmp->rewritten_query.c_ptr();
+        } else {
+          query_length = tmp->query_length();
+          query_str = tmp->query();
+        }
         size_t const width=
-          min<size_t>(PROCESS_LIST_INFO_WIDTH, tmp->query_length());
-        table->field[7]->store(tmp->query(), width, cs);
+          min<size_t>(PROCESS_LIST_INFO_WIDTH, query_length);
+        table->field[7]->store(query_str, width, cs);
         table->field[7]->set_notnull();
       }
       mysql_mutex_unlock(&tmp->LOCK_thd_data);

sql/sql_yacc.yy

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -14842,6 +14842,7 @@ option_value_no_option_type:
             lex->autocommit= TRUE;
             lex->is_set_password_sql= true;
             lex->is_change_password= TRUE;
+            lex->contains_plaintext_password= true;
 
             if (sp)
               sp->m_flags|= sp_head::HAS_SET_AUTOCOMMIT_STMT;