Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(sni): fix bad type of sni #5696

Merged
merged 2 commits into from
Sep 9, 2021
Merged

fix(sni): fix bad type of sni #5696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a69481
fix(sni): fix bad type of sni
tigercl Sep 9, 2021
ff2d73a
chore(upgrade): update upgrade script
tigercl Sep 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{application, emqx_plugin_libs,
[{description, "EMQ X Plugin utility libs"},
{vsn, "4.3.0"},
{vsn, "4.3.1"},
{modules, []},
{applications, [kernel,stdlib]},
{env, []}
Expand Down
16 changes: 16 additions & 0 deletions apps/emqx_plugin_libs/src/emqx_plugin_libs.appup.src
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
%% -*-: erlang -*-

{VSN,
[
{<<"4.3.0">>, [
{load_module, emqx_plugin_libs_ssl, brutal_purge, soft_purge, []}
]},
{<<".*">>, []}
],
[
{<<"4.3.0">>, [
{load_module, emqx_plugin_libs_ssl, brutal_purge, soft_purge, []}
]},
{<<".*">>, []}
]
}.
6 changes: 5 additions & 1 deletion apps/emqx_plugin_libs/src/emqx_plugin_libs_ssl.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,10 @@ save_files_return_opts(Options, Dir) ->
false -> verify_none;
_ -> verify_peer
end,
SNI = Get(<<"server_name_indication">>),
SNI = case Get(<<"server_name_indication">>) of
undefined -> undefined;
SNI0 -> ensure_str(SNI0)
end,
Versions = emqx_tls_lib:integral_versions(Get(<<"tls_versions">>)),
Ciphers = emqx_tls_lib:integral_ciphers(Versions, Get(<<"ciphers">>)),
filter([{keyfile, Key}, {certfile, Cert}, {cacertfile, CA},
Expand All @@ -81,6 +84,7 @@ save_file(Param, SubDir) ->

filter([]) -> [];
filter([{_, ""} | T]) -> filter(T);
filter([{_, undefined} | T]) -> filter(T);
filter([H | T]) -> [H | filter(T)].

do_save_file(#{<<"filename">> := FileName, <<"file">> := Content}, Dir)
Expand Down
2 changes: 1 addition & 1 deletion apps/emqx_web_hook/src/emqx_web_hook.app.src
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{application, emqx_web_hook,
[{description, "EMQ X WebHook Plugin"},
{vsn, "4.3.5"}, % strict semver, bump manually!
{vsn, "4.3.6"}, % strict semver, bump manually!
{modules, []},
{registered, [emqx_web_hook_sup]},
{applications, [kernel,stdlib,ehttpc]},
Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_web_hook/src/emqx_web_hook.appup.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{load_module, emqx_web_hook, brutal_purge, soft_purge, []},
{load_module, emqx_web_hook_actions, brutal_purge, soft_purge, []}
]},
{<<"4.3.[3-4]">>, [
{<<"4.3.[3-5]">>, [
{load_module, emqx_web_hook_actions, brutal_purge, soft_purge, []}
]},
{<<".*">>, []}
Expand All @@ -20,7 +20,7 @@
{load_module, emqx_web_hook, brutal_purge, soft_purge, []},
{load_module, emqx_web_hook_actions, brutal_purge, soft_purge, []}
]},
{<<"4.3.[3-4]">>, [
{<<"4.3.[3-5]">>, [
{load_module, emqx_web_hook_actions, brutal_purge, soft_purge, []}
]},
{<<".*">>, []}
Expand Down
2 changes: 1 addition & 1 deletion apps/emqx_web_hook/src/emqx_web_hook_actions.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ pool_opts(Params = #{<<"url">> := URL}, ResId) ->
cuttlefish_duration:parse(str(maps:get(<<"connect_timeout">>, Params, <<"5s">>))),
TransportOpts0 =
case Scheme =:= https of
true -> [get_ssl_opts(Params, ResId)];
true -> get_ssl_opts(Params, ResId);
false -> []
end,
TransportOpts = emqx_misc:ipv6_probe(TransportOpts0),
Expand Down
2 changes: 1 addition & 1 deletion apps/emqx_web_hook/src/emqx_web_hook_app.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ translate_env() ->
SNI0 -> SNI0
end,
TLSOpts = lists:filter(fun({_K, V}) ->
V /= <<>> andalso V /= undefined andalso V /= "" andalso true
V /= <<>> andalso V /= undefined andalso V /= ""
end, [{keyfile, KeyFile},
{certfile, CertFile},
{cacertfile, CACertFile},
Expand Down