featurei #952: Key now is generated with zones admin. Key can not be regenerated with DB data

This commit is contained in:
Ruben S. Montero committed 2011-11-03 01:45:06 +01:00
1 parent e2f5a07349
commit 648cf2e8fa
2 files changed
+17 -28

No files matched your search

+13 -24
View File
@@ -84,7 +84,7 @@ if Auth.all.size == 0
end
credentials[1] = Digest::SHA1.hexdigest(credentials[1])
@auth=Auth.create({:name => credentials[0],
:password => credentials[1]})
:password => credentials[1]})
@auth.save
else
warn "oZones admin credentials not set, missing OZONES_AUTH file."
@@ -96,7 +96,6 @@ end
ADMIN_NAME = @auth.name
ADMIN_PASS = @auth.password
ADMIN_KEY = Digest::SHA1.hexdigest("ADMIN_NAME:ADMIN_PASS")
begin
OZones::ProxyRules.new("apache",config[:htaccess])
@@ -120,32 +119,23 @@ set :show_exceptions, false
helpers do
def authorized?
if session[:ip] && session[:ip]==request.ip
return true
end
auth = Rack::Auth::Basic::Request.new(request.env)
if auth.provided? && auth.basic? && auth.credentials
user = auth.credentials[0]
sha1_pass = Digest::SHA1.hexdigest(auth.credentials[1])
if user == ADMIN_NAME && sha1_pass == ADMIN_PASS
return true
end
end
return false
session[:ip] && session[:ip]==request.ip ? true : false
end
def build_session
auth = Rack::Auth::Basic::Request.new(request.env)
if auth.provided? && auth.basic? && auth.credentials
user = auth.credentials[0]
sha1_pass = Digest::SHA1.hexdigest(auth.credentials[1])
user = auth.credentials[0]
pass = auth.credentials[1]
sha1_pass = Digest::SHA1.hexdigest(pass)
if user == ADMIN_NAME && sha1_pass == ADMIN_PASS
session[:user] = user
session[:password] = sha1_pass
session[:ip] = request.ip
session[:user] = user
session[:ip] = request.ip
session[:key] = Digest::SHA1.hexdigest("#{user}:#{pass}")
session[:remember] = params[:remember]
if params[:remember]
@@ -165,15 +155,14 @@ helpers do
session.clear
return [204, ""]
end
end
before do
unless request.path=='/login' || request.path=='/'
halt 401 unless authorized?
@OzonesServer = OzonesServer.new(ADMIN_KEY)
@pr = OZones::ProxyRules.new("apache",config[:htaccess])
@OzonesServer = OzonesServer.new(session[:key])
@pr = OZones::ProxyRules.new("apache",config[:htaccess])
end
end
+4 -4
View File
@@ -88,11 +88,11 @@ helpers do
end
def build_session
# begin
begin
result = settings.cloud_auth.auth(request.env, params)
# rescue Exception => e
# error 500, e.message
# end
rescue Exception => e
error 500, e.message
end
if result.nil?
return [401, ""]