Skip to content

amqp_ssl: simplify (backport #14644) #14645

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

Merged
merged 1 commit into from
Sep 30, 2025
Merged

amqp_ssl: simplify (backport #14644) #14645

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
4 changes: 0 additions & 4 deletions deps/amqp_client/src/amqp_client.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
%%---------------------------------------------------------------------------

start() ->
%% rabbit_common needs compiler and syntax_tools, see
%%
%% * https://github.com/rabbitmq/rabbitmq-erlang-client/issues/72
%% * https://github.com/rabbitmq/rabbitmq-common/pull/149
{ok, _} = application:ensure_all_started(rabbit_common),
{ok, _} = application:ensure_all_started(amqp_client),
ok.
Expand Down
16 changes: 4 additions & 12 deletions deps/amqp_client/src/amqp_ssl.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ maybe_enhance_ssl_options(Params) ->

% https://github.com/erlang/otp/blob/master/lib/inets/src/http_client/httpc_handler.erl
maybe_add_sni(Host, Options) ->
maybe_add_sni_0(lists:keyfind(server_name_indication, 1, Options), Host, Options).
ServerNameIndicationKeyFound = lists:keyfind(server_name_indication, 1, Options),
maybe_add_sni_0(ServerNameIndicationKeyFound, Host, Options).

maybe_add_sni_0(false, Host, Options) ->
maybe_add_sni_0(false = _ServerNameIndicationKeyFound, Host, Options) ->
% NB: this is the case where the user did not specify
% server_name_indication at all. If Host is a DNS host name,
% we will specify server_name_indication via code
Expand All @@ -37,23 +38,14 @@ maybe_add_sni_1(false, _Host, Options) ->
maybe_add_sni_1(true, Host, Options) ->
[{server_name_indication, Host} | Options].

%% This check is no longer necessary starting with OTP-26.
%% @todo Remove the check once we support only OTP-26 and above.
maybe_add_verify(Options) ->
%% This function is only defined starting in OTP-26.
case erlang:function_exported(user_drv, whereis_group, 0) of
true -> Options;
false -> maybe_add_verify1(Options)
end.

maybe_add_verify1(Options) ->
case lists:keymember(verify, 1, Options) of
true ->
% NB: user has explicitly set 'verify'
Options;
_ ->
?LOG_WARNING("Connection (~tp): certificate chain verification is not enabled for this TLS connection. "
"Please see https://rabbitmq.com/ssl.html for more information.", [self()]),
"Please see https://rabbitmq.com/ssl.html for more information.", [self()]),
Options
end.

Expand Down
Loading