shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-23 22:50:09 +03:00
Code Releases Wiki Activity

feature #495: Fix equal statement

Browse Source
This commit is contained in:
Daniel Molina 2011-02-25 12:37:58 +01:00
parent ad2b4e367d
commit 783fb7aacb
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/sunstone/sunstone-server.rb
View File

@ -36,7 +36,7 @@ use Rack::Session::Pool
##############################################################################
helpers do
def authorized?
session["ip"] && session["ip"]==request.ip ? true : false
session[:ip] && session[:ip]==request.ip ? true : false
end
def build_session
@ -47,12 +47,11 @@ helpers do
rc = SunstoneServer.authorize(user, sha1_pass)
if rc[1]
session["user"] = user
session["user_id"] = rc[1]
session["password"] = sha1_pass
session["ip"] = request.ip
session["user_agent"] = request.user_agent
session["remember"] = params[:remember]
session[:user] = user
session[:user_id] = rc[1]
session[:password] = sha1_pass
session[:ip] = request.ip
session[:remember] = params[:remember]
if params[:remember]
env['rack.session.options'][:expire_after] = 30*60*60*24
@ -77,14 +76,14 @@ before do
unless request.path=='/login' || request.path=='/'
halt 401 unless authorized?
@SunstoneServer = SunstoneServer.new(session["user"], session["password"])
@SunstoneServer = SunstoneServer.new(session[:user], session[:password])
end
end
after do
unless request.path=='/login' || request.path=='/'
unless session['remember']
if params[:timeout] === true
unless session[:remember]
if params[:timeout] == true
env['rack.session.options'][:defer] = true
else
env['rack.session.options'][:expire_after] = 60*10
@ -98,9 +97,15 @@ end
##############################################################################
get '/' do
redirect '/login' unless authorized?
time = Time.now + 60
response.set_cookie("one-user", :value=>"#{session['user']}", :expires=>time)
response.set_cookie("one-user_id", :value=>"#{session['user_id']}", :expires=>time)
response.set_cookie("one-user",
:value=>"#{session[:user]}",
:expires=>time)
response.set_cookie("one-user_id",
:value=>"#{session[:user_id]}",
:expires=>time)
File.read(File.dirname(__FILE__)+'/templates/index.html')
end
@ -119,6 +124,17 @@ post '/logout' do
destroy_session
end
##############################################################################
# Config and Logs
##############################################################################
get '/config' do
@SunstoneServer.get_configuration(session[:user_id])
end
get '/vm/:id/log' do
@SunstoneServer.get_vm_log(params[:id])
end
##############################################################################
# GET Pool information
##############################################################################
@ -154,13 +170,3 @@ post '/:resource/:id/action' do
@SunstoneServer.perform_action(params[:resource], params[:id], request.body.read)
end
##############################################################################
# Config and Logs
##############################################################################
get '/config' do
@SunstoneServer.get_configuration(session["user_id"])
end
get '/vm/:id/log' do
@SunstoneServer.get_vm_log(params[:id])
end