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

fix(listener_ocsp): assert listener id is present in options (ssl)

This commit is contained in:
Thales Macedo Garitezi 2022-11-08 17:01:21 -03:00
parent fb81c35cd7
commit df58d19f89
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/emqx_listeners.erl
View File

@ -90,7 +90,8 @@ ensure_all_started() ->
ensure_all_started([], []) -> ok; ensure_all_started([], []) -> ok;
ensure_all_started([], Failed) -> error(Failed); ensure_all_started([], Failed) -> error(Failed);
ensure_all_started([L | Rest], Results) -> ensure_all_started([L | Rest], Results) ->
#{proto := Proto, listen_on := ListenOn, opts := Options} = L, #{proto := Proto, listen_on := ListenOn, opts := Options0} = L,
Options = [{listener_id, identifier(L)} | Options0],
NewResults = NewResults =
case start_listener(Proto, ListenOn, Options) of case start_listener(Proto, ListenOn, Options) of
{ok, _Pid} -> {ok, _Pid} ->
@ -135,7 +136,7 @@ start_listener(tcp, ListenOn, Options) ->
%% Start MQTT/TLS listener %% Start MQTT/TLS listener
start_listener(Proto, ListenOn, Options0) when Proto == ssl; Proto == tls -> start_listener(Proto, ListenOn, Options0) when Proto == ssl; Proto == tls ->
ListenerID = proplists:get_value(listener_id, Options0, <<"mqtt:ssl:external">>), ListenerID = proplists:get_value(listener_id, Options0),
Options1 = proplists:delete(listener_id, Options0), Options1 = proplists:delete(listener_id, Options0),
Options = emqx_ocsp_cache:inject_sni_fun(ListenerID, Options1), Options = emqx_ocsp_cache:inject_sni_fun(ListenerID, Options1),
start_mqtt_listener('mqtt:ssl', ListenOn, Options); start_mqtt_listener('mqtt:ssl', ListenOn, Options);