Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-09-19 14:03:03 +02:00
Code Releases Activity

fix owners cache and fix unsubscribe permissions (EJAB-840)

Browse Source 
SVN Revision: 1800
This commit is contained in:
Christophe Romain 2009-01-11 02:05:41 +00:00
parent c77f7e727b
commit 89be1c2ede
3 changed files with 53 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2009-01-11 Christophe Romain <christophe.romain@process-one.net>
* src/mod_pubsub/mod_pubsub.erl: fix owners cache and fix unsubscribe
permissions (thanks to Andy Skelton)(EJAB-840)
* src/mod_pubsub/node_default.erl: Likewise
2009-01-10 Pablo Polvorin <pablo.polvorin@process-one.net>
* src/mod_vcard_odbc.erl: Fix bug in user search.

36
src/mod_pubsub/mod_pubsub.erl
View File

@ -2031,15 +2031,33 @@ set_subscriptions(Host, Node, From, EntitiesEls) ->
{error, 'bad-request'};
_ ->
Action = fun(#pubsub_node{type = Type, owners = Owners}) ->
case lists:member(Owner, Owners) of
true ->
lists:foreach(fun({JID, Subscription}) ->
node_call(Type, set_subscription, [Host, Node, JID, Subscription])
end, Entities),
{result, []};
_ ->
{error, 'forbidden'}
end
case lists:member(Owner, Owners) of
true ->
lists:foreach(
fun({JID, Affiliation}) ->
node_call(Type, set_affiliation, [Host, Node, JID, Affiliation]),
case Affiliation of
owner ->
NewOwner = jlib:short_prepd_bare_jid(JID),
NewOwners = [NewOwner|Owners],
tree_call(Host, set_node, [N#pubsub_node{owners = NewOwners}]);
none ->
NewOwner = jlib:short_prepd_bare_jid(JID),
case lists:member(OldOwner, Owners) of
true ->
NewOwners = Owners--[OldOwner],
tree_call(Host, set_node, [N#pubsub_node{owners = NewOwners}]);
_ ->
ok
end;
_ ->
ok
end
end, Entities),
{result, []};
_ ->
{error, 'forbidden'}
end
end,
transaction(Host, Node, Action, sync_dirty)
end.

33
src/mod_pubsub/node_default.erl
View File

@ -288,7 +288,6 @@ subscribe_node(Host, Node, Sender, Subscriber, AccessModel,
_ -> get_state(Host, Node, SubKey)
end,
Affiliation = GenState#pubsub_state.affiliation,
Subscription = SubState#pubsub_state.subscription,
Whitelisted = lists:member(Affiliation, [member, publisher, owner]),
if
not Authorized ->
@ -297,7 +296,7 @@ subscribe_node(Host, Node, Sender, Subscriber, AccessModel,
Affiliation == outcast ->
%% Requesting entity is blocked
{error, 'forbidden'};
Subscription == pending ->
SubState#pubsub_state.subscription == pending ->
%% Requesting entity has pending subscription
{error, ?ERR_EXTENDED('not-authorized', "pending-subscription")};
(AccessModel == presence) and (not PresenceSubscription) ->
@ -358,8 +357,6 @@ unsubscribe_node(Host, Node, Sender, Subscriber, _SubId) ->
GenKey -> GenState;
_ -> get_state(Host, Node, SubKey)
end,
Affiliation = GenState#pubsub_state.affiliation,
Subscription = SubState#pubsub_state.subscription,
if
%% Entity did not specify SubID
%%SubID == "", ?? ->
@ -368,10 +365,10 @@ unsubscribe_node(Host, Node, Sender, Subscriber, _SubId) ->
%%InvalidSubID ->
%% {error, ?ERR_EXTENDED('not-acceptable', "invalid-subid")};
%% Requesting entity is not a subscriber
Subscription == none ->
SubState#pubsub_state.subscription == none ->
{error, ?ERR_EXTENDED('unexpected-request', "not-subscribed")};
%% Requesting entity is prohibited from unsubscribing entity
(not Authorized) and (Affiliation =/= owner) ->
not Authorized ->
{error, 'forbidden'};
%% Was just subscriber, remove the record
SubState#pubsub_state.affiliation == none ->
@ -577,7 +574,12 @@ get_affiliation(Host, Node, Owner) ->
set_affiliation(Host, Node, Owner, Affiliation) ->
GenKey = jlib:short_prepd_bare_jid(Owner),
GenState = get_state(Host, Node, GenKey),
set_state(GenState#pubsub_state{affiliation = Affiliation}),
case {Affiliation, GenState#pubsub_state.subscription} of
{none, none} ->
del_state(GenState#pubsub_state.stateid);
_ ->
set_state(GenState#pubsub_state{affiliation = Affiliation})
end,
ok.
%% @spec (Host, Owner) -> [{Node,Subscription}]
@ -614,14 +616,19 @@ get_node_subscriptions(Host, Node) ->
{result, lists:map(Tr, States)}.
get_subscription(Host, Node, Owner) ->
GenKey = jlib:short_prepd_bare_jid(Owner),
GenState = get_state(Host, Node, GenKey),
{result, GenState#pubsub_state.subscription}.
SubKey = jlib:short_prepd_jid(Owner),
SubState = get_state(Host, Node, SubKey),
{result, SubState#pubsub_state.subscription}.
set_subscription(Host, Node, Owner, Subscription) ->
GenKey = jlib:short_prepd_bare_jid(Owner),
GenState = get_state(Host, Node, GenKey),
set_state(GenState#pubsub_state{subscription = Subscription}),
SubKey = jlib:short_prepd_jid(Owner),
SubState = get_state(Host, Node, SubKey),
case {Subscription, SubState#pubsub_state.affiliation} of
{none, none} ->
del_state(SubState#pubsub_state.stateid);
_ ->
set_state(SubState#pubsub_state{subscription = Subscription})
end,
ok.
%% @spec (Host, Node) -> [States] | []