mirror of
https://github.com/processone/ejabberd.git
synced 2024-12-22 17:28:25 +01:00
Check privacy of incoming IQ stanzas (EJAB-1320)
This commit is contained in:
parent
16fae4d117
commit
84d4a1619b
@ -1254,7 +1254,7 @@ handle_info({route, From, To, Packet}, StateName, StateData) ->
|
||||
ejabberd_router:route(To, From, Err)
|
||||
end,
|
||||
{false, Attrs, StateData};
|
||||
#iq{} ->
|
||||
IQ when (is_record(IQ, iq)) or (IQ == reply) ->
|
||||
case ejabberd_hooks:run_fold(
|
||||
privacy_check_packet, StateData#state.server,
|
||||
allow,
|
||||
@ -1265,14 +1265,16 @@ handle_info({route, From, To, Packet}, StateName, StateData) ->
|
||||
in]) of
|
||||
allow ->
|
||||
{true, Attrs, StateData};
|
||||
deny ->
|
||||
deny when is_record(IQ, iq) ->
|
||||
Err = jlib:make_error_reply(
|
||||
Packet, ?ERR_FEATURE_NOT_IMPLEMENTED),
|
||||
Packet, ?ERR_SERVICE_UNAVAILABLE),
|
||||
ejabberd_router:route(To, From, Err),
|
||||
{false, Attrs, StateData};
|
||||
deny when IQ == reply ->
|
||||
{false, Attrs, StateData}
|
||||
end;
|
||||
_ ->
|
||||
{true, Attrs, StateData}
|
||||
IQ when (IQ == invalid) or (IQ == not_iq) ->
|
||||
{false, Attrs, StateData}
|
||||
end;
|
||||
"message" ->
|
||||
case ejabberd_hooks:run_fold(
|
||||
|
@ -364,6 +364,8 @@ get_iq_namespace({xmlelement, Name, _Attrs, Els}) when Name == "iq" ->
|
||||
get_iq_namespace(_) ->
|
||||
"".
|
||||
|
||||
%% @spec (xmlelement()) -> iq() | reply | invalid | not_iq
|
||||
|
||||
iq_query_info(El) ->
|
||||
iq_info_internal(El, request).
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user