From: Terry Burton <tez@terryburton.co.uk>
Date: Fri, 20 Aug 2021 18:49:48 +0000 (+0100)
Subject: Data usage for MySQL: Run SP as invoker not definer (#4202)
X-Git-Tag: release_3_0_24~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c75b09278b021b5daad173f44b0e5b5644eb7b43;p=thirdparty%2Ffreeradius-server.git

Data usage for MySQL: Run SP as invoker not definer (#4202)
---

diff --git a/raddb/mods-config/sql/main/mysql/process-radacct.sql b/raddb/mods-config/sql/main/mysql/process-radacct.sql
index d0e77b93222..8cd0bd25dcc 100644
--- a/raddb/mods-config/sql/main/mysql/process-radacct.sql
+++ b/raddb/mods-config/sql/main/mysql/process-radacct.sql
@@ -78,11 +78,18 @@ DELIMITER $$
 
 DROP PROCEDURE IF EXISTS fr_new_data_usage_period;
 CREATE PROCEDURE fr_new_data_usage_period ()
+SQL SECURITY INVOKER
 BEGIN
 
     DECLARE v_start DATETIME;
     DECLARE v_end DATETIME;
 
+    DECLARE EXIT HANDLER FOR SQLEXCEPTION
+    BEGIN
+        ROLLBACK;
+        RESIGNAL;
+    END;
+
     SELECT IFNULL(DATE_ADD(MAX(period_end), INTERVAL 1 SECOND), FROM_UNIXTIME(0)) INTO v_start FROM data_usage_by_period;
     SELECT NOW() INTO v_end;