diff options
| -rw-r--r-- | src/ejabberd_c2s.erl | 2 | ||||
| -rw-r--r-- | src/ejabberd_ctl.erl | 62 | ||||
| -rw-r--r-- | src/mod_caps.erl | 14 |
3 files changed, 16 insertions, 62 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 9e0274cf8..36a6af195 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -386,7 +386,7 @@ sasl_mechanisms(Mechs, #{lserver := LServer} = State) -> (<<"DIGEST-MD5">>) -> Type == plain; (<<"SCRAM-SHA-1">>) -> Type /= external; (<<"PLAIN">>) -> true; - (<<"X-OAUTH2">>) -> true; + (<<"X-OAUTH2">>) -> [ejabberd_auth_anonymous] /= ejabberd_auth:auth_modules(LServer); (<<"EXTERNAL">>) -> maps:get(tls_verify, State, false); (_) -> false end, Mechs -- Mechs1). diff --git a/src/ejabberd_ctl.erl b/src/ejabberd_ctl.erl index 0a394b272..532c6eb7a 100644 --- a/src/ejabberd_ctl.erl +++ b/src/ejabberd_ctl.erl @@ -23,33 +23,14 @@ %%% %%%---------------------------------------------------------------------- -%%% @headerfile "ejabberd_ctl.hrl" - -%%% @doc Management of ejabberdctl commands and frontend to ejabberd commands. -%%% -%%% An ejabberdctl command is an abstract function identified by a -%%% name, with a defined number of calling arguments, that can be -%%% defined in any Erlang module and executed using ejabberdctl -%%% administration script. -%%% -%%% Note: strings cannot have blankspaces -%%% %%% Does not support commands that have arguments with ctypes: list, tuple -%%% -%%% TODO: Update the guide -%%% TODO: Mention this in the release notes -%%% Note: the commands with several words use now the underline: _ -%%% It is still possible to call the commands with dash: - -%%% but this is deprecated, and may be removed in a future version. - -module(ejabberd_ctl). -behaviour(gen_server). -author('alexey@process-one.net'). --export([start/0, start_link/0, process/1, process2/2, - register_commands/3, unregister_commands/3]). +-export([start/0, start_link/0, process/1, process2/2]). %% gen_server callbacks -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). @@ -111,8 +92,6 @@ start_link() -> gen_server:start_link({local, ?MODULE}, ?MODULE, [], []). init([]) -> - ets:new(ejabberd_ctl_cmds, [named_table, set, public]), - ets:new(ejabberd_ctl_host_cmds, [named_table, set, public]), {ok, #state{}}. handle_call(Request, From, State) -> @@ -134,29 +113,9 @@ code_change(_OldVsn, State, _Extra) -> {ok, State}. %%----------------------------- -%% ejabberdctl Command management -%%----------------------------- - -register_commands(CmdDescs, Module, Function) -> - ets:insert(ejabberd_ctl_cmds, CmdDescs), - ejabberd_hooks:add(ejabberd_ctl_process, - Module, Function, 50), - ok. - -unregister_commands(CmdDescs, Module, Function) -> - lists:foreach(fun(CmdDesc) -> - ets:delete_object(ejabberd_ctl_cmds, CmdDesc) - end, CmdDescs), - ejabberd_hooks:delete(ejabberd_ctl_process, - Module, Function, 50), - ok. - - -%%----------------------------- %% Process %%----------------------------- - -spec process([string()]) -> non_neg_integer(). process(Args) -> process(Args, ?DEFAULT_VERSION). @@ -509,13 +468,6 @@ is_supported_args(Args) -> end, Args). -get_list_ctls() -> - case catch ets:tab2list(ejabberd_ctl_cmds) of - {'EXIT', _} -> []; - Cs -> [{NameArgs, [], Desc} || {NameArgs, Desc} <- Cs] - end. - - %%----------------------------- %% Print help %%----------------------------- @@ -541,8 +493,7 @@ print_usage(HelpMode, MaxC, ShCode, Version) -> {"restart", [], "Restart ejabberd"}, {"help", ["[--tags [tag] | com?*]"], "Show help (try: ejabberdctl help help)"}, {"mnesia", ["[info]"], "show information of Mnesia system"}] ++ - get_list_commands(Version) ++ - get_list_ctls(), + get_list_commands(Version), print( ["Usage: ", ?B("ejabberdctl"), " [--no-timeout] [--node ", ?U("nodename"), "] [--version ", ?U("api_version"), "] ", @@ -874,12 +825,3 @@ disable_logging() -> disable_logging() -> logger:set_primary_config(level, none). -endif. - -%%----------------------------- -%% Command management -%%----------------------------- - -%%+++ -%% Struct(Integer res) create_account(Struct(String user, String server, String password)) -%%format_usage_xmlrpc(ArgsDef, ResultDef) -> -%% ["aaaa bbb ccc"]. diff --git a/src/mod_caps.erl b/src/mod_caps.erl index 5e8cc2eda..0b8f034cc 100644 --- a/src/mod_caps.erl +++ b/src/mod_caps.erl @@ -143,7 +143,19 @@ user_send_packet(Acc) -> -spec user_receive_packet({stanza(), ejabberd_c2s:state()}) -> {stanza(), ejabberd_c2s:state()}. user_receive_packet({#presence{from = From, type = available} = Pkt, #{lserver := LServer, jid := To} = State}) -> - IsRemote = not ejabberd_router:is_my_host(From#jid.lserver), + IsRemote = case From#jid.lresource of + % Don't store caps for presences sent by our muc rooms + <<>> -> + try ejabberd_router:host_of_route(From#jid.lserver) of + MaybeMuc -> + not lists:member(From#jid.lserver, + gen_mod:get_module_opt_hosts(MaybeMuc, mod_muc)) + catch error:{unregistered_route, _} -> + true + end; + _ -> + not ejabberd_router:is_my_host(From#jid.lserver) + end, if IsRemote -> case read_caps(Pkt) of nothing -> ok; |