From e178b5caba16acf49c489da6960e1cc3dd860069 Mon Sep 17 00:00:00 2001 From: sergiojvg Date: Fri, 17 May 2019 11:21:10 -0500 Subject: [PATCH] B #3331: Support token behind proxy (#3332) --- src/sunstone/routes/support.rb | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/sunstone/routes/support.rb b/src/sunstone/routes/support.rb index 2c4a023c8b..17fd4d6658 100644 --- a/src/sunstone/routes/support.rb +++ b/src/sunstone/routes/support.rb @@ -222,10 +222,13 @@ get '/support/check' do full_version = "#{major_version}.#{minor_version}" url = ENTREPRISE_REPO_URL.sub('', full_version) begin - http = Curl.get(url) do |http_options| + http = Curl.get(url) do |request| + if !$conf[:proxy].nil? && !$conf[:proxy].empty? + request.proxy_url = $conf[:proxy] + end token_enc = Base64.strict_encode64($conf[:token_remote_support]) - http_options.headers['Authorization'] = 'Basic ' + token_enc - http_options.headers['User-Agent'] = + request.headers['Authorization'] = 'Basic ' + token_enc + request.headers['User-Agent'] = 'OpenNebula Subscription Validation' end rescue StandardError @@ -257,8 +260,11 @@ get '/support/check/version' do end begin - http = Curl.get(GITHUB_TAGS_URL) do |http_options| - http_options.headers['User-Agent'] = 'OpenNebula Version Validation' + http = Curl.get(GITHUB_TAGS_URL) do |request| + if !$conf[:proxy].nil? && !$conf[:proxy].empty? + request.proxy_url = $conf[:proxy] + end + request.headers['User-Agent'] = 'OpenNebula Version Validation' end rescue StandardError return [400, JSON.pretty_generate(:version => 0)]