aboutsummaryrefslogtreecommitdiff
path: root/src/mod_announce.erl
diff options
context:
space:
mode:
Diffstat (limited to 'src/mod_announce.erl')
-rw-r--r--src/mod_announce.erl426
1 files changed, 169 insertions, 257 deletions
diff --git a/src/mod_announce.erl b/src/mod_announce.erl
index d74c46bf9..1d93cbe65 100644
--- a/src/mod_announce.erl
+++ b/src/mod_announce.erl
@@ -39,8 +39,7 @@
-include("ejabberd.hrl").
-include("logger.hrl").
--include("jlib.hrl").
--include("adhoc.hrl").
+-include("xmpp.hrl").
-include("mod_announce.hrl").
-callback init(binary(), gen_mod:opts()) -> any().
@@ -131,41 +130,36 @@ stop(Host) ->
{wait, Proc}.
%% Announcing via messages to a custom resource
-announce(From, #jid{luser = <<>>} = To, #xmlel{name = <<"message">>} = Packet) ->
+-spec announce(jid(), jid(), stanza()) -> ok | stop.
+announce(From, #jid{luser = <<>>} = To, #message{} = Packet) ->
Proc = gen_mod:get_module_proc(To#jid.lserver, ?PROCNAME),
- case To#jid.lresource of
- <<"announce/all">> ->
- Proc ! {announce_all, From, To, Packet},
- stop;
- <<"announce/all-hosts/all">> ->
- Proc ! {announce_all_hosts_all, From, To, Packet},
- stop;
- <<"announce/online">> ->
- Proc ! {announce_online, From, To, Packet},
- stop;
- <<"announce/all-hosts/online">> ->
- Proc ! {announce_all_hosts_online, From, To, Packet},
- stop;
- <<"announce/motd">> ->
- Proc ! {announce_motd, From, To, Packet},
- stop;
- <<"announce/all-hosts/motd">> ->
- Proc ! {announce_all_hosts_motd, From, To, Packet},
- stop;
- <<"announce/motd/update">> ->
- Proc ! {announce_motd_update, From, To, Packet},
- stop;
- <<"announce/all-hosts/motd/update">> ->
- Proc ! {announce_all_hosts_motd_update, From, To, Packet},
- stop;
- <<"announce/motd/delete">> ->
- Proc ! {announce_motd_delete, From, To, Packet},
- stop;
- <<"announce/all-hosts/motd/delete">> ->
- Proc ! {announce_all_hosts_motd_delete, From, To, Packet},
- stop;
- _ ->
- ok
+ Res = case To#jid.lresource of
+ <<"announce/all">> ->
+ Proc ! {announce_all, From, To, Packet};
+ <<"announce/all-hosts/all">> ->
+ Proc ! {announce_all_hosts_all, From, To, Packet};
+ <<"announce/online">> ->
+ Proc ! {announce_online, From, To, Packet};
+ <<"announce/all-hosts/online">> ->
+ Proc ! {announce_all_hosts_online, From, To, Packet};
+ <<"announce/motd">> ->
+ Proc ! {announce_motd, From, To, Packet};
+ <<"announce/all-hosts/motd">> ->
+ Proc ! {announce_all_hosts_motd, From, To, Packet};
+ <<"announce/motd/update">> ->
+ Proc ! {announce_motd_update, From, To, Packet};
+ <<"announce/all-hosts/motd/update">> ->
+ Proc ! {announce_all_hosts_motd_update, From, To, Packet};
+ <<"announce/motd/delete">> ->
+ Proc ! {announce_motd_delete, From, To, Packet};
+ <<"announce/all-hosts/motd/delete">> ->
+ Proc ! {announce_all_hosts_motd_delete, From, To, Packet};
+ _ ->
+ ok
+ end,
+ case Res of
+ ok -> ok;
+ _ -> stop
end;
announce(_From, _To, _Packet) ->
ok.
@@ -173,10 +167,9 @@ announce(_From, _To, _Packet) ->
%%-------------------------------------------------------------------------
%% Announcing via ad-hoc commands
-define(INFO_COMMAND(Lang, Node),
- [#xmlel{name = <<"identity">>,
- attrs = [{<<"category">>, <<"automation">>},
- {<<"type">>, <<"command-node">>},
- {<<"name">>, get_title(Lang, Node)}]}]).
+ [#identity{category = <<"automation">>,
+ type = <<"command-node">>,
+ name = get_title(Lang, Node)}]).
disco_identity(Acc, _From, _To, Node, Lang) ->
LNode = tokenize(Node),
@@ -210,7 +203,7 @@ disco_identity(Acc, _From, _To, Node, Lang) ->
-define(INFO_RESULT(Allow, Feats, Lang),
case Allow of
deny ->
- {error, ?ERRT_FORBIDDEN(Lang, <<"Denied by ACL">>)};
+ {error, xmpp:err_forbidden(<<"Denied by ACL">>, Lang)};
allow ->
{result, Feats}
end).
@@ -226,7 +219,7 @@ disco_features(Acc, From, #jid{lserver = LServer} = _To, <<"announce">>, Lang) -
acl:match_rule(global, Access2, From)} of
{deny, deny} ->
Txt = <<"Denied by ACL">>,
- {error, ?ERRT_FORBIDDEN(Lang, Txt)};
+ {error, xmpp:err_forbidden(Txt, Lang)};
_ ->
{result, []}
end
@@ -269,26 +262,19 @@ disco_features(Acc, From, #jid{lserver = LServer} = _To, Node, Lang) ->
%%-------------------------------------------------------------------------
-define(NODE_TO_ITEM(Lang, Server, Node),
-(
- #xmlel{
- name = <<"item">>,
- attrs = [
- {<<"jid">>, Server},
- {<<"node">>, Node},
- {<<"name">>, get_title(Lang, Node)}
- ]
- }
-)).
+ #disco_item{jid = jid:make(Server),
+ node = Node,
+ name = get_title(Lang, Node)}).
-define(ITEMS_RESULT(Allow, Items, Lang),
case Allow of
deny ->
- {error, ?ERRT_FORBIDDEN(Lang, <<"Denied by ACL">>)};
+ {error, xmpp:err_forbidden(<<"Denied by ACL">>, Lang)};
allow ->
{result, Items}
end).
-disco_items(Acc, From, #jid{lserver = LServer, server = Server} = _To, <<>>, Lang) ->
+disco_items(Acc, From, #jid{lserver = LServer, server = Server} = _To, <<"">>, Lang) ->
case gen_mod:is_loaded(LServer, mod_adhoc) of
false ->
Acc;
@@ -353,7 +339,10 @@ disco_items(Acc, From, #jid{lserver = LServer} = _To, Node, Lang) ->
end.
%%-------------------------------------------------------------------------
-
+-spec announce_items(empty | {error, stanza_error()} | {result, [disco_item()]},
+ jid(), jid(), binary()) -> {error, stanza_error()} |
+ {result, [disco_item()]} |
+ empty.
announce_items(Acc, From, #jid{lserver = LServer, server = Server} = _To, Lang) ->
Access1 = get_access(LServer),
Nodes1 = case acl:match_rule(LServer, Access1, From) of
@@ -393,15 +382,16 @@ announce_items(Acc, From, #jid{lserver = LServer, server = Server} = _To, Lang)
commands_result(Allow, From, To, Request) ->
case Allow of
deny ->
- Lang = Request#adhoc_request.lang,
- {error, ?ERRT_FORBIDDEN(Lang, <<"Denied by ACL">>)};
+ Lang = Request#adhoc_command.lang,
+ {error, xmpp:err_forbidden(<<"Denied by ACL">>, Lang)};
allow ->
announce_commands(From, To, Request)
end.
-
+-spec announce_commands(adhoc_command(), jid(), jid(), adhoc_command()) ->
+ adhoc_command() | {error, stanza_error()}.
announce_commands(Acc, From, #jid{lserver = LServer} = To,
- #adhoc_request{ node = Node} = Request) ->
+ #adhoc_command{node = Node} = Request) ->
LNode = tokenize(Node),
F = fun() ->
Access = get_access(global),
@@ -440,59 +430,35 @@ announce_commands(Acc, From, #jid{lserver = LServer} = To,
%%-------------------------------------------------------------------------
announce_commands(From, To,
- #adhoc_request{lang = Lang,
+ #adhoc_command{lang = Lang,
node = Node,
- action = Action,
- xdata = XData} = Request) ->
- %% If the "action" attribute is not present, it is
- %% understood as "execute". If there was no <actions/>
- %% element in the first response (which there isn't in our
- %% case), "execute" and "complete" are equivalent.
- ActionIsExecute = lists:member(Action, [<<>>, <<"execute">>, <<"complete">>]),
- if Action == <<"cancel">> ->
+ sid = SID,
+ xdata = XData,
+ action = Action} = Request) ->
+ ActionIsExecute = Action == execute orelse Action == complete,
+ if Action == cancel ->
%% User cancels request
- adhoc:produce_response(Request, #adhoc_response{status = canceled});
- XData == false, ActionIsExecute ->
+ #adhoc_command{status = canceled, lang = Lang, node = Node,
+ sid = SID};
+ XData == undefined, ActionIsExecute ->
%% User requests form
- Elements = generate_adhoc_form(Lang, Node, To#jid.lserver),
- adhoc:produce_response(Request,
- #adhoc_response{status = executing,elements = [Elements]});
- XData /= false, ActionIsExecute ->
- %% User returns form.
- case jlib:parse_xdata_submit(XData) of
- invalid ->
- {error, ?ERRT_BAD_REQUEST(Lang, <<"Incorrect data form">>)};
- Fields ->
- handle_adhoc_form(From, To, Request, Fields)
- end;
+ Form = generate_adhoc_form(Lang, Node, To#jid.lserver),
+ #adhoc_command{status = executing, lang = Lang, node = Node,
+ sid = SID, xdata = Form};
+ XData /= undefined, ActionIsExecute ->
+ handle_adhoc_form(From, To, Request);
true ->
- Txt = <<"Incorrect action or data form">>,
- {error, ?ERRT_BAD_REQUEST(Lang, Txt)}
+ Txt = <<"Unexpected action">>,
+ {error, xmpp:err_bad_request(Txt, Lang)}
end.
--define(VVALUE(Val),
-(
- #xmlel{
- name = <<"value">>,
- children = [{xmlcdata, Val}]
- }
-)).
-
-define(TVFIELD(Type, Var, Val),
-(
- #xmlel{
- name = <<"field">>,
- attrs = [{<<"type">>, Type}, {<<"var">>, Var}],
- children = vvaluel(Val)
- }
-)).
-
--define(HFIELD(), ?TVFIELD(<<"hidden">>, <<"FORM_TYPE">>, ?NS_ADMIN)).
+ #xdata_field{type = Type, var = Var, values = vvaluel(Val)}).
vvaluel(Val) ->
case Val of
<<>> -> [];
- _ -> [?VVALUE(Val)]
+ _ -> [Val]
end.
generate_adhoc_form(Lang, Node, ServerHost) ->
@@ -503,49 +469,27 @@ generate_adhoc_form(Lang, Node, ServerHost) ->
true ->
{<<>>, <<>>}
end,
- #xmlel{
- name = <<"x">>,
- attrs = [{<<"xmlns">>, ?NS_XDATA}, {<<"type">>, <<"form">>}],
- children = [
- ?HFIELD(),
- #xmlel{name = <<"title">>, children = [{xmlcdata, get_title(Lang, Node)}]}
- ]
- ++
- if (LNode == ?NS_ADMINL("delete-motd"))
- or (LNode == ?NS_ADMINL("delete-motd-allhosts")) ->
- [#xmlel{
- name = <<"field">>,
- attrs = [
- {<<"var">>, <<"confirm">>},
- {<<"type">>, <<"boolean">>},
- {<<"label">>,
- translate:translate(Lang, <<"Really delete message of the day?">>)}
- ],
- children = [
- #xmlel{name = <<"value">>, children = [{xmlcdata, <<"true">>}]}
- ]
- }
- ];
- true ->
- [#xmlel{
- name = <<"field">>,
- attrs = [
- {<<"var">>, <<"subject">>},
- {<<"type">>, <<"text-single">>},
- {<<"label">>, translate:translate(Lang, <<"Subject">>)}],
- children = vvaluel(OldSubject)
- },
- #xmlel{
- name = <<"field">>,
- attrs = [
- {<<"var">>, <<"body">>},
- {<<"type">>, <<"text-multi">>},
- {<<"label">>, translate:translate(Lang, <<"Message body">>)}],
- children = vvaluel(OldBody)
- }
- ]
-
- end}.
+ Fs = if (LNode == ?NS_ADMINL("delete-motd"))
+ or (LNode == ?NS_ADMINL("delete-motd-allhosts")) ->
+ [#xdata_field{type = boolean,
+ var = <<"confirm">>,
+ label = translate:translate(
+ Lang, <<"Really delete message of the day?">>),
+ values = [<<"true">>]}];
+ true ->
+ [#xdata_field{type = 'text-single',
+ var = <<"subject">>,
+ label = translate:translate(Lang, <<"Subject">>),
+ values = vvaluel(OldSubject)},
+ #xdata_field{type = 'text-multi',
+ var = <<"body">>,
+ label = translate:translate(Lang, <<"Message body">>),
+ values = vvaluel(OldBody)}]
+ end,
+ #xdata{type = form,
+ title = get_title(Lang, Node),
+ fields = [#xdata_field{type = hidden, var = <<"FORM_TYPE">>,
+ values = [?NS_ADMIN]}|Fs]}.
join_lines([]) ->
<<>>;
@@ -558,103 +502,73 @@ join_lines([], Acc) ->
iolist_to_binary(lists:reverse(tl(Acc))).
handle_adhoc_form(From, #jid{lserver = LServer} = To,
- #adhoc_request{lang = Lang,
- node = Node,
- sessionid = SessionID},
- Fields) ->
- Confirm = case lists:keysearch(<<"confirm">>, 1, Fields) of
- {value, {<<"confirm">>, [<<"true">>]}} ->
- true;
- {value, {<<"confirm">>, [<<"1">>]}} ->
- true;
- _ ->
- false
+ #adhoc_command{lang = Lang, node = Node,
+ sid = SessionID, xdata = XData}) ->
+ Confirm = case xmpp_util:get_xdata_values(<<"confirm">>, XData) of
+ [<<"true">>] -> true;
+ [<<"1">>] -> true;
+ _ -> false
end,
- Subject = case lists:keysearch(<<"subject">>, 1, Fields) of
- {value, {<<"subject">>, SubjectLines}} ->
- %% There really shouldn't be more than one
- %% subject line, but can we stop them?
- join_lines(SubjectLines);
- _ ->
- <<>>
- end,
- Body = case lists:keysearch(<<"body">>, 1, Fields) of
- {value, {<<"body">>, BodyLines}} ->
- join_lines(BodyLines);
- _ ->
- <<>>
- end,
- Response = #adhoc_response{lang = Lang,
- node = Node,
- sessionid = SessionID,
- status = completed},
- Packet = #xmlel{
- name = <<"message">>,
- attrs = [{<<"type">>, <<"headline">>}],
- children = if Subject /= <<>> ->
- [#xmlel{name = <<"subject">>, children = [{xmlcdata, Subject}]}];
- true ->
- []
- end
- ++
- if Body /= <<>> ->
- [#xmlel{name = <<"body">>, children = [{xmlcdata, Body}]}];
- true ->
- []
- end
- },
+ Subject = join_lines(xmpp_util:get_xdata_values(<<"subject">>, XData)),
+ Body = join_lines(xmpp_util:get_xdata_values(<<"body">>, XData)),
+ Response = #adhoc_command{lang = Lang, node = Node, sid = SessionID,
+ status = completed},
+ Packet = #message{type = headline,
+ body = xmpp:mk_text(Body),
+ subject = xmpp:mk_text(Subject)},
Proc = gen_mod:get_module_proc(LServer, ?PROCNAME),
case {Node, Body} of
{?NS_ADMIN_DELETE_MOTD, _} ->
if Confirm ->
Proc ! {announce_motd_delete, From, To, Packet},
- adhoc:produce_response(Response);
+ Response;
true ->
- adhoc:produce_response(Response)
+ Response
end;
{?NS_ADMIN_DELETE_MOTD_ALLHOSTS, _} ->
if Confirm ->
Proc ! {announce_all_hosts_motd_delete, From, To, Packet},
- adhoc:produce_response(Response);
+ Response;
true ->
- adhoc:produce_response(Response)
+ Response
end;
{_, <<>>} ->
%% An announce message with no body is definitely an operator error.
%% Throw an error and give him/her a chance to send message again.
- {error, ?ERRT_NOT_ACCEPTABLE(Lang,
- <<"No body provided for announce message">>)};
+ {error, xmpp:err_not_acceptable(
+ <<"No body provided for announce message">>, Lang)};
%% Now send the packet to ?PROCNAME.
%% We don't use direct announce_* functions because it
%% leads to large delay in response and <iq/> queries processing
{?NS_ADMIN_ANNOUNCE, _} ->
Proc ! {announce_online, From, To, Packet},
- adhoc:produce_response(Response);
+ Response;
{?NS_ADMIN_ANNOUNCE_ALLHOSTS, _} ->
Proc ! {announce_all_hosts_online, From, To, Packet},
- adhoc:produce_response(Response);
+ Response;
{?NS_ADMIN_ANNOUNCE_ALL, _} ->
Proc ! {announce_all, From, To, Packet},
- adhoc:produce_response(Response);
+ Response;
{?NS_ADMIN_ANNOUNCE_ALL_ALLHOSTS, _} ->
Proc ! {announce_all_hosts_all, From, To, Packet},
- adhoc:produce_response(Response);
+ Response;
{?NS_ADMIN_SET_MOTD, _} ->
Proc ! {announce_motd, From, To, Packet},
- adhoc:produce_response(Response);
+ Response;
{?NS_ADMIN_SET_MOTD_ALLHOSTS, _} ->
Proc ! {announce_all_hosts_motd, From, To, Packet},
- adhoc:produce_response(Response);
+ Response;
{?NS_ADMIN_EDIT_MOTD, _} ->
Proc ! {announce_motd_update, From, To, Packet},
- adhoc:produce_response(Response);
+ Response;
{?NS_ADMIN_EDIT_MOTD_ALLHOSTS, _} ->
Proc ! {announce_all_hosts_motd_update, From, To, Packet},
- adhoc:produce_response(Response);
- _ ->
+ Response;
+ Junk ->
%% This can't happen, as we haven't registered any other
%% command nodes.
- {error, ?ERR_INTERNAL_SERVER_ERROR}
+ ?ERROR_MSG("got unexpected node/body = ~p", [Junk]),
+ {error, xmpp:err_internal_server_error()}
end.
get_title(Lang, <<"announce">>) ->
@@ -687,12 +601,12 @@ announce_all(From, To, Packet) ->
Access = get_access(Host),
case acl:match_rule(Host, Access, From) of
deny ->
- Lang = fxml:get_tag_attr_s(<<"xml:lang">>, Packet),
+ Lang = xmpp:get_lang(Packet),
Txt = <<"Denied by ACL">>,
- Err = jlib:make_error_reply(Packet, ?ERRT_FORBIDDEN(Lang, Txt)),
+ Err = xmpp:make_error(Packet, xmpp:err_forbidden(Txt, Lang)),
ejabberd_router:route(To, From, Err);
allow ->
- Local = jid:make(<<>>, To#jid.server, <<>>),
+ Local = jid:make(To#jid.server),
lists:foreach(
fun({User, Server}) ->
Dest = jid:make(User, Server, <<>>),
@@ -704,12 +618,12 @@ announce_all_hosts_all(From, To, Packet) ->
Access = get_access(global),
case acl:match_rule(global, Access, From) of
deny ->
- Lang = fxml:get_tag_attr_s(<<"xml:lang">>, Packet),
+ Lang = xmpp:get_lang(Packet),
Txt = <<"Denied by ACL">>,
- Err = jlib:make_error_reply(Packet, ?ERRT_FORBIDDEN(Lang, Txt)),
+ Err = xmpp:make_error(Packet, xmpp:err_forbidden(Txt, Lang)),
ejabberd_router:route(To, From, Err);
allow ->
- Local = jid:make(<<>>, To#jid.server, <<>>),
+ Local = jid:make(To#jid.server),
lists:foreach(
fun({User, Server}) ->
Dest = jid:make(User, Server, <<>>),
@@ -722,9 +636,9 @@ announce_online(From, To, Packet) ->
Access = get_access(Host),
case acl:match_rule(Host, Access, From) of
deny ->
- Lang = fxml:get_tag_attr_s(<<"xml:lang">>, Packet),
+ Lang = xmpp:get_lang(Packet),
Txt = <<"Denied by ACL">>,
- Err = jlib:make_error_reply(Packet, ?ERRT_FORBIDDEN(Lang, Txt)),
+ Err = xmpp:make_error(Packet, xmpp:err_forbidden(Txt, Lang)),
ejabberd_router:route(To, From, Err);
allow ->
announce_online1(ejabberd_sm:get_vh_session_list(Host),
@@ -736,9 +650,9 @@ announce_all_hosts_online(From, To, Packet) ->
Access = get_access(global),
case acl:match_rule(global, Access, From) of
deny ->
- Lang = fxml:get_tag_attr_s(<<"xml:lang">>, Packet),
+ Lang = xmpp:get_lang(Packet),
Txt = <<"Denied by ACL">>,
- Err = jlib:make_error_reply(Packet, ?ERRT_FORBIDDEN(Lang, Txt)),
+ Err = xmpp:make_error(Packet, xmpp:err_forbidden(Txt, Lang)),
ejabberd_router:route(To, From, Err);
allow ->
announce_online1(ejabberd_sm:dirty_get_sessions_list(),
@@ -747,7 +661,7 @@ announce_all_hosts_online(From, To, Packet) ->
end.
announce_online1(Sessions, Server, Packet) ->
- Local = jid:make(<<>>, Server, <<>>),
+ Local = jid:make(Server),
lists:foreach(
fun({U, S, R}) ->
Dest = jid:make(U, S, R),
@@ -759,9 +673,9 @@ announce_motd(From, To, Packet) ->
Access = get_access(Host),
case acl:match_rule(Host, Access, From) of
deny ->
- Lang = fxml:get_tag_attr_s(<<"xml:lang">>, Packet),
+ Lang = xmpp:get_lang(Packet),
Txt = <<"Denied by ACL">>,
- Err = jlib:make_error_reply(Packet, ?ERRT_FORBIDDEN(Lang, Txt)),
+ Err = xmpp:make_error(Packet, xmpp:err_forbidden(Txt, Lang)),
ejabberd_router:route(To, From, Err);
allow ->
announce_motd(Host, Packet)
@@ -771,9 +685,9 @@ announce_all_hosts_motd(From, To, Packet) ->
Access = get_access(global),
case acl:match_rule(global, Access, From) of
deny ->
- Lang = fxml:get_tag_attr_s(<<"xml:lang">>, Packet),
+ Lang = xmpp:get_lang(Packet),
Txt = <<"Denied by ACL">>,
- Err = jlib:make_error_reply(Packet, ?ERRT_FORBIDDEN(Lang, Txt)),
+ Err = xmpp:make_error(Packet, xmpp:err_forbidden(Txt, Lang)),
ejabberd_router:route(To, From, Err);
allow ->
Hosts = ?MYHOSTS,
@@ -793,9 +707,9 @@ announce_motd_update(From, To, Packet) ->
Access = get_access(Host),
case acl:match_rule(Host, Access, From) of
deny ->
- Lang = fxml:get_tag_attr_s(<<"xml:lang">>, Packet),
+ Lang = xmpp:get_lang(Packet),
Txt = <<"Denied by ACL">>,
- Err = jlib:make_error_reply(Packet, ?ERRT_FORBIDDEN(Lang, Txt)),
+ Err = xmpp:make_error(Packet, xmpp:err_forbidden(Txt, Lang)),
ejabberd_router:route(To, From, Err);
allow ->
announce_motd_update(Host, Packet)
@@ -805,9 +719,9 @@ announce_all_hosts_motd_update(From, To, Packet) ->
Access = get_access(global),
case acl:match_rule(global, Access, From) of
deny ->
- Lang = fxml:get_tag_attr_s(<<"xml:lang">>, Packet),
+ Lang = xmpp:get_lang(Packet),
Txt = <<"Denied by ACL">>,
- Err = jlib:make_error_reply(Packet, ?ERRT_FORBIDDEN(Lang, Txt)),
+ Err = xmpp:make_error(Packet, xmpp:err_forbidden(Txt, Lang)),
ejabberd_router:route(To, From, Err);
allow ->
Hosts = ?MYHOSTS,
@@ -817,16 +731,16 @@ announce_all_hosts_motd_update(From, To, Packet) ->
announce_motd_update(LServer, Packet) ->
announce_motd_delete(LServer),
Mod = gen_mod:db_mod(LServer, ?MODULE),
- Mod:set_motd(LServer, Packet).
+ Mod:set_motd(LServer, xmpp:encode(Packet)).
announce_motd_delete(From, To, Packet) ->
Host = To#jid.lserver,
Access = get_access(Host),
case acl:match_rule(Host, Access, From) of
deny ->
- Lang = fxml:get_tag_attr_s(<<"xml:lang">>, Packet),
+ Lang = xmpp:get_lang(Packet),
Txt = <<"Denied by ACL">>,
- Err = jlib:make_error_reply(Packet, ?ERRT_FORBIDDEN(Lang, Txt)),
+ Err = xmpp:make_error(Packet, xmpp:err_forbidden(Txt, Lang)),
ejabberd_router:route(To, From, Err);
allow ->
announce_motd_delete(Host)
@@ -836,9 +750,9 @@ announce_all_hosts_motd_delete(From, To, Packet) ->
Access = get_access(global),
case acl:match_rule(global, Access, From) of
deny ->
- Lang = fxml:get_tag_attr_s(<<"xml:lang">>, Packet),
+ Lang = xmpp:get_lang(Packet),
Txt = <<"Denied by ACL">>,
- Err = jlib:make_error_reply(Packet, ?ERRT_FORBIDDEN(Lang, Txt)),
+ Err = xmpp:make_error(Packet, xmpp:err_forbidden(Txt, Lang)),
ejabberd_router:route(To, From, Err);
allow ->
Hosts = ?MYHOSTS,
@@ -849,17 +763,24 @@ announce_motd_delete(LServer) ->
Mod = gen_mod:db_mod(LServer, ?MODULE),
Mod:delete_motd(LServer).
+-spec send_motd(jid()) -> ok | {atomic, any()}.
send_motd(#jid{luser = LUser, lserver = LServer} = JID) when LUser /= <<>> ->
Mod = gen_mod:db_mod(LServer, ?MODULE),
case Mod:get_motd(LServer) of
{ok, Packet} ->
- case Mod:is_motd_user(LUser, LServer) of
- false ->
- Local = jid:make(<<>>, LServer, <<>>),
- ejabberd_router:route(Local, JID, Packet),
- Mod:set_motd_user(LUser, LServer);
- true ->
- ok
+ try xmpp:decode(Packet, ?NS_CLIENT, [ignore_els]) of
+ Msg ->
+ case Mod:is_motd_user(LUser, LServer) of
+ false ->
+ Local = jid:make(LServer),
+ ejabberd_router:route(Local, JID, Msg),
+ Mod:set_motd_user(LUser, LServer);
+ true ->
+ ok
+ end
+ catch _:{xmpp_codec, Why} ->
+ ?ERROR_MSG("failed to decode motd packet ~p: ~s",
+ [Packet, xmpp:format_error(Why)])
end;
error ->
ok
@@ -871,31 +792,24 @@ get_stored_motd(LServer) ->
Mod = gen_mod:db_mod(LServer, ?MODULE),
case Mod:get_motd(LServer) of
{ok, Packet} ->
- {fxml:get_subtag_cdata(Packet, <<"subject">>),
- fxml:get_subtag_cdata(Packet, <<"body">>)};
+ try xmpp:decode(Packet, ?NS_CLIENT, [ignore_els]) of
+ #message{body = Body, subject = Subject} ->
+ {xmpp:get_text(Subject), xmpp:get_text(Body)}
+ catch _:{xmpp_codec, Why} ->
+ ?ERROR_MSG("failed to decode motd packet ~p: ~s",
+ [Packet, xmpp:format_error(Why)])
+ end;
error ->
{<<>>, <<>>}
end.
%% This function is similar to others, but doesn't perform any ACL verification
send_announcement_to_all(Host, SubjectS, BodyS) ->
- SubjectEls = if SubjectS /= <<>> ->
- [#xmlel{name = <<"subject">>, children = [{xmlcdata, SubjectS}]}];
- true ->
- []
- end,
- BodyEls = if BodyS /= <<>> ->
- [#xmlel{name = <<"body">>, children = [{xmlcdata, BodyS}]}];
- true ->
- []
- end,
- Packet = #xmlel{
- name = <<"message">>,
- attrs = [{<<"type">>, <<"headline">>}],
- children = SubjectEls ++ BodyEls
- },
+ Packet = #message{type = headline,
+ body = xmpp:mk_text(BodyS),
+ subject = xmpp:mk_text(SubjectS)},
Sessions = ejabberd_sm:dirty_get_sessions_list(),
- Local = jid:make(<<>>, Host, <<>>),
+ Local = jid:make(Host),
lists:foreach(
fun({U, S, R}) ->
Dest = jid:make(U, S, R),
@@ -909,11 +823,9 @@ get_access(Host) ->
fun(A) -> A end,
none).
--spec add_store_hint(xmlel()) -> xmlel().
-
+-spec add_store_hint(stanza()) -> stanza().
add_store_hint(El) ->
- Hint = #xmlel{name = <<"store">>, attrs = [{<<"xmlns">>, ?NS_HINTS}]},
- fxml:append_subtags(El, [Hint]).
+ xmpp:set_subtag(El, #hint{type = store}).
%%-------------------------------------------------------------------------
export(LServer) ->
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-02 16:50:36 +0000