yetangitu/ejabberd
1
0
Fork 0
mirror of https://github.com/processone/ejabberd synced 2025-10-03 17:59:31 +02:00
Code Issues Releases Wiki Activity

mod_private: Handle invalid PEP-native bookmarks

Browse source 
Don't crash while attempting to convert invalid XEP-0402 conference
bookmark elements.
This commit is contained in:
Holger Weiss 2025-01-31 13:49:22 +01:00
parent eca3204e82
commit 20a0051578
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/mod_private.erl
View file

@ -490,15 +490,19 @@ storage_bookmark_to_xmpp_bookmark(#bookmark_conference{name = Name, autojoin = A
-spec pubsub_item_to_map(#pubsub_item{}, map()) -> map(). -spec pubsub_item_to_map(#pubsub_item{}, map()) -> map().
pubsub_item_to_map(#pubsub_item{itemid = {Id, _}, payload = [#xmlel{} = B | _]}, Map) -> pubsub_item_to_map(#pubsub_item{itemid = {Id, _}, payload = [#xmlel{} = B | _]}, Map) ->
case xmpp:decode(B) of try {xmpp:decode(B), jid:decode(Id)} of
#pep_bookmarks_conference{} = B2 -> {#pep_bookmarks_conference{} = B1, #jid{} = Jid} ->
try jid:decode(Id) of B2 = B1#pep_bookmarks_conference{extensions = undefined},
#jid{} = Jid -> maps:put(jid:tolower(Jid), B2, Map);
maps:put(jid:tolower(Jid), B2#pep_bookmarks_conference{extensions = undefined}, Map) {_, _} ->
catch _:_ -> Map
Map catch
end; _:{xmpp_codec, Why} ->
_ -> ?DEBUG("Failed to decode bookmark element (~ts): ~ts",
[Id, xmpp:format_error(Why)]),
Map;
_:{bad_jid, _} ->
?DEBUG("Failed to decode bookmark ID (~ts)", [Id]),
Map Map
end; end;
pubsub_item_to_map(_, Map) -> pubsub_item_to_map(_, Map) ->