From 8cc04e0cb4fb186092732c7687543f67b4628c96 Mon Sep 17 00:00:00 2001
From: AFCMS <61794590+AFCMS@users.noreply.github.com>
Date: Wed, 30 Jun 2021 20:40:45 +0200
Subject: [PATCH] Run on_grant and on_revoke callbacks after privs change
 (#11387)

Callbacks were run too early. This changes the order to call after the privs are updated.
---
 builtin/game/auth.lua | 7 ++++---
 builtin/game/chat.lua | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/builtin/game/auth.lua b/builtin/game/auth.lua
index fc061666c..e7d502bb3 100644
--- a/builtin/game/auth.lua
+++ b/builtin/game/auth.lua
@@ -87,6 +87,10 @@ core.builtin_auth_handler = {
 					core.settings:get("default_password")))
 		end
 
+		auth_entry.privileges = privileges
+
+		core_auth.save(auth_entry)
+
 		-- Run grant callbacks
 		for priv, _ in pairs(privileges) do
 			if not auth_entry.privileges[priv] then
@@ -100,9 +104,6 @@ core.builtin_auth_handler = {
 				core.run_priv_callbacks(name, priv, nil, "revoke")
 			end
 		end
-
-		auth_entry.privileges = privileges
-		core_auth.save(auth_entry)
 		core.notify_authentication_modified(name)
 	end,
 	reload = function()
diff --git a/builtin/game/chat.lua b/builtin/game/chat.lua
index 354b0ff90..99296f782 100644
--- a/builtin/game/chat.lua
+++ b/builtin/game/chat.lua
@@ -255,11 +255,11 @@ local function handle_grant_command(caller, grantname, grantprivstr)
 	if privs_unknown ~= "" then
 		return false, privs_unknown
 	end
+	core.set_player_privs(grantname, privs)
 	for priv, _ in pairs(grantprivs) do
 		-- call the on_grant callbacks
 		core.run_priv_callbacks(grantname, priv, caller, "grant")
 	end
-	core.set_player_privs(grantname, privs)
 	core.log("action", caller..' granted ('..core.privs_to_string(grantprivs, ', ')..') privileges to '..grantname)
 	if grantname ~= caller then
 		core.chat_send_player(grantname,
@@ -359,13 +359,13 @@ local function handle_revoke_command(caller, revokename, revokeprivstr)
 	end
 
 	local revokecount = 0
+
+	core.set_player_privs(revokename, privs)
 	for priv, _ in pairs(revokeprivs) do
 		-- call the on_revoke callbacks
 		core.run_priv_callbacks(revokename, priv, caller, "revoke")
 		revokecount = revokecount + 1
 	end
-
-	core.set_player_privs(revokename, privs)
 	local new_privs = core.get_player_privs(revokename)
 
 	if revokecount == 0 then