sixam/mail
1
0
Fork 0
mirror of https://github.com/mt-mods/mail.git synced 2025-04-30 08:21:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disallow recursive maillist inclusion

Browse source
This commit is contained in:
y5nw 2024-03-22 20:27:30 +01:00
parent 0799a245d6
commit fcef1b9e1c
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
storage.lua
View file

@ -404,31 +404,36 @@ function mail.delete_maillist(playername, listname)
end end
end end
function mail.extractMaillists(receivers, maillists_owner) local function extract_maillists_main(receivers, maillists_owner, expanded_receivers, seen)
if type(receivers) == "string" then if type(receivers) == "string" then
local list = mail.parse_player_list(receivers) receivers = mail.parse_player_list(receivers)
if not string.find(receivers, "@") then
return list
end
receivers = list
end end
local expanded_receivers = {}
for _, receiver in pairs(receivers) do for _, receiver in pairs(receivers) do
if string.find(receiver, "^@") then if seen[receiver] then
-- Do not add/expand this receiver as it is already seen
minetest.log("verbose", ("mail: ignoring duplicate receiver %q during maillist expansion"):format(receiver))
elseif string.find(receiver, "^@") then
seen[receiver] = true
local listname = string.sub(receiver, 2) local listname = string.sub(receiver, 2)
local maillist = mail.get_maillist_by_name(maillists_owner, listname) local maillist = mail.get_maillist_by_name(maillists_owner, listname)
if maillist then if maillist then
minetest.log("verbose", ("mail: expanding maillist %q"):format(listname))
for _, entry in ipairs(maillist.players) do for _, entry in ipairs(maillist.players) do
for _, recipient in ipairs(mail.extractMaillists(entry, maillists_owner)) do extract_maillists_main(entry, maillists_owner, expanded_receivers, seen)
table.insert(expanded_receivers, recipient)
end
end end
end end
else else
seen[receiver] = true
minetest.log("verbose", ("mail: adding %q to receiver list during maillist expansion"):format(receiver))
table.insert(expanded_receivers, receiver) table.insert(expanded_receivers, receiver)
end end
end end
end
function mail.extractMaillists(receivers, maillists_owner)
local expanded_receivers = {}
extract_maillists_main(receivers, maillists_owner, expanded_receivers, {})
return expanded_receivers return expanded_receivers
end end