mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-19 03:12:55 +09:00
feature #795: Check server error when authenticating
This commit is contained in:
1 parent
4623bdc264
commit
7e6c4eb333
3 files changed
+19
-3
No files matched your search
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user