root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Use the new function ranch_proxy_header:to_connection_info/1

This commit is contained in:
Loïc Hoguin 2021-09-09 13:15:08 +02:00
parent d327e8a7cb
commit 0a2bde4ab1
No known key found for this signature in database
GPG Key ID: C69E26E3A9DF618F
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
deps/rabbit_common/src/rabbit_net.erl vendored
View File

@ -100,26 +100,12 @@ ssl_info(_Sock) ->
nossl. nossl.
proxy_ssl_info(Sock, {rabbit_proxy_socket, _, ProxyInfo}) -> proxy_ssl_info(Sock, {rabbit_proxy_socket, _, ProxyInfo}) ->
case ProxyInfo of ConnInfo = ranch_proxy_header:to_connection_info(ProxyInfo),
#{ssl := #{version := Version, cipher := Cipher}} -> case lists:keymember(protocol, 1, ConnInfo) andalso
Proto = case Version of lists:keymember(selected_cipher_suite, 1, ConnInfo) of
<<"SSL3">> -> 'ssl3'; true ->
<<"TLSv1">> -> 'tlsv1'; {ok, ConnInfo};
<<"TLSv1.1">> -> 'tlsv1.1'; false ->
<<"TLSv1.2">> -> 'tlsv1.2';
<<"TLSv1.3">> -> 'tlsv1.3';
_ -> nossl
end,
CipherSuite = case ssl:str_to_suite(binary_to_list(Cipher)) of
#{} = CS -> CS;
_ -> nossl
end,
case {Proto, CipherSuite} of
{nossl, _} -> ssl_info(Sock);
{_, nossl} -> ssl_info(Sock);
_ -> {ok, [{protocol, Proto}, {selected_cipher_suite, CipherSuite}]}
end;
_ ->
ssl_info(Sock) ssl_info(Sock)
end; end;
proxy_ssl_info(Sock, _) -> proxy_ssl_info(Sock, _) ->