Fix critical security patch

[elidragon.git] / ranks.lua

diff --git a/ranks.lua b/ranks.lua
index d61e1192d48746c148190ec24596d064a4370820..7798353fdb15f6a2697dfb45394ae8c14c85fe69 100755 (executable)
--- a/ranks.lua
+++ b/ranks.lua
@@ -13,27 +13,33 @@ elidragon.ranks = {
        },
        {
                name = "builder",
-               privs = {creative = true, worldedit = true, areas = true},
+               privs = {creative = true, areas = true},
                color = "#EE6E00",
-               tag = "[BUILDER]",
+               tag = "[Builder]",
        },
        {
                name = "helper",
-               privs = {kick = true, noclip = true, settime = true, give = true, teleport = true},
+               privs = {kick = true, noclip = true, settime = true, give = true, teleport = true, watch = true},
                color = "#EBEE00",
-               tag = "[HELPER]",
+               tag = "[Helper]",
        },
        {
                name = "moderator",
-               privs = {ban = true, bring = true, invhack = true, vanish = true, protection_bypass = true},
+               privs = {ban = true, bring = true, invhack = true, vanish = true, protection_bypass = true, worldedit = true},
                color = "#001FFF",
-               tag = "[MODERATOR]",
+               tag = "[Moderator]",
        },
        {
-               name = "admin",
+               name = "developer",
                privs = {server = true, privs = true},
+               color = "#900A00",
+               tag = "[Developer]",
+       },
+       {
+               name = "admin",
+               privs = {},
                color = "#FF2D8D",
-               tag = "[ADMIN]",
+               tag = "[Admin]",
        },
 }
 
@@ -48,8 +54,10 @@ end
 
 elidragon.savedata.ranks = elidragon.savedata.ranks or elidragon.load_legacy_ranks() or {}
 
-function elidragon.get_rank(name)
-    return elidragon.get_rank_by_name(elidragon.savedata.ranks[name] or "player")
+function elidragon.get_rank(player)
+    local rank = elidragon.savedata.ranks[player:get_player_name()]
+    if not rank or rank == "" then rank = "player" end
+    return elidragon.get_rank_by_name(rank)
 end
 
 function elidragon.get_rank_by_name(rankname)
@@ -60,8 +68,8 @@ function elidragon.get_rank_by_name(rankname)
        end
 end
 
-function elidragon.get_player_name(name, color, brackets)
-    local rank = elidragon.get_rank(name)
+function elidragon.get_player_name(player, color, brackets)
+    local rank = elidragon.get_rank(player)
     local rank_tag = rank.tag
     if color then 
                rank_tag = minetest.colorize(rank.color, rank_tag)
@@ -69,45 +77,53 @@ function elidragon.get_player_name(name, color, brackets)
        if not brackets then 
                brackets = {"",""}
        end
-       return rank_tag .. brackets[1] .. name .. brackets[2] .. " "
+       return rank_tag .. brackets[1] .. player:get_player_name() .. brackets[2] .. " "
+end
+
+function elidragon.update_nametag(player)
+       if player then
+               player:set_nametag_attributes({color = elidragon.get_rank(player).color})
+       end
 end
 
 minetest.register_on_joinplayer(function(player)
        local name = player:get_player_name()
-    minetest.chat_send_all(elidragon.get_player_name(name, true) .. "has joined the Server.")
+       local rank = elidragon.savedata.ranks[name]
+    minetest.chat_send_all(elidragon.get_player_name(player, true) .. "has joined the Server.")
     if irc and irc.connected and irc.config.send_join_part then
-        irc.say(elidragon.get_player_name(name) .. "has joined the Server.")
+        irc.say(elidragon.get_player_name(player) .. "has joined the Server.")
     end
-    player:set_nametag_attributes({color = elidragon.get_rank(name).color})
+    elidragon.update_nametag(player)
 end)
 
 minetest.register_on_leaveplayer(function(player)
-       local name = player:get_player_name()
-    minetest.chat_send_all(elidragon.get_player_name(name, true) .. "has left the Server.")
+    minetest.chat_send_all(elidragon.get_player_name(player, true) .. "has left the Server.")
     if irc and irc.connected and irc.config.send_join_part then
-        irc.say(elidragon.get_player_name(name) .. "has left the Server.")
+        irc.say(elidragon.get_player_name(player) .. "has left the Server.")
     end
 end)
 
 minetest.register_on_chat_message(function(name, message)
-    minetest.chat_send_all(elidragon.get_player_name(name, true, {"<", ">"}) .. message)
+       local player = minetest.get_player_by_name(name)
+       if not player or not minetest.check_player_privs(name, {shout = true}) then return end
+    minetest.chat_send_all(elidragon.get_player_name(player, true, {"<", ">"}) .. message)
     if irc and irc.connected and irc.joined_players[name] then
-        irc.say(elidragon.get_player_name(name, false, {"<", ">"}) .. message)
+        irc.say(elidragon.get_player_name(player, false, {"<", ">"}) .. message)
     end
     return true
 end)
 
 minetest.register_chatcommand("rank", {
        params = "<player> <rank>",
-       description = "Set a player's rank (admin|moderator|helper|builder|vip|player)",
+       description = "Set a player's rank (admin|developer|moderator|helper|builder|vip|player)",
        privs = {privs = true},
        func = function(name, param)
-               local target = param:split(" ")[1]
-               local rank = param:split(" ")[2]
-               local target_ref = minetest.get_player_by_name(name)
+               local target = param:split(" ")[1] or ""
+               local rank = param:split(" ")[2] or ""
+               local target_ref = minetest.get_player_by_name(target)
                local rank_ref = elidragon.get_rank_by_name(rank)
                if not rank_ref then 
-            minetest.chat_send_player(name, "Invalid Rank: " .. rank)
+            return false, "Invalid Rank: " .. rank
         else
                        elidragon.savedata.ranks[target] = rank
                        local privs = {}
@@ -121,9 +137,17 @@ minetest.register_chatcommand("rank", {
                        end
                        minetest.set_player_privs(target, privs)
                        minetest.chat_send_all(target .. " is now a " .. minetest.colorize(rank_ref.color, rank_ref.name))
-                       if target_ref then
-                               target_ref:set_nametag_attributes({color = rank_ref.color})
-                       end
+                       elidragon.update_nametag(target_ref)
                end
        end,
 })
+
+-- Migrate old ranks
+minetest.register_on_joinplayer(function(player)
+       local name = player:get_player_name()
+       local rank = player:get_meta():get_string("elidragon:rank")
+       if rank and rank ~= "" then
+               elidragon.savedata.ranks[name] = rank
+               player:get_meta():set_string("elidragon:rank", "")
+       end
+end)