fix(ssl): verify ciphers list against all available ciphers
Prior to this change the ciphers are only checked against the list returned from from `ssl:cipher_suites(all, 'tlsv1.2', openssl)` which may cause some (weak) ciphers missing in certain otp + openssl installation
This commit is contained in:
parent
b42a2f2bc2
commit
ce486e5540
|
@ -1290,10 +1290,7 @@ parse_user_lookup_fun(StrConf) ->
|
||||||
{fun Mod:Fun/3, undefined}.
|
{fun Mod:Fun/3, undefined}.
|
||||||
|
|
||||||
validate_ciphers(Ciphers) ->
|
validate_ciphers(Ciphers) ->
|
||||||
All = case is_tlsv13_available() of
|
All = emqx_tls_lib:all_ciphers(),
|
||||||
true -> ssl:cipher_suites(all, 'tlsv1.3', openssl);
|
|
||||||
false -> []
|
|
||||||
end ++ ssl:cipher_suites(all, 'tlsv1.2', openssl),
|
|
||||||
case lists:filter(fun(Cipher) -> not lists:member(Cipher, All) end, Ciphers) of
|
case lists:filter(fun(Cipher) -> not lists:member(Cipher, All) end, Ciphers) of
|
||||||
[] -> ok;
|
[] -> ok;
|
||||||
Bad -> {error, {bad_ciphers, Bad}}
|
Bad -> {error, {bad_ciphers, Bad}}
|
||||||
|
@ -1306,6 +1303,3 @@ validate_tls_versions(Versions) ->
|
||||||
[] -> ok;
|
[] -> ok;
|
||||||
Vs -> {error, {unsupported_ssl_versions, Vs}}
|
Vs -> {error, {unsupported_ssl_versions, Vs}}
|
||||||
end.
|
end.
|
||||||
|
|
||||||
is_tlsv13_available() ->
|
|
||||||
lists:member('tlsv1.3', proplists:get_value(available, ssl:versions())).
|
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
, selected_ciphers/1
|
, selected_ciphers/1
|
||||||
, integral_ciphers/2
|
, integral_ciphers/2
|
||||||
, drop_tls13_for_old_otp/1
|
, drop_tls13_for_old_otp/1
|
||||||
|
, all_ciphers/0
|
||||||
]).
|
]).
|
||||||
|
|
||||||
%% non-empty string
|
%% non-empty string
|
||||||
|
@ -59,6 +60,9 @@ integral_versions(Desired) ->
|
||||||
Filtered
|
Filtered
|
||||||
end.
|
end.
|
||||||
|
|
||||||
|
%% @doc Return a list of all supported ciphers.
|
||||||
|
all_ciphers() -> all_ciphers(default_versions()).
|
||||||
|
|
||||||
%% @doc Return a list of (openssl string format) cipher suites.
|
%% @doc Return a list of (openssl string format) cipher suites.
|
||||||
-spec all_ciphers([ssl:tls_version()]) -> [string()].
|
-spec all_ciphers([ssl:tls_version()]) -> [string()].
|
||||||
all_ciphers(['tlsv1.3']) ->
|
all_ciphers(['tlsv1.3']) ->
|
||||||
|
@ -212,8 +216,6 @@ drop_tls13(SslOpts0) ->
|
||||||
-ifdef(TEST).
|
-ifdef(TEST).
|
||||||
-include_lib("eunit/include/eunit.hrl").
|
-include_lib("eunit/include/eunit.hrl").
|
||||||
|
|
||||||
all_ciphers() -> all_ciphers(default_versions()).
|
|
||||||
|
|
||||||
drop_tls13_test() ->
|
drop_tls13_test() ->
|
||||||
Versions = default_versions(),
|
Versions = default_versions(),
|
||||||
?assert(lists:member('tlsv1.3', Versions)),
|
?assert(lists:member('tlsv1.3', Versions)),
|
||||||
|
|
Loading…
Reference in New Issue