mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_bookmarks: Fix traceback on attempt to convert invalid bookmark

Browse source 
Found by accidentally publishing {urn:xmpp:bookmarks:0}conference
instead of :1 due to testing this earlier for the blocking.

By the principle of garbage in, garbage out, just generate a bookmark
from the item id / JID and carry on with a warning.
This commit is contained in:
Kim Alvefur 2022-01-11 00:06:48 +01:00
parent ba50691289
commit 2a0311098c
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plugins/mod_bookmarks.lua
View file

@ -41,16 +41,21 @@ local function generate_legacy_storage(items)
for _, item_id in ipairs(items) do
local item = items[item_id];
local bookmark = item:get_child("conference", namespace);
if not bookmark then
module:log("warn", "Invalid bookmark published: expected {%s}conference, got {%s}%s", namespace,
item.tags[1] and item.tags[1].attr.xmlns, item.tags[1] and item.tags[1].name);
end
local conference = st.stanza("conference", {
jid = item.attr.id,
name = bookmark.attr.name,
autojoin = bookmark.attr.autojoin,
name = bookmark and bookmark.attr.name,
autojoin = bookmark and bookmark.attr.autojoin,
});
local nick = bookmark:get_child_text("nick");
local nick = bookmark and bookmark:get_child_text("nick");
if nick ~= nil then
conference:text_tag("nick", nick):up();
end
local password = bookmark:get_child_text("password");
local password = bookmark and bookmark:get_child_text("password");
if password ~= nil then
conference:text_tag("password", password):up();
end