mirror of
https://github.com/MariaDB/server.git
synced 2025-01-26 00:34:18 +01:00
1af4194364
added new function test_if_data_home_dir() which checks that path does not contain mysql data home directory. Using of 'mysql data home'/'any db name' in DATA DIRECTORY & INDEX DIRECTORY is disallowed mysql-test/r/partition.result: test result mysql-test/r/partition_not_windows.result: result fix mysql-test/r/partition_symlink.result: result fix mysql-test/r/symlink.result: test result update mysql-test/t/partition.test: test case mysql-test/t/partition_not_windows.test: test case update mysql-test/t/partition_symlink.test: test case update mysql-test/t/symlink.test: test case sql/mysql_priv.h: new variable mysql_unpacked_real_data_home sql/mysqld.cc: new variable mysql_unpacked_real_data_home sql/partition_info.cc: new check_partition_dirs() which checks data directory and index directory for partition elements sql/partition_info.h: new check_partition_dirs() which checks data directory and index directory for partition elements sql/sql_parse.cc: added new function test_if_data_home_dir() which checks that path does not contain mysql data home directory. Using of 'mysql data home'/'any db name' in DATA DIRECTORY & INDEX DIRECTORY is disallowed
127 lines
4.6 KiB
Text
127 lines
4.6 KiB
Text
# Test that must have symlink. eg. using DATA/INDEX DIR
|
|
# (DATA/INDEX DIR requires symlinks)
|
|
-- source include/have_partition.inc
|
|
-- source include/have_symlink.inc
|
|
# remove the not_windows line after fixing bug#30459
|
|
-- source include/not_windows.inc
|
|
-- disable_warnings
|
|
DROP TABLE IF EXISTS t1;
|
|
DROP DATABASE IF EXISTS mysqltest2;
|
|
-- enable_warnings
|
|
|
|
#
|
|
# Bug 32091: Security breach via directory changes
|
|
#
|
|
# The below test shows that a pre-existing table mysqltest2.t1 cannot be
|
|
# replaced by a user with no rights in 'mysqltest2'. The altered table
|
|
# test.t1 will be altered (remove partitioning) into the test directory
|
|
# and having its partitions removed from the mysqltest2 directory.
|
|
# (the partitions data files are named <tablename>#P#<partname>.MYD
|
|
# and will not collide with a non partitioned table's data files.)
|
|
# NOTE: the privileges on files and directories are the same for all
|
|
# database users in mysqld, though mysqld enforces privileges on
|
|
# the database and table levels which in turn maps to directories and
|
|
# files, but not the other way around (any db-user can use any
|
|
# directory or file that the mysqld-process can use, via DATA/INDEX DIR)
|
|
# this is the security flaw that was used in bug#32091 and bug#32111
|
|
|
|
#--exec mkdir $MYSQLTEST_VARDIR/tmp/test || true
|
|
#--exec mkdir $MYSQLTEST_VARDIR/tmp/mysqltest2 || true
|
|
|
|
-- echo # Creating two non colliding tables mysqltest2.t1 and test.t1
|
|
-- echo # test.t1 have partitions in mysqltest2-directory!
|
|
-- echo # user root:
|
|
CREATE USER mysqltest_1@localhost;
|
|
CREATE DATABASE mysqltest2;
|
|
USE mysqltest2;
|
|
CREATE TABLE t1 (a INT);
|
|
INSERT INTO t1 VALUES (0);
|
|
connect(con1,localhost,mysqltest_1,,);
|
|
-- echo # user mysqltest_1:
|
|
USE test;
|
|
-- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
|
eval CREATE TABLE t1 (a INT)
|
|
PARTITION BY LIST (a) (
|
|
PARTITION p0 VALUES IN (0)
|
|
DATA DIRECTORY '$MYSQLTEST_VARDIR/tmp'
|
|
INDEX DIRECTORY '$MYSQLTEST_VARDIR/tmp',
|
|
PARTITION p1 VALUES IN (1)
|
|
DATA DIRECTORY '$MYSQLTEST_VARDIR/tmp'
|
|
INDEX DIRECTORY '$MYSQLTEST_VARDIR/tmp',
|
|
PARTITION p2 VALUES IN (2)
|
|
);
|
|
-- echo # without the patch for bug#32091 this would create
|
|
-- echo # files mysqltest2/t1.MYD + .MYI and possible overwrite
|
|
-- echo # the mysqltest2.t1 table (depending on bug#32111)
|
|
-- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
|
ALTER TABLE t1 REMOVE PARTITIONING;
|
|
INSERT INTO t1 VALUES (1);
|
|
SELECT * FROM t1;
|
|
connection default;
|
|
-- echo # user root:
|
|
USE mysqltest2;
|
|
FLUSH TABLES;
|
|
-- echo # if the patch works, this should be different
|
|
-- echo # and before the patch they were the same!
|
|
SELECT * FROM t1;
|
|
USE test;
|
|
SELECT * FROM t1;
|
|
DROP TABLE t1;
|
|
DROP DATABASE mysqltest2;
|
|
# The below test shows that a pre-existing partition can not be
|
|
# destroyed by a new partition from another table.
|
|
# (Remember that a table or partition that uses the DATA/INDEX DIR
|
|
# is symlinked and thus has
|
|
# 1. the real file in the DATA/INDEX DIR and
|
|
# 2. a symlink in its default database directory pointing to
|
|
# the real file.
|
|
# So it is using/blocking 2 files in (in 2 different directories
|
|
-- echo # test that symlinks can not overwrite files when CREATE TABLE
|
|
-- echo # user root:
|
|
|
|
CREATE DATABASE mysqltest2;
|
|
USE mysqltest2;
|
|
-- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
|
eval CREATE TABLE t1 (a INT)
|
|
PARTITION BY LIST (a) (
|
|
PARTITION p0 VALUES IN (0)
|
|
DATA DIRECTORY '$MYSQLTEST_VARDIR/tmp'
|
|
INDEX DIRECTORY '$MYSQLTEST_VARDIR/tmp',
|
|
PARTITION p1 VALUES IN (1)
|
|
DATA DIRECTORY '$MYSQLTEST_VARDIR/tmp'
|
|
INDEX DIRECTORY '$MYSQLTEST_VARDIR/tmp'
|
|
);
|
|
connection con1;
|
|
-- echo # user mysqltest_1:
|
|
USE test;
|
|
-- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
|
-- error 1,1
|
|
eval CREATE TABLE t1 (a INT)
|
|
PARTITION BY LIST (a) (
|
|
PARTITION p0 VALUES IN (0)
|
|
DATA DIRECTORY '$MYSQLTEST_VARDIR/tmp'
|
|
INDEX DIRECTORY '$MYSQLTEST_VARDIR/tmp',
|
|
PARTITION p1 VALUES IN (1)
|
|
DATA DIRECTORY '$MYSQLTEST_VARDIR/tmp'
|
|
INDEX DIRECTORY '$MYSQLTEST_VARDIR/tmp'
|
|
);
|
|
-- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
|
-- error 1,1
|
|
eval CREATE TABLE t1 (a INT)
|
|
PARTITION BY LIST (a) (
|
|
PARTITION p0 VALUES IN (0)
|
|
DATA DIRECTORY '$MYSQLTEST_VARDIR/tmp'
|
|
INDEX DIRECTORY '$MYSQLTEST_VARDIR/tmp',
|
|
PARTITION p1 VALUES IN (1)
|
|
DATA DIRECTORY '$MYSQLTEST_VARDIR/tmp'
|
|
INDEX DIRECTORY '$MYSQLTEST_VARDIR/tmp'
|
|
);
|
|
connection default;
|
|
-- echo # user root (cleanup):
|
|
DROP DATABASE mysqltest2;
|
|
USE test;
|
|
DROP USER mysqltest_1@localhost;
|
|
disconnect con1;
|
|
|
|
#--exec rmdir $MYSQLTEST_VARDIR/tmp/test || true
|
|
#--exec rmdir $MYSQLTEST_VARDIR/tmp/mysqltest2 || true
|