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

Only verify if passwd table is SCRAMmed when starting module. Some format fixes.

Browse Source
This commit is contained in:
Badlop 2011-10-28 16:43:07 +02:00
parent 576dda5c87
commit 3cd9cd0e36
1 changed files with 29 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/ejabberd_auth_storage.erl
View File

@ -127,7 +127,6 @@ start(Host) ->
[{ram_copies, [node()]}, [{ram_copies, [node()]},
{attributes, record_info(fields, reg_users_counter)}]), {attributes, record_info(fields, reg_users_counter)}]),
update_reg_users_counter_table(Host), update_reg_users_counter_table(Host),
maybe_alert_password_scrammed_without_option(HostB),
ok. ok.
stop(_Host) -> stop(_Host) ->
@ -146,13 +145,13 @@ update_reg_users_counter_table(Server) ->
%% @spec () -> bool() %% @spec () -> bool()
plain_password_required() -> plain_password_required() ->
case is_scrammed(?MYNAME) of case is_option_scram(?MYNAME) of
false -> false; false -> false;
true -> true true -> true
end. end.
store_type() -> store_type() ->
case is_scrammed(?MYNAME) of case is_option_scram(?MYNAME) of
false -> plain; %% allows: PLAIN DIGEST-MD5 SCRAM false -> plain; %% allows: PLAIN DIGEST-MD5 SCRAM
true -> scram %% allows: PLAIN SCRAM true -> scram %% allows: PLAIN SCRAM
end. end.
@ -232,7 +231,7 @@ set_password(User, Server, Password) ->
US -> US ->
%% TODO: why is this a transaction? %% TODO: why is this a transaction?
F = fun() -> F = fun() ->
Passwd = case is_scrammed(LServer) and (Password /= "") of Passwd = case is_option_scram(LServer) and (Password /= "") of
true -> password_to_scram(Password, #passwd{user_host=US}); true -> password_to_scram(Password, #passwd{user_host=US});
false -> #passwd{user_host = US, password = Password} false -> #passwd{user_host = US, password = Password}
end, end,
@ -259,7 +258,7 @@ try_register(User, Server, Password) ->
F = fun() -> F = fun() ->
case gen_storage:read(LServer, {passwd, US}) of case gen_storage:read(LServer, {passwd, US}) of
[] -> [] ->
Passwd = case is_scrammed(LServer) and (Password /= "") of Passwd = case is_option_scram(LServer) and (Password /= "") of
true -> password_to_scram(Password, #passwd{user_host=US}); true -> password_to_scram(Password, #passwd{user_host=US});
false -> #passwd{user_host = US, password = Password} false -> #passwd{user_host = US, password = Password}
end, end,
@ -536,23 +535,18 @@ remove_user(User, Server, Password) ->
%% The passwords are stored scrammed in the table either if the option says so, %% The passwords are stored scrammed in the table either if the option says so,
%% or if at least the first password is empty. %% or if at least the first password is empty.
is_scrammed(Host) ->
case action_password_format(Host) of
scram -> true;
must_scram -> true;
plain -> false;
forced_scram -> true
end.
action_password_format(HostB) -> action_password_format(Host) ->
OptionScram = is_option_scram(), OptionScram = is_option_scram(Host),
case {OptionScram, get_format_first_element(HostB)} of case {OptionScram, get_format_first_element(Host)} of
{true, scram} -> scram; {true, scram} -> scram;
{true, any} -> scram; {true, any} -> scram;
{true, plain} -> must_scram; {true, plain} -> must_scram;
{false, plain} -> plain; {false, plain} -> plain;
{false, any} -> plain; {false, any} -> plain;
{false, scram} -> forced_scram {false, scram} ->
set_option_password_format(scram),
forced_scram
end. end.
get_format_first_element(HostB) -> get_format_first_element(HostB) ->
@ -562,44 +556,40 @@ get_format_first_element(HostB) ->
[#passwd{} | _] -> plain [#passwd{} | _] -> plain
end. end.
is_option_scram() -> is_option_scram(Host) when is_list(Host) ->
scram == ejabberd_config:get_local_option({auth_password_format, ?MYNAME}). scram == ejabberd_config:get_local_option({auth_password_format, Host}).
maybe_alert_password_scrammed_without_option(Host) -> set_option_password_format(Value) ->
case is_scrammed(Host) andalso not is_option_scram() of ?ERROR_MSG("Some passwords are stored in the database as SCRAM bits, "
true -> "but the option 'auth_password_format' is not configured 'scram'. "
?ERROR_MSG("Some passwords were stored in the database as SCRAM, " "The option will now be considered to be 'scram'.", []),
"but 'auth_password_format' is not configured 'scram'. " ejabberd_config:add_local_option({auth_password_format, ?MYNAME}, Value).
"The option will now be considered to be 'scram'.", []);
false ->
ok
end.
maybe_scram_passwords(Host) -> maybe_scram_passwords(HostB) ->
case action_password_format(Host) of case action_password_format(binary_to_list(HostB)) of
must_scram -> scram_passwords(Host); must_scram -> scram_passwords(HostB);
_ -> ok _ -> ok
end. end.
scram_passwords(Host) -> scram_passwords(HostB) ->
Backend = Backend =
case ejabberd_config:get_local_option({auth_storage, Host}) of case ejabberd_config:get_local_option({auth_storage, binary_to_list(HostB)}) of
undefined -> mnesia; undefined -> mnesia;
B -> B B -> B
end, end,
scram_passwords(Host, Backend). scram_passwords(HostB, Backend).
scram_passwords(Host, mnesia) -> scram_passwords(HostB, mnesia) ->
?INFO_MSG("Converting the passwords stored in mnesia for host ~p into SCRAM bits", [Host]), ?INFO_MSG("Converting the passwords stored in mnesia for host ~p into SCRAM bits", [HostB]),
gen_storage_migration:migrate_mnesia( gen_storage_migration:migrate_mnesia(
Host, passwd, HostB, passwd,
[{passwd, [user_host, password, storedkey, serverkey, salt, iterationcount], [{passwd, [user_host, password, storedkey, serverkey, salt, iterationcount],
fun(#passwd{password = Password} = Passwd) -> fun(#passwd{password = Password} = Passwd) ->
password_to_scram(Password, Passwd) password_to_scram(Password, Passwd)
end}]); end}]);
scram_passwords(Host, odbc) -> scram_passwords(HostB, odbc) ->
?INFO_MSG("Converting the passwords stored in odbc for host ~p into SCRAM bits", [Host]), ?INFO_MSG("Converting the passwords stored in odbc for host ~p into SCRAM bits", [HostB]),
gen_storage_migration:migrate_odbc( gen_storage_migration:migrate_odbc(
Host, [passwd], HostB, [passwd],
[{"passwd", ["user", "host", "password", "storedkey", "serverkey", "salt", "iterationcount"], [{"passwd", ["user", "host", "password", "storedkey", "serverkey", "salt", "iterationcount"],
fun(_, User, Host2, Password, _Storedkey, _Serverkey, _Iterationcount, _Salt) -> fun(_, User, Host2, Password, _Storedkey, _Serverkey, _Iterationcount, _Salt) ->
password_to_scram(Password, #passwd{user_host = {User, Host2}}) password_to_scram(Password, #passwd{user_host = {User, Host2}})