fix(emqx_listeners): convert authentication certs
This commit is contained in:
parent
33fa053b9b
commit
53ec8326b0
|
@ -843,7 +843,9 @@ convert_certs(ListenerConf) ->
|
||||||
Listeners1 =
|
Listeners1 =
|
||||||
maps:fold(
|
maps:fold(
|
||||||
fun(Name, Conf, Acc1) ->
|
fun(Name, Conf, Acc1) ->
|
||||||
Acc1#{Name => convert_certs(Type, Name, Conf)}
|
Conf1 = convert_certs(Type, Name, Conf),
|
||||||
|
Conf2 = convert_authn_certs(Type, Name, Conf1),
|
||||||
|
Acc1#{Name => Conf2}
|
||||||
end,
|
end,
|
||||||
#{},
|
#{},
|
||||||
Listeners0
|
Listeners0
|
||||||
|
@ -866,6 +868,19 @@ convert_certs(Type, Name, Conf) ->
|
||||||
throw({bad_ssl_config, Reason})
|
throw({bad_ssl_config, Reason})
|
||||||
end.
|
end.
|
||||||
|
|
||||||
|
convert_authn_certs(Type, Name, #{<<"authentication">> := AuthNList} = Conf) ->
|
||||||
|
ChainName = listener_id(Type, Name),
|
||||||
|
AuthNList1 = lists:map(
|
||||||
|
fun(AuthN) ->
|
||||||
|
CertsDir = emqx_authentication_config:certs_dir(ChainName, AuthN),
|
||||||
|
emqx_authentication_config:convert_certs(CertsDir, AuthN)
|
||||||
|
end,
|
||||||
|
AuthNList
|
||||||
|
),
|
||||||
|
Conf#{<<"authentication">> => AuthNList1};
|
||||||
|
convert_authn_certs(_Type, _Name, Conf) ->
|
||||||
|
Conf.
|
||||||
|
|
||||||
filter_stacktrace({Reason, _Stacktrace}) -> Reason;
|
filter_stacktrace({Reason, _Stacktrace}) -> Reason;
|
||||||
filter_stacktrace(Reason) -> Reason.
|
filter_stacktrace(Reason) -> Reason.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue