yetangitu/ejabberd
1
0
Fork 0
mirror of https://github.com/processone/ejabberd synced 2025-10-05 19:42:11 +02:00
Code Issues Releases Wiki Activity

PubSub: fix error type on item deletion with insufficient priviledge

Browse source
This commit is contained in:
Christophe Romain 2016-09-29 11:20:56 +02:00
parent 6f538545b4
commit a42bf67957
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/node_flat.erl
View file

@ -419,11 +419,11 @@ delete_item(Nidx, Publisher, PublishModel, ItemId) ->
#pubsub_state{affiliation = Affiliation, items = Items} = GenState,
Allowed = Affiliation == publisher orelse
Affiliation == owner orelse
PublishModel == open orelse
case get_item(Nidx, ItemId) of
{result, #pubsub_item{creation = {_, GenKey}}} -> true;
_ -> false
end,
(PublishModel == open andalso
case get_item(Nidx, ItemId) of
{result, #pubsub_item{creation = {_, GenKey}}} -> true;
_ -> false
end),
if not Allowed ->
{error, ?ERR_FORBIDDEN};
true ->

10
src/node_flat_sql.erl
View file

@ -271,11 +271,11 @@ delete_item(Nidx, Publisher, PublishModel, ItemId) ->
{result, Affiliation} = get_affiliation(Nidx, GenKey),
Allowed = Affiliation == publisher orelse
Affiliation == owner orelse
PublishModel == open orelse
case get_item(Nidx, ItemId) of
{result, #pubsub_item{creation = {_, GenKey}}} -> true;
_ -> false
end,
(PublishModel == open andalso
case get_item(Nidx, ItemId) of
{result, #pubsub_item{creation = {_, GenKey}}} -> true;
_ -> false
end),
if not Allowed ->
{error, ?ERR_FORBIDDEN};
true ->