yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: improve coverage

This commit is contained in:
William Yang 2023-05-12 18:13:21 +02:00
parent 64955e9083
commit dfabc7ca72
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/emqx_const_v2.erl
View File

@ -52,7 +52,7 @@ make_tls_verify_fun(verify_cert_extKeyUsage, KeyUsages) ->
verify_fun_peer_extKeyUsage(_, {bad_cert, invalid_ext_key_usage}, UserState) -> verify_fun_peer_extKeyUsage(_, {bad_cert, invalid_ext_key_usage}, UserState) ->
%% !! Override OTP verify peer default %% !! Override OTP verify peer default
%% OTP SSL is unhappy with the ext_key_usage but we will check on ower own. %% OTP SSL is unhappy with the ext_key_usage but we will check on our own.
{unknown, UserState}; {unknown, UserState};
verify_fun_peer_extKeyUsage(_, {bad_cert, _} = Reason, _UserState) -> verify_fun_peer_extKeyUsage(_, {bad_cert, _} = Reason, _UserState) ->
%% OTP verify_peer default %% OTP verify_peer default
@ -97,9 +97,6 @@ do_verify_ext_key_usage(CertExtL, [Usage | T] = _Required) ->
%% @doc Helper tls cert extension %% @doc Helper tls cert extension
-spec ext_key_opts(string()) -> [OidString::string() | public_key:oid()]; -spec ext_key_opts(string()) -> [OidString::string() | public_key:oid()];
(undefined) -> undefined. (undefined) -> undefined.
ext_key_opts(undefined) ->
%% disabled
undefined;
ext_key_opts(Str) -> ext_key_opts(Str) ->
Usages = string:tokens(Str, ","), Usages = string:tokens(Str, ","),
lists:map(fun("clientAuth") -> lists:map(fun("clientAuth") ->

2
test/emqx_listener_tls_verify_keyusage_SUITE.erl
View File

@ -218,7 +218,7 @@ t_conn_fail_client_keyusage_incomplete(Config) ->
Port = emqx_test_tls_certs_helper:select_free_port(ssl), Port = emqx_test_tls_certs_helper:select_free_port(ssl),
DataDir = ?config(data_dir, Config), DataDir = ?config(data_dir, Config),
%% Give listener keyusage is codeSigning,clientAuth %% Give listener keyusage is codeSigning,clientAuth
Options = [{ssl_options, [ {verify_peer_ext_key_usage, "codeSigning,clientAuth"} Options = [{ssl_options, [ {verify_peer_ext_key_usage, "serverAuth,clientAuth,codeSigning,emailProtection,timeStamping,ocspSigning"}
| ?config(ssl_config, Config) | ?config(ssl_config, Config)
]}], ]}],
emqx_listeners:start_listener(ssl, Port, Options), emqx_listeners:start_listener(ssl, Port, Options),