diff options
| -rw-r--r-- | src/ejabberd_auth.erl | 31 | ||||
| -rw-r--r-- | src/ejabberd_auth_external.erl | 42 | ||||
| -rw-r--r-- | src/ejabberd_auth_mnesia.erl (renamed from src/ejabberd_auth_internal.erl) | 4 | ||||
| -rw-r--r-- | src/ejabberd_config.erl | 32 | ||||
| -rw-r--r-- | src/ejd2sql.erl | 2 |
5 files changed, 64 insertions, 47 deletions
diff --git a/src/ejabberd_auth.erl b/src/ejabberd_auth.erl index 0267a219..927abdac 100644 --- a/src/ejabberd_auth.erl +++ b/src/ejabberd_auth.erl @@ -136,7 +136,7 @@ check_password(User, AuthzId, Server, Password, Digest, %% {true, AuthModule} | false %% where %% AuthModule = ejabberd_auth_anonymous | ejabberd_auth_external -%% | ejabberd_auth_internal | ejabberd_auth_ldap +%% | ejabberd_auth_mnesia | ejabberd_auth_ldap %% | ejabberd_auth_sql | ejabberd_auth_pam | ejabberd_auth_riak -spec check_password_with_authmodule(binary(), binary(), binary(), binary()) -> false | {true, atom()}. @@ -428,38 +428,35 @@ auth_modules() -> %% Return the list of authenticated modules for a given host auth_modules(Server) -> LServer = jid:nameprep(Server), - Default = case gen_mod:default_db(LServer) of - mnesia -> internal; - DBType -> DBType - end, + Default = gen_mod:default_db(LServer), Methods = ejabberd_config:get_option( - {auth_method, LServer}, - fun(V) when is_list(V) -> - true = lists:all(fun is_atom/1, V), - V; - (V) when is_atom(V) -> - [V] - end, [Default]), + {auth_method, LServer}, opt_type(auth_method), [Default]), [jlib:binary_to_atom(<<"ejabberd_auth_", (jlib:atom_to_binary(M))/binary>>) || M <- Methods]. export(Server) -> - ejabberd_auth_internal:export(Server). + ejabberd_auth_mnesia:export(Server). import(Server) -> - ejabberd_auth_internal:import(Server). + ejabberd_auth_mnesia:import(Server). import(Server, mnesia, Passwd) -> - ejabberd_auth_internal:import(Server, mnesia, Passwd); + ejabberd_auth_mnesia:import(Server, mnesia, Passwd); import(Server, riak, Passwd) -> ejabberd_auth_riak:import(Server, riak, Passwd); import(_, _, _) -> pass. +-spec v_auth_method(atom()) -> atom(). + +v_auth_method(odbc) -> sql; +v_auth_method(internal) -> mnesia; +v_auth_method(A) when is_atom(A) -> A. + opt_type(auth_method) -> fun (V) when is_list(V) -> - true = lists:all(fun is_atom/1, V), V; - (V) when is_atom(V) -> [V] + lists:map(fun v_auth_method/1, V); + (V) -> [v_auth_method(V)] end; opt_type(_) -> [auth_method]. diff --git a/src/ejabberd_auth_external.erl b/src/ejabberd_auth_external.erl index 5897fba5..ef7c9755 100644 --- a/src/ejabberd_auth_external.erl +++ b/src/ejabberd_auth_external.erl @@ -56,7 +56,7 @@ start(Host) -> "extauth"), extauth:start(Host, Cmd), check_cache_last_options(Host), - ejabberd_auth_internal:start(Host). + ejabberd_auth_mnesia:start(Host). check_cache_last_options(Server) -> case get_cache_option(Server) of @@ -94,7 +94,7 @@ check_password(User, AuthzId, Server, Password, _Digest, set_password(User, Server, Password) -> case extauth:set_password(User, Server, Password) of true -> - set_password_internal(User, Server, Password), ok; + set_password_mnesia(User, Server, Password), ok; _ -> {error, unknown_problem} end. @@ -106,20 +106,20 @@ try_register(User, Server, Password) -> end. dirty_get_registered_users() -> - ejabberd_auth_internal:dirty_get_registered_users(). + ejabberd_auth_mnesia:dirty_get_registered_users(). get_vh_registered_users(Server) -> - ejabberd_auth_internal:get_vh_registered_users(Server). + ejabberd_auth_mnesia:get_vh_registered_users(Server). get_vh_registered_users(Server, Data) -> - ejabberd_auth_internal:get_vh_registered_users(Server, + ejabberd_auth_mnesia:get_vh_registered_users(Server, Data). get_vh_registered_users_number(Server) -> - ejabberd_auth_internal:get_vh_registered_users_number(Server). + ejabberd_auth_mnesia:get_vh_registered_users_number(Server). get_vh_registered_users_number(Server, Data) -> - ejabberd_auth_internal:get_vh_registered_users_number(Server, + ejabberd_auth_mnesia:get_vh_registered_users_number(Server, Data). %% The password can only be returned if cache is enabled, cached info exists and is fresh enough. @@ -151,7 +151,7 @@ remove_user(User, Server) -> case get_cache_option(Server) of false -> false; {true, _CacheTime} -> - ejabberd_auth_internal:remove_user(User, Server) + ejabberd_auth_mnesia:remove_user(User, Server) end end. @@ -162,7 +162,7 @@ remove_user(User, Server, Password) -> case get_cache_option(Server) of false -> false; {true, _CacheTime} -> - ejabberd_auth_internal:remove_user(User, Server, + ejabberd_auth_mnesia:remove_user(User, Server, Password) end end. @@ -197,7 +197,7 @@ check_password_cache(User, AuthzId, Server, Password, CacheTime) -> case get_last_access(User, Server) of online -> - check_password_internal(User, AuthzId, Server, Password); + check_password_mnesia(User, AuthzId, Server, Password); never -> check_password_external_cache(User, AuthzId, Server, Password); mod_last_required -> @@ -210,7 +210,7 @@ check_password_cache(User, AuthzId, Server, Password, case is_fresh_enough(TimeStamp, CacheTime) of %% If no need to refresh, check password against Mnesia true -> - case check_password_internal(User, AuthzId, Server, Password) of + case check_password_mnesia(User, AuthzId, Server, Password) of %% If password valid in Mnesia, accept it true -> true; %% Else (password nonvalid in Mnesia), check in extauth and cache result @@ -223,13 +223,13 @@ check_password_cache(User, AuthzId, Server, Password, end end. -get_password_internal(User, Server) -> - ejabberd_auth_internal:get_password(User, Server). +get_password_mnesia(User, Server) -> + ejabberd_auth_mnesia:get_password(User, Server). -spec get_password_cache(User::binary(), Server::binary(), CacheTime::integer()) -> Password::string() | false. get_password_cache(User, Server, CacheTime) -> case get_last_access(User, Server) of - online -> get_password_internal(User, Server); + online -> get_password_mnesia(User, Server); never -> false; mod_last_required -> ?ERROR_MSG("extauth is used, extauth_cache is enabled " @@ -239,7 +239,7 @@ get_password_cache(User, Server, CacheTime) -> false; TimeStamp -> case is_fresh_enough(TimeStamp, CacheTime) of - true -> get_password_internal(User, Server); + true -> get_password_mnesia(User, Server); false -> false end end. @@ -248,7 +248,7 @@ get_password_cache(User, Server, CacheTime) -> check_password_external_cache(User, AuthzId, Server, Password) -> case check_password_extauth(User, AuthzId, Server, Password) of true -> - set_password_internal(User, Server, Password), true; + set_password_mnesia(User, Server, Password), true; false -> false end. @@ -256,21 +256,21 @@ check_password_external_cache(User, AuthzId, Server, Password) -> try_register_external_cache(User, Server, Password) -> case try_register_extauth(User, Server, Password) of {atomic, ok} = R -> - set_password_internal(User, Server, Password), R; + set_password_mnesia(User, Server, Password), R; _ -> {error, not_allowed} end. %% @spec (User, AuthzId, Server, Password) -> true | false -check_password_internal(User, AuthzId, Server, Password) -> - ejabberd_auth_internal:check_password(User, AuthzId, Server, +check_password_mnesia(User, AuthzId, Server, Password) -> + ejabberd_auth_mnesia:check_password(User, AuthzId, Server, Password). %% @spec (User, Server, Password) -> ok | {error, invalid_jid} -set_password_internal(User, Server, Password) -> +set_password_mnesia(User, Server, Password) -> %% @spec (TimeLast, CacheTime) -> true | false %% TimeLast = online | never | integer() %% CacheTime = integer() | false - ejabberd_auth_internal:set_password(User, Server, + ejabberd_auth_mnesia:set_password(User, Server, Password). is_fresh_enough(TimeStampLast, CacheTime) -> diff --git a/src/ejabberd_auth_internal.erl b/src/ejabberd_auth_mnesia.erl index acbbfe50..9029404d 100644 --- a/src/ejabberd_auth_internal.erl +++ b/src/ejabberd_auth_mnesia.erl @@ -1,5 +1,5 @@ %%%---------------------------------------------------------------------- -%%% File : ejabberd_auth_internal.erl +%%% File : ejabberd_auth_mnesia.erl %%% Author : Alexey Shchepin <alexey@process-one.net> %%% Purpose : Authentification via mnesia %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net> @@ -23,7 +23,7 @@ %%% %%%---------------------------------------------------------------------- --module(ejabberd_auth_internal). +-module(ejabberd_auth_mnesia). -behaviour(ejabberd_config). diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl index f73474fe..7fccbc74 100644 --- a/src/ejabberd_config.erl +++ b/src/ejabberd_config.erl @@ -651,9 +651,9 @@ process_host_term(Term, Host, State, Action) -> {hosts, _} -> State; {Opt, Val} when Action == set -> - set_option({rename_option(Opt), Host}, Val, State); + set_option({rename_option(Opt), Host}, change_val(Opt, Val), State); {Opt, Val} when Action == append -> - append_option({rename_option(Opt), Host}, Val, State); + append_option({rename_option(Opt), Host}, change_val(Opt, Val), State); Opt -> ?WARNING_MSG("Ignore invalid (outdated?) option ~p", [Opt]), State @@ -672,6 +672,12 @@ rename_option(Option) when is_atom(Option) -> rename_option(Option) -> Option. +change_val(auth_method, Val) -> + prepare_opt_val(auth_method, Val, + ejabberd_auth:opt_type(auth_method), [mnesia]); +change_val(_Opt, Val) -> + Val. + set_option(Opt, Val, State) -> State#state{opts = [#local_config{key = Opt, value = Val} | State#state.opts]}. @@ -842,11 +848,25 @@ validate_opts(#state{opts = Opts} = State) -> -spec get_vh_by_auth_method(atom()) -> [binary()]. -%% Return the list of hosts handled by a given module +%% Return the list of hosts with a given auth method get_vh_by_auth_method(AuthMethod) -> - mnesia:dirty_select(local_config, - [{#local_config{key = {auth_method, '$1'}, - value=AuthMethod},[],['$1']}]). + Cfgs = mnesia:dirty_match_object(local_config, + #local_config{key = {auth_method, '_'}, + _ = '_'}), + lists:flatmap( + fun(#local_config{key = {auth_method, Host}, value = M}) -> + Methods = if not is_list(M) -> [M]; + true -> M + end, + case lists:member(AuthMethod, Methods) of + true when Host == global -> + get_myhosts(); + true -> + [Host]; + false -> + [] + end + end, Cfgs). %% @spec (Path::string()) -> true | false is_file_readable(Path) -> diff --git a/src/ejd2sql.erl b/src/ejd2sql.erl index aa74286e..0457f6be 100644 --- a/src/ejd2sql.erl +++ b/src/ejd2sql.erl @@ -104,7 +104,7 @@ import_file(Server, FileName) -> LServer = jid:nameprep(Server), Mods = [{Mod, gen_mod:db_type(LServer, Mod)} || Mod <- modules(), gen_mod:is_loaded(LServer, Mod)], - AuthMods = case lists:member(ejabberd_auth_internal, + AuthMods = case lists:member(ejabberd_auth_mnesia, ejabberd_auth:auth_modules(LServer)) of true -> [{ejabberd_auth, mnesia}]; |