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

feature #967: CloudAuth thread safe

Browse Source
This commit is contained in:
Daniel Molina 2012-03-23 13:00:09 +01:00
parent 1efef61128
commit 2d471abdc9
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/cloud/common/CloudAuth.rb
View File

@ -14,6 +14,8 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
require 'thread'
class CloudAuth
# These are the authentication methods for the user requests
AUTH_MODULES = {
@ -47,6 +49,8 @@ class CloudAuth
@conf = conf
@logger = logger
@mutex = Mutex.new
@token_expiration_time = Time.now.to_i + EXPIRE_DELTA
if AUTH_MODULES.include?(@conf[:auth])
@ -56,7 +60,6 @@ class CloudAuth
raise "Auth module not specified"
end
if AUTH_CORE_MODULES.include?(@conf[:core_auth])
core_auth = AUTH_CORE_MODULES[@conf[:core_auth]]
else
@ -69,6 +72,8 @@ class CloudAuth
rescue => e
raise e.message
end
update_userpool_cache
end
# Generate a new OpenNebula client for the target User, if the username
@ -81,12 +86,12 @@ class CloudAuth
end
def update_userpool_cache
@user_pool = OpenNebula::UserPool.new(client)
@mutex.synchronize {
@user_pool = OpenNebula::UserPool.new(client)
rc = @user_pool.info
if OpenNebula.is_error?(rc)
raise rc.message
end
rc = @user_pool.info
raise rc.message if OpenNebula.is_error?(rc)
}
end
def auth(env, params={})
@ -106,18 +111,14 @@ class CloudAuth
time_now = Time.now.to_i
if time_now > @token_expiration_time - EXPIRE_MARGIN
@token_expiration_time = time_now + EXPIRE_DELTA
@mutex.synchronize {
@token_expiration_time = time_now + EXPIRE_DELTA
}
end
@token_expiration_time
end
# If @user_pool is not defined it will retrieve it from OpenNebula
def get_userpool
update_userpool_cache if @user_pool.nil?
@user_pool
end
def get_password(username, driver=nil)
if driver
xp="USER[NAME=\"#{username}\" and AUTH_DRIVER=\"#{driver}\"]/PASSWORD"
@ -125,13 +126,13 @@ class CloudAuth
xp="USER[NAME=\"#{username}\"]/PASSWORD"
end
return get_userpool[xp]
@user_pool[xp]
end
# Gets the username associated with a password
# password:: _String_ the password
# [return] _Hash_ with the username
def get_username(password)
return get_userpool["USER[contains(PASSWORD, \"#{password}\")]/NAME"]
@user_pool["USER[contains(PASSWORD, \"#{password}\")]/NAME"]
end
end