mirror of
https://github.com/MariaDB/server.git
synced 2026-10-23 18:49:29 +03:00
6c951fea5f
mariadb-upgrade silently dropped EXECUTE grants on sys schema stored functions and procedures. The sys schema install scripts reinstalled every routine with DROP FUNCTION/PROCEDURE IF EXISTS followed by CREATE. DROP cascades to delete the routine's rows in mysql.procs_priv, so any EXECUTE grant a DBA had issued on e.g. sys.table_exists or sys.quote_identifier was lost every time mariadb-upgrade reinstalled the sys schema, even though the routine itself came back unchanged. Fix: replace DROP ... IF EXISTS + CREATE with CREATE OR REPLACE in all 53 sys_schema function/procedure files and in the two templates (templates/function.sql, templates/procedure.sql) so future routines follow the same pattern. CREATE OR REPLACE PROCEDURE/FUNCTION goes through sp_drop_routine_internal(), which only deletes the mysql.proc row and never reaches sp_revoke_privileges() (that is only called from the explicit DROP PROCEDURE/FUNCTION statement), so mysql.procs_priv is left untouched and existing grants survive. This mirrors the pattern already used by sys schema views (CREATE OR REPLACE ... VIEW, since MDEV-9077), which never had this problem. Four of the converted files (functions/format_path.sql, functions/ps_is_account_enabled_57.sql, procedures/ps_setup_reset_to_default.sql, procedures/ps_trace_thread_57.sql) are not referenced by scripts/sys_schema/CMakeLists.txt; they were converted anyway for consistency and have no behavioural effect. As a side effect, a pre-existing UDF whose name collides with a sys routine name is no longer destroyed before the reinstall fails: DROP FUNCTION IF EXISTS resolved the UDF namespace first, silently dropping the UDF and then failing on ER_SP_ALREADY_EXISTS anyway; CREATE OR REPLACE fails immediately on ER_UDF_EXISTS with the UDF intact. scripts/maria_add_gis_sp.sql.in and the sys_config triggers were deliberately left untouched: the GIS procedures are only re-installed at bootstrap time (mariadb-upgrade instead patches their definer in place via UPDATE), and triggers carry no procs_priv rows, so neither is on the code path this bug is about. Added mysql-test/main/mysql_upgrade_sys_routine_grants.test, which grants EXECUTE on sys.table_exists and sys.quote_identifier, overwrites both routine bodies with a marker to prove the upgrade actually reinstalls them (rather than the sys schema install being skipped), runs mariadb-upgrade, and checks both that the grants survived and that the real routine bodies came back. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
90 lines
3.5 KiB
SQL
90 lines
3.5 KiB
SQL
-- Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
|
|
--
|
|
-- This program is free software; you can redistribute it and/or modify
|
|
-- it under the terms of the GNU General Public License as published by
|
|
-- the Free Software Foundation; version 2 of the License.
|
|
--
|
|
-- This program is distributed in the hope that it will be useful,
|
|
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
-- GNU General Public License for more details.
|
|
--
|
|
-- You should have received a copy of the GNU General Public License
|
|
-- along with this program; if not, write to the Free Software
|
|
-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
DELIMITER $$
|
|
|
|
CREATE OR REPLACE DEFINER='mariadb.sys'@'localhost' FUNCTION list_drop (
|
|
in_list TEXT,
|
|
in_drop_value TEXT
|
|
)
|
|
RETURNS TEXT
|
|
COMMENT '
|
|
Description
|
|
-----------
|
|
|
|
Takes a list, and a value to attempt to remove from the list, and returns the resulting list.
|
|
|
|
Useful for altering certain session variables, like sql_mode or optimizer_switch for instance.
|
|
|
|
Parameters
|
|
-----------
|
|
|
|
in_list (TEXT):
|
|
The comma separated list to drop a value from
|
|
|
|
in_drop_value (TEXT):
|
|
The value to drop from the input list
|
|
|
|
Returns
|
|
-----------
|
|
|
|
TEXT
|
|
|
|
Example
|
|
--------
|
|
|
|
mysql> select @@sql_mode;
|
|
+-----------------------------------------------------------------------------------------------+
|
|
| @@sql_mode |
|
|
+-----------------------------------------------------------------------------------------------+
|
|
| ANSI_QUOTES,ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION |
|
|
+-----------------------------------------------------------------------------------------------+
|
|
1 row in set (0.00 sec)
|
|
|
|
mysql> set sql_mode = sys.list_drop(@@sql_mode, ''ONLY_FULL_GROUP_BY'');
|
|
Query OK, 0 rows affected (0.03 sec)
|
|
|
|
mysql> select @@sql_mode;
|
|
+----------------------------------------------------------------------------+
|
|
| @@sql_mode |
|
|
+----------------------------------------------------------------------------+
|
|
| ANSI_QUOTES,STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION |
|
|
+----------------------------------------------------------------------------+
|
|
1 row in set (0.00 sec)
|
|
|
|
'
|
|
SQL SECURITY INVOKER
|
|
DETERMINISTIC
|
|
CONTAINS SQL
|
|
BEGIN
|
|
|
|
IF (in_drop_value IS NULL) THEN
|
|
SIGNAL SQLSTATE '02200'
|
|
SET MESSAGE_TEXT = 'Function sys.list_drop: in_drop_value input variable should not be NULL',
|
|
MYSQL_ERRNO = 1138;
|
|
END IF;
|
|
|
|
IF (in_list IS NULL OR LENGTH(in_list) = 0) THEN
|
|
-- return the list as it was passed in
|
|
RETURN in_list;
|
|
END IF;
|
|
|
|
-- ensure that leading / trailing commas are remove, support values with either spaces or not between commas
|
|
RETURN (SELECT TRIM(BOTH ',' FROM REPLACE(REPLACE(CONCAT(',', in_list), CONCAT(',', in_drop_value), ''), CONCAT(', ', in_drop_value), '')));
|
|
|
|
END$$
|
|
|
|
DELIMITER ;
|