Allow disabling HTTP/2 Websocket

Author: lhoguin

deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_app.erl

@@ -124,7 +124,7 @@ start_tcp_listener(TCPConf0, CowboyOpts) ->
 
 
 start_tls_listener([], _) -> ok;
-start_tls_listener(TLSConf0, CowboyOpts) ->
+start_tls_listener(TLSConf0, CowboyOpts0) ->
     _ = rabbit_networking:ensure_ssl(),
     {TLSConf, TLSIpStr, TLSPort} = get_tls_conf(TLSConf0),
     RanchRef = rabbit_networking:ranch_ref(TLSConf),
@@ -135,7 +135,11 @@ start_tls_listener(TLSConf0, CowboyOpts) ->
       num_acceptors => get_env(num_ssl_acceptors, 10),
       num_conns_sups => get_env(num_conns_sup, 1)
      },
-    case cowboy:start_tls(RanchRef, RanchTransportOpts, CowboyOpts#{enable_connect_protocol => true}) of
+    CowboyOpts = CowboyOpts0#{
+        %% Enable HTTP/2 Websocket if not explicitly disabled.
+        enable_connect_protocol => maps:get(enable_connect_protocol, CowboyOpts0, true)
+    },
+    case cowboy:start_tls(RanchRef, RanchTransportOpts, CowboyOpts) of
         {ok, _} ->
             ok;
         {error, {already_started, _}} ->

deps/rabbitmq_web_stomp/src/rabbit_web_stomp_handler.erl

@@ -291,7 +291,7 @@ websocket_info(Msg, State) ->
 
 terminate(_Reason, _Req, State = #state{proc_state = undefined}) ->
     terminate_heartbeaters(State);
-terminate(Reason, _Req, State = #state{proc_state = ProcState}) ->
+terminate(_Reason, _Req, State = #state{proc_state = ProcState}) ->
     _ = rabbit_stomp_processor:flush_and_die(ProcState),
     terminate_heartbeaters(State).
 

deps/rabbitmq_web_stomp/src/rabbit_web_stomp_listener.erl

@@ -34,8 +34,7 @@ init() ->
     logger:set_process_metadata(#{domain => ?RMQLOG_DOMAIN_CONN}),
     WsFrame = get_env(ws_frame, text),
     CowboyOpts0 = maps:from_list(get_env(cowboy_opts, [])),
-    CowboyOpts = CowboyOpts0#{enable_connect_protocol => true,
-                              proxy_header => get_env(proxy_protocol, false),
+    CowboyOpts = CowboyOpts0#{proxy_header => get_env(proxy_protocol, false),
                               stream_handlers => [rabbit_web_stomp_stream_handler, cowboy_stream_h]},
     CowboyWsOpts = maps:from_list(get_env(cowboy_ws_opts, [])),
 
@@ -143,10 +142,14 @@ start_tls_listener(TLSConf0, CowboyOpts0, Routes) ->
     num_acceptors   => NumSslAcceptors,
     num_conns_sups => 1
   },
-  CowboyOpts = CowboyOpts0#{env => #{dispatch => Routes},
-                            middlewares => [cowboy_router,
-                                            rabbit_web_stomp_middleware,
-                                            cowboy_handler]},
+  CowboyOpts = CowboyOpts0#{
+        env => #{dispatch => Routes},
+        middlewares => [cowboy_router,
+                        rabbit_web_stomp_middleware,
+                        cowboy_handler],
+        %% Enable HTTP/2 Websocket if not explicitly disabled.
+        enable_connect_protocol => maps:get(enable_connect_protocol, CowboyOpts0, true)
+  },
   case ranch:start_listener(rabbit_networking:ranch_ref(TLSConf),
                             ranch_ssl,
                             RanchTransportOpts,