Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-28 16:34:13 +01:00
Code Releases Activity

Improve handling of errors in pubsub code

Browse Source
This commit is contained in:
Evgeny Khramtsov 2019-07-29 17:13:16 +03:00
parent cd88d342b9
commit 2da168cf05
7 changed files with 612 additions and 428 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pubsub.hrl
View File

@ -84,7 +84,7 @@
Value::binary() | [binary()] | boolean() Value::binary() | [binary()] | boolean()
}). }).
-type(subOptions() :: [mod_pubsub:subOption(),...]). -type(subOptions() :: [mod_pubsub:subOption()]).
-type(pubOption() :: -type(pubOption() ::
{Option::binary(), {Option::binary(),

8
src/gen_pubsub_node.erl
View File

@ -142,7 +142,7 @@
-callback set_affiliation(NodeIdx :: nodeIdx(), -callback set_affiliation(NodeIdx :: nodeIdx(),
Owner :: jid(), Owner :: jid(),
Affiliation :: affiliation()) -> Affiliation :: affiliation()) ->
ok | {result, ok} |
{error, stanza_error()}. {error, stanza_error()}.
-callback get_node_subscriptions(NodeIdx :: nodeIdx()) -> -callback get_node_subscriptions(NodeIdx :: nodeIdx()) ->
@ -208,10 +208,10 @@
-callback get_item_name(Host :: host(), -callback get_item_name(Host :: host(),
ServerHost :: binary(), ServerHost :: binary(),
Node :: nodeId()) -> Node :: nodeId()) ->
itemId(). {result, itemId()}.
-callback node_to_path(Node :: nodeId()) -> -callback node_to_path(Node :: nodeId()) ->
[nodeId()]. {result, [nodeId()]}.
-callback path_to_node(Node :: [nodeId()]) -> -callback path_to_node(Node :: [nodeId()]) ->
nodeId(). {result, nodeId()}.

2
src/mod_caps.erl
View File

@ -106,7 +106,7 @@ list_features(C2SState) ->
Rs = maps:get(caps_resources, C2SState, gb_trees:empty()), Rs = maps:get(caps_resources, C2SState, gb_trees:empty()),
gb_trees:to_list(Rs). gb_trees:to_list(Rs).
-spec get_user_caps(jid(), ejabberd_c2s:state()) -> {ok, caps()} | error. -spec get_user_caps(jid() | ljid(), ejabberd_c2s:state()) -> {ok, caps()} | error.
get_user_caps(JID, C2SState) -> get_user_caps(JID, C2SState) ->
Rs = maps:get(caps_resources, C2SState, gb_trees:empty()), Rs = maps:get(caps_resources, C2SState, gb_trees:empty()),
LJID = jid:tolower(JID), LJID = jid:tolower(JID),

577
src/mod_pubsub.erl
View File

File diff suppressed because it is too large Load Diff

25
src/node_flat.erl
View File

@ -535,8 +535,8 @@ set_affiliation(Nidx, Owner, Affiliation) ->
GenKey = jid:remove_resource(SubKey), GenKey = jid:remove_resource(SubKey),
GenState = get_state(Nidx, GenKey), GenState = get_state(Nidx, GenKey),
case {Affiliation, GenState#pubsub_state.subscriptions} of case {Affiliation, GenState#pubsub_state.subscriptions} of
{none, []} -> del_state(GenState); {none, []} -> {result, del_state(GenState)};
_ -> set_state(GenState#pubsub_state{affiliation = Affiliation}) _ -> {result, set_state(GenState#pubsub_state{affiliation = Affiliation})}
end. end.
%% @doc <p>Return the current subscriptions for the given user</p> %% @doc <p>Return the current subscriptions for the given user</p>
@ -616,7 +616,7 @@ set_subscriptions(Nidx, Owner, Subscription, SubId) ->
replace_subscription(NewSub, SubState) -> replace_subscription(NewSub, SubState) ->
NewSubs = replace_subscription(NewSub, SubState#pubsub_state.subscriptions, []), NewSubs = replace_subscription(NewSub, SubState#pubsub_state.subscriptions, []),
set_state(SubState#pubsub_state{subscriptions = NewSubs}). {result, set_state(SubState#pubsub_state{subscriptions = NewSubs})}.
replace_subscription(_, [], Acc) -> Acc; replace_subscription(_, [], Acc) -> Acc;
replace_subscription({Sub, SubId}, [{_, SubId} | T], Acc) -> replace_subscription({Sub, SubId}, [{_, SubId} | T], Acc) ->
@ -627,7 +627,7 @@ new_subscription(_Nidx, _Owner, Sub, SubState) ->
SubId = pubsub_subscription:make_subid(), SubId = pubsub_subscription:make_subid(),
Subs = SubState#pubsub_state.subscriptions, Subs = SubState#pubsub_state.subscriptions,
set_state(SubState#pubsub_state{subscriptions = [{Sub, SubId} | Subs]}), set_state(SubState#pubsub_state{subscriptions = [{Sub, SubId} | Subs]}),
{Sub, SubId}. {result, {Sub, SubId}}.
unsub_with_subid(SubState, SubId) -> unsub_with_subid(SubState, SubId) ->
%%pubsub_subscription:delete_subscription(SubState#pubsub_state.stateid, Nidx, SubId), %%pubsub_subscription:delete_subscription(SubState#pubsub_state.stateid, Nidx, SubId),
@ -635,8 +635,8 @@ unsub_with_subid(SubState, SubId) ->
|| {S, Sid} <- SubState#pubsub_state.subscriptions, || {S, Sid} <- SubState#pubsub_state.subscriptions,
SubId =/= Sid], SubId =/= Sid],
case {NewSubs, SubState#pubsub_state.affiliation} of case {NewSubs, SubState#pubsub_state.affiliation} of
{[], none} -> del_state(SubState); {[], none} -> {result, del_state(SubState)};
_ -> set_state(SubState#pubsub_state{subscriptions = NewSubs}) _ -> {result, set_state(SubState#pubsub_state{subscriptions = NewSubs})}
end. end.
%% @doc <p>Returns a list of Owner's nodes on Host with pending %% @doc <p>Returns a list of Owner's nodes on Host with pending
@ -884,22 +884,23 @@ del_orphan_items(Nidx) ->
end. end.
get_item_name(_Host, _Node, Id) -> get_item_name(_Host, _Node, Id) ->
Id. {result, Id}.
%% @doc <p>Return the path of the node. In flat it's just node id.</p> %% @doc <p>Return the path of the node. In flat it's just node id.</p>
node_to_path(Node) -> node_to_path(Node) ->
[(Node)]. {result, [Node]}.
path_to_node(Path) -> path_to_node(Path) ->
{result,
case Path of case Path of
% default slot %% default slot
[Node] -> iolist_to_binary(Node); [Node] -> iolist_to_binary(Node);
% handle old possible entries, used when migrating database content to new format %% handle old possible entries, used when migrating database content to new format
[Node | _] when is_binary(Node) -> [Node | _] when is_binary(Node) ->
iolist_to_binary(str:join([<<"">> | Path], <<"/">>)); iolist_to_binary(str:join([<<"">> | Path], <<"/">>));
% default case (used by PEP for example) %% default case (used by PEP for example)
_ -> iolist_to_binary(Path) _ -> iolist_to_binary(Path)
end. end}.
can_fetch_item(owner, _) -> true; can_fetch_item(owner, _) -> true;
can_fetch_item(member, _) -> true; can_fetch_item(member, _) -> true;

14
src/node_flat_sql.erl
View File

@ -377,8 +377,8 @@ set_affiliation(Nidx, Owner, Affiliation) ->
GenKey = jid:remove_resource(SubKey), GenKey = jid:remove_resource(SubKey),
{_, Subscriptions} = select_affiliation_subscriptions(Nidx, GenKey), {_, Subscriptions} = select_affiliation_subscriptions(Nidx, GenKey),
case {Affiliation, Subscriptions} of case {Affiliation, Subscriptions} of
{none, []} -> del_state(Nidx, GenKey); {none, []} -> {result, del_state(Nidx, GenKey)};
_ -> update_affiliation(Nidx, GenKey, Affiliation) _ -> {result, update_affiliation(Nidx, GenKey, Affiliation)}
end. end.
get_entity_subscriptions(Host, Owner) -> get_entity_subscriptions(Host, Owner) ->
@ -522,7 +522,7 @@ set_subscriptions(Nidx, Owner, Subscription, SubId) ->
replace_subscription(NewSub, SubState) -> replace_subscription(NewSub, SubState) ->
NewSubs = replace_subscription(NewSub, SubState#pubsub_state.subscriptions, []), NewSubs = replace_subscription(NewSub, SubState#pubsub_state.subscriptions, []),
set_state(SubState#pubsub_state{subscriptions = NewSubs}). {result, set_state(SubState#pubsub_state{subscriptions = NewSubs})}.
replace_subscription(_, [], Acc) -> Acc; replace_subscription(_, [], Acc) -> Acc;
replace_subscription({Sub, SubId}, [{_, SubId} | T], Acc) -> replace_subscription({Sub, SubId}, [{_, SubId} | T], Acc) ->
@ -533,7 +533,7 @@ new_subscription(_Nidx, _Owner, Subscription, SubState) ->
SubId = pubsub_subscription_sql:make_subid(), SubId = pubsub_subscription_sql:make_subid(),
Subscriptions = [{Subscription, SubId} | SubState#pubsub_state.subscriptions], Subscriptions = [{Subscription, SubId} | SubState#pubsub_state.subscriptions],
set_state(SubState#pubsub_state{subscriptions = Subscriptions}), set_state(SubState#pubsub_state{subscriptions = Subscriptions}),
{Subscription, SubId}. {result, {Subscription, SubId}}.
unsub_with_subid(Nidx, SubId, SubState) -> unsub_with_subid(Nidx, SubId, SubState) ->
%%pubsub_subscription_sql:unsubscribe_node(SubState#pubsub_state.stateid, Nidx, SubId), %%pubsub_subscription_sql:unsubscribe_node(SubState#pubsub_state.stateid, Nidx, SubId),
@ -541,8 +541,8 @@ unsub_with_subid(Nidx, SubId, SubState) ->
|| {S, Sid} <- SubState#pubsub_state.subscriptions, || {S, Sid} <- SubState#pubsub_state.subscriptions,
SubId =/= Sid], SubId =/= Sid],
case {NewSubs, SubState#pubsub_state.affiliation} of case {NewSubs, SubState#pubsub_state.affiliation} of
{[], none} -> del_state(Nidx, element(1, SubState#pubsub_state.stateid)); {[], none} -> {result, del_state(Nidx, element(1, SubState#pubsub_state.stateid))};
_ -> set_state(SubState#pubsub_state{subscriptions = NewSubs}) _ -> {result, set_state(SubState#pubsub_state{subscriptions = NewSubs})}
end. end.
get_pending_nodes(Host, Owner) -> get_pending_nodes(Host, Owner) ->
@ -825,7 +825,7 @@ del_items(Nidx, ItemIds) ->
I, <<") and nodeid='">>, SNidx, <<"';">>]). I, <<") and nodeid='">>, SNidx, <<"';">>]).
get_item_name(_Host, _Node, Id) -> get_item_name(_Host, _Node, Id) ->
Id. {result, Id}.
node_to_path(Node) -> node_to_path(Node) ->
node_flat:node_to_path(Node). node_flat:node_to_path(Node).

4
src/nodetree_tree.erl
View File

@ -139,11 +139,11 @@ get_subnodes_tree(Host, Node) ->
Rec -> Rec ->
BasePlugin = misc:binary_to_atom(<<"node_", BasePlugin = misc:binary_to_atom(<<"node_",
(Rec#pubsub_node.type)/binary>>), (Rec#pubsub_node.type)/binary>>),
BasePath = BasePlugin:node_to_path(Node), {result, BasePath} = BasePlugin:node_to_path(Node),
mnesia:foldl(fun (#pubsub_node{nodeid = {H, N}} = R, Acc) -> mnesia:foldl(fun (#pubsub_node{nodeid = {H, N}} = R, Acc) ->
Plugin = misc:binary_to_atom(<<"node_", Plugin = misc:binary_to_atom(<<"node_",
(R#pubsub_node.type)/binary>>), (R#pubsub_node.type)/binary>>),
Path = Plugin:node_to_path(N), {result, Path} = Plugin:node_to_path(N),
case lists:prefix(BasePath, Path) and (H == Host) of case lists:prefix(BasePath, Path) and (H == Host) of
true -> [R | Acc]; true -> [R | Acc];
false -> Acc false -> Acc