From ecb48f3caf3bfafcc6b90bb861bd046e9c70710b Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Thu, 23 Jan 2014 16:19:50 +0100 Subject: [PATCH] Only change zone name if zone exists --- src/sunstone/sunstone-server.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb index e0f7319ae1..6118ae90f5 100755 --- a/src/sunstone/sunstone-server.rb +++ b/src/sunstone/sunstone-server.rb @@ -224,10 +224,7 @@ before do unless request.path=='/login' || request.path=='/' || request.path=='/vnc' halt 401 unless authorized? - # Extra check: Retrieve list if env['HTTP_ZONE_NAME'] - session[:zone_name] = env['HTTP_ZONE_NAME'] - client=$cloud_auth.client(session[:user]) zpool = ZonePoolJSON.new(client) @@ -236,8 +233,9 @@ before do return [500, rc.to_json] if OpenNebula.is_error?(rc) zpool.each{|z| - if z['TEMPLATE/ENDPOINT'] == env['HTTP_ZONE_NAME'] + if z.name == env['HTTP_ZONE_NAME'] session[:active_zone_endpoint] = z['TEMPLATE/ENDPOINT'] + session[:zone_name] = env['HTTP_ZONE_NAME'] end } end