From 909775dd9b3d99e0ed11d83c603a085c7d7040e8 Mon Sep 17 00:00:00 2001 From: Jorge Miguel Lobo Escalona <47326048+jloboescalona2@users.noreply.github.com> Date: Wed, 19 May 2021 13:30:41 +0200 Subject: [PATCH] B #~: fix login with ruby version <= 2.0.0 (#1231) Co-authored-by: Jorge Lobo --- src/sunstone/sunstone-server.rb | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb index 455c5cc984..2cfd61919b 100755 --- a/src/sunstone/sunstone-server.rb +++ b/src/sunstone/sunstone-server.rb @@ -543,8 +543,20 @@ helpers do session[:federation_mode] = active_zone_configuration['FEDERATION/MODE'].upcase session[:mode] = $conf[:mode] - auth = request.env['HTTP_AUTHORIZATION'].match(/(?\w+) (?\w+)/) - session[:auth] = auth[:pass] + if RUBY_VERSION > '2.0.0' + auth = request.env['HTTP_AUTHORIZATION'].match(/(?\w+) (?\w+)/) + session[:auth] = auth[:pass] + else + auth = request.env['HTTP_AUTHORIZATION'].split(" ") + if auth[0] && auth[0].downcase === 'basic' + session[:auth] = auth[1] + else + logger.info { 'Unauthorized login attempt' } + return [401, ''] + end + end + + #get firedge JWT session[:fireedge_token] = get_fireedge_token(two_factor_auth_token)