Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Fix delete item from unregistered user (#2067)

This commit is contained in:
Christophe Romain 2017-10-25 11:16:54 +02:00
parent 65c85eab03
commit 17e3ed513b
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/node_flat.erl
View File

@ -445,21 +445,30 @@ delete_item(Nidx, Publisher, PublishModel, ItemId) ->
case Affiliation of
owner ->
{result, States} = get_states(Nidx),
Records = States ++ mnesia:read({pubsub_orphan, Nidx}),
lists:foldl(fun
(#pubsub_state{items = PI} = S, Res) ->
case lists:member(ItemId, PI) of
(#pubsub_state{items = RI} = S, Res) ->
case lists:member(ItemId, RI) of
true ->
Nitems = lists:delete(ItemId, PI),
NI = lists:delete(ItemId, RI),
del_item(Nidx, ItemId),
set_state(S#pubsub_state{items = Nitems}),
mnesia:write(S#pubsub_state{items = NI}),
{result, {default, broadcast}};
false ->
Res
end;
(_, Res) ->
Res
(#pubsub_orphan{items = RI} = S, Res) ->
case lists:member(ItemId, RI) of
true ->
NI = lists:delete(ItemId, RI),
del_item(Nidx, ItemId),
mnesia:write(S#pubsub_orphan{items = NI}),
{result, {default, broadcast}};
false ->
Res
end
end,
{error, xmpp:err_item_not_found()}, States);
{error, xmpp:err_item_not_found()}, Records);
_ ->
{error, xmpp:err_forbidden()}
end