2003-12-13 16:40:52 +01:00
|
|
|
use test;
|
2004-03-02 11:52:19 +01:00
|
|
|
grant usage on *.* to user1@localhost;
|
|
|
|
flush privileges;
|
2005-07-07 17:55:16 +02:00
|
|
|
drop table if exists t1;
|
2003-12-13 16:40:52 +01:00
|
|
|
drop database if exists db1_secret;
|
|
|
|
create database db1_secret;
|
2004-06-15 15:42:28 +02:00
|
|
|
create procedure db1_secret.dummy() begin end;
|
|
|
|
drop procedure db1_secret.dummy;
|
2003-12-13 16:40:52 +01:00
|
|
|
use db1_secret;
|
|
|
|
create table t1 ( u varchar(64), i int );
|
|
|
|
create procedure stamp(i int)
|
|
|
|
insert into db1_secret.t1 values (user(), i);
|
|
|
|
show procedure status like 'stamp';
|
2004-03-11 17:18:59 +01:00
|
|
|
Db Name Type Definer Modified Created Security_type Comment
|
|
|
|
db1_secret stamp PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER
|
2004-03-19 19:01:54 +01:00
|
|
|
create function db() returns varchar(64) return database();
|
|
|
|
show function status like 'db';
|
|
|
|
Db Name Type Definer Modified Created Security_type Comment
|
|
|
|
db1_secret db FUNCTION root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER
|
2003-12-13 16:40:52 +01:00
|
|
|
call stamp(1);
|
|
|
|
select * from t1;
|
|
|
|
u i
|
|
|
|
root@localhost 1
|
2004-03-19 19:01:54 +01:00
|
|
|
select db();
|
|
|
|
db()
|
|
|
|
db1_secret
|
2005-05-17 20:54:20 +02:00
|
|
|
grant execute on procedure db1_secret.stamp to user1@'%';
|
|
|
|
grant execute on function db1_secret.db to user1@'%';
|
|
|
|
grant execute on procedure db1_secret.stamp to ''@'%';
|
|
|
|
grant execute on function db1_secret.db to ''@'%';
|
2004-03-11 17:18:59 +01:00
|
|
|
call db1_secret.stamp(2);
|
2004-03-19 19:01:54 +01:00
|
|
|
select db1_secret.db();
|
|
|
|
db1_secret.db()
|
|
|
|
db1_secret
|
2003-12-13 16:40:52 +01:00
|
|
|
select * from db1_secret.t1;
|
2004-12-31 17:59:43 +01:00
|
|
|
ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
|
2004-06-15 15:42:28 +02:00
|
|
|
create procedure db1_secret.dummy() begin end;
|
2004-10-20 03:04:37 +02:00
|
|
|
ERROR 42000: Access denied for user 'user1'@'localhost' to database 'db1_secret'
|
2004-06-15 15:42:28 +02:00
|
|
|
drop procedure db1_secret.dummy;
|
|
|
|
ERROR 42000: PROCEDURE db1_secret.dummy does not exist
|
2004-03-11 17:18:59 +01:00
|
|
|
call db1_secret.stamp(3);
|
2004-03-19 19:01:54 +01:00
|
|
|
select db1_secret.db();
|
|
|
|
db1_secret.db()
|
|
|
|
db1_secret
|
2003-12-13 16:40:52 +01:00
|
|
|
select * from db1_secret.t1;
|
2004-12-31 17:59:43 +01:00
|
|
|
ERROR 42000: SELECT command denied to user ''@'localhost' for table 't1'
|
2004-06-15 15:42:28 +02:00
|
|
|
create procedure db1_secret.dummy() begin end;
|
2004-10-20 03:04:37 +02:00
|
|
|
ERROR 42000: Access denied for user ''@'localhost' to database 'db1_secret'
|
2004-06-15 15:42:28 +02:00
|
|
|
drop procedure db1_secret.dummy;
|
|
|
|
ERROR 42000: PROCEDURE db1_secret.dummy does not exist
|
2003-12-13 16:40:52 +01:00
|
|
|
select * from t1;
|
|
|
|
u i
|
|
|
|
root@localhost 1
|
2004-03-02 11:52:19 +01:00
|
|
|
user1@localhost 2
|
2003-12-13 16:40:52 +01:00
|
|
|
anon@localhost 3
|
|
|
|
alter procedure stamp sql security invoker;
|
|
|
|
show procedure status like 'stamp';
|
2004-03-11 17:18:59 +01:00
|
|
|
Db Name Type Definer Modified Created Security_type Comment
|
|
|
|
db1_secret stamp PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 INVOKER
|
2004-03-19 19:01:54 +01:00
|
|
|
alter function db sql security invoker;
|
|
|
|
show function status like 'db';
|
|
|
|
Db Name Type Definer Modified Created Security_type Comment
|
|
|
|
db1_secret db FUNCTION root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 INVOKER
|
2003-12-13 16:40:52 +01:00
|
|
|
call stamp(4);
|
|
|
|
select * from t1;
|
|
|
|
u i
|
|
|
|
root@localhost 1
|
2004-03-02 11:52:19 +01:00
|
|
|
user1@localhost 2
|
2003-12-13 16:40:52 +01:00
|
|
|
anon@localhost 3
|
|
|
|
root@localhost 4
|
2004-03-19 19:01:54 +01:00
|
|
|
select db();
|
|
|
|
db()
|
|
|
|
db1_secret
|
2004-03-11 17:18:59 +01:00
|
|
|
call db1_secret.stamp(5);
|
2004-07-15 03:19:07 +02:00
|
|
|
ERROR 42000: Access denied for user 'user1'@'localhost' to database 'db1_secret'
|
2004-03-19 19:01:54 +01:00
|
|
|
select db1_secret.db();
|
2004-07-15 03:19:07 +02:00
|
|
|
ERROR 42000: Access denied for user 'user1'@'localhost' to database 'db1_secret'
|
2004-03-11 17:18:59 +01:00
|
|
|
call db1_secret.stamp(6);
|
2004-07-15 03:19:07 +02:00
|
|
|
ERROR 42000: Access denied for user ''@'localhost' to database 'db1_secret'
|
2004-03-19 19:01:54 +01:00
|
|
|
select db1_secret.db();
|
2004-07-15 03:19:07 +02:00
|
|
|
ERROR 42000: Access denied for user ''@'localhost' to database 'db1_secret'
|
2004-03-02 11:52:19 +01:00
|
|
|
drop database if exists db2;
|
|
|
|
create database db2;
|
|
|
|
use db2;
|
|
|
|
create table t2 (s1 int);
|
|
|
|
insert into t2 values (0);
|
|
|
|
grant usage on db2.* to user1@localhost;
|
|
|
|
grant select on db2.* to user1@localhost;
|
|
|
|
grant usage on db2.* to user2@localhost;
|
2004-12-23 11:46:24 +01:00
|
|
|
grant select,insert,update,delete,create routine on db2.* to user2@localhost;
|
|
|
|
grant create routine on db2.* to user1@localhost;
|
2004-03-02 11:52:19 +01:00
|
|
|
flush privileges;
|
|
|
|
use db2;
|
|
|
|
create procedure p () insert into t2 values (1);
|
|
|
|
call p();
|
2004-12-31 17:59:43 +01:00
|
|
|
ERROR 42000: INSERT command denied to user 'user1'@'localhost' for table 't2'
|
2004-03-02 11:52:19 +01:00
|
|
|
use db2;
|
|
|
|
call p();
|
2004-12-23 11:46:24 +01:00
|
|
|
ERROR 42000: execute command denied to user 'user2'@'localhost' for routine 'db2.p'
|
2004-03-02 11:52:19 +01:00
|
|
|
select * from t2;
|
|
|
|
s1
|
|
|
|
0
|
|
|
|
create procedure q () insert into t2 values (2);
|
|
|
|
call q();
|
|
|
|
select * from t2;
|
|
|
|
s1
|
|
|
|
0
|
|
|
|
2
|
2005-05-17 20:54:20 +02:00
|
|
|
grant usage on procedure db2.q to user2@localhost with grant option;
|
|
|
|
grant execute on procedure db2.q to user1@localhost;
|
2004-03-02 11:52:19 +01:00
|
|
|
use db2;
|
|
|
|
call q();
|
|
|
|
select * from t2;
|
|
|
|
s1
|
|
|
|
0
|
|
|
|
2
|
|
|
|
2
|
2004-10-22 20:29:06 +02:00
|
|
|
alter procedure p modifies sql data;
|
|
|
|
drop procedure p;
|
|
|
|
alter procedure q modifies sql data;
|
2005-05-17 20:54:20 +02:00
|
|
|
ERROR 42000: alter routine command denied to user 'user1'@'localhost' for routine 'db2.q'
|
2004-10-22 20:29:06 +02:00
|
|
|
drop procedure q;
|
2005-05-17 20:54:20 +02:00
|
|
|
ERROR 42000: alter routine command denied to user 'user1'@'localhost' for routine 'db2.q'
|
2004-10-22 20:29:06 +02:00
|
|
|
use db2;
|
|
|
|
alter procedure q modifies sql data;
|
|
|
|
drop procedure q;
|
2003-12-13 16:40:52 +01:00
|
|
|
use test;
|
2004-03-22 14:44:41 +01:00
|
|
|
select type,db,name from mysql.proc;
|
|
|
|
type db name
|
|
|
|
FUNCTION db1_secret db
|
|
|
|
PROCEDURE db1_secret stamp
|
2003-12-13 16:40:52 +01:00
|
|
|
drop database db1_secret;
|
2004-03-02 11:52:19 +01:00
|
|
|
drop database db2;
|
2004-03-22 14:44:41 +01:00
|
|
|
select type,db,name from mysql.proc;
|
|
|
|
type db name
|
2004-03-02 11:52:19 +01:00
|
|
|
delete from mysql.user where user='user1' or user='user2';
|
Add new option "check-testcases" to mysql-test-run.pl
Cleanup the sideeffects from most of the testcases with sideeffects.
mysql-test/mysql-test-run.pl:
Add option "check-testcases" to mysql-test-run.pl
Will execute "include/check-testcase.test" once before each tescase and record the output into "var/tmp/check-testcase.result"
After the teastcase it will run again and this time compare the output with previously recorded file.
mysql-test/r/analyze.result:
Drop table t1 at end of test
mysql-test/r/create_select_tmp.result:
Drop table t1 at end of test
mysql-test/r/ctype_cp932.result:
Drop table t1 at end of test
mysql-test/r/ctype_recoding.result:
Drop table t1 at end of test
mysql-test/r/grant2.result:
Drop user mysqltest_2 and mysqltest_A@'%'
mysql-test/r/join_outer.result:
Drop view v1 to cleanup
mysql-test/r/ps_1general.result:
Drop table t1 at end of test
mysql-test/r/query_cache.result:
Drop function "f1"
mysql-test/r/read_only.result:
Reset the "read_only" flag
mysql-test/r/rpl000001.result:
Remove user "blafasel2"
mysql-test/r/rpl000017.result:
Remove user "replicate"
mysql-test/r/rpl_failed_optimize.result:
Drop table t1 to cleanup
mysql-test/r/rpl_flush_tables.result:
Drop tables t3, t4, t5
mysql-test/r/rpl_ignore_revoke.result:
Delete user "user_foo"
mysql-test/r/rpl_insert_id.result:
Drop table t1 to cleanup
mysql-test/r/rpl_loaddata.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_loaddata_rule_m.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_loaddata_rule_s.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_misc_functions.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_multi_update3.result:
Drop tyable t1 and t2 to cleanup
mysql-test/r/rpl_replicate_do.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_skip_error.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_slave_status.result:
Drop tyable t1 to cleanup
mysql-test/r/sp-prelocking.result:
Drop view v1 and tables t1, t2, t3 and t4 to cleanup
mysql-test/r/sp-security.result:
Delete users to cleanup
Delete remaining traces in tables_priv and procs_priv
mysql-test/r/subselect_innodb.result:
Drop procedure p1 to cleanup
mysql-test/r/trigger-compat.result:
Drop trigger wl2818_trg1 and wl2818_trg2.
Drop table t1, t2
Drop database mysqltest_db1
And the users "mysqltest_dfn@localhost" and "mysqltest_inv@localhost"
mysql-test/r/type_bit.result:
Drop tables t1 and t2 to cleanup
mysql-test/r/variables.result:
Set GLOBAL max_join_size to 10 as it originally was in variables-master.opt
mysql-test/r/view_grant.result:
Dop user "test@localhost" to cleanup
mysql-test/t/analyze.test:
Drop table t1 to cleanup
mysql-test/t/create_select_tmp.test:
Drop table t1 to cleanup
mysql-test/t/ctype_cp932.test:
Drop table t1 to cleanup
mysql-test/t/ctype_recoding.test:
Drop table t1 to cleanup
mysql-test/t/fulltext_var.test:
Restore the original ft_boolean_syntax
mysql-test/t/grant2.test:
Drop users "mysqltest_2" and "mysqltest_A@'%'" to cleanup
mysql-test/t/innodb_cache.test:
Reset query_cache_size to original value
mysql-test/t/join_outer.test:
Drop view v1 to cleanup
mysql-test/t/ps_1general.test:
Drop table t1 to cleanup
mysql-test/t/query_cache.test:
Drop function "f1" to cleanup
mysql-test/t/read_only.test:
Reset the readonly flag
mysql-test/t/rpl000001.test:
Delete user "blafasel2" to cleanup
mysql-test/t/rpl000017.test:
Delete user "replicate" to cleanup
mysql-test/t/rpl_failed_optimize.test:
Drop table t1 to cleanup
mysql-test/t/rpl_flush_tables.test:
Droip table t3, t4 and t5 to cleanup
mysql-test/t/rpl_ignore_revoke.test:
Delet user "user_foo" to cleanup
mysql-test/t/rpl_insert_id.test:
drop table t1 to cleanup
mysql-test/t/rpl_loaddata.test:
Drop table t1 to cleanup
mysql-test/t/rpl_loaddata_rule_m.test:
Drop table t1 to cleanup
mysql-test/t/rpl_loaddata_rule_s.test:
Drop table t1 to cleanup
mysql-test/t/rpl_misc_functions.test:
Drop table t1 to cleanup
mysql-test/t/rpl_multi_update3.test:
Drop table t1 and t2 to cleanup
mysql-test/t/rpl_replicate_do.test:
Drop table t1 to cleanup
mysql-test/t/rpl_skip_error.test:
Drop table t1 to cleanup
mysql-test/t/rpl_slave_status.test:
Drop table t1 to cleanup
mysql-test/t/sp-prelocking.test:
Drop table t1, t2 t3 and t4 to cleanup
Drop view v1
mysql-test/t/sp-security.test:
Delete test users from mysql.user, mysql.db, mysql.procs_priv and mysql.tables_priv
Drop table t1 to cleanup
mysql-test/t/subselect_innodb.test:
Drop procedure p1 to cleanup
mysql-test/t/trigger-compat.test:
Drop trigger wl2818_trg1 and wl2818_trg2 to cleanup
Drop table t1, t2
Drop users
drop database mysqltest_db1
mysql-test/t/type_bit.test:
drop table t1 and t2 to cleanup
mysql-test/t/variables-master.opt:
Increase max_join_size to 100.
mysql-test/t/variables.test:
Set max_join_size to 10, which was the original value in variables-master.opt
mysql-test/t/view_grant.test:
Drop the user "test@localhost"
mysql-test/include/check-testcase.test:
New BitKeeper file ``mysql-test/include/check-testcase.test''
2006-01-26 17:54:34 +01:00
|
|
|
delete from mysql.user where user='' and host='%';
|
2004-12-23 11:46:24 +01:00
|
|
|
delete from mysql.procs_priv where user='user1' or user='user2';
|
Add new option "check-testcases" to mysql-test-run.pl
Cleanup the sideeffects from most of the testcases with sideeffects.
mysql-test/mysql-test-run.pl:
Add option "check-testcases" to mysql-test-run.pl
Will execute "include/check-testcase.test" once before each tescase and record the output into "var/tmp/check-testcase.result"
After the teastcase it will run again and this time compare the output with previously recorded file.
mysql-test/r/analyze.result:
Drop table t1 at end of test
mysql-test/r/create_select_tmp.result:
Drop table t1 at end of test
mysql-test/r/ctype_cp932.result:
Drop table t1 at end of test
mysql-test/r/ctype_recoding.result:
Drop table t1 at end of test
mysql-test/r/grant2.result:
Drop user mysqltest_2 and mysqltest_A@'%'
mysql-test/r/join_outer.result:
Drop view v1 to cleanup
mysql-test/r/ps_1general.result:
Drop table t1 at end of test
mysql-test/r/query_cache.result:
Drop function "f1"
mysql-test/r/read_only.result:
Reset the "read_only" flag
mysql-test/r/rpl000001.result:
Remove user "blafasel2"
mysql-test/r/rpl000017.result:
Remove user "replicate"
mysql-test/r/rpl_failed_optimize.result:
Drop table t1 to cleanup
mysql-test/r/rpl_flush_tables.result:
Drop tables t3, t4, t5
mysql-test/r/rpl_ignore_revoke.result:
Delete user "user_foo"
mysql-test/r/rpl_insert_id.result:
Drop table t1 to cleanup
mysql-test/r/rpl_loaddata.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_loaddata_rule_m.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_loaddata_rule_s.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_misc_functions.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_multi_update3.result:
Drop tyable t1 and t2 to cleanup
mysql-test/r/rpl_replicate_do.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_skip_error.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_slave_status.result:
Drop tyable t1 to cleanup
mysql-test/r/sp-prelocking.result:
Drop view v1 and tables t1, t2, t3 and t4 to cleanup
mysql-test/r/sp-security.result:
Delete users to cleanup
Delete remaining traces in tables_priv and procs_priv
mysql-test/r/subselect_innodb.result:
Drop procedure p1 to cleanup
mysql-test/r/trigger-compat.result:
Drop trigger wl2818_trg1 and wl2818_trg2.
Drop table t1, t2
Drop database mysqltest_db1
And the users "mysqltest_dfn@localhost" and "mysqltest_inv@localhost"
mysql-test/r/type_bit.result:
Drop tables t1 and t2 to cleanup
mysql-test/r/variables.result:
Set GLOBAL max_join_size to 10 as it originally was in variables-master.opt
mysql-test/r/view_grant.result:
Dop user "test@localhost" to cleanup
mysql-test/t/analyze.test:
Drop table t1 to cleanup
mysql-test/t/create_select_tmp.test:
Drop table t1 to cleanup
mysql-test/t/ctype_cp932.test:
Drop table t1 to cleanup
mysql-test/t/ctype_recoding.test:
Drop table t1 to cleanup
mysql-test/t/fulltext_var.test:
Restore the original ft_boolean_syntax
mysql-test/t/grant2.test:
Drop users "mysqltest_2" and "mysqltest_A@'%'" to cleanup
mysql-test/t/innodb_cache.test:
Reset query_cache_size to original value
mysql-test/t/join_outer.test:
Drop view v1 to cleanup
mysql-test/t/ps_1general.test:
Drop table t1 to cleanup
mysql-test/t/query_cache.test:
Drop function "f1" to cleanup
mysql-test/t/read_only.test:
Reset the readonly flag
mysql-test/t/rpl000001.test:
Delete user "blafasel2" to cleanup
mysql-test/t/rpl000017.test:
Delete user "replicate" to cleanup
mysql-test/t/rpl_failed_optimize.test:
Drop table t1 to cleanup
mysql-test/t/rpl_flush_tables.test:
Droip table t3, t4 and t5 to cleanup
mysql-test/t/rpl_ignore_revoke.test:
Delet user "user_foo" to cleanup
mysql-test/t/rpl_insert_id.test:
drop table t1 to cleanup
mysql-test/t/rpl_loaddata.test:
Drop table t1 to cleanup
mysql-test/t/rpl_loaddata_rule_m.test:
Drop table t1 to cleanup
mysql-test/t/rpl_loaddata_rule_s.test:
Drop table t1 to cleanup
mysql-test/t/rpl_misc_functions.test:
Drop table t1 to cleanup
mysql-test/t/rpl_multi_update3.test:
Drop table t1 and t2 to cleanup
mysql-test/t/rpl_replicate_do.test:
Drop table t1 to cleanup
mysql-test/t/rpl_skip_error.test:
Drop table t1 to cleanup
mysql-test/t/rpl_slave_status.test:
Drop table t1 to cleanup
mysql-test/t/sp-prelocking.test:
Drop table t1, t2 t3 and t4 to cleanup
Drop view v1
mysql-test/t/sp-security.test:
Delete test users from mysql.user, mysql.db, mysql.procs_priv and mysql.tables_priv
Drop table t1 to cleanup
mysql-test/t/subselect_innodb.test:
Drop procedure p1 to cleanup
mysql-test/t/trigger-compat.test:
Drop trigger wl2818_trg1 and wl2818_trg2 to cleanup
Drop table t1, t2
Drop users
drop database mysqltest_db1
mysql-test/t/type_bit.test:
drop table t1 and t2 to cleanup
mysql-test/t/variables-master.opt:
Increase max_join_size to 100.
mysql-test/t/variables.test:
Set max_join_size to 10, which was the original value in variables-master.opt
mysql-test/t/view_grant.test:
Drop the user "test@localhost"
mysql-test/include/check-testcase.test:
New BitKeeper file ``mysql-test/include/check-testcase.test''
2006-01-26 17:54:34 +01:00
|
|
|
delete from mysql.procs_priv where user='' and host='%';
|
|
|
|
delete from mysql.db where user='user2';
|
|
|
|
flush privileges;
|
2004-12-23 11:46:24 +01:00
|
|
|
grant usage on *.* to usera@localhost;
|
|
|
|
grant usage on *.* to userb@localhost;
|
|
|
|
grant usage on *.* to userc@localhost;
|
|
|
|
create database sptest;
|
|
|
|
create table t1 ( u varchar(64), i int );
|
|
|
|
create procedure sptest.p1(i int) insert into test.t1 values (user(), i);
|
|
|
|
grant insert on t1 to usera@localhost;
|
2005-05-17 20:54:20 +02:00
|
|
|
grant execute on procedure sptest.p1 to usera@localhost;
|
2004-12-23 11:46:24 +01:00
|
|
|
show grants for usera@localhost;
|
|
|
|
Grants for usera@localhost
|
|
|
|
GRANT USAGE ON *.* TO 'usera'@'localhost'
|
|
|
|
GRANT INSERT ON `test`.`t1` TO 'usera'@'localhost'
|
2005-05-17 20:54:20 +02:00
|
|
|
GRANT EXECUTE ON PROCEDURE `sptest`.`p1` TO 'usera'@'localhost'
|
|
|
|
grant execute on procedure sptest.p1 to userc@localhost with grant option;
|
2004-12-23 11:46:24 +01:00
|
|
|
show grants for userc@localhost;
|
|
|
|
Grants for userc@localhost
|
|
|
|
GRANT USAGE ON *.* TO 'userc'@'localhost'
|
2005-05-17 20:54:20 +02:00
|
|
|
GRANT EXECUTE ON PROCEDURE `sptest`.`p1` TO 'userc'@'localhost' WITH GRANT OPTION
|
2004-12-23 11:46:24 +01:00
|
|
|
call sptest.p1(1);
|
2005-05-17 20:54:20 +02:00
|
|
|
grant execute on procedure sptest.p1 to userb@localhost;
|
2004-12-23 11:46:24 +01:00
|
|
|
ERROR 42000: grant command denied to user 'usera'@'localhost' for routine 'sptest.p1'
|
|
|
|
drop procedure sptest.p1;
|
2005-05-17 20:54:20 +02:00
|
|
|
ERROR 42000: alter routine command denied to user 'usera'@'localhost' for routine 'sptest.p1'
|
2004-12-23 11:46:24 +01:00
|
|
|
call sptest.p1(2);
|
|
|
|
ERROR 42000: execute command denied to user 'userb'@'localhost' for routine 'sptest.p1'
|
2005-05-17 20:54:20 +02:00
|
|
|
grant execute on procedure sptest.p1 to userb@localhost;
|
2004-12-23 11:46:24 +01:00
|
|
|
ERROR 42000: execute command denied to user 'userb'@'localhost' for routine 'sptest.p1'
|
|
|
|
drop procedure sptest.p1;
|
2005-05-17 20:54:20 +02:00
|
|
|
ERROR 42000: alter routine command denied to user 'userb'@'localhost' for routine 'sptest.p1'
|
2004-12-23 11:46:24 +01:00
|
|
|
call sptest.p1(3);
|
2005-05-17 20:54:20 +02:00
|
|
|
grant execute on procedure sptest.p1 to userb@localhost;
|
2004-12-23 11:46:24 +01:00
|
|
|
drop procedure sptest.p1;
|
2005-05-17 20:54:20 +02:00
|
|
|
ERROR 42000: alter routine command denied to user 'userc'@'localhost' for routine 'sptest.p1'
|
2004-12-23 11:46:24 +01:00
|
|
|
call sptest.p1(4);
|
2005-05-17 20:54:20 +02:00
|
|
|
grant execute on procedure sptest.p1 to userb@localhost;
|
2004-12-23 11:46:24 +01:00
|
|
|
ERROR 42000: grant command denied to user 'userb'@'localhost' for routine 'sptest.p1'
|
|
|
|
drop procedure sptest.p1;
|
2005-05-17 20:54:20 +02:00
|
|
|
ERROR 42000: alter routine command denied to user 'userb'@'localhost' for routine 'sptest.p1'
|
2004-12-23 11:46:24 +01:00
|
|
|
select * from t1;
|
|
|
|
u i
|
|
|
|
usera@localhost 1
|
|
|
|
userc@localhost 3
|
|
|
|
userb@localhost 4
|
2005-05-17 20:54:20 +02:00
|
|
|
grant all privileges on procedure sptest.p1 to userc@localhost;
|
2004-12-23 11:46:24 +01:00
|
|
|
show grants for userc@localhost;
|
|
|
|
Grants for userc@localhost
|
|
|
|
GRANT USAGE ON *.* TO 'userc'@'localhost'
|
2005-05-17 20:54:20 +02:00
|
|
|
GRANT EXECUTE, ALTER ROUTINE ON PROCEDURE `sptest`.`p1` TO 'userc'@'localhost' WITH GRANT OPTION
|
2004-12-23 11:46:24 +01:00
|
|
|
show grants for userb@localhost;
|
|
|
|
Grants for userb@localhost
|
|
|
|
GRANT USAGE ON *.* TO 'userb'@'localhost'
|
2005-05-17 20:54:20 +02:00
|
|
|
GRANT EXECUTE ON PROCEDURE `sptest`.`p1` TO 'userb'@'localhost'
|
|
|
|
revoke all privileges on procedure sptest.p1 from userb@localhost;
|
2004-12-23 11:46:24 +01:00
|
|
|
show grants for userb@localhost;
|
|
|
|
Grants for userb@localhost
|
|
|
|
GRANT USAGE ON *.* TO 'userb'@'localhost'
|
|
|
|
use test;
|
|
|
|
drop database sptest;
|
|
|
|
delete from mysql.user where user='usera' or user='userb' or user='userc';
|
|
|
|
delete from mysql.procs_priv where user='usera' or user='userb' or user='userc';
|
Add new option "check-testcases" to mysql-test-run.pl
Cleanup the sideeffects from most of the testcases with sideeffects.
mysql-test/mysql-test-run.pl:
Add option "check-testcases" to mysql-test-run.pl
Will execute "include/check-testcase.test" once before each tescase and record the output into "var/tmp/check-testcase.result"
After the teastcase it will run again and this time compare the output with previously recorded file.
mysql-test/r/analyze.result:
Drop table t1 at end of test
mysql-test/r/create_select_tmp.result:
Drop table t1 at end of test
mysql-test/r/ctype_cp932.result:
Drop table t1 at end of test
mysql-test/r/ctype_recoding.result:
Drop table t1 at end of test
mysql-test/r/grant2.result:
Drop user mysqltest_2 and mysqltest_A@'%'
mysql-test/r/join_outer.result:
Drop view v1 to cleanup
mysql-test/r/ps_1general.result:
Drop table t1 at end of test
mysql-test/r/query_cache.result:
Drop function "f1"
mysql-test/r/read_only.result:
Reset the "read_only" flag
mysql-test/r/rpl000001.result:
Remove user "blafasel2"
mysql-test/r/rpl000017.result:
Remove user "replicate"
mysql-test/r/rpl_failed_optimize.result:
Drop table t1 to cleanup
mysql-test/r/rpl_flush_tables.result:
Drop tables t3, t4, t5
mysql-test/r/rpl_ignore_revoke.result:
Delete user "user_foo"
mysql-test/r/rpl_insert_id.result:
Drop table t1 to cleanup
mysql-test/r/rpl_loaddata.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_loaddata_rule_m.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_loaddata_rule_s.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_misc_functions.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_multi_update3.result:
Drop tyable t1 and t2 to cleanup
mysql-test/r/rpl_replicate_do.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_skip_error.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_slave_status.result:
Drop tyable t1 to cleanup
mysql-test/r/sp-prelocking.result:
Drop view v1 and tables t1, t2, t3 and t4 to cleanup
mysql-test/r/sp-security.result:
Delete users to cleanup
Delete remaining traces in tables_priv and procs_priv
mysql-test/r/subselect_innodb.result:
Drop procedure p1 to cleanup
mysql-test/r/trigger-compat.result:
Drop trigger wl2818_trg1 and wl2818_trg2.
Drop table t1, t2
Drop database mysqltest_db1
And the users "mysqltest_dfn@localhost" and "mysqltest_inv@localhost"
mysql-test/r/type_bit.result:
Drop tables t1 and t2 to cleanup
mysql-test/r/variables.result:
Set GLOBAL max_join_size to 10 as it originally was in variables-master.opt
mysql-test/r/view_grant.result:
Dop user "test@localhost" to cleanup
mysql-test/t/analyze.test:
Drop table t1 to cleanup
mysql-test/t/create_select_tmp.test:
Drop table t1 to cleanup
mysql-test/t/ctype_cp932.test:
Drop table t1 to cleanup
mysql-test/t/ctype_recoding.test:
Drop table t1 to cleanup
mysql-test/t/fulltext_var.test:
Restore the original ft_boolean_syntax
mysql-test/t/grant2.test:
Drop users "mysqltest_2" and "mysqltest_A@'%'" to cleanup
mysql-test/t/innodb_cache.test:
Reset query_cache_size to original value
mysql-test/t/join_outer.test:
Drop view v1 to cleanup
mysql-test/t/ps_1general.test:
Drop table t1 to cleanup
mysql-test/t/query_cache.test:
Drop function "f1" to cleanup
mysql-test/t/read_only.test:
Reset the readonly flag
mysql-test/t/rpl000001.test:
Delete user "blafasel2" to cleanup
mysql-test/t/rpl000017.test:
Delete user "replicate" to cleanup
mysql-test/t/rpl_failed_optimize.test:
Drop table t1 to cleanup
mysql-test/t/rpl_flush_tables.test:
Droip table t3, t4 and t5 to cleanup
mysql-test/t/rpl_ignore_revoke.test:
Delet user "user_foo" to cleanup
mysql-test/t/rpl_insert_id.test:
drop table t1 to cleanup
mysql-test/t/rpl_loaddata.test:
Drop table t1 to cleanup
mysql-test/t/rpl_loaddata_rule_m.test:
Drop table t1 to cleanup
mysql-test/t/rpl_loaddata_rule_s.test:
Drop table t1 to cleanup
mysql-test/t/rpl_misc_functions.test:
Drop table t1 to cleanup
mysql-test/t/rpl_multi_update3.test:
Drop table t1 and t2 to cleanup
mysql-test/t/rpl_replicate_do.test:
Drop table t1 to cleanup
mysql-test/t/rpl_skip_error.test:
Drop table t1 to cleanup
mysql-test/t/rpl_slave_status.test:
Drop table t1 to cleanup
mysql-test/t/sp-prelocking.test:
Drop table t1, t2 t3 and t4 to cleanup
Drop view v1
mysql-test/t/sp-security.test:
Delete test users from mysql.user, mysql.db, mysql.procs_priv and mysql.tables_priv
Drop table t1 to cleanup
mysql-test/t/subselect_innodb.test:
Drop procedure p1 to cleanup
mysql-test/t/trigger-compat.test:
Drop trigger wl2818_trg1 and wl2818_trg2 to cleanup
Drop table t1, t2
Drop users
drop database mysqltest_db1
mysql-test/t/type_bit.test:
drop table t1 and t2 to cleanup
mysql-test/t/variables-master.opt:
Increase max_join_size to 100.
mysql-test/t/variables.test:
Set max_join_size to 10, which was the original value in variables-master.opt
mysql-test/t/view_grant.test:
Drop the user "test@localhost"
mysql-test/include/check-testcase.test:
New BitKeeper file ``mysql-test/include/check-testcase.test''
2006-01-26 17:54:34 +01:00
|
|
|
delete from mysql.tables_priv where user='usera';
|
|
|
|
flush privileges;
|
|
|
|
drop table t1;
|
2005-06-23 17:29:10 +02:00
|
|
|
drop function if exists bug_9503;
|
|
|
|
create database mysqltest//
|
|
|
|
use mysqltest//
|
|
|
|
create table t1 (s1 int)//
|
|
|
|
grant select on t1 to user1@localhost//
|
|
|
|
create function bug_9503 () returns int sql security invoker begin declare v int;
|
|
|
|
select min(s1) into v from t1; return v; end//
|
|
|
|
use mysqltest;
|
|
|
|
select bug_9503();
|
|
|
|
ERROR 42000: execute command denied to user 'user1'@'localhost' for routine 'mysqltest.bug_9503'
|
|
|
|
grant execute on function bug_9503 to user1@localhost;
|
|
|
|
do 1;
|
|
|
|
use test;
|
|
|
|
REVOKE ALL PRIVILEGES, GRANT OPTION FROM user1@localhost;
|
|
|
|
drop function bug_9503;
|
|
|
|
use test;
|
|
|
|
drop database mysqltest;
|
2005-07-15 23:01:44 +02:00
|
|
|
use test;
|
|
|
|
select current_user();
|
|
|
|
current_user()
|
|
|
|
root@localhost
|
|
|
|
select user();
|
|
|
|
user()
|
|
|
|
root@localhost
|
|
|
|
create procedure bug7291_0 () sql security invoker select current_user(), user();
|
|
|
|
create procedure bug7291_1 () sql security definer call bug7291_0();
|
|
|
|
create procedure bug7291_2 () sql security invoker call bug7291_0();
|
|
|
|
grant execute on procedure bug7291_0 to user1@localhost;
|
|
|
|
grant execute on procedure bug7291_1 to user1@localhost;
|
|
|
|
grant execute on procedure bug7291_2 to user1@localhost;
|
|
|
|
call bug7291_2();
|
|
|
|
current_user() user()
|
|
|
|
user1@localhost user1@localhost
|
|
|
|
call bug7291_1();
|
|
|
|
current_user() user()
|
|
|
|
root@localhost user1@localhost
|
|
|
|
drop procedure bug7291_1;
|
|
|
|
drop procedure bug7291_2;
|
|
|
|
drop procedure bug7291_0;
|
|
|
|
REVOKE ALL PRIVILEGES, GRANT OPTION FROM user1@localhost;
|
|
|
|
drop user user1@localhost;
|
2005-08-12 02:04:16 +02:00
|
|
|
drop database if exists mysqltest_1;
|
|
|
|
create database mysqltest_1;
|
|
|
|
create procedure mysqltest_1.p1()
|
|
|
|
begin
|
|
|
|
select 1 from dual;
|
|
|
|
end//
|
|
|
|
grant usage on *.* to mysqltest_1@localhost;
|
|
|
|
call mysqltest_1.p1();
|
|
|
|
ERROR 42000: execute command denied to user 'mysqltest_1'@'localhost' for routine 'mysqltest_1.p1'
|
2005-08-20 10:00:00 +02:00
|
|
|
call mysqltest_1.p1();
|
|
|
|
ERROR 42000: execute command denied to user 'mysqltest_1'@'localhost' for routine 'mysqltest_1.p1'
|
2005-08-12 02:04:16 +02:00
|
|
|
drop procedure mysqltest_1.p1;
|
|
|
|
drop database mysqltest_1;
|
|
|
|
revoke usage on *.* from mysqltest_1@localhost;
|
|
|
|
drop user mysqltest_1@localhost;
|
2005-10-16 20:47:19 +02:00
|
|
|
drop function if exists bug12812|
|
|
|
|
create function bug12812() returns char(2)
|
|
|
|
begin
|
|
|
|
return 'ok';
|
|
|
|
end;
|
|
|
|
create user user_bug12812@localhost IDENTIFIED BY 'ABC'|
|
|
|
|
SELECT test.bug12812()|
|
|
|
|
ERROR 42000: execute command denied to user 'user_bug12812'@'localhost' for routine 'test.bug12812'
|
|
|
|
CREATE VIEW v1 AS SELECT test.bug12812()|
|
|
|
|
ERROR 42000: execute command denied to user 'user_bug12812'@'localhost' for routine 'test.bug12812'
|
|
|
|
DROP USER user_bug12812@localhost|
|
|
|
|
drop function bug12812|
|
2005-12-15 15:23:16 +01:00
|
|
|
create database db_bug14834;
|
|
|
|
create user user1_bug14834@localhost identified by '';
|
|
|
|
grant all on `db\_bug14834`.* to user1_bug14834@localhost;
|
|
|
|
create user user2_bug14834@localhost identified by '';
|
|
|
|
grant all on `db\_bug14834`.* to user2_bug14834@localhost;
|
|
|
|
create user user3_bug14834@localhost identified by '';
|
|
|
|
grant all on `db__ug14834`.* to user3_bug14834@localhost;
|
|
|
|
create procedure p_bug14834() select user(), current_user();
|
|
|
|
call p_bug14834();
|
|
|
|
user() current_user()
|
|
|
|
user1_bug14834@localhost user1_bug14834@localhost
|
|
|
|
call p_bug14834();
|
|
|
|
user() current_user()
|
|
|
|
user2_bug14834@localhost user1_bug14834@localhost
|
|
|
|
call p_bug14834();
|
|
|
|
user() current_user()
|
|
|
|
user3_bug14834@localhost user1_bug14834@localhost
|
|
|
|
drop user user1_bug14834@localhost;
|
|
|
|
drop user user2_bug14834@localhost;
|
|
|
|
drop user user3_bug14834@localhost;
|
|
|
|
drop database db_bug14834;
|
2006-02-01 14:46:30 +01:00
|
|
|
create database db_bug14533;
|
|
|
|
use db_bug14533;
|
|
|
|
create table t1 (id int);
|
|
|
|
create user user_bug14533@localhost identified by '';
|
|
|
|
create procedure bug14533_1()
|
|
|
|
sql security definer
|
|
|
|
desc db_bug14533.t1;
|
|
|
|
create procedure bug14533_2()
|
|
|
|
sql security definer
|
|
|
|
select * from db_bug14533.t1;
|
|
|
|
grant execute on procedure db_bug14533.bug14533_1 to user_bug14533@localhost;
|
|
|
|
grant execute on procedure db_bug14533.bug14533_2 to user_bug14533@localhost;
|
|
|
|
call db_bug14533.bug14533_1();
|
|
|
|
Field Type Null Key Default Extra
|
|
|
|
id int(11) YES NULL
|
|
|
|
call db_bug14533.bug14533_2();
|
|
|
|
id
|
|
|
|
desc db_bug14533.t1;
|
|
|
|
ERROR 42000: SELECT command denied to user 'user_bug14533'@'localhost' for table 't1'
|
|
|
|
select * from db_bug14533.t1;
|
|
|
|
ERROR 42000: SELECT command denied to user 'user_bug14533'@'localhost' for table 't1'
|
|
|
|
drop user user_bug14533@localhost;
|
|
|
|
drop database db_bug14533;
|
2006-03-02 13:18:49 +01:00
|
|
|
|
|
|
|
---> connection: root
|
|
|
|
DROP DATABASE IF EXISTS mysqltest;
|
|
|
|
CREATE DATABASE mysqltest;
|
|
|
|
CREATE USER mysqltest_1@localhost;
|
|
|
|
GRANT ALL PRIVILEGES ON mysqltest.* TO mysqltest_1@localhost;
|
|
|
|
CREATE USER mysqltest_2@localhost;
|
|
|
|
GRANT SUPER ON *.* TO mysqltest_2@localhost;
|
|
|
|
GRANT ALL PRIVILEGES ON mysqltest.* TO mysqltest_2@localhost;
|
|
|
|
|
|
|
|
---> connection: mysqltest_2_con
|
|
|
|
use mysqltest;
|
|
|
|
CREATE PROCEDURE wl2897_p1() SELECT 1;
|
|
|
|
CREATE FUNCTION wl2897_f1() RETURNS INT RETURN 1;
|
|
|
|
|
|
|
|
---> connection: mysqltest_1_con
|
|
|
|
use mysqltest;
|
|
|
|
CREATE DEFINER=root@localhost PROCEDURE wl2897_p2() SELECT 2;
|
|
|
|
ERROR 42000: Access denied; you need the SUPER privilege for this operation
|
|
|
|
CREATE DEFINER=root@localhost FUNCTION wl2897_f2() RETURNS INT RETURN 2;
|
|
|
|
ERROR 42000: Access denied; you need the SUPER privilege for this operation
|
|
|
|
|
|
|
|
---> connection: mysqltest_2_con
|
|
|
|
use mysqltest;
|
|
|
|
CREATE DEFINER='a @ b @ c'@localhost PROCEDURE wl2897_p3() SELECT 3;
|
|
|
|
Warnings:
|
|
|
|
Note 1449 There is no 'a @ b @ c'@'localhost' registered
|
|
|
|
CREATE DEFINER='a @ b @ c'@localhost FUNCTION wl2897_f3() RETURNS INT RETURN 3;
|
|
|
|
Warnings:
|
|
|
|
Note 1449 There is no 'a @ b @ c'@'localhost' registered
|
|
|
|
|
|
|
|
---> connection: con1root
|
|
|
|
use mysqltest;
|
|
|
|
SHOW CREATE PROCEDURE wl2897_p1;
|
|
|
|
Procedure sql_mode Create Procedure
|
|
|
|
wl2897_p1 CREATE DEFINER=`mysqltest_2`@`localhost` PROCEDURE `wl2897_p1`()
|
|
|
|
SELECT 1
|
|
|
|
SHOW CREATE PROCEDURE wl2897_p3;
|
|
|
|
Procedure sql_mode Create Procedure
|
|
|
|
wl2897_p3 CREATE DEFINER=`a @ b @ c`@`localhost` PROCEDURE `wl2897_p3`()
|
|
|
|
SELECT 3
|
|
|
|
SHOW CREATE FUNCTION wl2897_f1;
|
|
|
|
Function sql_mode Create Function
|
|
|
|
wl2897_f1 CREATE DEFINER=`mysqltest_2`@`localhost` FUNCTION `wl2897_f1`() RETURNS int(11)
|
|
|
|
RETURN 1
|
|
|
|
SHOW CREATE FUNCTION wl2897_f3;
|
|
|
|
Function sql_mode Create Function
|
|
|
|
wl2897_f3 CREATE DEFINER=`a @ b @ c`@`localhost` FUNCTION `wl2897_f3`() RETURNS int(11)
|
|
|
|
RETURN 3
|
|
|
|
DROP USER mysqltest_1@localhost;
|
|
|
|
DROP USER mysqltest_2@localhost;
|
|
|
|
DROP DATABASE mysqltest;
|
2006-03-02 14:23:42 +01:00
|
|
|
|
|
|
|
---> connection: root
|
|
|
|
DROP DATABASE IF EXISTS mysqltest;
|
|
|
|
CREATE DATABASE mysqltest;
|
|
|
|
CREATE USER mysqltest_1@localhost;
|
|
|
|
GRANT ALL PRIVILEGES ON mysqltest.* TO mysqltest_1@localhost;
|
|
|
|
CREATE USER mysqltest_2@localhost;
|
|
|
|
GRANT ALL PRIVILEGES ON mysqltest.* TO mysqltest_2@localhost;
|
|
|
|
|
|
|
|
---> connection: mysqltest_1_con
|
|
|
|
use mysqltest;
|
|
|
|
CREATE PROCEDURE bug13198_p1()
|
|
|
|
SELECT 1;
|
|
|
|
CREATE FUNCTION bug13198_f1() RETURNS INT
|
|
|
|
RETURN 1;
|
|
|
|
CALL bug13198_p1();
|
|
|
|
1
|
|
|
|
1
|
|
|
|
SELECT bug13198_f1();
|
|
|
|
bug13198_f1()
|
|
|
|
1
|
|
|
|
|
|
|
|
---> connection: mysqltest_2_con
|
|
|
|
use mysqltest;
|
|
|
|
CALL bug13198_p1();
|
|
|
|
1
|
|
|
|
1
|
|
|
|
SELECT bug13198_f1();
|
|
|
|
bug13198_f1()
|
|
|
|
1
|
|
|
|
|
|
|
|
---> connection: root
|
|
|
|
DROP USER mysqltest_1@localhost;
|
|
|
|
|
|
|
|
---> connection: mysqltest_2_con
|
|
|
|
use mysqltest;
|
|
|
|
CALL bug13198_p1();
|
|
|
|
ERROR HY000: There is no 'mysqltest_1'@'localhost' registered
|
|
|
|
SELECT bug13198_f1();
|
|
|
|
ERROR HY000: There is no 'mysqltest_1'@'localhost' registered
|
|
|
|
|
|
|
|
---> connection: root
|
|
|
|
DROP USER mysqltest_2@localhost;
|
|
|
|
DROP DATABASE mysqltest;
|
2006-06-28 12:40:17 +02:00
|
|
|
GRANT USAGE ON *.* TO user19857@localhost IDENTIFIED BY 'meow';
|
|
|
|
GRANT SELECT, INSERT, UPDATE, DELETE, CREATE ROUTINE, ALTER ROUTINE ON test.* TO
|
|
|
|
user19857@localhost;
|
|
|
|
SELECT Host,User,Password FROM mysql.user WHERE User='user19857';
|
|
|
|
Host User Password
|
|
|
|
localhost user19857 *82DC221D557298F6CE9961037DB1C90604792F5C
|
|
|
|
|
|
|
|
---> connection: mysqltest_2_con
|
|
|
|
use test;
|
|
|
|
CREATE PROCEDURE sp19857() DETERMINISTIC
|
|
|
|
BEGIN
|
|
|
|
DECLARE a INT;
|
|
|
|
SET a=1;
|
|
|
|
SELECT a;
|
|
|
|
END //
|
|
|
|
SHOW CREATE PROCEDURE test.sp19857;
|
|
|
|
Procedure sql_mode Create Procedure
|
|
|
|
sp19857 CREATE DEFINER=`user19857`@`localhost` PROCEDURE `sp19857`()
|
|
|
|
DETERMINISTIC
|
|
|
|
BEGIN
|
|
|
|
DECLARE a INT;
|
|
|
|
SET a=1;
|
|
|
|
SELECT a;
|
|
|
|
END
|
|
|
|
DROP PROCEDURE IF EXISTS test.sp19857;
|
|
|
|
|
|
|
|
---> connection: root
|
|
|
|
SELECT Host,User,Password FROM mysql.user WHERE User='user19857';
|
|
|
|
Host User Password
|
|
|
|
localhost user19857 *82DC221D557298F6CE9961037DB1C90604792F5C
|
|
|
|
DROP USER user19857@localhost;
|
Bug#18630: Arguments of suid routine calculated in wrong security
context.
Routine arguments were evaluated in the security context of the routine
itself, not in the caller's context.
The bug is fixed the following way:
- Item_func_sp::find_and_check_access() has been split into two
functions: Item_func_sp::find_and_check_access() itself only
finds the function and check that the caller have EXECUTE privilege
on it. New function set_routine_security_ctx() changes security
context for SUID routines and checks that definer have EXECUTE
privilege too.
- new function sp_head::execute_trigger() is called from
Table_triggers_list::process_triggers() instead of
sp_head::execute_function(), and is effectively just as the
sp_head::execute_function() is, with all non-trigger related code
removed, and added trigger-specific security context switch.
- call to Item_func_sp::find_and_check_access() stays outside
of sp_head::execute_function(), and there is a code in
sql_parse.cc before the call to sp_head::execute_procedure() that
checks that the caller have EXECUTE privilege, but both
sp_head::execute_function() and sp_head::execute_procedure() call
set_routine_security_ctx() after evaluating their parameters,
and restore the context after the body is executed.
mysql-test/r/sp-security.result:
Add test case for bug#18630: Arguments of suid routine calculated
in wrong security context.
mysql-test/t/sp-security.test:
Add result for bug#18630: Arguments of suid routine calculated
in wrong security context.
sql/item_func.cc:
Do not change security context before executing the function, as it
will be changed after argument evaluation.
Do not change security context in Item_func_sp::find_and_check_access().
sql/item_func.h:
Change prototype for Item_func_sp::find_and_check_access().
sql/sp_head.cc:
Add set_routine_security_ctx() function.
Add sp_head::execute_trigger() method.
Change security context in sp_head::execute_trigger(), and in
sp_head::execute_function() and sp_head::execute_procedure()
after argument evaluation.
Move pop_all_cursors() call to sp_head::execute().
sql/sp_head.h:
Add declaration for sp_head::execute_trigger() and
set_routine_security_ctx().
sql/sql_parse.cc:
Do not change security context before executing the procedure, as it
will be changed after argument evaluation.
sql/sql_trigger.cc:
Call new sp_head::execute_trigger() instead of
sp_head::execute_function(), which is responsible to switch
security context.
2006-07-13 15:12:31 +02:00
|
|
|
DROP TABLE IF EXISTS t1;
|
|
|
|
DROP VIEW IF EXISTS v1;
|
|
|
|
DROP FUNCTION IF EXISTS f_suid;
|
|
|
|
DROP PROCEDURE IF EXISTS p_suid;
|
|
|
|
DROP FUNCTION IF EXISTS f_evil;
|
|
|
|
DELETE FROM mysql.user WHERE user LIKE 'mysqltest\_%';
|
|
|
|
DELETE FROM mysql.db WHERE user LIKE 'mysqltest\_%';
|
|
|
|
DELETE FROM mysql.tables_priv WHERE user LIKE 'mysqltest\_%';
|
|
|
|
DELETE FROM mysql.columns_priv WHERE user LIKE 'mysqltest\_%';
|
|
|
|
FLUSH PRIVILEGES;
|
|
|
|
CREATE TABLE t1 (i INT);
|
|
|
|
CREATE FUNCTION f_suid(i INT) RETURNS INT SQL SECURITY DEFINER RETURN 0;
|
|
|
|
CREATE PROCEDURE p_suid(IN i INT) SQL SECURITY DEFINER SET @c:= 0;
|
|
|
|
CREATE USER mysqltest_u1@localhost;
|
|
|
|
GRANT EXECUTE ON test.* TO mysqltest_u1@localhost;
|
|
|
|
CREATE DEFINER=mysqltest_u1@localhost FUNCTION f_evil () RETURNS INT
|
|
|
|
SQL SECURITY INVOKER
|
|
|
|
BEGIN
|
|
|
|
SET @a:= CURRENT_USER();
|
|
|
|
SET @b:= (SELECT COUNT(*) FROM t1);
|
|
|
|
RETURN @b;
|
|
|
|
END|
|
|
|
|
CREATE SQL SECURITY INVOKER VIEW v1 AS SELECT f_evil();
|
|
|
|
SELECT COUNT(*) FROM t1;
|
|
|
|
ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't1'
|
|
|
|
SELECT f_evil();
|
|
|
|
ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't1'
|
|
|
|
SELECT @a, @b;
|
|
|
|
@a @b
|
|
|
|
mysqltest_u1@localhost NULL
|
|
|
|
SELECT f_suid(f_evil());
|
|
|
|
ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't1'
|
|
|
|
SELECT @a, @b;
|
|
|
|
@a @b
|
|
|
|
mysqltest_u1@localhost NULL
|
|
|
|
CALL p_suid(f_evil());
|
|
|
|
ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't1'
|
|
|
|
SELECT @a, @b;
|
|
|
|
@a @b
|
|
|
|
mysqltest_u1@localhost NULL
|
|
|
|
SELECT * FROM v1;
|
|
|
|
ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 'v1'
|
|
|
|
SELECT @a, @b;
|
|
|
|
@a @b
|
|
|
|
mysqltest_u1@localhost NULL
|
|
|
|
DROP VIEW v1;
|
|
|
|
DROP FUNCTION f_evil;
|
|
|
|
DROP USER mysqltest_u1@localhost;
|
|
|
|
DROP PROCEDURE p_suid;
|
|
|
|
DROP FUNCTION f_suid;
|
|
|
|
DROP TABLE t1;
|
|
|
|
End of 5.0 tests.
|