mirror of
https://github.com/MariaDB/server.git
synced 2026-02-18 00:28:40 +01:00
11f228cbb2
When GRANT EXECUTE ON PROCEDURE fails on the master, it will erroneously be replicated and executed successfully on the slave. This both breaks replication and is a security violation. The underlying issue is that a failed GRANT EXECUTE ON PROCEDURE will still be replicated when sql_mode does not have NO_AUTO_CREATE_USER. This is because the function mysql_routine_grant() does not check if an error occured while performing the GRANT before binlogging, it simply always binlogs. This patch fixes this problem by checking if an error happened previously before binlogging, and if so, then skip binlogging. Note there is still a broader issue in this area leading to replication divergence. Reported in MDEV-29848, a partially-completed GRANT statment (where some earlier GRANTS succeed and a later fails) will not binlog. Note this affects all grant types, whereas the issue addressed in this patch is limited to GRANT EXECUTE ON PROCEDURE. This patch makes GRANT EXECUTE ON PROCEDURE binlogging behavior consistent with the other grant types. A separate follow-up patch will address the broader MDEV-29848 issue. Also note that a test case in rpl_do_grant.test took advantage of MDEV-38506 so a partially-failing REVOKE EXECUTE ON PROCEDURE would still replicate. This test case is disabled with a TODO note to re-enable it once MDEV-29848 is fixed Reviewed-by: Sergei Golubchik <serg@mariadb.org> Signed-off-by: Brandon Nesterenko <brandon.nesterenko@mariadb.com>
361 lines
11 KiB
Text
361 lines
11 KiB
Text
# Works in statement-based and row-based binlogging.
|
|
# Test that GRANT and other user management commands are replicated to the slave
|
|
|
|
-- source include/master-slave.inc
|
|
|
|
# test replication of GRANT
|
|
connection master;
|
|
create user rpl_do_grant@localhost;
|
|
grant select on *.* to rpl_do_grant@localhost;
|
|
grant drop on test.* to rpl_do_grant@localhost;
|
|
sync_slave_with_master;
|
|
show grants for rpl_do_grant@localhost;
|
|
|
|
# test replication of SET PASSWORD
|
|
connection master;
|
|
set password for rpl_do_grant@localhost=password("does it work?");
|
|
sync_slave_with_master;
|
|
select authentication_string<>'' from mysql.user where user='rpl_do_grant';
|
|
|
|
#
|
|
# Bug#24158 SET PASSWORD in binary log fails under ANSI_QUOTES
|
|
#
|
|
connection master;
|
|
update mysql.global_priv set priv=json_remove(priv, '$.authentication_string') where user='rpl_do_grant';
|
|
flush privileges;
|
|
select authentication_string<>'' from mysql.user where user='rpl_do_grant';
|
|
set sql_mode='ANSI_QUOTES';
|
|
set password for rpl_do_grant@localhost=password('does it work?');
|
|
set sql_mode='';
|
|
sync_slave_with_master;
|
|
select authentication_string<>'' from mysql.user where user='rpl_do_grant';
|
|
|
|
# clear what we have done, to not influence other tests.
|
|
connection master;
|
|
drop user rpl_do_grant@localhost;
|
|
sync_slave_with_master;
|
|
|
|
# End of 4.1 tests
|
|
|
|
connection master;
|
|
--error 1141
|
|
show grants for rpl_do_grant@localhost;
|
|
connection slave;
|
|
--error 1141
|
|
show grants for rpl_do_grant@localhost;
|
|
|
|
connection master;
|
|
create user rpl_do_grant@localhost;
|
|
show grants for rpl_do_grant@localhost;
|
|
--error 1141
|
|
show grants for rpl_do_grant2@localhost;
|
|
sync_slave_with_master;
|
|
show grants for rpl_do_grant@localhost;
|
|
--error 1141
|
|
show grants for rpl_do_grant2@localhost;
|
|
|
|
connection master;
|
|
rename user rpl_do_grant@localhost to rpl_do_grant2@localhost;
|
|
show grants for rpl_do_grant2@localhost;
|
|
sync_slave_with_master;
|
|
show grants for rpl_do_grant2@localhost;
|
|
|
|
connection master;
|
|
grant DELETE,INSERT on mysqltest1.* to rpl_do_grant2@localhost;
|
|
show grants for rpl_do_grant2@localhost;
|
|
sync_slave_with_master;
|
|
show grants for rpl_do_grant2@localhost;
|
|
|
|
connection master;
|
|
revoke DELETE on mysqltest1.* from rpl_do_grant2@localhost;
|
|
show grants for rpl_do_grant2@localhost;
|
|
sync_slave_with_master;
|
|
show grants for rpl_do_grant2@localhost;
|
|
|
|
connection master;
|
|
revoke all privileges, grant option from rpl_do_grant2@localhost;
|
|
show grants for rpl_do_grant2@localhost;
|
|
sync_slave_with_master;
|
|
show grants for rpl_do_grant2@localhost;
|
|
|
|
connection master;
|
|
drop user rpl_do_grant2@localhost;
|
|
--error 1141
|
|
show grants for rpl_do_grant2@localhost;
|
|
sync_slave_with_master;
|
|
--error 1141
|
|
show grants for rpl_do_grant2@localhost;
|
|
|
|
#####################################################
|
|
# Purpose
|
|
# Test whether mysql.procs_priv get replicated
|
|
# Related bugs:
|
|
# BUG42217 mysql.procs_priv does not get replicated
|
|
#####################################################
|
|
connection master;
|
|
call mtr.add_suppression("Slave: Operation DROP USER failed for 'create_rout_db'@'localhost' error.* 1396");
|
|
sync_slave_with_master;
|
|
connection master;
|
|
|
|
--disable_warnings
|
|
DROP DATABASE IF EXISTS bug42217_db;
|
|
--enable_warnings
|
|
CREATE DATABASE bug42217_db;
|
|
|
|
GRANT CREATE ROUTINE ON bug42217_db.* TO 'create_rout_db'@'localhost'
|
|
IDENTIFIED BY 'create_rout_db' WITH GRANT OPTION;
|
|
|
|
-- sync_slave_with_master
|
|
-- connection master
|
|
|
|
connect (create_rout_db_master, localhost, create_rout_db, create_rout_db, bug42217_db,$MASTER_MYPORT,);
|
|
connect (create_rout_db_slave, localhost, create_rout_db, create_rout_db, bug42217_db, $SLAVE_MYPORT,);
|
|
|
|
connection create_rout_db_master;
|
|
|
|
|
|
USE bug42217_db;
|
|
|
|
DELIMITER //;
|
|
CREATE FUNCTION upgrade_del_func() RETURNS CHAR(30)
|
|
BEGIN
|
|
RETURN "INSIDE upgrade_del_func()";
|
|
END//
|
|
|
|
DELIMITER ;//
|
|
|
|
connection master;
|
|
|
|
USE bug42217_db;
|
|
--replace_column 8 #
|
|
SELECT * FROM mysql.procs_priv;
|
|
SELECT upgrade_del_func();
|
|
|
|
sync_slave_with_master;
|
|
--replace_column 8 #
|
|
SELECT * FROM mysql.procs_priv;
|
|
SHOW GRANTS FOR 'create_rout_db'@'localhost';
|
|
|
|
USE bug42217_db;
|
|
SHOW CREATE FUNCTION upgrade_del_func;
|
|
SELECT upgrade_del_func();
|
|
|
|
--echo "Check whether the definer user will be able to execute the replicated routine on slave"
|
|
connection create_rout_db_slave;
|
|
USE bug42217_db;
|
|
SHOW CREATE FUNCTION upgrade_del_func;
|
|
SELECT upgrade_del_func();
|
|
|
|
connection slave;
|
|
DELETE FROM mysql.procs_priv;
|
|
FLUSH PRIVILEGES;
|
|
USE bug42217_db;
|
|
--echo "Can't execute the replicated routine on slave like before after procs privilege is deleted "
|
|
--error 1370
|
|
SELECT upgrade_del_func();
|
|
|
|
--echo "Test the user who creates a function on master doesn't exist on slave."
|
|
--echo "Hence SQL thread ACL_GLOBAL privilege jumps in and no mysql.procs_priv is inserted"
|
|
DROP USER 'create_rout_db'@'localhost';
|
|
|
|
connection create_rout_db_master;
|
|
DELIMITER //;
|
|
CREATE FUNCTION upgrade_alter_func() RETURNS CHAR(30)
|
|
BEGIN
|
|
RETURN "INSIDE upgrade_alter_func()";
|
|
END//
|
|
DELIMITER ;//
|
|
|
|
connection master;
|
|
SELECT upgrade_alter_func();
|
|
|
|
sync_slave_with_master;
|
|
SHOW CREATE FUNCTION upgrade_alter_func;
|
|
--echo "Should no privilege record for upgrade_alter_func in mysql.procs_priv"
|
|
--replace_column 8 #
|
|
SELECT * FROM mysql.procs_priv;
|
|
--error 1449
|
|
SELECT upgrade_alter_func();
|
|
|
|
###### CLEAN UP SECTION ##############
|
|
disconnect create_rout_db_master;
|
|
disconnect create_rout_db_slave;
|
|
connection master;
|
|
USE bug42217_db;
|
|
DROP FUNCTION upgrade_del_func;
|
|
DROP FUNCTION upgrade_alter_func;
|
|
DROP DATABASE bug42217_db;
|
|
-- sync_slave_with_master
|
|
-- connection master
|
|
|
|
# user was already dropped in the slave before
|
|
# so we should not replicate this statement.
|
|
SET SQL_LOG_BIN= 0;
|
|
DROP USER 'create_rout_db'@'localhost';
|
|
SET SQL_LOG_BIN= 1;
|
|
|
|
# finish entire clean up (remove binlogs)
|
|
# so that we leave a pristine environment for the
|
|
# following tests
|
|
--let $rpl_only_running_threads= 1
|
|
-- source include/rpl_reset.inc
|
|
USE test;
|
|
|
|
# BUG#49119: Master crashes when executing 'REVOKE ... ON
|
|
# {PROCEDURE|FUNCTION} FROM ...'
|
|
#
|
|
# The tests are divided into two test cases:
|
|
#
|
|
# i) a test case that mimics the one in the bug report.
|
|
#
|
|
# - We show that, despite the fact, that a revoke command fails
|
|
# when binlogging is active, the master will not hit an
|
|
# assertion.
|
|
#
|
|
# ii) (DISABLED) To pass, this test case took advantage of a vulnerability,
|
|
# MDEV-38506. Please uncomment this test case when MDEV-29848 is fixed.
|
|
#
|
|
# test case that partially succeeds on the master will also
|
|
# partially succeed on the slave.
|
|
#
|
|
# - The revoke statement that partially succeeds tries to revoke
|
|
# an EXECUTE grant for two users, and only one of the user has
|
|
# the specific grant. This will cause mysql to drop one of the
|
|
# grants and report error for the statement. The slave should
|
|
# also drop the grants that the master succeed and the SQL
|
|
# thread should not stop on statement failure.
|
|
|
|
-- echo ######## BUG#49119 #######
|
|
-- echo ### i) test case from the 'how to repeat section'
|
|
|
|
-- connection master
|
|
|
|
CREATE TABLE t1(c1 INT);
|
|
DELIMITER |;
|
|
CREATE PROCEDURE p1() SELECT * FROM t1 |
|
|
DELIMITER ;|
|
|
-- error ER_NONEXISTING_PROC_GRANT
|
|
REVOKE EXECUTE ON PROCEDURE p1 FROM 'root'@'localhost';
|
|
|
|
-- sync_slave_with_master
|
|
|
|
-- connection master
|
|
DROP TABLE t1;
|
|
DROP PROCEDURE p1;
|
|
|
|
-- sync_slave_with_master
|
|
|
|
--echo #
|
|
--echo # TODO: Re-enable test-case after fixing MDEV-29848
|
|
--echo #
|
|
if (0)
|
|
{
|
|
-- echo ### ii) Test case in which REVOKE partially succeeds
|
|
|
|
-- connection master
|
|
-- source include/rpl_reset.inc
|
|
-- connection master
|
|
|
|
CREATE TABLE t1(c1 INT);
|
|
DELIMITER |;
|
|
CREATE PROCEDURE p1() SELECT * FROM t1 |
|
|
DELIMITER ;|
|
|
|
|
CREATE USER 'user49119'@'localhost';
|
|
GRANT EXECUTE ON PROCEDURE p1 TO 'user49119'@'localhost';
|
|
|
|
-- echo ##############################################################
|
|
-- echo ### Showing grants for both users: root and user49119 (master)
|
|
SHOW GRANTS FOR 'user49119'@'localhost';
|
|
SHOW GRANTS FOR CURRENT_USER;
|
|
-- echo ##############################################################
|
|
|
|
-- sync_slave_with_master
|
|
|
|
-- echo ##############################################################
|
|
-- echo ### Showing grants for both users: root and user49119 (master)
|
|
SHOW GRANTS FOR 'user49119'@'localhost';
|
|
SHOW GRANTS FOR CURRENT_USER;
|
|
-- echo ##############################################################
|
|
|
|
-- connection master
|
|
|
|
-- echo ## This statement will make the revoke fail because root has no
|
|
-- echo ## execute grant. However, it will still revoke the grant for
|
|
-- echo ## user49119.
|
|
-- error ER_NONEXISTING_PROC_GRANT
|
|
REVOKE EXECUTE ON PROCEDURE p1 FROM 'user49119'@'localhost', 'root'@'localhost';
|
|
|
|
-- echo ##############################################################
|
|
-- echo ### Showing grants for both users: root and user49119 (master)
|
|
-- echo ### after revoke statement failure
|
|
SHOW GRANTS FOR 'user49119'@'localhost';
|
|
SHOW GRANTS FOR CURRENT_USER;
|
|
-- echo ##############################################################
|
|
|
|
-- sync_slave_with_master
|
|
|
|
-- echo #############################################################
|
|
-- echo ### Showing grants for both users: root and user49119 (slave)
|
|
-- echo ### after revoke statement failure (should match)
|
|
SHOW GRANTS FOR 'user49119'@'localhost';
|
|
SHOW GRANTS FOR CURRENT_USER;
|
|
-- echo ##############################################################
|
|
|
|
-- connection master
|
|
DROP TABLE t1;
|
|
DROP PROCEDURE p1;
|
|
DROP USER 'user49119'@'localhost';
|
|
|
|
-- sync_slave_with_master
|
|
}
|
|
|
|
#
|
|
# Bug #51987 revoke privileges logs wrong error code
|
|
#
|
|
|
|
-- source include/rpl_reset.inc
|
|
-- connection master
|
|
|
|
grant all on *.* to foo@"1.2.3.4";
|
|
-- error ER_REVOKE_GRANTS
|
|
revoke all privileges, grant option from "foo";
|
|
|
|
## assertion: revoke is logged
|
|
-- source include/show_binlog_events.inc
|
|
|
|
-- sync_slave_with_master
|
|
|
|
## assertion: slave replicates revoke and does not fail because master
|
|
## logged revoke with correct expected error code
|
|
--source include/check_slave_no_error.inc
|
|
|
|
-- connection master
|
|
DROP USER foo@"1.2.3.4";
|
|
-- sync_slave_with_master
|
|
|
|
--echo
|
|
--echo # Bug#27606 GRANT statement should be replicated with DEFINER information
|
|
--source include/rpl_reset.inc
|
|
--connection master
|
|
GRANT SELECT, INSERT ON mysql.user TO user_bug27606@localhost;
|
|
|
|
SELECT Grantor FROM mysql.tables_priv WHERE User='user_bug27606';
|
|
sync_slave_with_master;
|
|
SELECT Grantor FROM mysql.tables_priv WHERE User='user_bug27606';
|
|
|
|
--connection master
|
|
REVOKE SELECT ON mysql.user FROM user_bug27606@localhost;
|
|
SELECT Grantor FROM mysql.tables_priv WHERE User='user_bug27606';
|
|
sync_slave_with_master;
|
|
SELECT Grantor FROM mysql.tables_priv WHERE User='user_bug27606';
|
|
|
|
--connection master
|
|
DROP USER user_bug27606@localhost;
|
|
--disable_cursor_protocol
|
|
select priv into @root_priv from mysql.global_priv where user='root' and host='127.0.0.1';
|
|
--enable_cursor_protocol
|
|
update mysql.global_priv set priv=@root_priv where user='root' and host='localhost';
|
|
|
|
|
|
--source include/rpl_end.inc
|