mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-22 16:20:52 +01:00
Convert to exmpp.
PR: EJABP-1 Submitted by: Pablo Polvorin <pablo.polvorin@process-one.net> SVN Revision: 1606
This commit is contained in:
Jean-Sébastien Pédron
parent
5ceffdd5a7
commit
3f8a303286
@ -10,6 +10,9 @@
|
||||
* src/mod_roster_odbc.erl (get_jid_info/4): Fix a confusion between
|
||||
#jid and tuples. Thanks to Pablo Polvorin!
|
||||
|
||||
* src/mod_privacy.erl, src/mod_privacy_odbc.erl: Convert to exmpp.
|
||||
Thanks to Pablo Polvorin!
|
||||
|
||||
2008-10-02 Jean-Sébastien Pédron <js.pedron@meetic-corp.com>
|
||||
|
||||
* src/mod_roster_odbc.erl: Fix a bug where a JID represented as a
|
||||
|
||||
@ -37,8 +37,9 @@
|
||||
check_packet/6,
|
||||
updated_list/3]).
|
||||
|
||||
-include_lib("exmpp/include/exmpp.hrl").
|
||||
|
||||
-include("ejabberd.hrl").
|
||||
-include("jlib.hrl").
|
||||
-include("mod_privacy.hrl").
|
||||
|
||||
|
||||
@ -73,102 +74,93 @@ stop(Host) ->
|
||||
?MODULE, updated_list, 50),
|
||||
gen_iq_handler:remove_iq_handler(ejabberd_sm, Host, ?NS_PRIVACY).
|
||||
|
||||
process_iq(_From, _To, IQ) ->
|
||||
SubEl = IQ#iq.sub_el,
|
||||
IQ#iq{type = error, sub_el = [SubEl, ?ERR_NOT_ALLOWED]}.
|
||||
process_iq(_From, _To, IQ_Rec) ->
|
||||
exmpp_iq:error(IQ_Rec, 'not-allowed').
|
||||
|
||||
|
||||
process_iq_get(_, From, _To, #iq{sub_el = SubEl},
|
||||
process_iq_get(_, From, _To, #iq{payload = SubEl},
|
||||
#userlist{name = Active}) ->
|
||||
#jid{luser = LUser, lserver = LServer} = From,
|
||||
{xmlelement, _, _, Els} = SubEl,
|
||||
case xml:remove_cdata(Els) of
|
||||
#jid{lnode = LUser, ldomain = LServer} = From,
|
||||
case exmpp_xml:get_child_elements(SubEl) of
|
||||
[] ->
|
||||
process_lists_get(LUser, LServer, Active);
|
||||
[{xmlelement, Name, Attrs, _SubEls}] ->
|
||||
[#xmlel{name = Name} = Child] ->
|
||||
case Name of
|
||||
"list" ->
|
||||
ListName = xml:get_attr("name", Attrs),
|
||||
list ->
|
||||
ListName = exmpp_xml:get_attribute(Child, name, false),
|
||||
process_list_get(LUser, LServer, ListName);
|
||||
_ ->
|
||||
{error, ?ERR_BAD_REQUEST}
|
||||
{error, 'bad-request'}
|
||||
end;
|
||||
_ ->
|
||||
{error, ?ERR_BAD_REQUEST}
|
||||
{error, 'bad-request'}
|
||||
end.
|
||||
|
||||
|
||||
process_lists_get(LUser, LServer, Active) ->
|
||||
case catch mnesia:dirty_read(privacy, {LUser, LServer}) of
|
||||
{'EXIT', _Reason} ->
|
||||
{error, ?ERR_INTERNAL_SERVER_ERROR};
|
||||
{error, 'internal-server-error'};
|
||||
[] ->
|
||||
{result, [{xmlelement, "query", [{"xmlns", ?NS_PRIVACY}], []}]};
|
||||
{result, #xmlel{ns = ?NS_PRIVACY, name = 'query'}};
|
||||
[#privacy{default = Default, lists = Lists}] ->
|
||||
case Lists of
|
||||
[] ->
|
||||
{result, [{xmlelement, "query",
|
||||
[{"xmlns", ?NS_PRIVACY}], []}]};
|
||||
{result, #xmlel{ns = ?NS_PRIVACY, name = 'query'}};
|
||||
_ ->
|
||||
LItems = lists:map(
|
||||
fun({N, _}) ->
|
||||
{xmlelement, "list",
|
||||
[{"name", N}], []}
|
||||
exmpp_xml:set_attribute(#xmlel{ns = ?NS_PRIVACY, name = list}, name, N)
|
||||
end, Lists),
|
||||
DItems =
|
||||
case Default of
|
||||
none ->
|
||||
LItems;
|
||||
_ ->
|
||||
[{xmlelement, "default",
|
||||
[{"name", Default}], []} | LItems]
|
||||
[exmpp_xml:set_attribute(#xmlel{ns = ?NS_PRIVACY, name = default}, name, Default) | LItems]
|
||||
end,
|
||||
ADItems =
|
||||
case Active of
|
||||
none ->
|
||||
DItems;
|
||||
_ ->
|
||||
[{xmlelement, "active",
|
||||
[{"name", Active}], []} | DItems]
|
||||
[exmpp_xml:set_attribute(#xmlel{ns = ?NS_PRIVACY, name = active}, name, Active) | DItems]
|
||||
end,
|
||||
{result,
|
||||
[{xmlelement, "query", [{"xmlns", ?NS_PRIVACY}],
|
||||
ADItems}]}
|
||||
{result, #xmlel{ns = ?NS_PRIVACY, name = 'query', children = ADItems}}
|
||||
end
|
||||
end.
|
||||
|
||||
process_list_get(LUser, LServer, {value, Name}) ->
|
||||
process_list_get(_LUser, _LServer, false) ->
|
||||
{error, 'bad-request'};
|
||||
|
||||
process_list_get(LUser, LServer, Name) ->
|
||||
case catch mnesia:dirty_read(privacy, {LUser, LServer}) of
|
||||
{'EXIT', _Reason} ->
|
||||
{error, ?ERR_INTERNAL_SERVER_ERROR};
|
||||
{error, 'internal-server-error'};
|
||||
[] ->
|
||||
{error, ?ERR_ITEM_NOT_FOUND};
|
||||
{error, 'item-not-found'};
|
||||
%{result, [{xmlelement, "query", [{"xmlns", ?NS_PRIVACY}], []}]};
|
||||
[#privacy{lists = Lists}] ->
|
||||
case lists:keysearch(Name, 1, Lists) of
|
||||
{value, {_, List}} ->
|
||||
LItems = lists:map(fun item_to_xml/1, List),
|
||||
{result,
|
||||
[{xmlelement, "query", [{"xmlns", ?NS_PRIVACY}],
|
||||
[{xmlelement, "list",
|
||||
[{"name", Name}], LItems}]}]};
|
||||
ListEl = exmpp_xml:set_attribute(#xmlel{ns = ?NS_PRIVACY, name = list, children = LItems}, name, Name),
|
||||
{result,#xmlel{ns = ?NS_PRIVACY, name = 'query', children = [ListEl]}};
|
||||
_ ->
|
||||
{error, ?ERR_ITEM_NOT_FOUND}
|
||||
{error, 'item-not-found'}
|
||||
end
|
||||
end;
|
||||
end.
|
||||
|
||||
process_list_get(_LUser, _LServer, false) ->
|
||||
{error, ?ERR_BAD_REQUEST}.
|
||||
|
||||
item_to_xml(Item) ->
|
||||
Attrs1 = [{"action", action_to_list(Item#listitem.action)},
|
||||
{"order", order_to_list(Item#listitem.order)}],
|
||||
Attrs1 = [#xmlattr{name = 'action', value = action_to_list(Item#listitem.action)},
|
||||
#xmlattr{name = 'order', value = order_to_list(Item#listitem.order)}],
|
||||
Attrs2 = case Item#listitem.type of
|
||||
none ->
|
||||
Attrs1;
|
||||
Type ->
|
||||
[{"type", type_to_list(Item#listitem.type)},
|
||||
{"value", value_to_list(Type, Item#listitem.value)} |
|
||||
[#xmlattr{name = 'type', value = type_to_list(Item#listitem.type)},
|
||||
#xmlattr{name = 'value', value = value_to_list(Type, Item#listitem.value)} |
|
||||
Attrs1]
|
||||
end,
|
||||
SubEls = case Item#listitem.match_all of
|
||||
@ -177,31 +169,31 @@ item_to_xml(Item) ->
|
||||
false ->
|
||||
SE1 = case Item#listitem.match_iq of
|
||||
true ->
|
||||
[{xmlelement, "iq", [], []}];
|
||||
[#xmlel{ns = ?NS_PRIVACY, name = iq}];
|
||||
false ->
|
||||
[]
|
||||
end,
|
||||
SE2 = case Item#listitem.match_message of
|
||||
true ->
|
||||
[{xmlelement, "message", [], []} | SE1];
|
||||
[#xmlel{ns = ?NS_PRIVACY, name = message} | SE1];
|
||||
false ->
|
||||
SE1
|
||||
end,
|
||||
SE3 = case Item#listitem.match_presence_in of
|
||||
true ->
|
||||
[{xmlelement, "presence-in", [], []} | SE2];
|
||||
[#xmlel{ns = ?NS_PRIVACY, name = 'presence-in'} | SE2];
|
||||
false ->
|
||||
SE2
|
||||
end,
|
||||
SE4 = case Item#listitem.match_presence_out of
|
||||
true ->
|
||||
[{xmlelement, "presence-out", [], []} | SE3];
|
||||
[#xmlel{ns = ?NS_PRIVACY, name = 'presence-out'} | SE3];
|
||||
false ->
|
||||
SE3
|
||||
end,
|
||||
SE4
|
||||
end,
|
||||
{xmlelement, "item", Attrs2, SubEls}.
|
||||
exmpp_xml:set_attributes(#xmlel{ns = ?NS_PRIVACY, name = item, children = SubEls}, Attrs2).
|
||||
|
||||
|
||||
action_to_list(Action) ->
|
||||
@ -222,7 +214,9 @@ type_to_list(Type) ->
|
||||
|
||||
value_to_list(Type, Val) ->
|
||||
case Type of
|
||||
jid -> jlib:jid_to_string(Val);
|
||||
jid ->
|
||||
{N, D, R} = Val,
|
||||
exmpp_jid:jid_to_list(N, D, R);
|
||||
group -> Val;
|
||||
subscription ->
|
||||
case Val of
|
||||
@ -243,53 +237,27 @@ list_to_action(S) ->
|
||||
|
||||
|
||||
|
||||
process_iq_set(_, From, _To, #iq{sub_el = SubEl}) ->
|
||||
#jid{luser = LUser, lserver = LServer} = From,
|
||||
{xmlelement, _, _, Els} = SubEl,
|
||||
case xml:remove_cdata(Els) of
|
||||
[{xmlelement, Name, Attrs, SubEls}] ->
|
||||
ListName = xml:get_attr("name", Attrs),
|
||||
process_iq_set(_, From, _To, #iq{payload = SubEl}) ->
|
||||
#jid{lnode = LUser, ldomain = LServer} = From,
|
||||
case exmpp_xml:get_child_elements(SubEl) of
|
||||
[#xmlel{name = Name} = Child] ->
|
||||
ListName = exmpp_xml:get_attribute(Child, 'name', false),
|
||||
case Name of
|
||||
"list" ->
|
||||
list ->
|
||||
process_list_set(LUser, LServer, ListName,
|
||||
xml:remove_cdata(SubEls));
|
||||
"active" ->
|
||||
exmpp_xml:get_child_elements(Child));
|
||||
active ->
|
||||
process_active_set(LUser, LServer, ListName);
|
||||
"default" ->
|
||||
default ->
|
||||
process_default_set(LUser, LServer, ListName);
|
||||
_ ->
|
||||
{error, ?ERR_BAD_REQUEST}
|
||||
{error, 'bad-request'}
|
||||
end;
|
||||
_ ->
|
||||
{error, ?ERR_BAD_REQUEST}
|
||||
{error, 'bad-request'}
|
||||
end.
|
||||
|
||||
|
||||
process_default_set(LUser, LServer, {value, Name}) ->
|
||||
F = fun() ->
|
||||
case mnesia:read({privacy, {LUser, LServer}}) of
|
||||
[] ->
|
||||
{error, ?ERR_ITEM_NOT_FOUND};
|
||||
[#privacy{lists = Lists} = P] ->
|
||||
case lists:keymember(Name, 1, Lists) of
|
||||
true ->
|
||||
mnesia:write(P#privacy{default = Name,
|
||||
lists = Lists}),
|
||||
{result, []};
|
||||
false ->
|
||||
{error, ?ERR_ITEM_NOT_FOUND}
|
||||
end
|
||||
end
|
||||
end,
|
||||
case mnesia:transaction(F) of
|
||||
{atomic, {error, _} = Error} ->
|
||||
Error;
|
||||
{atomic, {result, _} = Res} ->
|
||||
Res;
|
||||
_ ->
|
||||
{error, ?ERR_INTERNAL_SERVER_ERROR}
|
||||
end;
|
||||
|
||||
process_default_set(LUser, LServer, false) ->
|
||||
F = fun() ->
|
||||
case mnesia:read({privacy, {LUser, LServer}}) of
|
||||
@ -306,31 +274,60 @@ process_default_set(LUser, LServer, false) ->
|
||||
{atomic, {result, _} = Res} ->
|
||||
Res;
|
||||
_ ->
|
||||
{error, ?ERR_INTERNAL_SERVER_ERROR}
|
||||
{error, 'internal-server-error'}
|
||||
end;
|
||||
|
||||
process_default_set(LUser, LServer, Name) ->
|
||||
F = fun() ->
|
||||
case mnesia:read({privacy, {LUser, LServer}}) of
|
||||
[] ->
|
||||
{error, 'item-not-found'};
|
||||
[#privacy{lists = Lists} = P] ->
|
||||
case lists:keymember(Name, 1, Lists) of
|
||||
true ->
|
||||
mnesia:write(P#privacy{default = Name,
|
||||
lists = Lists}),
|
||||
{result, []};
|
||||
false ->
|
||||
{error, 'item-not-found'}
|
||||
end
|
||||
end
|
||||
end,
|
||||
case mnesia:transaction(F) of
|
||||
{atomic, {error, _} = Error} ->
|
||||
Error;
|
||||
{atomic, {result, _} = Res} ->
|
||||
Res;
|
||||
_ ->
|
||||
{error, 'internal-server-error'}
|
||||
end.
|
||||
|
||||
|
||||
process_active_set(LUser, LServer, {value, Name}) ->
|
||||
process_active_set(_LUser, _LServer, false) ->
|
||||
{result, [], #userlist{}};
|
||||
|
||||
process_active_set(LUser, LServer, Name) ->
|
||||
case catch mnesia:dirty_read(privacy, {LUser, LServer}) of
|
||||
[] ->
|
||||
{error, ?ERR_ITEM_NOT_FOUND};
|
||||
{error, 'item-not-found'};
|
||||
[#privacy{lists = Lists}] ->
|
||||
case lists:keysearch(Name, 1, Lists) of
|
||||
{value, {_, List}} ->
|
||||
{result, [], #userlist{name = Name, list = List}};
|
||||
false ->
|
||||
{error, ?ERR_ITEM_NOT_FOUND}
|
||||
{error, 'item-not-found'}
|
||||
end
|
||||
end;
|
||||
|
||||
process_active_set(_LUser, _LServer, false) ->
|
||||
{result, [], #userlist{}}.
|
||||
end.
|
||||
|
||||
|
||||
process_list_set(LUser, LServer, {value, Name}, Els) ->
|
||||
|
||||
process_list_set(_LUser, _LServer, false, _Els) ->
|
||||
{error, 'bad-request'};
|
||||
|
||||
process_list_set(LUser, LServer, Name, Els) ->
|
||||
case parse_items(Els) of
|
||||
false ->
|
||||
{error, ?ERR_BAD_REQUEST};
|
||||
{error, 'bad-request'};
|
||||
remove ->
|
||||
F =
|
||||
fun() ->
|
||||
@ -341,7 +338,7 @@ process_list_set(LUser, LServer, {value, Name}, Els) ->
|
||||
% TODO: check active
|
||||
if
|
||||
Name == Default ->
|
||||
{error, ?ERR_CONFLICT};
|
||||
{error, 'conflict'};
|
||||
true ->
|
||||
NewLists =
|
||||
lists:keydelete(Name, 1, Lists),
|
||||
@ -356,15 +353,15 @@ process_list_set(LUser, LServer, {value, Name}, Els) ->
|
||||
Error;
|
||||
{atomic, {result, _} = Res} ->
|
||||
ejabberd_router:route(
|
||||
jlib:make_jid(LUser, LServer, ""),
|
||||
jlib:make_jid(LUser, LServer, ""),
|
||||
{xmlelement, "broadcast", [],
|
||||
[{privacy_list,
|
||||
exmpp_jid:make_bare_jid(LUser, LServer),
|
||||
exmpp_jid:make_bare_jid(LUser, LServer),
|
||||
#xmlel{name = 'broadcast',
|
||||
children=[{privacy_list,
|
||||
#userlist{name = Name, list = []},
|
||||
Name}]}),
|
||||
Res;
|
||||
_ ->
|
||||
{error, ?ERR_INTERNAL_SERVER_ERROR}
|
||||
{error, 'internal-server-error'}
|
||||
end;
|
||||
List ->
|
||||
F =
|
||||
@ -387,20 +384,18 @@ process_list_set(LUser, LServer, {value, Name}, Els) ->
|
||||
Error;
|
||||
{atomic, {result, _} = Res} ->
|
||||
ejabberd_router:route(
|
||||
jlib:make_jid(LUser, LServer, ""),
|
||||
jlib:make_jid(LUser, LServer, ""),
|
||||
{xmlelement, "broadcast", [],
|
||||
[{privacy_list,
|
||||
exmpp_jid:make_bare_jid(LUser, LServer),
|
||||
exmpp_jid:make_bare_jid(LUser, LServer),
|
||||
#xmlel{name = 'broadcast',
|
||||
children=[{privacy_list,
|
||||
#userlist{name = Name, list = List},
|
||||
Name}]}),
|
||||
Res;
|
||||
_ ->
|
||||
{error, ?ERR_INTERNAL_SERVER_ERROR}
|
||||
{error, 'internal_server_error'}
|
||||
end
|
||||
end;
|
||||
end.
|
||||
|
||||
process_list_set(_LUser, _LServer, false, _Els) ->
|
||||
{error, ?ERR_BAD_REQUEST}.
|
||||
|
||||
|
||||
parse_items([]) ->
|
||||
@ -410,16 +405,16 @@ parse_items(Els) ->
|
||||
|
||||
parse_items([], Res) ->
|
||||
lists:reverse(Res);
|
||||
parse_items([{xmlelement, "item", Attrs, SubEls} | Els], Res) ->
|
||||
Type = xml:get_attr("type", Attrs),
|
||||
Value = xml:get_attr("value", Attrs),
|
||||
SAction = xml:get_attr("action", Attrs),
|
||||
SOrder = xml:get_attr("order", Attrs),
|
||||
Action = case catch list_to_action(element(2, SAction)) of
|
||||
parse_items([El = #xmlel{name = item} | Els], Res) ->
|
||||
Type = exmpp_xml:get_attribute(El, type, false),
|
||||
Value = exmpp_xml:get_attribute(El, value, false),
|
||||
SAction =exmpp_xml:get_attribute(El, action, false),
|
||||
SOrder = exmpp_xml:get_attribute(El, order, false),
|
||||
Action = case catch list_to_action(SAction) of
|
||||
{'EXIT', _} -> false;
|
||||
Val -> Val
|
||||
end,
|
||||
Order = case catch list_to_integer(element(2, SOrder)) of
|
||||
Order = case catch list_to_integer(SOrder) of
|
||||
{'EXIT', _} ->
|
||||
false;
|
||||
IntVal ->
|
||||
@ -434,16 +429,17 @@ parse_items([{xmlelement, "item", Attrs, SubEls} | Els], Res) ->
|
||||
(Action /= false) and (Order /= false) ->
|
||||
I1 = #listitem{action = Action, order = Order},
|
||||
I2 = case {Type, Value} of
|
||||
{{value, T}, {value, V}} ->
|
||||
{T, V} when is_list(T), is_list(V) ->
|
||||
case T of
|
||||
"jid" ->
|
||||
case jlib:string_to_jid(V) of
|
||||
error ->
|
||||
false;
|
||||
JID ->
|
||||
try
|
||||
JID = exmpp_jid:list_to_jid(V),
|
||||
I1#listitem{
|
||||
type = jid,
|
||||
value = jlib:jid_tolower(JID)}
|
||||
value = jlib:short_prepd_jid(JID)}
|
||||
catch
|
||||
_ ->
|
||||
false
|
||||
end;
|
||||
"group" ->
|
||||
I1#listitem{type = group,
|
||||
@ -466,7 +462,7 @@ parse_items([{xmlelement, "item", Attrs, SubEls} | Els], Res) ->
|
||||
false
|
||||
end
|
||||
end;
|
||||
{{value, _}, false} ->
|
||||
{T, false} when is_list(T) ->
|
||||
false;
|
||||
_ ->
|
||||
I1
|
||||
@ -475,7 +471,7 @@ parse_items([{xmlelement, "item", Attrs, SubEls} | Els], Res) ->
|
||||
false ->
|
||||
false;
|
||||
_ ->
|
||||
case parse_matches(I2, xml:remove_cdata(SubEls)) of
|
||||
case parse_matches(I2, exmpp_xml:get_child_elements(El)) of
|
||||
false ->
|
||||
false;
|
||||
I3 ->
|
||||
@ -497,15 +493,15 @@ parse_matches(Item, Els) ->
|
||||
|
||||
parse_matches1(Item, []) ->
|
||||
Item;
|
||||
parse_matches1(Item, [{xmlelement, "message", _, _} | Els]) ->
|
||||
parse_matches1(Item, [#xmlel{name = message} | Els]) ->
|
||||
parse_matches1(Item#listitem{match_message = true}, Els);
|
||||
parse_matches1(Item, [{xmlelement, "iq", _, _} | Els]) ->
|
||||
parse_matches1(Item, [#xmlel{name = iq} | Els]) ->
|
||||
parse_matches1(Item#listitem{match_iq = true}, Els);
|
||||
parse_matches1(Item, [{xmlelement, "presence-in", _, _} | Els]) ->
|
||||
parse_matches1(Item, [#xmlel{name = 'presence-in'} | Els]) ->
|
||||
parse_matches1(Item#listitem{match_presence_in = true}, Els);
|
||||
parse_matches1(Item, [{xmlelement, "presence-out", _, _} | Els]) ->
|
||||
parse_matches1(Item, [#xmlel{name = 'presence-out'} | Els]) ->
|
||||
parse_matches1(Item#listitem{match_presence_out = true}, Els);
|
||||
parse_matches1(_Item, [{xmlelement, _, _, _} | _Els]) ->
|
||||
parse_matches1(_Item, [#xmlel{} | _Els]) ->
|
||||
false.
|
||||
|
||||
|
||||
@ -515,8 +511,9 @@ parse_matches1(_Item, [{xmlelement, _, _, _} | _Els]) ->
|
||||
|
||||
|
||||
get_user_list(_, User, Server) ->
|
||||
LUser = jlib:nodeprep(User),
|
||||
LServer = jlib:nameprep(Server),
|
||||
try
|
||||
LUser = exmpp_stringprep:nodeprep(User),
|
||||
LServer = exmpp_stringprep:nameprep(Server),
|
||||
case catch mnesia:dirty_read(privacy, {LUser, LServer}) of
|
||||
[] ->
|
||||
#userlist{};
|
||||
@ -535,53 +532,54 @@ get_user_list(_, User, Server) ->
|
||||
end;
|
||||
_ ->
|
||||
#userlist{}
|
||||
end
|
||||
catch
|
||||
_ ->
|
||||
#userlist{}
|
||||
end.
|
||||
|
||||
|
||||
check_packet(_, User, Server,
|
||||
#userlist{list = List},
|
||||
{From, To, {xmlelement, PName, _, _}},
|
||||
Dir) ->
|
||||
{From, To, #xmlel{name = PName}},
|
||||
Dir) when PName =:= message ;
|
||||
PName =:= iq ;
|
||||
PName =:= presence ->
|
||||
case List of
|
||||
[] ->
|
||||
allow;
|
||||
_ ->
|
||||
PType = case PName of
|
||||
"message" -> message;
|
||||
"iq" -> iq;
|
||||
"presence" -> presence
|
||||
end,
|
||||
case {PType, Dir} of
|
||||
case {PName, Dir} of
|
||||
{message, in} ->
|
||||
LJID = jlib:jid_tolower(From),
|
||||
LJID = jlib:short_prepd_jid(From),
|
||||
{Subscription, Groups} =
|
||||
ejabberd_hooks:run_fold(
|
||||
roster_get_jid_info, jlib:nameprep(Server),
|
||||
{none, []}, [User, Server, LJID]),
|
||||
roster_get_jid_info, exmpp_stringprep:nameprep(Server),
|
||||
{none, []}, [User, Server, From]),
|
||||
check_packet_aux(List, message,
|
||||
LJID, Subscription, Groups);
|
||||
{iq, in} ->
|
||||
LJID = jlib:jid_tolower(From),
|
||||
LJID = jlib:short_prepd_jid(From),
|
||||
{Subscription, Groups} =
|
||||
ejabberd_hooks:run_fold(
|
||||
roster_get_jid_info, jlib:nameprep(Server),
|
||||
{none, []}, [User, Server, LJID]),
|
||||
roster_get_jid_info, exmpp_stringprep:nameprep(Server),
|
||||
{none, []}, [User, Server, From]),
|
||||
check_packet_aux(List, iq,
|
||||
LJID, Subscription, Groups);
|
||||
{presence, in} ->
|
||||
LJID = jlib:jid_tolower(From),
|
||||
LJID = jlib:short_prepd_jid(From),
|
||||
{Subscription, Groups} =
|
||||
ejabberd_hooks:run_fold(
|
||||
roster_get_jid_info, jlib:nameprep(Server),
|
||||
{none, []}, [User, Server, LJID]),
|
||||
roster_get_jid_info, exmpp_stringprep:nameprep(Server),
|
||||
{none, []}, [User, Server, From]),
|
||||
check_packet_aux(List, presence_in,
|
||||
LJID, Subscription, Groups);
|
||||
{presence, out} ->
|
||||
LJID = jlib:jid_tolower(To),
|
||||
LJID = jlib:short_prepd_jid(To),
|
||||
{Subscription, Groups} =
|
||||
ejabberd_hooks:run_fold(
|
||||
roster_get_jid_info, jlib:nameprep(Server),
|
||||
{none, []}, [User, Server, LJID]),
|
||||
roster_get_jid_info, exmpp_stringprep:nameprep(Server),
|
||||
{none, []}, [User, Server, To]),
|
||||
check_packet_aux(List, presence_out,
|
||||
LJID, Subscription, Groups);
|
||||
_ ->
|
||||
@ -635,14 +633,14 @@ is_type_match(Type, Value, JID, Subscription, Groups) ->
|
||||
case Type of
|
||||
jid ->
|
||||
case Value of
|
||||
{"", Server, ""} ->
|
||||
{undefined, Server, undefined} ->
|
||||
case JID of
|
||||
{_, Server, _} ->
|
||||
true;
|
||||
_ ->
|
||||
false
|
||||
end;
|
||||
{User, Server, ""} ->
|
||||
{User, Server, undefined} ->
|
||||
case JID of
|
||||
{User, Server, _} ->
|
||||
true;
|
||||
@ -675,7 +673,7 @@ update_table() ->
|
||||
Fields = record_info(fields, privacy),
|
||||
case mnesia:table_info(privacy, attributes) of
|
||||
Fields ->
|
||||
ok;
|
||||
convert_to_exmpp();
|
||||
[user, default, lists] ->
|
||||
?INFO_MSG("Converting privacy table from "
|
||||
"{user, default, lists} format", []),
|
||||
@ -714,3 +712,42 @@ update_table() ->
|
||||
end.
|
||||
|
||||
|
||||
convert_to_exmpp() ->
|
||||
Fun = fun() ->
|
||||
mnesia:foldl(fun convert_to_exmpp2/2, done, privacy, write)
|
||||
end,
|
||||
mnesia:transaction(Fun).
|
||||
|
||||
convert_to_exmpp2(#privacy{us = {U, S} = Key, lists = L} = P, Acc) ->
|
||||
U1 = convert_jid_to_exmpp(U),
|
||||
L1 = convert_lists_to_exmpp(L),
|
||||
New_P = P#privacy{
|
||||
us = {U1, S},
|
||||
lists = L1
|
||||
},
|
||||
if
|
||||
New_P /= P -> mnesia:delete({privacy, Key}), mnesia:write(New_P);
|
||||
true -> ok
|
||||
end,
|
||||
Acc.
|
||||
|
||||
convert_jid_to_exmpp("") -> undefined;
|
||||
convert_jid_to_exmpp(V) -> V.
|
||||
|
||||
convert_lists_to_exmpp(L) ->
|
||||
convert_lists_to_exmpp2(L, []).
|
||||
|
||||
convert_lists_to_exmpp2([{Name, List} | Rest], Result) ->
|
||||
convert_lists_to_exmpp2(Rest,
|
||||
[{Name, convert_list_to_exmpp(List, [])} | Result]);
|
||||
convert_lists_to_exmpp2([], Result) ->
|
||||
lists:reverse(Result).
|
||||
|
||||
convert_list_to_exmpp([#listitem{type = jid, value = {U, S, R}} = I | Rest],
|
||||
Result) ->
|
||||
U1 = convert_jid_to_exmpp(U),
|
||||
R1 = convert_jid_to_exmpp(R),
|
||||
New_I = I#listitem{value = {U1, S, R1}},
|
||||
convert_list_to_exmpp(Rest, [New_I | Result]);
|
||||
convert_list_to_exmpp([], Result) ->
|
||||
lists:reverse(Result).
|
||||
|
||||
@ -37,8 +37,9 @@
|
||||
check_packet/6,
|
||||
updated_list/3]).
|
||||
|
||||
-include_lib("exmpp/include/exmpp.hrl").
|
||||
|
||||
-include("ejabberd.hrl").
|
||||
-include("jlib.hrl").
|
||||
-include("mod_privacy.hrl").
|
||||
|
||||
start(Host, Opts) ->
|
||||
@ -69,28 +70,26 @@ stop(Host) ->
|
||||
?MODULE, updated_list, 50),
|
||||
gen_iq_handler:remove_iq_handler(ejabberd_sm, Host, ?NS_PRIVACY).
|
||||
|
||||
process_iq(_From, _To, IQ) ->
|
||||
SubEl = IQ#iq.sub_el,
|
||||
IQ#iq{type = error, sub_el = [SubEl, ?ERR_NOT_ALLOWED]}.
|
||||
process_iq(_From, _To, IQ_Rec) ->
|
||||
exmpp_iq:error(IQ_Rec, 'not-allowed').
|
||||
|
||||
|
||||
process_iq_get(_, From, _To, #iq{sub_el = SubEl},
|
||||
process_iq_get(_, From, _To, #iq{payload = SubEl},
|
||||
#userlist{name = Active}) ->
|
||||
#jid{luser = LUser, lserver = LServer} = From,
|
||||
{xmlelement, _, _, Els} = SubEl,
|
||||
case xml:remove_cdata(Els) of
|
||||
#jid{lnode = LUser, ldomain = LServer} = From,
|
||||
case exmpp_xml:get_child_elements(SubEl) of
|
||||
[] ->
|
||||
process_lists_get(LUser, LServer, Active);
|
||||
[{xmlelement, Name, Attrs, _SubEls}] ->
|
||||
[#xmlel{name = Name} = Child] ->
|
||||
case Name of
|
||||
"list" ->
|
||||
ListName = xml:get_attr("name", Attrs),
|
||||
list ->
|
||||
ListName = exmpp_xml:get_attribute(Child, name, false),
|
||||
process_list_get(LUser, LServer, ListName);
|
||||
_ ->
|
||||
{error, ?ERR_BAD_REQUEST}
|
||||
{error, 'bad-request'}
|
||||
end;
|
||||
_ ->
|
||||
{error, ?ERR_BAD_REQUEST}
|
||||
{error, 'bad-request'}
|
||||
end.
|
||||
|
||||
|
||||
@ -105,40 +104,38 @@ process_lists_get(LUser, LServer, Active) ->
|
||||
end,
|
||||
case catch sql_get_privacy_list_names(LUser, LServer) of
|
||||
{selected, ["name"], []} ->
|
||||
{result, [{xmlelement, "query", [{"xmlns", ?NS_PRIVACY}], []}]};
|
||||
{result, #xmlel{ns = ?NS_PRIVACY, name = 'query'}};
|
||||
{selected, ["name"], Names} ->
|
||||
LItems = lists:map(
|
||||
fun({N}) ->
|
||||
{xmlelement, "list",
|
||||
[{"name", N}], []}
|
||||
exmpp_xml:set_attribute(#xmlel{ns = ?NS_PRIVACY, name = list}, name, N)
|
||||
end, Names),
|
||||
DItems =
|
||||
case Default of
|
||||
none ->
|
||||
LItems;
|
||||
_ ->
|
||||
[{xmlelement, "default",
|
||||
[{"name", Default}], []} | LItems]
|
||||
[exmpp_xml:set_attribute(#xmlel{ns = ?NS_PRIVACY, name = default}, name, Default) | LItems]
|
||||
end,
|
||||
ADItems =
|
||||
case Active of
|
||||
none ->
|
||||
DItems;
|
||||
_ ->
|
||||
[{xmlelement, "active",
|
||||
[{"name", Active}], []} | DItems]
|
||||
[exmpp_xml:set_attribute(#xmlel{ns = ?NS_PRIVACY, name = active}, name, Active) | DItems]
|
||||
end,
|
||||
{result,
|
||||
[{xmlelement, "query", [{"xmlns", ?NS_PRIVACY}],
|
||||
ADItems}]};
|
||||
{result, #xmlel{ns = ?NS_PRIVACY, name = 'query', children = ADItems}};
|
||||
_ ->
|
||||
{error, ?ERR_INTERNAL_SERVER_ERROR}
|
||||
{error, 'internal-server-error'}
|
||||
end.
|
||||
|
||||
process_list_get(LUser, LServer, {value, Name}) ->
|
||||
process_list_get(_LUser, _LServer, false) ->
|
||||
{error, 'bad-request'};
|
||||
|
||||
process_list_get(LUser, LServer, Name) ->
|
||||
case catch sql_get_privacy_list_id(LUser, LServer, Name) of
|
||||
{selected, ["id"], []} ->
|
||||
{error, ?ERR_ITEM_NOT_FOUND};
|
||||
{error, 'item-not-found'};
|
||||
{selected, ["id"], [{ID}]} ->
|
||||
case catch sql_get_privacy_list_data_by_id(ID, LServer) of
|
||||
{selected, ["t", "value", "action", "ord", "match_all",
|
||||
@ -147,29 +144,29 @@ process_list_get(LUser, LServer, {value, Name}) ->
|
||||
RItems} ->
|
||||
Items = lists:map(fun raw_to_item/1, RItems),
|
||||
LItems = lists:map(fun item_to_xml/1, Items),
|
||||
{result,
|
||||
[{xmlelement, "query", [{"xmlns", ?NS_PRIVACY}],
|
||||
[{xmlelement, "list",
|
||||
[{"name", Name}], LItems}]}]};
|
||||
ListEl = exmpp_xml:set_attribute(#xmlel{name = list,
|
||||
ns = ?NS_PRIVACY,
|
||||
children = LItems},
|
||||
name,
|
||||
Name),
|
||||
{result, #xmlel{ns = ?NS_PRIVACY, name = 'query', children = [ListEl]}};
|
||||
_ ->
|
||||
{error, ?ERR_INTERNAL_SERVER_ERROR}
|
||||
{error, 'internal-server-error'}
|
||||
end;
|
||||
_ ->
|
||||
{error, ?ERR_INTERNAL_SERVER_ERROR}
|
||||
end;
|
||||
{error, 'internal-server-error'}
|
||||
end.
|
||||
|
||||
process_list_get(_LUser, _LServer, false) ->
|
||||
{error, ?ERR_BAD_REQUEST}.
|
||||
|
||||
item_to_xml(Item) ->
|
||||
Attrs1 = [{"action", action_to_list(Item#listitem.action)},
|
||||
{"order", order_to_list(Item#listitem.order)}],
|
||||
Attrs1 = [#xmlattr{name = 'action', value = action_to_list(Item#listitem.action)},
|
||||
#xmlattr{name = 'order', value = order_to_list(Item#listitem.order)}],
|
||||
Attrs2 = case Item#listitem.type of
|
||||
none ->
|
||||
Attrs1;
|
||||
Type ->
|
||||
[{"type", type_to_list(Item#listitem.type)},
|
||||
{"value", value_to_list(Type, Item#listitem.value)} |
|
||||
[#xmlattr{name = 'type', value = type_to_list(Item#listitem.type)},
|
||||
#xmlattr{name = 'value', value = value_to_list(Type, Item#listitem.value)} |
|
||||
Attrs1]
|
||||
end,
|
||||
SubEls = case Item#listitem.match_all of
|
||||
@ -178,31 +175,31 @@ item_to_xml(Item) ->
|
||||
false ->
|
||||
SE1 = case Item#listitem.match_iq of
|
||||
true ->
|
||||
[{xmlelement, "iq", [], []}];
|
||||
[#xmlel{ns = ?NS_PRIVACY, name = iq}];
|
||||
false ->
|
||||
[]
|
||||
end,
|
||||
SE2 = case Item#listitem.match_message of
|
||||
true ->
|
||||
[{xmlelement, "message", [], []} | SE1];
|
||||
[#xmlel{ns = ?NS_PRIVACY, name = message} | SE1];
|
||||
false ->
|
||||
SE1
|
||||
end,
|
||||
SE3 = case Item#listitem.match_presence_in of
|
||||
true ->
|
||||
[{xmlelement, "presence-in", [], []} | SE2];
|
||||
[#xmlel{ns = ?NS_PRIVACY, name = 'presence-in'} | SE2];
|
||||
false ->
|
||||
SE2
|
||||
end,
|
||||
SE4 = case Item#listitem.match_presence_out of
|
||||
true ->
|
||||
[{xmlelement, "presence-out", [], []} | SE3];
|
||||
[#xmlel{ns = ?NS_PRIVACY, name = 'presence-out'} | SE3];
|
||||
false ->
|
||||
SE3
|
||||
end,
|
||||
SE4
|
||||
end,
|
||||
{xmlelement, "item", Attrs2, SubEls}.
|
||||
exmpp_xml:set_attributes(#xmlel{ns = ?NS_PRIVACY, name = item, children = SubEls}, Attrs2).
|
||||
|
||||
|
||||
action_to_list(Action) ->
|
||||
@ -223,7 +220,9 @@ type_to_list(Type) ->
|
||||
|
||||
value_to_list(Type, Val) ->
|
||||
case Type of
|
||||
jid -> jlib:jid_to_string(Val);
|
||||
jid ->
|
||||
{N, D, R} = Val,
|
||||
exmpp_jid:jid_to_list(N, D, R);
|
||||
group -> Val;
|
||||
subscription ->
|
||||
case Val of
|
||||
@ -244,40 +243,49 @@ list_to_action(S) ->
|
||||
|
||||
|
||||
|
||||
process_iq_set(_, From, _To, #iq{sub_el = SubEl}) ->
|
||||
#jid{luser = LUser, lserver = LServer} = From,
|
||||
{xmlelement, _, _, Els} = SubEl,
|
||||
case xml:remove_cdata(Els) of
|
||||
[{xmlelement, Name, Attrs, SubEls}] ->
|
||||
ListName = xml:get_attr("name", Attrs),
|
||||
process_iq_set(_, From, _To, #iq{payload = SubEl}) ->
|
||||
#jid{lnode = LUser, ldomain = LServer} = From,
|
||||
case exmpp_xml:get_child_elements(SubEl) of
|
||||
[#xmlel{name = Name} = Child] ->
|
||||
ListName = exmpp_xml:get_attribute(Child, 'name', false),
|
||||
case Name of
|
||||
"list" ->
|
||||
list ->
|
||||
process_list_set(LUser, LServer, ListName,
|
||||
xml:remove_cdata(SubEls));
|
||||
"active" ->
|
||||
exmpp_xml:get_child_elements(Child));
|
||||
active ->
|
||||
process_active_set(LUser, LServer, ListName);
|
||||
"default" ->
|
||||
default ->
|
||||
process_default_set(LUser, LServer, ListName);
|
||||
_ ->
|
||||
{error, ?ERR_BAD_REQUEST}
|
||||
{error, 'bad-request'}
|
||||
end;
|
||||
_ ->
|
||||
{error, ?ERR_BAD_REQUEST}
|
||||
{error, 'bad-request'}
|
||||
end.
|
||||
|
||||
|
||||
process_default_set(LUser, LServer, {value, Name}) ->
|
||||
process_default_set(LUser, LServer, false) ->
|
||||
case catch sql_unset_default_privacy_list(LUser, LServer) of
|
||||
{'EXIT', _Reason} ->
|
||||
{error, 'internal_server_error'};
|
||||
{error, _Reason} ->
|
||||
{error, 'internal_server_error'};
|
||||
_ ->
|
||||
{result, []}
|
||||
end;
|
||||
|
||||
process_default_set(LUser, LServer, Name) ->
|
||||
F = fun() ->
|
||||
case sql_get_privacy_list_names_t(LUser) of
|
||||
{selected, ["name"], []} ->
|
||||
{error, ?ERR_ITEM_NOT_FOUND};
|
||||
{error, 'item-not-found'};
|
||||
{selected, ["name"], Names} ->
|
||||
case lists:member({Name}, Names) of
|
||||
true ->
|
||||
sql_set_default_privacy_list(LUser, Name),
|
||||
{result, []};
|
||||
false ->
|
||||
{error, ?ERR_ITEM_NOT_FOUND}
|
||||
{error, 'item-not-found'}
|
||||
end
|
||||
end
|
||||
end,
|
||||
@ -287,24 +295,17 @@ process_default_set(LUser, LServer, {value, Name}) ->
|
||||
{atomic, {result, _} = Res} ->
|
||||
Res;
|
||||
_ ->
|
||||
{error, ?ERR_INTERNAL_SERVER_ERROR}
|
||||
end;
|
||||
|
||||
process_default_set(LUser, LServer, false) ->
|
||||
case catch sql_unset_default_privacy_list(LUser, LServer) of
|
||||
{'EXIT', _Reason} ->
|
||||
{error, ?ERR_INTERNAL_SERVER_ERROR};
|
||||
{error, _Reason} ->
|
||||
{error, ?ERR_INTERNAL_SERVER_ERROR};
|
||||
_ ->
|
||||
{result, []}
|
||||
{error, 'internal-server-error'}
|
||||
end.
|
||||
|
||||
|
||||
process_active_set(LUser, LServer, {value, Name}) ->
|
||||
process_active_set(_LUser, _LServer, false) ->
|
||||
{result, [], #userlist{}};
|
||||
|
||||
process_active_set(LUser, LServer, Name) ->
|
||||
case catch sql_get_privacy_list_id(LUser, LServer, Name) of
|
||||
{selected, ["id"], []} ->
|
||||
{error, ?ERR_ITEM_NOT_FOUND};
|
||||
{error, 'item-not-found'};
|
||||
{selected, ["id"], [{ID}]} ->
|
||||
case catch sql_get_privacy_list_data_by_id(ID, LServer) of
|
||||
{selected, ["t", "value", "action", "ord", "match_all",
|
||||
@ -314,24 +315,21 @@ process_active_set(LUser, LServer, {value, Name}) ->
|
||||
Items = lists:map(fun raw_to_item/1, RItems),
|
||||
{result, [], #userlist{name = Name, list = Items}};
|
||||
_ ->
|
||||
{error, ?ERR_INTERNAL_SERVER_ERROR}
|
||||
{error, 'internal-server-error'}
|
||||
end;
|
||||
_ ->
|
||||
{error, ?ERR_INTERNAL_SERVER_ERROR}
|
||||
end;
|
||||
|
||||
process_active_set(_LUser, _LServer, false) ->
|
||||
{result, [], #userlist{}}.
|
||||
{error, 'internal_server_error'}
|
||||
end.
|
||||
|
||||
|
||||
|
||||
process_list_set(_LUser, _LServer, false, _Els) ->
|
||||
{error, 'bad-request'};
|
||||
|
||||
|
||||
|
||||
process_list_set(LUser, LServer, {value, Name}, Els) ->
|
||||
process_list_set(LUser, LServer, Name, Els) ->
|
||||
case parse_items(Els) of
|
||||
false ->
|
||||
{error, ?ERR_BAD_REQUEST};
|
||||
{error, 'bad-request'};
|
||||
remove ->
|
||||
F =
|
||||
fun() ->
|
||||
@ -340,10 +338,10 @@ process_list_set(LUser, LServer, {value, Name}, Els) ->
|
||||
sql_remove_privacy_list(LUser, Name),
|
||||
{result, []};
|
||||
{selected, ["name"], [{Default}]} ->
|
||||
%% TODO: check active
|
||||
% TODO: check active
|
||||
if
|
||||
Name == Default ->
|
||||
{error, ?ERR_CONFLICT};
|
||||
{error, 'conflict'};
|
||||
true ->
|
||||
sql_remove_privacy_list(LUser, Name),
|
||||
{result, []}
|
||||
@ -355,15 +353,15 @@ process_list_set(LUser, LServer, {value, Name}, Els) ->
|
||||
Error;
|
||||
{atomic, {result, _} = Res} ->
|
||||
ejabberd_router:route(
|
||||
jlib:make_jid(LUser, LServer, ""),
|
||||
jlib:make_jid(LUser, LServer, ""),
|
||||
{xmlelement, "broadcast", [],
|
||||
[{privacy_list,
|
||||
exmpp_jid:make_bare_jid(LUser, LServer),
|
||||
exmpp_jid:make_bare_jid(LUser, LServer),
|
||||
#xmlel{name = 'broadcast',
|
||||
children=[{privacy_list,
|
||||
#userlist{name = Name, list = []},
|
||||
Name}]}),
|
||||
Res;
|
||||
_ ->
|
||||
{error, ?ERR_INTERNAL_SERVER_ERROR}
|
||||
{error, 'internal-server-error'}
|
||||
end;
|
||||
List ->
|
||||
RItems = lists:map(fun item_to_raw/1, List),
|
||||
@ -387,20 +385,18 @@ process_list_set(LUser, LServer, {value, Name}, Els) ->
|
||||
Error;
|
||||
{atomic, {result, _} = Res} ->
|
||||
ejabberd_router:route(
|
||||
jlib:make_jid(LUser, LServer, ""),
|
||||
jlib:make_jid(LUser, LServer, ""),
|
||||
{xmlelement, "broadcast", [],
|
||||
[{privacy_list,
|
||||
exmpp_jid:make_bare_jid(LUser, LServer),
|
||||
exmpp_jid:make_bare_jid(LUser, LServer),
|
||||
#xmlel{name = 'broadcast',
|
||||
children=[{privacy_list,
|
||||
#userlist{name = Name, list = List},
|
||||
Name}]}),
|
||||
Res;
|
||||
_ ->
|
||||
{error, ?ERR_INTERNAL_SERVER_ERROR}
|
||||
{error, 'internal_server_error'}
|
||||
end
|
||||
end;
|
||||
end.
|
||||
|
||||
process_list_set(_LUser, _LServer, false, _Els) ->
|
||||
{error, ?ERR_BAD_REQUEST}.
|
||||
|
||||
|
||||
parse_items([]) ->
|
||||
@ -410,16 +406,16 @@ parse_items(Els) ->
|
||||
|
||||
parse_items([], Res) ->
|
||||
lists:reverse(Res);
|
||||
parse_items([{xmlelement, "item", Attrs, SubEls} | Els], Res) ->
|
||||
Type = xml:get_attr("type", Attrs),
|
||||
Value = xml:get_attr("value", Attrs),
|
||||
SAction = xml:get_attr("action", Attrs),
|
||||
SOrder = xml:get_attr("order", Attrs),
|
||||
Action = case catch list_to_action(element(2, SAction)) of
|
||||
parse_items([El = #xmlel{name = item} | Els], Res) ->
|
||||
Type = exmpp_xml:get_attribute(El, type, false),
|
||||
Value = exmpp_xml:get_attribute(El, value, false),
|
||||
SAction =exmpp_xml:get_attribute(El, action, false),
|
||||
SOrder = exmpp_xml:get_attribute(El, order, false),
|
||||
Action = case catch list_to_action(SAction) of
|
||||
{'EXIT', _} -> false;
|
||||
Val -> Val
|
||||
end,
|
||||
Order = case catch list_to_integer(element(2, SOrder)) of
|
||||
Order = case catch list_to_integer(SOrder) of
|
||||
{'EXIT', _} ->
|
||||
false;
|
||||
IntVal ->
|
||||
@ -434,16 +430,17 @@ parse_items([{xmlelement, "item", Attrs, SubEls} | Els], Res) ->
|
||||
(Action /= false) and (Order /= false) ->
|
||||
I1 = #listitem{action = Action, order = Order},
|
||||
I2 = case {Type, Value} of
|
||||
{{value, T}, {value, V}} ->
|
||||
{T, V} when is_list(T), is_list(V) ->
|
||||
case T of
|
||||
"jid" ->
|
||||
case jlib:string_to_jid(V) of
|
||||
error ->
|
||||
false;
|
||||
JID ->
|
||||
try
|
||||
JID = exmpp_jid:list_to_jid(V),
|
||||
I1#listitem{
|
||||
type = jid,
|
||||
value = jlib:jid_tolower(JID)}
|
||||
value = jlib:short_prepd_jid(JID)}
|
||||
catch
|
||||
_ ->
|
||||
false
|
||||
end;
|
||||
"group" ->
|
||||
I1#listitem{type = group,
|
||||
@ -466,7 +463,7 @@ parse_items([{xmlelement, "item", Attrs, SubEls} | Els], Res) ->
|
||||
false
|
||||
end
|
||||
end;
|
||||
{{value, _}, false} ->
|
||||
{T, false} when is_list(T) ->
|
||||
false;
|
||||
_ ->
|
||||
I1
|
||||
@ -475,7 +472,7 @@ parse_items([{xmlelement, "item", Attrs, SubEls} | Els], Res) ->
|
||||
false ->
|
||||
false;
|
||||
_ ->
|
||||
case parse_matches(I2, xml:remove_cdata(SubEls)) of
|
||||
case parse_matches(I2, exmpp_xml:get_child_elements(El)) of
|
||||
false ->
|
||||
false;
|
||||
I3 ->
|
||||
@ -497,15 +494,15 @@ parse_matches(Item, Els) ->
|
||||
|
||||
parse_matches1(Item, []) ->
|
||||
Item;
|
||||
parse_matches1(Item, [{xmlelement, "message", _, _} | Els]) ->
|
||||
parse_matches1(Item, [#xmlel{name = message} | Els]) ->
|
||||
parse_matches1(Item#listitem{match_message = true}, Els);
|
||||
parse_matches1(Item, [{xmlelement, "iq", _, _} | Els]) ->
|
||||
parse_matches1(Item, [#xmlel{name = iq} | Els]) ->
|
||||
parse_matches1(Item#listitem{match_iq = true}, Els);
|
||||
parse_matches1(Item, [{xmlelement, "presence-in", _, _} | Els]) ->
|
||||
parse_matches1(Item, [#xmlel{name = 'presence-in'} | Els]) ->
|
||||
parse_matches1(Item#listitem{match_presence_in = true}, Els);
|
||||
parse_matches1(Item, [{xmlelement, "presence-out", _, _} | Els]) ->
|
||||
parse_matches1(Item, [#xmlel{name = 'presence-out'} | Els]) ->
|
||||
parse_matches1(Item#listitem{match_presence_out = true}, Els);
|
||||
parse_matches1(_Item, [{xmlelement, _, _, _} | _Els]) ->
|
||||
parse_matches1(_Item, [#xmlel{} | _Els]) ->
|
||||
false.
|
||||
|
||||
|
||||
@ -515,9 +512,9 @@ parse_matches1(_Item, [{xmlelement, _, _, _} | _Els]) ->
|
||||
|
||||
|
||||
get_user_list(_, User, Server) ->
|
||||
LUser = jlib:nodeprep(User),
|
||||
LServer = jlib:nameprep(Server),
|
||||
|
||||
try
|
||||
LUser = exmpp_stringprep:nodeprep(User),
|
||||
LServer = exmpp_stringprep:nameprep(Server),
|
||||
case catch sql_get_default_privacy_list(LUser, LServer) of
|
||||
{selected, ["name"], []} ->
|
||||
#userlist{};
|
||||
@ -534,53 +531,54 @@ get_user_list(_, User, Server) ->
|
||||
end;
|
||||
_ ->
|
||||
#userlist{}
|
||||
end
|
||||
catch
|
||||
_ ->
|
||||
#userlist{}
|
||||
end.
|
||||
|
||||
|
||||
check_packet(_, User, Server,
|
||||
#userlist{list = List},
|
||||
{From, To, {xmlelement, PName, _, _}},
|
||||
Dir) ->
|
||||
{From, To, #xmlel{name = PName}},
|
||||
Dir) when PName =:= message ;
|
||||
PName =:= iq ;
|
||||
PName =:= presence ->
|
||||
case List of
|
||||
[] ->
|
||||
allow;
|
||||
_ ->
|
||||
PType = case PName of
|
||||
"message" -> message;
|
||||
"iq" -> iq;
|
||||
"presence" -> presence
|
||||
end,
|
||||
case {PType, Dir} of
|
||||
case {PName, Dir} of
|
||||
{message, in} ->
|
||||
LJID = jlib:jid_tolower(From),
|
||||
LJID = jlib:short_prepd_jid(From),
|
||||
{Subscription, Groups} =
|
||||
ejabberd_hooks:run_fold(
|
||||
roster_get_jid_info, jlib:nameprep(Server),
|
||||
{none, []}, [User, Server, LJID]),
|
||||
roster_get_jid_info, exmpp_stringprep:nameprep(Server),
|
||||
{none, []}, [User, Server, From]),
|
||||
check_packet_aux(List, message,
|
||||
LJID, Subscription, Groups);
|
||||
{iq, in} ->
|
||||
LJID = jlib:jid_tolower(From),
|
||||
LJID = jlib:short_prepd_jid(From),
|
||||
{Subscription, Groups} =
|
||||
ejabberd_hooks:run_fold(
|
||||
roster_get_jid_info, jlib:nameprep(Server),
|
||||
{none, []}, [User, Server, LJID]),
|
||||
roster_get_jid_info, exmpp_stringprep:nameprep(Server),
|
||||
{none, []}, [User, Server, From]),
|
||||
check_packet_aux(List, iq,
|
||||
LJID, Subscription, Groups);
|
||||
{presence, in} ->
|
||||
LJID = jlib:jid_tolower(From),
|
||||
LJID = jlib:short_prepd_jid(From),
|
||||
{Subscription, Groups} =
|
||||
ejabberd_hooks:run_fold(
|
||||
roster_get_jid_info, jlib:nameprep(Server),
|
||||
{none, []}, [User, Server, LJID]),
|
||||
roster_get_jid_info, exmpp_stringprep:nameprep(Server),
|
||||
{none, []}, [User, Server, From]),
|
||||
check_packet_aux(List, presence_in,
|
||||
LJID, Subscription, Groups);
|
||||
{presence, out} ->
|
||||
LJID = jlib:jid_tolower(To),
|
||||
LJID = jlib:short_prepd_jid(To),
|
||||
{Subscription, Groups} =
|
||||
ejabberd_hooks:run_fold(
|
||||
roster_get_jid_info, jlib:nameprep(Server),
|
||||
{none, []}, [User, Server, LJID]),
|
||||
roster_get_jid_info, exmpp_stringprep:nameprep(Server),
|
||||
{none, []}, [User, Server, To]),
|
||||
check_packet_aux(List, presence_out,
|
||||
LJID, Subscription, Groups);
|
||||
_ ->
|
||||
@ -634,14 +632,14 @@ is_type_match(Type, Value, JID, Subscription, Groups) ->
|
||||
case Type of
|
||||
jid ->
|
||||
case Value of
|
||||
{"", Server, ""} ->
|
||||
{undefined, Server, undefined} ->
|
||||
case JID of
|
||||
{_, Server, _} ->
|
||||
true;
|
||||
_ ->
|
||||
false
|
||||
end;
|
||||
{User, Server, ""} ->
|
||||
{User, Server, undefined} ->
|
||||
case JID of
|
||||
{User, Server, _} ->
|
||||
true;
|
||||
@ -676,10 +674,8 @@ raw_to_item({SType, SValue, SAction, SOrder, SMatchAll, SMatchIQ,
|
||||
"n" ->
|
||||
{none, none};
|
||||
"j" ->
|
||||
case jlib:string_to_jid(SValue) of
|
||||
#jid{} = JID ->
|
||||
{jid, jlib:jid_tolower(JID)}
|
||||
end;
|
||||
JID = exmpp_jid:list_to_jid(SValue),
|
||||
{jid, jlib:short_prepd_jid(JID)};
|
||||
"g" ->
|
||||
{group, SValue};
|
||||
"s" ->
|
||||
@ -731,7 +727,7 @@ item_to_raw(#listitem{type = Type,
|
||||
none ->
|
||||
{"n", ""};
|
||||
jid ->
|
||||
{"j", jlib:jid_to_string(Value)};
|
||||
{"j", exmpp_jid:jid_to_list(Value)};
|
||||
group ->
|
||||
{"g", Value};
|
||||
subscription ->
|
||||
|
||||
Loading…
Reference in New Issue
Block a user