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

Make mod_privilge properly handle roster iq

Browse Source
This commit is contained in:
Paweł Chmielowski 2024-11-05 16:55:47 +01:00
parent 4843cd432f
commit b50ea7ef1f
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/mod_privilege.erl
View File

@ -274,7 +274,7 @@ component_send_packet({#iq{from = From,
case {maps:find(Host, Permissions), get_iq_encapsulated_details(IQ)} of case {maps:find(Host, Permissions), get_iq_encapsulated_details(IQ)} of
{{ok, Access}, {ok, EncapType, EncapNs, EncapFrom, EncIq}} {{ok, Access}, {ok, EncapType, EncapNs, EncapFrom, EncIq}}
when (EncapType == Type) and ((EncapFrom == undefined) or (EncapFrom == To)) -> when (EncapType == Type) and ((EncapFrom == undefined) or (EncapFrom == To)) ->
NsPermissions = proplists:get_value(iq, Access, none), NsPermissions = proplists:get_value(iq, Access, []),
Permission = Permission =
case lists:keyfind(EncapNs, 2, NsPermissions) of case lists:keyfind(EncapNs, 2, NsPermissions) of
#privilege_namespace{type = AllowedType} -> #privilege_namespace{type = AllowedType} ->
@ -306,6 +306,16 @@ component_send_packet({#iq{from = From,
?INFO_MSG("IQ not forwarded: The FROM attribute in the encapsulated " ?INFO_MSG("IQ not forwarded: The FROM attribute in the encapsulated "
"IQ stanza and the TO in top-level IQ stanza do not match", "IQ stanza and the TO in top-level IQ stanza do not match",
[]), []),
drop;
{_, {error, no_privileged_iq, _Err}} ->
?INFO_MSG("IQ not forwarded: Component tried to send not wrapped IQ stanza.",
[]),
drop;
{_, {error, roster_query, _Err}} ->
IQ;
{_, {error, Type, _Err}} ->
?INFO_MSG("IQ not forwarded: Component tried to send not valid IQ stanza: ~p.",
[Type]),
drop drop
end, end,
{Result, State}; {Result, State};
@ -557,8 +567,8 @@ forward_message(#message{to = To} = Msg) ->
%% @format-begin %% @format-begin
-spec get_iq_encapsulated_details(iq()) -> -spec get_iq_encapsulated_details(iq()) ->
{ok, set | get, binary(), jid(), iq()} | {ok, iq_type(), binary(), jid(), iq()} |
{error, Why :: atom(), any(), iq()}. {error, Why :: atom(), stanza_error()}.
get_iq_encapsulated_details(#iq{sub_els = [IqSub]} = Msg) -> get_iq_encapsulated_details(#iq{sub_els = [IqSub]} = Msg) ->
Lang = xmpp:get_lang(Msg), Lang = xmpp:get_lang(Msg),
try xmpp:try_subtag(Msg, #privileged_iq{}) of try xmpp:try_subtag(Msg, #privileged_iq{}) of
@ -567,6 +577,10 @@ get_iq_encapsulated_details(#iq{sub_els = [IqSub]} = Msg) ->
[Element] = xmpp:get_els(IqSubSub), [Element] = xmpp:get_els(IqSubSub),
Ns = xmpp:get_ns(Element), Ns = xmpp:get_ns(Element),
{ok, EncapsulatedType, Ns, From, EncIq}; {ok, EncapsulatedType, Ns, From, EncIq};
_ ->
try xmpp:try_subtag(Msg, #roster_query{}) of
#roster_query{} ->
{error, roster_query, xmpp:err_bad_request()};
_ -> _ ->
Txt = ?T("No <privileged_iq/> element found"), Txt = ?T("No <privileged_iq/> element found"),
Err = xmpp:err_bad_request(Txt, Lang), Err = xmpp:err_bad_request(Txt, Lang),
@ -576,6 +590,12 @@ get_iq_encapsulated_details(#iq{sub_els = [IqSub]} = Msg) ->
Txt = xmpp:io_format_error(Why), Txt = xmpp:io_format_error(Why),
Err = xmpp:err_bad_request(Txt, Lang), Err = xmpp:err_bad_request(Txt, Lang),
{error, codec_error, Err} {error, codec_error, Err}
end
catch
_:{xmpp_codec, Why} ->
Txt = xmpp:io_format_error(Why),
Err = xmpp:err_bad_request(Txt, Lang),
{error, codec_error, Err}
end. end.
-spec forward_iq(binary(), jid(), binary(), iq()) -> iq(). -spec forward_iq(binary(), jid(), binary(), iq()) -> iq().