Bug #23498254: KEYRING_FILE SHOULD NOT DUMP ITS CONTENT WHEN KEYRING

Robert Golebiowski · Robert Golebiowski · commit 95a9dbbb78f4 · 2016-10-28T17:32:46.000+02:00
FILE IS NOT AVAILABLE - fix for 5.7 based on file's stat
    fix for test gr_key_rotation
diff --git a/mysql-test/suite/auth_sec/r/install_keyring_file.result b/mysql-test/suite/auth_sec/r/install_keyring_file.result
@@ -1,7 +1,7 @@
 call mtr.add_suppression("keyring_file initialization failure. Please check if the keyring_file_data points to readable keyring file or keyring file can be created in the specified location. The keyring_file will stay unusable until correct path to the keyring file gets provided");
 call mtr.add_suppression("Could not create keyring directory The keyring_file will stay unusable until correct path to the keyring directory gets provided");
 call mtr.add_suppression("Error while loading keyring content. The keyring might be malformed");
-call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File");
+call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File .*/keyring' not found .*");
 SET @@global.keyring_file_data= 'MYSQL_TMP_DIR/new_keyring_file';
 ERROR HY000: Unknown system variable 'keyring_file_data'
 INSTALL PLUGIN keyring_file SONAME 'keyring_file.so';
diff --git a/mysql-test/suite/auth_sec/r/keyring_file_data.result b/mysql-test/suite/auth_sec/r/keyring_file_data.result
@@ -1,6 +1,7 @@
 call mtr.add_suppression("keyring_file_data cannot be set to new value as the keyring file cannot be created/accessed in the provided path");
 call mtr.add_suppression("Error while loading keyring content. The keyring might be malformed");
-call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File");
+call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File .*/keyring' not found .*");
+call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File .*/bad_keyring_file_data/' not found .*");
 SELECT @@global.keyring_file_data;
 @@global.keyring_file_data
 MYSQL_TMP_DIR/mysecret_keyring
