feat(quic): support TLS password protected keyfile
This commit is contained in:
parent
2803aff798
commit
88731fd145
|
@ -388,7 +388,11 @@ do_start_listener(quic, ListenerName, #{bind := Bind} = Opts) ->
|
||||||
] ++
|
] ++
|
||||||
case maps:get(cacertfile, SSLOpts, undefined) of
|
case maps:get(cacertfile, SSLOpts, undefined) of
|
||||||
undefined -> [];
|
undefined -> [];
|
||||||
CaCertFile -> [{cacertfile, binary_to_list(CaCertFile)}]
|
CaCertFile -> [{cacertfile, str(CaCertFile)}]
|
||||||
|
end ++
|
||||||
|
case maps:get(password, SSLOpts, undefined) of
|
||||||
|
undefined -> [];
|
||||||
|
Password -> [{password, str(Password)}]
|
||||||
end ++
|
end ++
|
||||||
optional_quic_listener_opts(Opts),
|
optional_quic_listener_opts(Opts),
|
||||||
ConnectionOpts = #{
|
ConnectionOpts = #{
|
||||||
|
|
|
@ -85,6 +85,13 @@
|
||||||
reset_proxy/2
|
reset_proxy/2
|
||||||
]).
|
]).
|
||||||
|
|
||||||
|
%% TLS certs API
|
||||||
|
-export([
|
||||||
|
gen_ca/2,
|
||||||
|
gen_host_cert/3,
|
||||||
|
gen_host_cert/4
|
||||||
|
]).
|
||||||
|
|
||||||
-define(CERTS_PATH(CertName), filename:join(["etc", "certs", CertName])).
|
-define(CERTS_PATH(CertName), filename:join(["etc", "certs", CertName])).
|
||||||
|
|
||||||
-define(MQTT_SSL_CLIENT_CERTS, [
|
-define(MQTT_SSL_CLIENT_CERTS, [
|
||||||
|
@ -561,6 +568,7 @@ ensure_quic_listener(Name, UdpPort, ExtraSettings) ->
|
||||||
mountpoint => <<>>,
|
mountpoint => <<>>,
|
||||||
zone => default
|
zone => default
|
||||||
},
|
},
|
||||||
|
|
||||||
Conf2 = maps:merge(Conf, ExtraSettings),
|
Conf2 = maps:merge(Conf, ExtraSettings),
|
||||||
emqx_config:put([listeners, quic, Name], Conf2),
|
emqx_config:put([listeners, quic, Name], Conf2),
|
||||||
case emqx_listeners:start_listener(emqx_listeners:listener_id(quic, Name)) of
|
case emqx_listeners:start_listener(emqx_listeners:listener_id(quic, Name)) of
|
||||||
|
@ -1073,6 +1081,104 @@ latency_up_proxy(off, Name, ProxyHost, ProxyPort) ->
|
||||||
).
|
).
|
||||||
|
|
||||||
%%-------------------------------------------------------------------------------
|
%%-------------------------------------------------------------------------------
|
||||||
|
%% TLS certs
|
||||||
|
%%-------------------------------------------------------------------------------
|
||||||
|
gen_ca(Path, Name) ->
|
||||||
|
%% Generate ca.pem and ca.key which will be used to generate certs
|
||||||
|
%% for hosts server and clients
|
||||||
|
ECKeyFile = filename(Path, "~s-ec.key", [Name]),
|
||||||
|
filelib:ensure_dir(ECKeyFile),
|
||||||
|
os:cmd("openssl ecparam -name secp256r1 > " ++ ECKeyFile),
|
||||||
|
Cmd = lists:flatten(
|
||||||
|
io_lib:format(
|
||||||
|
"openssl req -new -x509 -nodes "
|
||||||
|
"-newkey ec:~s "
|
||||||
|
"-keyout ~s -out ~s -days 3650 "
|
||||||
|
"-subj \"/C=SE/O=Internet Widgits Pty Ltd CA\"",
|
||||||
|
[
|
||||||
|
ECKeyFile,
|
||||||
|
ca_key_name(Path, Name),
|
||||||
|
ca_cert_name(Path, Name)
|
||||||
|
]
|
||||||
|
)
|
||||||
|
),
|
||||||
|
os:cmd(Cmd).
|
||||||
|
|
||||||
|
ca_cert_name(Path, Name) ->
|
||||||
|
filename(Path, "~s.pem", [Name]).
|
||||||
|
ca_key_name(Path, Name) ->
|
||||||
|
filename(Path, "~s.key", [Name]).
|
||||||
|
|
||||||
|
gen_host_cert(H, CaName, Path) ->
|
||||||
|
gen_host_cert(H, CaName, Path, #{}).
|
||||||
|
|
||||||
|
gen_host_cert(H, CaName, Path, Opts) ->
|
||||||
|
ECKeyFile = filename(Path, "~s-ec.key", [CaName]),
|
||||||
|
CN = str(H),
|
||||||
|
HKey = filename(Path, "~s.key", [H]),
|
||||||
|
HCSR = filename(Path, "~s.csr", [H]),
|
||||||
|
HPEM = filename(Path, "~s.pem", [H]),
|
||||||
|
HEXT = filename(Path, "~s.extfile", [H]),
|
||||||
|
PasswordArg =
|
||||||
|
case maps:get(password, Opts, undefined) of
|
||||||
|
undefined ->
|
||||||
|
" -nodes ";
|
||||||
|
Password ->
|
||||||
|
io_lib:format(" -passout pass:'~s' ", [Password])
|
||||||
|
end,
|
||||||
|
CSR_Cmd =
|
||||||
|
lists:flatten(
|
||||||
|
io_lib:format(
|
||||||
|
"openssl req -new ~s -newkey ec:~s "
|
||||||
|
"-keyout ~s -out ~s "
|
||||||
|
"-addext \"subjectAltName=DNS:~s\" "
|
||||||
|
"-addext keyUsage=digitalSignature,keyAgreement "
|
||||||
|
"-subj \"/C=SE/O=Internet Widgits Pty Ltd/CN=~s\"",
|
||||||
|
[PasswordArg, ECKeyFile, HKey, HCSR, CN, CN]
|
||||||
|
)
|
||||||
|
),
|
||||||
|
create_file(
|
||||||
|
HEXT,
|
||||||
|
"keyUsage=digitalSignature,keyAgreement\n"
|
||||||
|
"subjectAltName=DNS:~s\n",
|
||||||
|
[CN]
|
||||||
|
),
|
||||||
|
CERT_Cmd =
|
||||||
|
lists:flatten(
|
||||||
|
io_lib:format(
|
||||||
|
"openssl x509 -req "
|
||||||
|
"-extfile ~s "
|
||||||
|
"-in ~s -CA ~s -CAkey ~s -CAcreateserial "
|
||||||
|
"-out ~s -days 500",
|
||||||
|
[
|
||||||
|
HEXT,
|
||||||
|
HCSR,
|
||||||
|
ca_cert_name(Path, CaName),
|
||||||
|
ca_key_name(Path, CaName),
|
||||||
|
HPEM
|
||||||
|
]
|
||||||
|
)
|
||||||
|
),
|
||||||
|
os:cmd(CSR_Cmd),
|
||||||
|
os:cmd(CERT_Cmd),
|
||||||
|
file:delete(HEXT).
|
||||||
|
|
||||||
|
filename(Path, F, A) ->
|
||||||
|
filename:join(Path, str(io_lib:format(F, A))).
|
||||||
|
|
||||||
|
str(Arg) ->
|
||||||
|
binary_to_list(iolist_to_binary(Arg)).
|
||||||
|
|
||||||
|
create_file(Filename, Fmt, Args) ->
|
||||||
|
filelib:ensure_dir(Filename),
|
||||||
|
{ok, F} = file:open(Filename, [write]),
|
||||||
|
try
|
||||||
|
io:format(F, Fmt, Args)
|
||||||
|
after
|
||||||
|
file:close(F)
|
||||||
|
end,
|
||||||
|
ok.
|
||||||
|
%%-------------------------------------------------------------------------------
|
||||||
%% Testcase teardown utilities
|
%% Testcase teardown utilities
|
||||||
%%-------------------------------------------------------------------------------
|
%%-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,8 @@
|
||||||
|
|
||||||
-define(CERTS_PATH(CertName), filename:join(["../../lib/emqx/etc/certs/", CertName])).
|
-define(CERTS_PATH(CertName), filename:join(["../../lib/emqx/etc/certs/", CertName])).
|
||||||
|
|
||||||
|
-define(SERVER_KEY_PASSWORD, "sErve7r8Key$!").
|
||||||
|
|
||||||
all() -> emqx_common_test_helpers:all(?MODULE).
|
all() -> emqx_common_test_helpers:all(?MODULE).
|
||||||
|
|
||||||
init_per_suite(Config) ->
|
init_per_suite(Config) ->
|
||||||
|
@ -45,11 +47,6 @@ init_per_testcase(Case, Config) when
|
||||||
->
|
->
|
||||||
catch emqx_config_handler:stop(),
|
catch emqx_config_handler:stop(),
|
||||||
{ok, _} = emqx_config_handler:start_link(),
|
{ok, _} = emqx_config_handler:start_link(),
|
||||||
case emqx_config:get([listeners], undefined) of
|
|
||||||
undefined -> ok;
|
|
||||||
Listeners -> emqx_config:put([listeners], maps:remove(quic, Listeners))
|
|
||||||
end,
|
|
||||||
|
|
||||||
PrevListeners = emqx_config:get([listeners], #{}),
|
PrevListeners = emqx_config:get([listeners], #{}),
|
||||||
PureListeners = remove_default_limiter(PrevListeners),
|
PureListeners = remove_default_limiter(PrevListeners),
|
||||||
PureListeners2 = PureListeners#{
|
PureListeners2 = PureListeners#{
|
||||||
|
@ -185,6 +182,28 @@ t_wss_conn(_) ->
|
||||||
{ok, Socket} = ssl:connect({127, 0, 0, 1}, 9998, [{verify, verify_none}], 1000),
|
{ok, Socket} = ssl:connect({127, 0, 0, 1}, 9998, [{verify, verify_none}], 1000),
|
||||||
ok = ssl:close(Socket).
|
ok = ssl:close(Socket).
|
||||||
|
|
||||||
|
t_quic_conn(Config) ->
|
||||||
|
DataDir = ?config(data_dir, Config),
|
||||||
|
generate_quic_tls_certs(Config),
|
||||||
|
SSLOpts = #{
|
||||||
|
password => ?SERVER_KEY_PASSWORD,
|
||||||
|
certfile => filename:join(DataDir, "server-password.pem"),
|
||||||
|
cacertfile => filename:join(DataDir, "ca.pem"),
|
||||||
|
keyfile => filename:join(DataDir, "server-password.key")
|
||||||
|
},
|
||||||
|
emqx_common_test_helpers:ensure_quic_listener(?FUNCTION_NAME, 24568, #{ssl_options => SSLOpts}),
|
||||||
|
ct:pal("~p", [emqx_listeners:list()]),
|
||||||
|
{ok, Conn} = quicer:connect(
|
||||||
|
{127, 0, 0, 1},
|
||||||
|
24568,
|
||||||
|
[
|
||||||
|
{verify, verify_none},
|
||||||
|
{alpn, ["mqtt"]}
|
||||||
|
],
|
||||||
|
1000
|
||||||
|
),
|
||||||
|
ok = quicer:close_connection(Conn).
|
||||||
|
|
||||||
t_format_bind(_) ->
|
t_format_bind(_) ->
|
||||||
?assertEqual(
|
?assertEqual(
|
||||||
":1883",
|
":1883",
|
||||||
|
@ -269,3 +288,10 @@ remove_default_limiter(Listeners) ->
|
||||||
end,
|
end,
|
||||||
Listeners
|
Listeners
|
||||||
).
|
).
|
||||||
|
|
||||||
|
generate_quic_tls_certs(Config) ->
|
||||||
|
DataDir = ?config(data_dir, Config),
|
||||||
|
emqx_common_test_helpers:gen_ca(DataDir, "ca"),
|
||||||
|
emqx_common_test_helpers:gen_host_cert("server-password", "ca", DataDir, #{
|
||||||
|
password => ?SERVER_KEY_PASSWORD
|
||||||
|
}).
|
||||||
|
|
Loading…
Reference in New Issue