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

fix: testing connector removes ssl cert files that are in use

This commit is contained in:
Shawn 2022-05-05 12:14:01 +08:00
parent 5b5878f4a9
commit 1ce8a8c886
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
apps/emqx_bridge/src/emqx_bridge.erl
View File

@ -347,13 +347,15 @@ create_dry_run(Type, Conf) ->
case emqx_resource:check_config(emqx_bridge:resource_type(Type), Conf0) of case emqx_resource:check_config(emqx_bridge:resource_type(Type), Conf0) of
{ok, Conf1} -> {ok, Conf1} ->
TmpPath = iolist_to_binary(["bridges-create-dry-run:", emqx_misc:gen_id(8)]), TmpPath = iolist_to_binary(["bridges-create-dry-run:", emqx_misc:gen_id(8)]),
try emqx_connector_ssl:convert_certs(TmpPath, Conf1) of case emqx_connector_ssl:convert_certs(TmpPath, Conf1) of
{error, Reason} -> {error, Reason} ->
{error, Reason}; {error, Reason};
{ok, ConfNew} -> {ok, ConfNew} ->
emqx_resource:create_dry_run_local(emqx_bridge:resource_type(Type), ConfNew) Res = emqx_resource:create_dry_run_local(
after emqx_bridge:resource_type(Type), ConfNew
emqx_connector_ssl:clear_certs(TmpPath, Conf1) ),
_ = maybe_clear_certs(TmpPath, ConfNew),
Res
end; end;
{error, _} = Error -> {error, _} = Error ->
Error Error
@ -568,6 +570,28 @@ fill_dry_run_conf(Conf) ->
#{<<"remote_topic">> => <<"t">>} #{<<"remote_topic">> => <<"t">>}
}. }.
maybe_clear_certs(TmpPath, #{ssl := SslConf} = Conf) ->
%% don't remove the cert files if they are in use
case is_tmp_path_conf(TmpPath, SslConf) of
true -> emqx_connector_ssl:clear_certs(TmpPath, Conf);
false -> ok
end.
is_tmp_path_conf(TmpPath, #{certfile := Certfile}) ->
is_tmp_path(TmpPath, Certfile);
is_tmp_path_conf(TmpPath, #{keyfile := Keyfile}) ->
is_tmp_path(TmpPath, Keyfile);
is_tmp_path_conf(TmpPath, #{cacertfile := CaCertfile}) ->
is_tmp_path(TmpPath, CaCertfile);
is_tmp_path_conf(_TmpPath, _Conf) ->
false.
is_tmp_path(TmpPath, File) ->
string:str(str(File), str(TmpPath)) > 0.
str(Bin) when is_binary(Bin) -> binary_to_list(Bin);
str(Str) when is_list(Str) -> Str.
bin(Bin) when is_binary(Bin) -> Bin; bin(Bin) when is_binary(Bin) -> Bin;
bin(Str) when is_list(Str) -> list_to_binary(Str); bin(Str) when is_list(Str) -> list_to_binary(Str);
bin(Atom) when is_atom(Atom) -> atom_to_binary(Atom, utf8). bin(Atom) when is_atom(Atom) -> atom_to_binary(Atom, utf8).