feature #795: Check server error when authenticating

This commit is contained in:
Daniel Molina committed 2011-09-22 13:16:59 +02:00
1 parent 4623bdc264
commit 7e6c4eb333
3 files changed
+19 -3

No files matched your search

+7 -1
View File
@@ -80,7 +80,13 @@ end
before do
@econe_server = EC2QueryServer.new(settings.config)
result = @econe_server.authenticate(request.env, params)
begin
result = @econe_server.authenticate(request.env, params)
rescue Exception => e
error 500, e.message
end
if result
# Add a log message
error 400, error_xml("AuthFailure", 0)
+6 -1
View File
@@ -82,7 +82,12 @@ set :port, settings.config[:port]
before do
@occi_server = OCCIServer.new(settings.config)
result = @occi_server.authenticate(request.env)
begin
result = @occi_server.authenticate(request.env)
rescue Exception => e
error 500, e.message
end
if result
error 401, result
end
+6 -1
View File
@@ -78,7 +78,12 @@ helpers do
def build_session
cloud_auth = CloudAuth.new(settings.config)
result = cloud_auth.auth(request.env, params)
begin
result = cloud_auth.auth(request.env, params)
rescue Exception => e
error 500, e.message
end
if result
return [401, ""]
else