From 84f5f46504e2460eed59f7addc271eed1ce67eb5 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Wed, 14 Oct 2020 17:50:21 +0200 Subject: [PATCH] M #-: Two Sunstone improvements * Destroy session instead of clearing it, don't reuse session ids * Remove unused one-user cookie --- src/sunstone/sunstone-server.rb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb index 55980e262e..27327c8eab 100755 --- a/src/sunstone/sunstone-server.rb +++ b/src/sunstone/sunstone-server.rb @@ -514,12 +514,12 @@ helpers do rescue logger.info("Fireedge server is not running.") end - + [204, ""] end def destroy_session - session.clear + session.destroy [204, ""] end end @@ -640,7 +640,6 @@ get '/' do build_conf_locals end - response.set_cookie("one-user", :value=>"#{session[:user]}") erb :index, :locals => { :logos_conf => $conf[:locals][:logos_conf], :oned_conf => $conf[:locals][:oned_conf], @@ -651,22 +650,22 @@ end get '/ws' do logger.info { 'Incomming WS connection' } - if request.websocket? + if request.websocket? request.websocket do |ws| ws.onopen do - logger.info { "New client registered" } + logger.info { "New client registered" } settings.sockets << ws end - + ws.onmessage do |msg| - logger.info { "New message received: #{msg}" } + logger.info { "New message received: #{msg}" } end - + ws.onclose do - logger.info { "Client disconnected." } + logger.info { "Client disconnected." } settings.sockets.delete(ws) end - end + end end end