Handle invalid WS connections with 400 response

firehoseio · Oct 5, 2017 · c9221f0 · c9221f0
1 parent f2e3149
commit c9221f0
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/lib/firehose/rack/consumer/web_socket.rb b/lib/firehose/rack/consumer/web_socket.rb
@@ -8,13 +8,18 @@ class Consumer
       class WebSocket
         # Setup a handler for the websocket connection.
         def call(env)
-          ws = Faye::WebSocket.new(env)
-          if Consumer.multiplexing_request?(env)
-            MultiplexingHandler.new(ws)
-          else
-            DefaultHandler.new(ws)
+          begin
+            ws = Faye::WebSocket.new(env)
+            if Consumer.multiplexing_request?(env)
+              MultiplexingHandler.new(ws)
+            else
+              DefaultHandler.new(ws)
+            end
+            ws.rack_response
+          rescue StandardError => e
+            Firehose.logger.error "WS connection error: #{e.inspect}"
+            Firehose::Rack::Helpers.response(400, "Invalid WebSocket request")
           end
-          ws.rack_response
         end
 
         # Determine if the rack request is a WebSocket request.