diff --git a/mysql-test/suite/auth_sec/r/keyring_file_data_qa.result b/mysql-test/suite/auth_sec/r/keyring_file_data_qa.result
@@ -4,7 +4,9 @@ call mtr.add_suppression("keyring_file_data cannot be set to new value as the ke
 call mtr.add_suppression("\\[Error\\] Plugin keyring_file reported: 'keyring_file initialization failure.");
 call mtr.add_suppression("Plugin keyring_file reported: 'Could not create keyring directory The keyring_file will stay unusable until correct path to the keyring directory gets provided");
 call mtr.add_suppression("Error while loading keyring content. The keyring might be malformed");
-call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File");
+call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File .*/keyring' not found .*");
+call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File 'MYSQL_test_invalid/dir/' not found .*");
+call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File '/' not found .*");
 INSTALL PLUGIN keyring_file SONAME 'keyring_file.so';
 SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS
 FROM INFORMATION_SCHEMA.PLUGINS WHERE plugin_name='keyring_file';
diff --git a/mysql-test/suite/auth_sec/t/install_keyring_file.test b/mysql-test/suite/auth_sec/t/install_keyring_file.test
@@ -5,7 +5,7 @@
 call mtr.add_suppression("keyring_file initialization failure. Please check if the keyring_file_data points to readable keyring file or keyring file can be created in the specified location. The keyring_file will stay unusable until correct path to the keyring file gets provided");
 call mtr.add_suppression("Could not create keyring directory The keyring_file will stay unusable until correct path to the keyring directory gets provided");
 call mtr.add_suppression("Error while loading keyring content. The keyring might be malformed");
-call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File");
+call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File .*/keyring' not found .*");
 
 
 --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
diff --git a/mysql-test/suite/auth_sec/t/keyring_file_data.test b/mysql-test/suite/auth_sec/t/keyring_file_data.test
@@ -4,7 +4,8 @@
 
 call mtr.add_suppression("keyring_file_data cannot be set to new value as the keyring file cannot be created/accessed in the provided path");
 call mtr.add_suppression("Error while loading keyring content. The keyring might be malformed");
-call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File");
+call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File .*/keyring' not found .*");
+call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File .*/bad_keyring_file_data/' not found .*");
 
 --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
 SELECT @@global.keyring_file_data;
diff --git a/mysql-test/suite/auth_sec/t/keyring_file_data_qa.test b/mysql-test/suite/auth_sec/t/keyring_file_data_qa.test
@@ -10,7 +10,9 @@ call mtr.add_suppression("keyring_file_data cannot be set to new value as the ke
 call mtr.add_suppression("\\[Error\\] Plugin keyring_file reported: 'keyring_file initialization failure.");
 call mtr.add_suppression("Plugin keyring_file reported: 'Could not create keyring directory The keyring_file will stay unusable until correct path to the keyring directory gets provided");
 call mtr.add_suppression("Error while loading keyring content. The keyring might be malformed");
-call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File");
+call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File .*/keyring' not found .*");
+call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File 'MYSQL_test_invalid/dir/' not found .*");
+call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File '/' not found .*");
 
 # Installing keyring plugin.
 --replace_regex /\.dll/.so/
diff --git a/mysql-test/suite/innodb/r/table_encrypt_5.result b/mysql-test/suite/innodb/r/table_encrypt_5.result
@@ -13,7 +13,7 @@ call mtr.add_suppression("\\[Warning\\] InnoDB: Please refer to .* for how to re
 call mtr.add_suppression("Error while loading keyring content. The keyring might be malformed");
 call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'Could not create keyring directory");
 call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'keyring_file initialization failure.");
-call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File");
+call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File .*/keyring' not found .*");
 # Starting server with keyring plugin  
 # restart: --early-plugin-load=keyring_file=keyring_file.so --loose-keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring --plugin-dir=KEYRING_PLUGIN_PATH
 DROP DATABASE IF EXISTS tde_db;
diff --git a/mysql-test/suite/innodb/t/table_encrypt_5.test b/mysql-test/suite/innodb/t/table_encrypt_5.test
@@ -33,7 +33,7 @@ call mtr.add_suppression("\\[Warning\\] InnoDB: Please refer to .* for how to re
 call mtr.add_suppression("Error while loading keyring content. The keyring might be malformed");
 call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'Could not create keyring directory");
 call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'keyring_file initialization failure.");
-call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File");
+call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File .*/keyring' not found .*");
 
 let $innodb_file_per_table = `SELECT @@innodb_file_per_table`;
 
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_key_rotation.result b/rapid/plugin/group_replication/tests/mtr/r/gr_key_rotation.result
@@ -7,6 +7,7 @@ set sql_log_bin=0;
 call mtr.add_suppression("\\[Error\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded.");
 call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'Error while loading keyring content*");
 call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'keyring_file initialization failure.*");
+call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File .*/keyring' not found .*");
 set sql_log_bin=1;
 ALTER INSTANCE ROTATE INNODB MASTER KEY;
 ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
@@ -38,6 +39,7 @@ call mtr.add_suppression("\\[Error\\] Plugin group_replication reported: 'The se
 call mtr.add_suppression("\\[Warning\\] Plugin group_replication reported: 'Skipping leave operation:*");
 call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'Error while loading keyring content*");
 call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'keyring_file initialization failure.*");
+call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File .*/keyring' not found .*");
 call mtr.add_suppression("\\[Error\\] Plugin group_replication reported: 'Message received while the plugin is not ready, message discarded'*");
 set sql_log_bin=1;
 ALTER INSTANCE ROTATE INNODB MASTER KEY;
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_key_rotation.test b/rapid/plugin/group_replication/tests/mtr/t/gr_key_rotation.test
@@ -17,8 +17,8 @@
 # 3. Clean Up.
 ###############################################################################
 
---let plugins = KEYRING_PLUGIN,GROUP_REPLICATION
---source include/check_plugin_dir.inc
+#--let plugins = KEYRING_PLUGIN,GROUP_REPLICATION
+#--source include/check_plugin_dir.inc
 
 --source ../inc/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
@@ -28,6 +28,7 @@ set sql_log_bin=0;
 call mtr.add_suppression("\\[Error\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded.");
 call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'Error while loading keyring content*");
 call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'keyring_file initialization failure.*");
+call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File .*/keyring' not found .*");
 set sql_log_bin=1;
 
 # Scenario 1
@@ -37,8 +38,10 @@ set sql_log_bin=1;
 ALTER INSTANCE ROTATE INNODB MASTER KEY;
 
 # Install keyring plugin on server1
+--disable_warnings
 --replace_regex /\.dll/.so/
 --eval INSTALL PLUGIN keyring_file SONAME '$KEYRING_PLUGIN'
+--enable_warnings
 --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
 --eval SET @@global.keyring_file_data='$MYSQL_TMP_DIR/keyring_server1/keyring_server1'
 --query_vertical SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS FROM INFORMATION_SCHEMA.PLUGINS WHERE plugin_name='keyring_file'
@@ -74,6 +77,7 @@ call mtr.add_suppression("\\[Error\\] Plugin group_replication reported: 'The se
 call mtr.add_suppression("\\[Warning\\] Plugin group_replication reported: 'Skipping leave operation:*");
 call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'Error while loading keyring content*");
 call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'keyring_file initialization failure.*");
+call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File .*/keyring' not found .*");
 call mtr.add_suppression("\\[Error\\] Plugin group_replication reported: 'Message received while the plugin is not ready, message discarded'*");
 set sql_log_bin=1;
 
@@ -82,8 +86,10 @@ set sql_log_bin=1;
 ALTER INSTANCE ROTATE INNODB MASTER KEY;
 
 # Install keyring plugin on server2
+--disable_warnings
 --replace_regex /\.dll/.so/
 --eval INSTALL PLUGIN keyring_file SONAME '$KEYRING_PLUGIN'
+--enable_warnings
 --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
 --eval SET @@global.keyring_file_data='$MYSQL_TMP_DIR/keyring_server2/keyring_server2'
 --query_vertical SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS FROM INFORMATION_SCHEMA.PLUGINS WHERE plugin_name='keyring_file'
@@ -138,8 +144,10 @@ SELECT * FROM t3;
 --source include/stop_group_replication.inc
 
 # Install plugin on server2 and start GR
+--disable_warnings
 --replace_regex /\.dll/.so/
 --eval INSTALL PLUGIN keyring_file SONAME '$KEYRING_PLUGIN'
+--enable_warnings
 --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
 --eval SET @@global.keyring_file_data='$MYSQL_TMP_DIR/keyring_server2/keyring_server2'
 --query_vertical SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS FROM INFORMATION_SCHEMA.PLUGINS WHERE plugin_name='keyring_file'
