From 5b5878f4a9b4ef99ee8146764b810c7c0673031e Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Thu, 5 May 2022 12:14:46 +0800 Subject: [PATCH] fix: don't drop input ssl options even if invalid --- apps/emqx_connector/src/emqx_connector_ssl.erl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/apps/emqx_connector/src/emqx_connector_ssl.erl b/apps/emqx_connector/src/emqx_connector_ssl.erl index 1388181dd..e20596b6c 100644 --- a/apps/emqx_connector/src/emqx_connector_ssl.erl +++ b/apps/emqx_connector/src/emqx_connector_ssl.erl @@ -22,7 +22,7 @@ ]). convert_certs(RltvDir, NewConfig) -> - NewSSL = drop_invalid_certs(map_get_oneof([<<"ssl">>, ssl], NewConfig, undefined)), + NewSSL = map_get_oneof([<<"ssl">>, ssl], NewConfig, undefined), case emqx_tls_lib:ensure_ssl_files(RltvDir, NewSSL) of {ok, NewSSL1} -> {ok, new_ssl_config(NewConfig, NewSSL1)}; @@ -31,16 +31,13 @@ convert_certs(RltvDir, NewConfig) -> end. clear_certs(RltvDir, Config) -> - OldSSL = drop_invalid_certs(map_get_oneof([<<"ssl">>, ssl], Config, undefined)), + OldSSL = map_get_oneof([<<"ssl">>, ssl], Config, undefined), ok = emqx_tls_lib:delete_ssl_files(RltvDir, undefined, OldSSL). new_ssl_config(Config, undefined) -> Config; new_ssl_config(Config, #{<<"enable">> := _} = SSL) -> Config#{<<"ssl">> => SSL}; new_ssl_config(Config, #{enable := _} = SSL) -> Config#{ssl => SSL}. -drop_invalid_certs(undefined) -> undefined; -drop_invalid_certs(SSL) -> emqx_tls_lib:drop_invalid_certs(SSL). - map_get_oneof([], _Map, Default) -> Default; map_get_oneof([Key | Keys], Map, Default) ->