Skip to content

Enable TLS-PSK auth #316

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

Closed
Elzor wants to merge 1 commit into from
Closed

Enable TLS-PSK auth #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/ranch_ssl.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ listen(TransOpts) ->
case lists:keymember(cert, 1, SocketOpts)
orelse lists:keymember(certfile, 1, SocketOpts)
orelse lists:keymember(sni_fun, 1, SocketOpts)
orelse lists:keymember(sni_hosts, 1, SocketOpts) of
orelse lists:keymember(sni_hosts, 1, SocketOpts)
orelse lists:keymember(user_lookup_fun, 1, SocketOpts) of
true ->
Logger = maps:get(logger, TransOpts, logger),
do_listen(SocketOpts, Logger);
Expand Down
45 changes: 45 additions & 0 deletions test/acceptor_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ groups() ->
ssl_handshake,
ssl_sni_echo,
ssl_sni_fail,
ssl_tls_psk,
ssl_tls_psk_fail,
ssl_upgrade_from_tcp,
ssl_getopts_capability,
ssl_getstat_capability,
Expand Down Expand Up @@ -702,6 +704,49 @@ ssl_sni_fail(_) ->
{'EXIT', _} = begin catch ranch:get_port(Name) end,
ok.

ssl_tls_psk(_) ->
doc("Ensure that TLS-PSK works without certificate"),
Name = name(),
Ciphers = [#{cipher => aes_256_gcm, key_exchange => psk, mac => aead, prf => sha384}],
LookupFun = {fun psk_lookup_helper/3, <<"shared_secret">>},
{ok, _} = ranch:start_listener(Name,
ranch_ssl, [{protocol, tls}, {handshake, full}, {ciphers, Ciphers},
{user_lookup_fun, LookupFun}],
Comment thread
essen marked this conversation as resolved.
echo_protocol, []),
Port = ranch:get_port(Name),
{ok, Socket} = ssl:connect("localhost", Port,
[binary, {active, false}, {packet, raw}, {versions, ['tlsv1.2']},
{ciphers, Ciphers}, {user_lookup_fun, LookupFun}]),
ok = ssl:send(Socket, <<"SSL Ranch is working!">>),
{ok, <<"SSL Ranch is working!">>} = ssl:recv(Socket, 21, 1000),
ok = ranch:stop_listener(Name),
{error, closed} = ssl:recv(Socket, 0, 1000),
%% Make sure the listener stopped.
{'EXIT', _} = begin catch ranch:get_port(Name) end,
ok.

ssl_tls_psk_fail(_) ->
doc("Ensure that TLS-PSK filed for different shared keys"),
Name = name(),
Ciphers = [#{cipher => aes_256_gcm, key_exchange => psk, mac => aead, prf => sha384}],
ServerLookupFun = {fun psk_lookup_helper/3, <<"server_secret">>},
ClientLookupFun = {fun psk_lookup_helper/3, <<"client_secret">>},
{ok, _} = ranch:start_listener(Name,
ranch_ssl, [{protocol, tls}, {handshake, full}, {ciphers, Ciphers},
{user_lookup_fun, ServerLookupFun}],
echo_protocol, []),
Port = ranch:get_port(Name),
{error, _} = ssl:connect("localhost", Port,
[binary, {active, false}, {packet, raw}, {versions, ['tlsv1.2']},
{ciphers, Ciphers}, {user_lookup_fun, ClientLookupFun}]),
ok = ranch:stop_listener(Name),
%% Make sure the listener stopped.
{'EXIT', _} = begin catch ranch:get_port(Name) end,
ok.

psk_lookup_helper(psk, _PskIdentity, UserState) ->
{ok, UserState}.

ssl_upgrade_from_tcp(_) ->
doc("Ensure a TCP socket can be upgraded to SSL"),
Name = name(),
Expand Down