diff options
| author | Michael Klishin <klishinm@vmware.com> | 2023-04-24 18:03:49 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-24 18:03:49 +0400 |
| commit | 686fb9a4e90b03cae1610e532f9d4547029e2197 (patch) | |
| tree | fc39ff4b52f7ea76edffdb17758f4abb0f3de38d | |
| parent | e514f85c71ef70cbc38d7fb8c0522d136ea12838 (diff) | |
| parent | d04b3afe9b8b136e7fb51fda517ea132b7131b9f (diff) | |
| download | rabbitmq-server-git-686fb9a4e90b03cae1610e532f9d4547029e2197.tar.gz | |
Merge pull request #7966 from rabbitmq/otp26-compatibility
OTP26 compatibility: `{verify_none}`
6 files changed, 18 insertions, 8 deletions
diff --git a/deps/rabbitmq_amqp1_0/test/proxy_protocol_SUITE.erl b/deps/rabbitmq_amqp1_0/test/proxy_protocol_SUITE.erl index 1786f0a77f..dc307d90f2 100644 --- a/deps/rabbitmq_amqp1_0/test/proxy_protocol_SUITE.erl +++ b/deps/rabbitmq_amqp1_0/test/proxy_protocol_SUITE.erl @@ -74,7 +74,7 @@ proxy_protocol_tls(Config) -> {ok, Socket} = gen_tcp:connect({127,0,0,1}, Port, [binary, {active, false}, {packet, raw}]), ok = inet:send(Socket, "PROXY TCP4 192.168.1.1 192.168.1.2 80 81\r\n"), - {ok, SslSocket} = ssl:connect(Socket, [], ?TIMEOUT), + {ok, SslSocket} = ssl:connect(Socket, [{verify, verify_none}], ?TIMEOUT), [ok = ssl:send(SslSocket, amqp_1_0_frame(FrameType)) || FrameType <- [header_sasl, sasl_init, header_amqp, open, 'begin']], {ok, _Packet} = ssl:recv(SslSocket, 0, ?TIMEOUT), diff --git a/deps/rabbitmq_mqtt/test/proxy_protocol_SUITE.erl b/deps/rabbitmq_mqtt/test/proxy_protocol_SUITE.erl index 551b14c865..b14f1f7314 100644 --- a/deps/rabbitmq_mqtt/test/proxy_protocol_SUITE.erl +++ b/deps/rabbitmq_mqtt/test/proxy_protocol_SUITE.erl @@ -78,7 +78,7 @@ proxy_protocol_tls(Config) -> {ok, Socket} = gen_tcp:connect({127,0,0,1}, Port, [binary, {active, false}, {packet, raw}]), ok = inet:send(Socket, "PROXY TCP4 192.168.1.1 192.168.1.2 80 81\r\n"), - {ok, SslSocket} = ssl:connect(Socket, [], ?TIMEOUT), + {ok, SslSocket} = ssl:connect(Socket, [{verify, verify_none}], ?TIMEOUT), ok = ssl:send(SslSocket, mqtt_3_1_1_connect_packet()), {ok, _Packet} = ssl:recv(SslSocket, 0, ?TIMEOUT), timer:sleep(10), diff --git a/deps/rabbitmq_stomp/test/proxy_protocol_SUITE.erl b/deps/rabbitmq_stomp/test/proxy_protocol_SUITE.erl index 9d74ea36a7..2422a165d1 100644 --- a/deps/rabbitmq_stomp/test/proxy_protocol_SUITE.erl +++ b/deps/rabbitmq_stomp/test/proxy_protocol_SUITE.erl @@ -78,7 +78,7 @@ proxy_protocol_tls(Config) -> {ok, Socket} = gen_tcp:connect({127,0,0,1}, Port, [binary, {active, false}, {packet, raw}]), ok = inet:send(Socket, "PROXY TCP4 192.168.1.1 192.168.1.2 80 81\r\n"), - {ok, SslSocket} = ssl:connect(Socket, [], ?TIMEOUT), + {ok, SslSocket} = ssl:connect(Socket, [{verify, verify_none}], ?TIMEOUT), ok = ssl:send(SslSocket, stomp_connect_frame()), {ok, _Packet} = ssl:recv(SslSocket, 0, ?TIMEOUT), ConnectionName = rabbit_ct_broker_helpers:rpc(Config, 0, diff --git a/deps/rabbitmq_stream/test/commands_SUITE.erl b/deps/rabbitmq_stream/test/commands_SUITE.erl index 361a819c81..b718568e31 100644 --- a/deps/rabbitmq_stream/test/commands_SUITE.erl +++ b/deps/rabbitmq_stream/test/commands_SUITE.erl @@ -769,9 +769,13 @@ start_stream_tls_connection(Port) -> start_stream_connection(ssl, Port). start_stream_connection(Transport, Port) -> + TlsOpts = case Transport of + ssl -> [{verify, verify_none}]; + _ -> [] + end, {ok, S} = Transport:connect("localhost", Port, - [{active, false}, {mode, binary}]), + [{active, false}, {mode, binary}] ++ TlsOpts), C0 = rabbit_stream_core:init(0), C1 = rabbit_stream_SUITE:test_peer_properties(Transport, S, C0), C = rabbit_stream_SUITE:test_authenticate(Transport, S, C1), diff --git a/deps/rabbitmq_web_mqtt/test/src/rfc6455_client.erl b/deps/rabbitmq_web_mqtt/test/src/rfc6455_client.erl index 98fa459483..fc8fd0f98f 100644 --- a/deps/rabbitmq_web_mqtt/test/src/rfc6455_client.erl +++ b/deps/rabbitmq_web_mqtt/test/src/rfc6455_client.erl @@ -103,9 +103,12 @@ close(WS, WsReason) -> start_conn(State = #state{transport = Transport}, AuthInfo, Protocols, TcpPreface) -> {ok, Socket} = case TcpPreface of <<>> -> + TlsOpts = case Transport of + ssl -> [{verify, verify_none}]; + _ -> [] + end, Transport:connect(State#state.host, State#state.port, - [binary, - {packet, 0}]); + [binary, {packet, 0}] ++ TlsOpts); _ -> {ok, Socket0} = gen_tcp:connect(State#state.host, State#state.port, [binary, diff --git a/deps/rabbitmq_web_stomp/test/src/rfc6455_client.erl b/deps/rabbitmq_web_stomp/test/src/rfc6455_client.erl index 3bfbeb4c97..d790eda082 100644 --- a/deps/rabbitmq_web_stomp/test/src/rfc6455_client.erl +++ b/deps/rabbitmq_web_stomp/test/src/rfc6455_client.erl @@ -87,9 +87,12 @@ close(WS, WsReason) -> start_conn(State = #state{transport = Transport}, AuthInfo, Protocols, TcpPreface) -> {ok, Socket} = case TcpPreface of <<>> -> + TlsOpts = case Transport of + ssl -> [{verify, verify_none}]; + _ -> [] + end, Transport:connect(State#state.host, State#state.port, - [binary, - {packet, 0}]); + [binary, {packet, 0}] ++ TlsOpts); _ -> {ok, Socket0} = gen_tcp:connect(State#state.host, State#state.port, [binary, |