2003-12-13 16:40:52 +01:00
|
|
|
#
|
|
|
|
# Testing SQL SECURITY of stored procedures
|
|
|
|
#
|
|
|
|
|
2005-04-04 21:43:58 +02:00
|
|
|
# Can't test with embedded server that doesn't support grants
|
|
|
|
-- source include/not_embedded.inc
|
|
|
|
|
2003-12-13 16:40:52 +01:00
|
|
|
connect (con1root,localhost,root,,);
|
|
|
|
|
|
|
|
connection con1root;
|
|
|
|
use test;
|
|
|
|
|
2004-03-02 11:52:19 +01:00
|
|
|
# Create user user1 with no particular access rights
|
|
|
|
grant usage on *.* to user1@localhost;
|
|
|
|
flush privileges;
|
2003-12-13 16:40:52 +01:00
|
|
|
|
|
|
|
--disable_warnings
|
2005-07-07 17:44:10 +02:00
|
|
|
drop table if exists t1;
|
2003-12-13 16:40:52 +01:00
|
|
|
drop database if exists db1_secret;
|
|
|
|
--enable_warnings
|
|
|
|
# Create our secret database
|
|
|
|
create database db1_secret;
|
|
|
|
|
2004-06-15 15:42:28 +02:00
|
|
|
# Can create a procedure in other db
|
|
|
|
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 );
|
2007-03-23 12:12:11 +01:00
|
|
|
insert into t1 values('test', 0);
|
2003-12-13 16:40:52 +01:00
|
|
|
|
2004-03-19 19:01:54 +01:00
|
|
|
# A test procedure and function
|
2003-12-13 16:40:52 +01:00
|
|
|
create procedure stamp(i int)
|
|
|
|
insert into db1_secret.t1 values (user(), i);
|
2004-03-11 17:18:59 +01:00
|
|
|
--replace_column 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00'
|
2003-12-13 16:40:52 +01:00
|
|
|
show procedure status like 'stamp';
|
|
|
|
|
2007-03-23 12:12:11 +01:00
|
|
|
delimiter |;
|
|
|
|
create function db() returns varchar(64)
|
|
|
|
begin
|
|
|
|
declare v varchar(64);
|
|
|
|
|
|
|
|
select u into v from t1 limit 1;
|
|
|
|
|
|
|
|
return v;
|
|
|
|
end|
|
|
|
|
delimiter ;|
|
2004-03-19 19:01:54 +01:00
|
|
|
--replace_column 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00'
|
|
|
|
show function status like 'db';
|
|
|
|
|
2003-12-13 16:40:52 +01:00
|
|
|
# root can, of course
|
|
|
|
call stamp(1);
|
|
|
|
select * from t1;
|
2004-03-19 19:01:54 +01:00
|
|
|
select db();
|
2003-12-13 16:40:52 +01:00
|
|
|
|
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-12-23 11:46:24 +01:00
|
|
|
|
2004-03-02 11:52:19 +01:00
|
|
|
connect (con2user1,localhost,user1,,);
|
2003-12-13 16:40:52 +01:00
|
|
|
connect (con3anon,localhost,anon,,);
|
|
|
|
|
2004-06-15 15:42:28 +02:00
|
|
|
|
2003-12-13 16:40:52 +01:00
|
|
|
#
|
2004-03-02 11:52:19 +01:00
|
|
|
# User1 can
|
2003-12-13 16:40:52 +01:00
|
|
|
#
|
2004-03-02 11:52:19 +01:00
|
|
|
connection con2user1;
|
2003-12-13 16:40:52 +01:00
|
|
|
|
|
|
|
# This should work...
|
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();
|
2003-12-13 16:40:52 +01:00
|
|
|
|
|
|
|
# ...but not this
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2003-12-13 16:40:52 +01:00
|
|
|
select * from db1_secret.t1;
|
|
|
|
|
2004-06-15 15:42:28 +02:00
|
|
|
# ...and not this
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_DBACCESS_DENIED_ERROR
|
2004-06-15 15:42:28 +02:00
|
|
|
create procedure db1_secret.dummy() begin end;
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_SP_DOES_NOT_EXIST
|
2004-06-15 15:42:28 +02:00
|
|
|
drop procedure db1_secret.dummy;
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_PROCACCESS_DENIED_ERROR
|
|
|
|
drop procedure db1_secret.stamp;
|
|
|
|
--error ER_PROCACCESS_DENIED_ERROR
|
|
|
|
drop function db1_secret.db;
|
2004-06-15 15:42:28 +02:00
|
|
|
|
|
|
|
|
2003-12-13 16:40:52 +01:00
|
|
|
#
|
|
|
|
# Anonymous can
|
|
|
|
#
|
|
|
|
connection con3anon;
|
|
|
|
|
|
|
|
# This should work...
|
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();
|
2003-12-13 16:40:52 +01:00
|
|
|
|
|
|
|
# ...but not this
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2003-12-13 16:40:52 +01:00
|
|
|
select * from db1_secret.t1;
|
|
|
|
|
2004-06-15 15:42:28 +02:00
|
|
|
# ...and not this
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_DBACCESS_DENIED_ERROR
|
2004-06-15 15:42:28 +02:00
|
|
|
create procedure db1_secret.dummy() begin end;
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_SP_DOES_NOT_EXIST
|
2004-06-15 15:42:28 +02:00
|
|
|
drop procedure db1_secret.dummy;
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_PROCACCESS_DENIED_ERROR
|
|
|
|
drop procedure db1_secret.stamp;
|
|
|
|
--error ER_PROCACCESS_DENIED_ERROR
|
|
|
|
drop function db1_secret.db;
|
2004-06-15 15:42:28 +02:00
|
|
|
|
|
|
|
|
2003-12-13 16:40:52 +01:00
|
|
|
#
|
|
|
|
# Check it out
|
|
|
|
#
|
|
|
|
connection con1root;
|
|
|
|
select * from t1;
|
|
|
|
|
|
|
|
#
|
|
|
|
# Change to invoker's rights
|
|
|
|
#
|
|
|
|
alter procedure stamp sql security invoker;
|
2004-03-11 17:18:59 +01:00
|
|
|
--replace_column 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00'
|
2003-12-13 16:40:52 +01:00
|
|
|
show procedure status like 'stamp';
|
|
|
|
|
2004-03-19 19:01:54 +01:00
|
|
|
alter function db sql security invoker;
|
|
|
|
--replace_column 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00'
|
|
|
|
show function status like 'db';
|
|
|
|
|
2003-12-13 16:40:52 +01:00
|
|
|
# root still can
|
|
|
|
call stamp(4);
|
|
|
|
select * from t1;
|
2004-03-19 19:01:54 +01:00
|
|
|
select db();
|
2003-12-13 16:40:52 +01:00
|
|
|
|
|
|
|
#
|
2004-03-02 11:52:19 +01:00
|
|
|
# User1 cannot
|
2003-12-13 16:40:52 +01:00
|
|
|
#
|
2004-03-02 11:52:19 +01:00
|
|
|
connection con2user1;
|
2003-12-13 16:40:52 +01:00
|
|
|
|
|
|
|
# This should not work
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2004-03-11 17:18:59 +01:00
|
|
|
call db1_secret.stamp(5);
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2004-03-19 19:01:54 +01:00
|
|
|
select db1_secret.db();
|
2003-12-13 16:40:52 +01:00
|
|
|
|
|
|
|
#
|
|
|
|
# Anonymous cannot
|
|
|
|
#
|
|
|
|
connection con3anon;
|
|
|
|
|
|
|
|
# This should not work
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2004-03-11 17:18:59 +01:00
|
|
|
call db1_secret.stamp(6);
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2004-03-19 19:01:54 +01:00
|
|
|
select db1_secret.db();
|
2004-03-02 11:52:19 +01:00
|
|
|
|
|
|
|
#
|
|
|
|
# BUG#2777
|
|
|
|
#
|
|
|
|
|
|
|
|
connection con1root;
|
|
|
|
--disable_warnings
|
|
|
|
drop database if exists db2;
|
|
|
|
--enable_warnings
|
|
|
|
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;
|
|
|
|
|
|
|
|
connection con2user1;
|
|
|
|
use db2;
|
|
|
|
|
|
|
|
create procedure p () insert into t2 values (1);
|
|
|
|
|
|
|
|
# Check that this doesn't work.
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
2004-03-02 11:52:19 +01:00
|
|
|
call p();
|
|
|
|
|
|
|
|
connect (con4user2,localhost,user2,,);
|
|
|
|
|
|
|
|
connection con4user2;
|
|
|
|
use db2;
|
|
|
|
|
|
|
|
# This should not work, since p is executed with definer's (user1's) rights.
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_PROCACCESS_DENIED_ERROR
|
2004-03-02 11:52:19 +01:00
|
|
|
call p();
|
|
|
|
select * from t2;
|
|
|
|
|
|
|
|
create procedure q () insert into t2 values (2);
|
|
|
|
|
|
|
|
call q();
|
|
|
|
select * from t2;
|
|
|
|
|
2004-12-23 11:46:24 +01:00
|
|
|
connection con1root;
|
2005-05-17 20:54:20 +02:00
|
|
|
grant usage on procedure db2.q to user2@localhost with grant option;
|
2004-12-23 11:46:24 +01:00
|
|
|
|
|
|
|
connection con4user2;
|
2005-05-17 20:54:20 +02:00
|
|
|
grant execute on procedure db2.q to user1@localhost;
|
2004-12-23 11:46:24 +01:00
|
|
|
|
2004-03-02 11:52:19 +01:00
|
|
|
connection con2user1;
|
|
|
|
use db2;
|
|
|
|
|
|
|
|
# This should work
|
|
|
|
call q();
|
|
|
|
select * from t2;
|
|
|
|
|
2004-10-22 20:29:06 +02:00
|
|
|
#
|
|
|
|
# BUG#6030: Stored procedure has no appropriate DROP privilege
|
|
|
|
# (or ALTER for that matter)
|
|
|
|
|
|
|
|
# still connection con2user1 in db2
|
|
|
|
|
|
|
|
# This should work:
|
|
|
|
alter procedure p modifies sql data;
|
|
|
|
drop procedure p;
|
|
|
|
|
|
|
|
# This should NOT work
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_PROCACCESS_DENIED_ERROR
|
2004-10-22 20:29:06 +02:00
|
|
|
alter procedure q modifies sql data;
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_PROCACCESS_DENIED_ERROR
|
2004-10-22 20:29:06 +02:00
|
|
|
drop procedure q;
|
|
|
|
|
2003-12-13 16:40:52 +01:00
|
|
|
connection con1root;
|
2004-10-22 20:29:06 +02:00
|
|
|
use db2;
|
|
|
|
# But root always can
|
|
|
|
alter procedure q modifies sql data;
|
|
|
|
drop procedure q;
|
|
|
|
|
|
|
|
|
|
|
|
# Clean up
|
|
|
|
#Still connection con1root;
|
2004-12-23 11:46:24 +01:00
|
|
|
disconnect con2user1;
|
|
|
|
disconnect con3anon;
|
|
|
|
disconnect con4user2;
|
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;
|
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
|
|
|
# Make sure the routines are gone
|
|
|
|
select type,db,name from mysql.proc;
|
|
|
|
# Get rid of the users
|
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
|
|
|
# And any routine privileges
|
|
|
|
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 the grants to user ''@'%' that was created above
|
|
|
|
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
|
|
|
#
|
|
|
|
# Test the new security acls
|
|
|
|
#
|
|
|
|
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;
|
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
|
|
|
show grants for userc@localhost;
|
|
|
|
|
|
|
|
connect (con2usera,localhost,usera,,);
|
|
|
|
connect (con3userb,localhost,userb,,);
|
|
|
|
connect (con4userc,localhost,userc,,);
|
|
|
|
|
|
|
|
connection con2usera;
|
|
|
|
call sptest.p1(1);
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_PROCACCESS_DENIED_ERROR
|
2005-05-17 20:54:20 +02:00
|
|
|
grant execute on procedure sptest.p1 to userb@localhost;
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_PROCACCESS_DENIED_ERROR
|
2004-12-23 11:46:24 +01:00
|
|
|
drop procedure sptest.p1;
|
|
|
|
|
|
|
|
connection con3userb;
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_PROCACCESS_DENIED_ERROR
|
2004-12-23 11:46:24 +01:00
|
|
|
call sptest.p1(2);
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_PROCACCESS_DENIED_ERROR
|
2005-05-17 20:54:20 +02:00
|
|
|
grant execute on procedure sptest.p1 to userb@localhost;
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_PROCACCESS_DENIED_ERROR
|
2004-12-23 11:46:24 +01:00
|
|
|
drop procedure sptest.p1;
|
|
|
|
|
|
|
|
connection con4userc;
|
|
|
|
call sptest.p1(3);
|
2005-05-17 20:54:20 +02:00
|
|
|
grant execute on procedure sptest.p1 to userb@localhost;
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_PROCACCESS_DENIED_ERROR
|
2004-12-23 11:46:24 +01:00
|
|
|
drop procedure sptest.p1;
|
|
|
|
|
|
|
|
connection con3userb;
|
|
|
|
call sptest.p1(4);
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_PROCACCESS_DENIED_ERROR
|
2005-05-17 20:54:20 +02:00
|
|
|
grant execute on procedure sptest.p1 to userb@localhost;
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_PROCACCESS_DENIED_ERROR
|
2004-12-23 11:46:24 +01:00
|
|
|
drop procedure sptest.p1;
|
|
|
|
|
|
|
|
connection con1root;
|
|
|
|
select * from t1;
|
|
|
|
|
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;
|
|
|
|
show grants for userb@localhost;
|
|
|
|
|
|
|
|
connection con4userc;
|
2005-05-17 20:54:20 +02:00
|
|
|
revoke all privileges on procedure sptest.p1 from userb@localhost;
|
2004-12-23 11:46:24 +01:00
|
|
|
|
|
|
|
connection con1root;
|
|
|
|
show grants for userb@localhost;
|
|
|
|
|
|
|
|
#cleanup
|
|
|
|
disconnect con4userc;
|
|
|
|
disconnect con3userb;
|
|
|
|
disconnect con2usera;
|
|
|
|
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;
|
2004-12-23 11:46:24 +01:00
|
|
|
|
2005-06-23 17:29:10 +02:00
|
|
|
#
|
|
|
|
# BUG#9503: reseting correct parameters of thread after error in SP function
|
|
|
|
#
|
|
|
|
connect (root,localhost,root,,test);
|
|
|
|
connection root;
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop function if exists bug_9503;
|
|
|
|
--enable_warnings
|
|
|
|
delimiter //;
|
|
|
|
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//
|
|
|
|
delimiter ;//
|
|
|
|
|
|
|
|
connect (user1,localhost,user1,,test);
|
|
|
|
connection user1;
|
|
|
|
use mysqltest;
|
2007-03-23 12:12:11 +01:00
|
|
|
-- error ER_PROCACCESS_DENIED_ERROR
|
2005-06-23 17:29:10 +02:00
|
|
|
select bug_9503();
|
|
|
|
|
|
|
|
connection root;
|
|
|
|
grant execute on function bug_9503 to user1@localhost;
|
|
|
|
|
|
|
|
connection user1;
|
|
|
|
do 1;
|
|
|
|
use test;
|
|
|
|
|
2005-10-12 13:56:07 +02:00
|
|
|
disconnect user1;
|
2005-06-23 17:29:10 +02:00
|
|
|
connection root;
|
|
|
|
REVOKE ALL PRIVILEGES, GRANT OPTION FROM user1@localhost;
|
|
|
|
drop function bug_9503;
|
|
|
|
use test;
|
|
|
|
drop database mysqltest;
|
2005-07-15 23:17:05 +02:00
|
|
|
|
2005-07-15 23:01:44 +02:00
|
|
|
#
|
|
|
|
# correct value from current_user() in function run from "security definer"
|
|
|
|
# (BUG#7291)
|
|
|
|
#
|
|
|
|
connection con1root;
|
|
|
|
use test;
|
|
|
|
|
|
|
|
select current_user();
|
|
|
|
select user();
|
|
|
|
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;
|
|
|
|
|
|
|
|
connect (user1,localhost,user1,,);
|
|
|
|
connection user1;
|
|
|
|
|
|
|
|
call bug7291_2();
|
|
|
|
call bug7291_1();
|
|
|
|
|
|
|
|
connection con1root;
|
|
|
|
drop procedure bug7291_1;
|
|
|
|
drop procedure bug7291_2;
|
|
|
|
drop procedure bug7291_0;
|
|
|
|
disconnect user1;
|
|
|
|
REVOKE ALL PRIVILEGES, GRANT OPTION FROM user1@localhost;
|
|
|
|
drop user user1@localhost;
|
2005-08-12 02:04:16 +02:00
|
|
|
|
|
|
|
#
|
|
|
|
# Bug #12318: Wrong error message when accessing an inaccessible stored
|
|
|
|
# procedure in another database when the current database is
|
|
|
|
# information_schema.
|
|
|
|
#
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop database if exists mysqltest_1;
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
create database mysqltest_1;
|
|
|
|
delimiter //;
|
|
|
|
create procedure mysqltest_1.p1()
|
|
|
|
begin
|
|
|
|
select 1 from dual;
|
|
|
|
end//
|
|
|
|
delimiter ;//
|
|
|
|
|
|
|
|
grant usage on *.* to mysqltest_1@localhost;
|
|
|
|
|
|
|
|
connect (n1,localhost,mysqltest_1,,information_schema,$MASTER_MYPORT,$MASTER_MYSOCK);
|
|
|
|
connection n1;
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_PROCACCESS_DENIED_ERROR
|
2005-08-12 02:04:16 +02:00
|
|
|
call mysqltest_1.p1();
|
|
|
|
disconnect n1;
|
2005-08-20 10:00:00 +02:00
|
|
|
# Test also without a current database
|
|
|
|
connect (n2,localhost,mysqltest_1,,*NO-ONE*,$MASTER_MYPORT,$MASTER_MYSOCK);
|
|
|
|
connection n2;
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_PROCACCESS_DENIED_ERROR
|
2005-08-20 10:00:00 +02:00
|
|
|
call mysqltest_1.p1();
|
|
|
|
disconnect n2;
|
2005-08-12 02:04:16 +02:00
|
|
|
|
|
|
|
connection default;
|
|
|
|
|
|
|
|
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
|
|
|
#
|
|
|
|
# BUG#12812 create view calling a function works without execute right
|
|
|
|
# on function
|
|
|
|
delimiter |;
|
|
|
|
--disable_warnings
|
|
|
|
drop function if exists bug12812|
|
|
|
|
--enable_warnings
|
|
|
|
create function bug12812() returns char(2)
|
|
|
|
begin
|
|
|
|
return 'ok';
|
|
|
|
end;
|
|
|
|
create user user_bug12812@localhost IDENTIFIED BY 'ABC'|
|
|
|
|
--replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
|
|
|
|
connect (test_user_12812,localhost,user_bug12812,ABC,test)|
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_PROCACCESS_DENIED_ERROR
|
2005-10-16 20:47:19 +02:00
|
|
|
SELECT test.bug12812()|
|
2007-03-23 12:12:11 +01:00
|
|
|
--error ER_PROCACCESS_DENIED_ERROR
|
2005-10-16 20:47:19 +02:00
|
|
|
CREATE VIEW v1 AS SELECT test.bug12812()|
|
|
|
|
# Cleanup
|
|
|
|
connection default|
|
|
|
|
disconnect test_user_12812|
|
|
|
|
DROP USER user_bug12812@localhost|
|
|
|
|
drop function bug12812|
|
|
|
|
delimiter ;|
|
2005-12-15 15:23:16 +01:00
|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
# BUG#14834: Server denies to execute Stored Procedure
|
|
|
|
#
|
|
|
|
# The problem here was with '_' in the database name.
|
|
|
|
#
|
|
|
|
create database db_bug14834;
|
|
|
|
|
|
|
|
create user user1_bug14834@localhost identified by '';
|
|
|
|
# The exact name of the database (no wildcard)
|
|
|
|
grant all on `db\_bug14834`.* to user1_bug14834@localhost;
|
|
|
|
|
|
|
|
create user user2_bug14834@localhost identified by '';
|
|
|
|
# The exact name of the database (no wildcard)
|
|
|
|
grant all on `db\_bug14834`.* to user2_bug14834@localhost;
|
|
|
|
|
|
|
|
create user user3_bug14834@localhost identified by '';
|
|
|
|
# Wildcards in the database name
|
|
|
|
grant all on `db__ug14834`.* to user3_bug14834@localhost;
|
|
|
|
|
|
|
|
connect (user1_bug14834,localhost,user1_bug14834,,db_bug14834);
|
|
|
|
# Create the procedure and check that we can call it
|
|
|
|
create procedure p_bug14834() select user(), current_user();
|
|
|
|
call p_bug14834();
|
|
|
|
|
|
|
|
connect (user2_bug14834,localhost,user2_bug14834,,db_bug14834);
|
|
|
|
# This didn't work before
|
|
|
|
call p_bug14834();
|
|
|
|
|
|
|
|
connect (user3_bug14834,localhost,user3_bug14834,,db_bug14834);
|
|
|
|
# Should also work
|
|
|
|
call p_bug14834();
|
|
|
|
|
|
|
|
# Cleanup
|
|
|
|
connection default;
|
|
|
|
disconnect user1_bug14834;
|
|
|
|
disconnect user2_bug14834;
|
|
|
|
disconnect user3_bug14834;
|
|
|
|
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
|
|
|
|
|
|
|
#
|
2007-03-23 12:12:11 +01:00
|
|
|
# BUG#14533: 'desc tbl' in stored procedure causes error
|
|
|
|
# ER_TABLEACCESS_DENIED_ERROR
|
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;
|
|
|
|
|
|
|
|
connect (user_bug14533,localhost,user_bug14533,,test);
|
|
|
|
|
|
|
|
# These should work
|
|
|
|
call db_bug14533.bug14533_1();
|
|
|
|
call db_bug14533.bug14533_2();
|
|
|
|
|
|
|
|
# For reference, these should not work
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
desc db_bug14533.t1;
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
select * from db_bug14533.t1;
|
|
|
|
|
|
|
|
# Cleanup
|
|
|
|
connection default;
|
|
|
|
disconnect user_bug14533;
|
|
|
|
drop user user_bug14533@localhost;
|
|
|
|
drop database db_bug14533;
|
|
|
|
|
2006-02-22 11:44:04 +01:00
|
|
|
|
|
|
|
#
|
|
|
|
# BUG#7787: Stored procedures: improper warning for "grant execute" statement
|
|
|
|
#
|
|
|
|
|
|
|
|
# Prepare.
|
|
|
|
|
|
|
|
CREATE DATABASE db_bug7787;
|
|
|
|
use db_bug7787;
|
|
|
|
|
|
|
|
# Test.
|
|
|
|
|
|
|
|
CREATE PROCEDURE p1()
|
|
|
|
SHOW INNODB STATUS;
|
|
|
|
|
|
|
|
GRANT EXECUTE ON PROCEDURE p1 TO user_bug7787@localhost;
|
|
|
|
|
|
|
|
# Cleanup.
|
|
|
|
|
|
|
|
DROP DATABASE db_bug7787;
|
2006-04-18 18:10:47 +02:00
|
|
|
drop user user_bug7787@localhost;
|
2006-02-22 11:44:04 +01:00
|
|
|
use test;
|
|
|
|
|
2006-03-02 13:18:49 +01:00
|
|
|
|
|
|
|
#
|
|
|
|
# WL#2897: Complete definer support in the stored routines.
|
|
|
|
#
|
|
|
|
# The following cases are tested:
|
|
|
|
# 1. check that if DEFINER-clause is not explicitly specified, stored routines
|
|
|
|
# are created with CURRENT_USER privileges;
|
|
|
|
# 2. check that if DEFINER-clause specifies non-current user, SUPER privilege
|
|
|
|
# is required to create a stored routine;
|
|
|
|
# 3. check that if DEFINER-clause specifies non-existent user, a warning is
|
|
|
|
# emitted.
|
|
|
|
# 4. check that SHOW CREATE PROCEDURE | FUNCTION works correctly;
|
|
|
|
#
|
|
|
|
# The following cases are tested in other test suites:
|
|
|
|
# - check that mysqldump dumps new attribute correctly;
|
|
|
|
# - check that slave replicates CREATE-statements with explicitly specified
|
|
|
|
# DEFINER correctly.
|
|
|
|
#
|
|
|
|
|
|
|
|
# Setup the environment.
|
|
|
|
|
|
|
|
--echo
|
|
|
|
--echo ---> connection: root
|
|
|
|
--connection con1root
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
DROP DATABASE IF EXISTS mysqltest;
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
--connect (mysqltest_2_con,localhost,mysqltest_2,,mysqltest)
|
|
|
|
--connect (mysqltest_1_con,localhost,mysqltest_1,,mysqltest)
|
|
|
|
|
|
|
|
# test case (1).
|
|
|
|
|
|
|
|
--echo
|
|
|
|
--echo ---> connection: mysqltest_2_con
|
|
|
|
--connection mysqltest_2_con
|
|
|
|
|
|
|
|
use mysqltest;
|
|
|
|
|
|
|
|
CREATE PROCEDURE wl2897_p1() SELECT 1;
|
|
|
|
|
|
|
|
CREATE FUNCTION wl2897_f1() RETURNS INT RETURN 1;
|
|
|
|
|
|
|
|
# test case (2).
|
|
|
|
|
|
|
|
--echo
|
|
|
|
--echo ---> connection: mysqltest_1_con
|
|
|
|
--connection mysqltest_1_con
|
|
|
|
|
|
|
|
use mysqltest;
|
|
|
|
|
|
|
|
--error ER_SPECIFIC_ACCESS_DENIED_ERROR
|
|
|
|
CREATE DEFINER=root@localhost PROCEDURE wl2897_p2() SELECT 2;
|
|
|
|
|
|
|
|
--error ER_SPECIFIC_ACCESS_DENIED_ERROR
|
|
|
|
CREATE DEFINER=root@localhost FUNCTION wl2897_f2() RETURNS INT RETURN 2;
|
|
|
|
|
|
|
|
# test case (3).
|
|
|
|
|
|
|
|
--echo
|
|
|
|
--echo ---> connection: mysqltest_2_con
|
|
|
|
--connection mysqltest_2_con
|
|
|
|
|
|
|
|
use mysqltest;
|
|
|
|
|
|
|
|
CREATE DEFINER='a @ b @ c'@localhost PROCEDURE wl2897_p3() SELECT 3;
|
|
|
|
|
|
|
|
CREATE DEFINER='a @ b @ c'@localhost FUNCTION wl2897_f3() RETURNS INT RETURN 3;
|
|
|
|
|
|
|
|
# test case (4).
|
|
|
|
|
|
|
|
--echo
|
|
|
|
--echo ---> connection: con1root
|
|
|
|
--connection con1root
|
|
|
|
|
|
|
|
use mysqltest;
|
|
|
|
|
|
|
|
SHOW CREATE PROCEDURE wl2897_p1;
|
|
|
|
SHOW CREATE PROCEDURE wl2897_p3;
|
|
|
|
|
|
|
|
SHOW CREATE FUNCTION wl2897_f1;
|
|
|
|
SHOW CREATE FUNCTION wl2897_f3;
|
|
|
|
|
|
|
|
# Cleanup.
|
|
|
|
|
|
|
|
DROP USER mysqltest_1@localhost;
|
|
|
|
DROP USER mysqltest_2@localhost;
|
|
|
|
|
|
|
|
DROP DATABASE mysqltest;
|
|
|
|
|
2006-03-02 14:23:42 +01:00
|
|
|
--disconnect mysqltest_1_con
|
|
|
|
--disconnect mysqltest_2_con
|
|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
# BUG#13198: SP executes if definer does not exist
|
|
|
|
#
|
|
|
|
|
|
|
|
# Prepare environment.
|
|
|
|
|
|
|
|
--echo
|
|
|
|
--echo ---> connection: root
|
|
|
|
--connection con1root
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
DROP DATABASE IF EXISTS mysqltest;
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
--connect (mysqltest_1_con,localhost,mysqltest_1,,mysqltest)
|
|
|
|
--connect (mysqltest_2_con,localhost,mysqltest_2,,mysqltest)
|
|
|
|
|
|
|
|
# Create a procedure/function under u1.
|
|
|
|
|
|
|
|
--echo
|
|
|
|
--echo ---> connection: mysqltest_1_con
|
|
|
|
--connection mysqltest_1_con
|
|
|
|
|
|
|
|
use mysqltest;
|
|
|
|
|
|
|
|
CREATE PROCEDURE bug13198_p1()
|
|
|
|
SELECT 1;
|
|
|
|
|
|
|
|
CREATE FUNCTION bug13198_f1() RETURNS INT
|
|
|
|
RETURN 1;
|
|
|
|
|
|
|
|
CALL bug13198_p1();
|
|
|
|
|
|
|
|
SELECT bug13198_f1();
|
|
|
|
|
|
|
|
# Check that u2 can call the procedure/function.
|
|
|
|
|
|
|
|
--echo
|
|
|
|
--echo ---> connection: mysqltest_2_con
|
|
|
|
--connection mysqltest_2_con
|
|
|
|
|
|
|
|
use mysqltest;
|
|
|
|
|
|
|
|
CALL bug13198_p1();
|
|
|
|
|
|
|
|
SELECT bug13198_f1();
|
|
|
|
|
|
|
|
# Drop user u1 (definer of the object);
|
|
|
|
|
|
|
|
--echo
|
|
|
|
--echo ---> connection: root
|
|
|
|
--connection con1root
|
|
|
|
|
|
|
|
--disconnect mysqltest_1_con
|
|
|
|
|
|
|
|
DROP USER mysqltest_1@localhost;
|
|
|
|
|
|
|
|
# Check that u2 can not call the procedure/function.
|
|
|
|
|
|
|
|
--echo
|
|
|
|
--echo ---> connection: mysqltest_2_con
|
|
|
|
--connection mysqltest_2_con
|
|
|
|
|
|
|
|
use mysqltest;
|
|
|
|
|
|
|
|
--error ER_NO_SUCH_USER
|
|
|
|
CALL bug13198_p1();
|
|
|
|
|
|
|
|
--error ER_NO_SUCH_USER
|
|
|
|
SELECT bug13198_f1();
|
|
|
|
|
|
|
|
# Cleanup.
|
|
|
|
|
|
|
|
--echo
|
|
|
|
--echo ---> connection: root
|
|
|
|
--connection con1root
|
|
|
|
|
|
|
|
--disconnect mysqltest_2_con
|
|
|
|
|
|
|
|
DROP USER mysqltest_2@localhost;
|
|
|
|
|
|
|
|
DROP DATABASE mysqltest;
|
|
|
|
|
2006-03-02 13:18:49 +01:00
|
|
|
|
2006-06-28 12:40:17 +02:00
|
|
|
#
|
|
|
|
# Bug#19857 - When a user with CREATE ROUTINE priv creates a routine,
|
|
|
|
# it results in NULL p/w
|
|
|
|
#
|
|
|
|
|
|
|
|
# Can't test with embedded server that doesn't support grants
|
|
|
|
|
|
|
|
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';
|
|
|
|
|
|
|
|
--connect (mysqltest_2_con,localhost,user19857,meow,test)
|
|
|
|
--echo
|
|
|
|
--echo ---> connection: mysqltest_2_con
|
|
|
|
--connection mysqltest_2_con
|
|
|
|
|
|
|
|
use test;
|
|
|
|
|
|
|
|
DELIMITER //;
|
|
|
|
CREATE PROCEDURE sp19857() DETERMINISTIC
|
|
|
|
BEGIN
|
|
|
|
DECLARE a INT;
|
|
|
|
SET a=1;
|
|
|
|
SELECT a;
|
|
|
|
END //
|
|
|
|
DELIMITER ;//
|
|
|
|
|
|
|
|
SHOW CREATE PROCEDURE test.sp19857;
|
|
|
|
|
|
|
|
--disconnect mysqltest_2_con
|
|
|
|
--connect (mysqltest_2_con,localhost,user19857,meow,test)
|
|
|
|
--connection mysqltest_2_con
|
|
|
|
|
|
|
|
DROP PROCEDURE IF EXISTS test.sp19857;
|
|
|
|
|
|
|
|
--echo
|
|
|
|
--echo ---> connection: root
|
|
|
|
--connection con1root
|
|
|
|
|
|
|
|
--disconnect mysqltest_2_con
|
|
|
|
|
|
|
|
SELECT Host,User,Password FROM mysql.user WHERE User='user19857';
|
|
|
|
|
|
|
|
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
|
|
|
--disconnect con1root
|
|
|
|
--connection default
|
|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
# BUG#18630: Arguments of suid routine calculated in wrong security
|
|
|
|
# context
|
|
|
|
#
|
|
|
|
# Arguments of suid routines were calculated in definer's security
|
|
|
|
# context instead of caller's context thus creating security hole.
|
|
|
|
#
|
|
|
|
--disable_warnings
|
|
|
|
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;
|
|
|
|
--enable_warnings
|
|
|
|
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;
|
|
|
|
# Thanks to this grant statement privileges of anonymous users on
|
|
|
|
# 'test' database are not applicable for mysqltest_u1@localhost.
|
|
|
|
GRANT EXECUTE ON test.* TO mysqltest_u1@localhost;
|
|
|
|
|
|
|
|
delimiter |;
|
|
|
|
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|
|
|
|
|
delimiter ;|
|
|
|
|
|
|
|
|
CREATE SQL SECURITY INVOKER VIEW v1 AS SELECT f_evil();
|
|
|
|
|
|
|
|
connect (conn1, localhost, mysqltest_u1,,);
|
|
|
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
SELECT COUNT(*) FROM t1;
|
|
|
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
SELECT f_evil();
|
|
|
|
SELECT @a, @b;
|
|
|
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
SELECT f_suid(f_evil());
|
|
|
|
SELECT @a, @b;
|
|
|
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
CALL p_suid(f_evil());
|
|
|
|
SELECT @a, @b;
|
|
|
|
|
|
|
|
--error ER_TABLEACCESS_DENIED_ERROR
|
|
|
|
SELECT * FROM v1;
|
|
|
|
SELECT @a, @b;
|
|
|
|
|
|
|
|
disconnect conn1;
|
|
|
|
connection default;
|
|
|
|
|
|
|
|
DROP VIEW v1;
|
|
|
|
DROP FUNCTION f_evil;
|
|
|
|
DROP USER mysqltest_u1@localhost;
|
|
|
|
DROP PROCEDURE p_suid;
|
|
|
|
DROP FUNCTION f_suid;
|
|
|
|
DROP TABLE t1;
|
|
|
|
|
|
|
|
--echo End of 5.0 tests.
|