mirror of
https://github.com/MariaDB/server.git
synced 2026-10-23 18:49:29 +03:00
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>
176 lines
6.3 KiB
SQL
176 lines
6.3 KiB
SQL
-- Copyright (c) 2014, 2016, 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' PROCEDURE create_synonym_db (
|
|
IN in_db_name VARCHAR(64),
|
|
IN in_synonym VARCHAR(64)
|
|
)
|
|
COMMENT '
|
|
Description
|
|
-----------
|
|
|
|
Takes a source database name and synonym name, and then creates the
|
|
synonym database with views that point to all of the tables within
|
|
the source database.
|
|
|
|
Useful for creating a "ps" synonym for "performance_schema",
|
|
or "is" instead of "information_schema", for example.
|
|
|
|
Parameters
|
|
-----------
|
|
|
|
in_db_name (VARCHAR(64)):
|
|
The database name that you would like to create a synonym for.
|
|
in_synonym (VARCHAR(64)):
|
|
The database synonym name.
|
|
|
|
Example
|
|
-----------
|
|
|
|
mysql> SHOW DATABASES;
|
|
+--------------------+
|
|
| Database |
|
|
+--------------------+
|
|
| information_schema |
|
|
| mysql |
|
|
| performance_schema |
|
|
| sys |
|
|
| test |
|
|
+--------------------+
|
|
5 rows in set (0.00 sec)
|
|
|
|
mysql> CALL sys.create_synonym_db(\'performance_schema\', \'ps\');
|
|
+---------------------------------------+
|
|
| summary |
|
|
+---------------------------------------+
|
|
| Created 74 views in the `ps` database |
|
|
+---------------------------------------+
|
|
1 row in set (8.57 sec)
|
|
|
|
Query OK, 0 rows affected (8.57 sec)
|
|
|
|
mysql> SHOW DATABASES;
|
|
+--------------------+
|
|
| Database |
|
|
+--------------------+
|
|
| information_schema |
|
|
| mysql |
|
|
| performance_schema |
|
|
| ps |
|
|
| sys |
|
|
| test |
|
|
+--------------------+
|
|
6 rows in set (0.00 sec)
|
|
|
|
mysql> SHOW FULL TABLES FROM ps;
|
|
+------------------------------------------------------+------------+
|
|
| Tables_in_ps | Table_type |
|
|
+------------------------------------------------------+------------+
|
|
| accounts | VIEW |
|
|
| cond_instances | VIEW |
|
|
| events_stages_current | VIEW |
|
|
| events_stages_history | VIEW |
|
|
...
|
|
'
|
|
SQL SECURITY INVOKER
|
|
NOT DETERMINISTIC
|
|
MODIFIES SQL DATA
|
|
BEGIN
|
|
DECLARE v_done bool DEFAULT FALSE;
|
|
DECLARE v_db_name_check VARCHAR(64);
|
|
DECLARE v_db_err_msg TEXT;
|
|
DECLARE v_table VARCHAR(64);
|
|
DECLARE v_views_created INT DEFAULT 0;
|
|
DECLARE v_table_exists ENUM('', 'BASE TABLE', 'VIEW', 'TEMPORARY') DEFAULT '';
|
|
|
|
DECLARE db_doesnt_exist CONDITION FOR SQLSTATE '42000';
|
|
DECLARE db_name_exists CONDITION FOR SQLSTATE 'HY000';
|
|
|
|
DECLARE c_table_names CURSOR FOR
|
|
SELECT TABLE_NAME
|
|
FROM INFORMATION_SCHEMA.TABLES
|
|
WHERE TABLE_SCHEMA = in_db_name;
|
|
|
|
DECLARE CONTINUE HANDLER FOR NOT FOUND SET v_done = TRUE;
|
|
|
|
-- Check if the source database exists
|
|
SELECT SCHEMA_NAME INTO v_db_name_check
|
|
FROM INFORMATION_SCHEMA.SCHEMATA
|
|
WHERE SCHEMA_NAME = in_db_name;
|
|
|
|
IF v_db_name_check IS NULL THEN
|
|
SET v_db_err_msg = CONCAT('Unknown database ', in_db_name);
|
|
SIGNAL SQLSTATE 'HY000'
|
|
SET MESSAGE_TEXT = v_db_err_msg;
|
|
END IF;
|
|
|
|
-- Check if a database of the synonym name already exists
|
|
SELECT SCHEMA_NAME INTO v_db_name_check
|
|
FROM INFORMATION_SCHEMA.SCHEMATA
|
|
WHERE SCHEMA_NAME = in_synonym;
|
|
|
|
IF v_db_name_check = in_synonym THEN
|
|
SET v_db_err_msg = CONCAT('Can\'t create database ', in_synonym, '; database exists');
|
|
SIGNAL SQLSTATE 'HY000'
|
|
SET MESSAGE_TEXT = v_db_err_msg;
|
|
END IF;
|
|
|
|
-- All good, create the database and views
|
|
SET @create_db_stmt := CONCAT('CREATE DATABASE ', sys.quote_identifier(in_synonym));
|
|
PREPARE create_db_stmt FROM @create_db_stmt;
|
|
EXECUTE create_db_stmt;
|
|
DEALLOCATE PREPARE create_db_stmt;
|
|
|
|
SET v_done = FALSE;
|
|
OPEN c_table_names;
|
|
c_table_names: LOOP
|
|
FETCH c_table_names INTO v_table;
|
|
IF v_done THEN
|
|
LEAVE c_table_names;
|
|
END IF;
|
|
-- Check the table type, don't support temporary since cannot create the view
|
|
CALL sys.table_exists(in_db_name, v_table, v_table_exists);
|
|
IF (v_table_exists <> 'TEMPORARY') THEN
|
|
SET @create_view_stmt = CONCAT(
|
|
'CREATE SQL SECURITY INVOKER VIEW ',
|
|
sys.quote_identifier(in_synonym),
|
|
'.',
|
|
sys.quote_identifier(v_table),
|
|
' AS SELECT * FROM ',
|
|
sys.quote_identifier(in_db_name),
|
|
'.',
|
|
sys.quote_identifier(v_table)
|
|
);
|
|
PREPARE create_view_stmt FROM @create_view_stmt;
|
|
EXECUTE create_view_stmt;
|
|
DEALLOCATE PREPARE create_view_stmt;
|
|
|
|
SET v_views_created = v_views_created + 1;
|
|
END IF;
|
|
END LOOP;
|
|
CLOSE c_table_names;
|
|
|
|
SELECT CONCAT(
|
|
'Created ', v_views_created, ' view',
|
|
IF(v_views_created != 1, 's', ''), ' in the ',
|
|
sys.quote_identifier(in_synonym), ' database'
|
|
) AS summary;
|
|
|
|
END$$
|
|
|
|
DELIMITER ;
|