Remove POODLE check (backport #9843) (backport #9845)

deps/rabbit/src/rabbit_networking.erl

@@ -38,8 +38,13 @@
 
 %% Used by TCP-based transports, e.g. STOMP adapter
 -export([tcp_listener_addresses/1,
+<<<<<<< HEAD
          tcp_listener_spec/9, tcp_listener_spec/10,
          ensure_ssl/0, fix_ssl_options/1, poodle_check/1]).
+=======
+         tcp_listener_spec/9, tcp_listener_spec/10, tcp_listener_spec/11,
+         ensure_ssl/0, fix_ssl_options/1]).
+>>>>>>> a73551387a (Remove POODLE check, we are in the future)
 
 -export([tcp_listener_started/4, tcp_listener_stopped/4]).
 
@@ -129,12 +134,7 @@ boot_tls(NumAcceptors, ConcurrentConnsSupsCount) ->
             ok;
         {ok, SslListeners} ->
             SslOpts = ensure_ssl(),
-            case poodle_check('AMQP') of
-                ok     -> _ = [start_ssl_listener(L, SslOpts, NumAcceptors, ConcurrentConnsSupsCount)
-                           || L <- SslListeners],
-                          ok;
-                danger -> ok
-            end,
+            _ = [start_ssl_listener(L, SslOpts, NumAcceptors, ConcurrentConnsSupsCount) || L <- SslListeners],
             ok
     end.
 
@@ -146,6 +146,7 @@ ensure_ssl() ->
     {ok, SslOptsConfig0} = application:get_env(rabbit, ssl_options),
     rabbit_ssl_options:fix(SslOptsConfig0).
 
+<<<<<<< HEAD
 -spec poodle_check(atom()) -> 'ok' | 'danger'.
 
 poodle_check(Context) ->
@@ -173,6 +174,8 @@ log_poodle_fail(Context) ->
       "'rabbit' section of your configuration file.",
       [rabbit_misc:otp_release(), Context]).
 
+=======
+>>>>>>> a73551387a (Remove POODLE check, we are in the future)
 fix_ssl_options(Config) ->
     rabbit_ssl_options:fix(Config).
 

deps/rabbit_common/src/rabbit_misc.erl

@@ -1340,12 +1340,9 @@ get_proc_name() ->
             {ok, Name}
     end.
 
-%% application:get_env/3 is only available in R16B01 or later.
+%% application:get_env/3 is available in R16B01 or later.
 get_env(Application, Key, Def) ->
-    case application:get_env(Application, Key) of
-        {ok, Val} -> Val;
-        undefined -> Def
-    end.
+    application:get_env(Application, Key, Def).
 
 get_channel_operation_timeout() ->
     %% Default channel_operation_timeout set to net_ticktime + 10s to

deps/rabbitmq_mqtt/src/rabbit_mqtt_sup.erl

@@ -26,11 +26,16 @@ init([{Listeners, SslListeners0}]) ->
         = case SslListeners0 of
               [] -> {none, 0, []};
               _  -> {rabbit_networking:ensure_ssl(),
+<<<<<<< HEAD
                      application:get_env(rabbitmq_mqtt, num_ssl_acceptors, 10),
                      case rabbit_networking:poodle_check('MQTT') of
                          ok     -> SslListeners0;
                          danger -> []
                      end}
+=======
+                     application:get_env(?APP_NAME, num_ssl_acceptors, 10),
+                     SslListeners0}
+>>>>>>> a73551387a (Remove POODLE check, we are in the future)
           end,
     {ok, {{one_for_all, 10, 10},
           [{rabbit_mqtt_retainer_sup,

deps/rabbitmq_stomp/src/rabbit_stomp_sup.erl

@@ -26,10 +26,7 @@ init([{Listeners, SslListeners0}, Configuration]) ->
               [] -> {none, 0, []};
               _  -> {rabbit_networking:ensure_ssl(),
                      application:get_env(rabbitmq_stomp, num_ssl_acceptors, 10),
-                     case rabbit_networking:poodle_check('STOMP') of
-                         ok     -> SslListeners0;
-                         danger -> []
-                     end}
+                     SslListeners0}
           end,
     Flags = #{
         strategy => one_for_all,

deps/rabbitmq_stream/src/rabbit_stream_sup.erl

@@ -44,12 +44,7 @@ init([]) ->
             _ ->
                 {rabbit_networking:ensure_ssl(),
                  application:get_env(rabbitmq_stream, num_ssl_acceptors, 10),
-                 case rabbit_networking:poodle_check('STREAM') of
-                     ok ->
-                         SslListeners0;
-                     danger ->
-                         []
-                 end}
+                 SslListeners0}
         end,
 
     Nodes = rabbit_nodes:all(),

deps/rabbitmq_web_dispatch/src/rabbit_web_dispatch_sup.erl

@@ -71,12 +71,9 @@ init([]) ->
 preprocess_config(Options) ->
     case proplists:get_value(ssl, Options) of
         true -> _ = rabbit_networking:ensure_ssl(),
-                case rabbit_networking:poodle_check('HTTP') of
-                    ok     -> case proplists:get_value(ssl_opts, Options) of
-                                  undefined -> auto_ssl(Options);
-                                  _         -> fix_ssl(Options)
-                              end;
-                    danger -> {ranch_tcp, transport_config(Options), protocol_config(Options)}
+                case proplists:get_value(ssl_opts, Options) of
+                    undefined -> auto_ssl(Options);
+                    _         -> fix_ssl(Options)
                 end;
         _    -> {ranch_tcp, transport_config(Options), protocol_config(Options)}
     end.