occi-api 4.2.5 → 4.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 537358e80a242d16bad669cc2cf47de39851628c
-  data.tar.gz: 4c22b5810f04cd315fb4230d206ce6c0d3c8f097
+  metadata.gz: a33443d89ab0c83183170cd0876da0c9af576c64
+  data.tar.gz: 9da580054d01f0c6e007ceabc1b9266e0673324d
 SHA512:
-  metadata.gz: 6a4d8c20490fd1d339222fccec4bf6148f6b74f77a198d9a808fb9ebcb4ae2a9aacd0fab6011e1135d01d7fa64e850cf9211cfee0bee6f3f04cd7fb1acc6caa0
-  data.tar.gz: 47e3b64bbb98d84951a60b1ec2d3781d8104db484ee6af4482e6d5fd25afbf2de90b5a9223297dbab3a31f4655daab952c1a73e5a0a71d329a609de8bd32634b
+  metadata.gz: a039a1a18bcc7e42736f158b4259f7dd14a976ebdf56b137e19454abbc5b469bf01d05cb0b4bafa717d82e3838950305cd28ce018a5f6bbc9d42e095731f1e76
+  data.tar.gz: 573576b99c9d4ddca4e1b0d5a6e1d1dc4b96e20f04f9550ee9e391290a346792e5102df995aac2434edbc7a0e4af9251ceacaa68a403fe2ab6a015a825bbbdd5

data/lib/occi/api/client/http/authn_plugins/keystone.rb

@@ -7,13 +7,18 @@ module Occi::Api::Client
         KEYSTONE_URI_REGEXP = /^(Keystone|snf-auth) uri='(.+)'$/
 
         def setup(options = {})
-          # get Keystone URL if possible, get unscoped token
+          # get Keystone URL if possible
           set_keystone_base_url
+
+          # get an un-scoped token
           set_auth_token
 
-          # use unscoped token for tenant discovery, get scoped token
-          tenant = get_prefered_tenant
-          set_auth_token(tenant)
+          # use the un-scoped token for tenant discovery
+          # and get a scoped token
+          get_prefered_tenant
+
+          raise ::Occi::Api::Client::Errors::AuthnError,
+                "Unable to get a tenant from Keystone, fallback failed!" if @env_ref.class.headers['X-Auth-Token'].blank?
         end
 
         def authenticate(options = {})
@@ -46,20 +51,16 @@ module Occi::Api::Client
 
           match = KEYSTONE_URI_REGEXP.match(authN_header)
           raise ::Occi::Api::Client::Errors::AuthnError,
-                "Unable to get Keystone's URL from the response!" unless match && match[2]
+                "Unable to get Keystone's URL from the response, fallback failed!" unless match && match[2]
 
           @keystone_url = match[2].chomp('/').chomp('/v2.0')
         end
 
         def set_auth_token(tenant = nil)
-          headers = @env_ref.class.headers.clone
-          headers['Content-Type'] = "application/json"
-          headers['Accept'] = headers['Content-Type']
-
           response = @env_ref.class.post(
             "#{@keystone_url}/v2.0/tokens",
             :body => get_keystone_req(tenant),
-            :headers => headers
+            :headers => get_req_headers
           )
           Occi::Api::Log.debug response.inspect
 
@@ -67,7 +68,7 @@ module Occi::Api::Client
             @env_ref.class.headers['X-Auth-Token'] = response['access']['token']['id']
           else
             raise ::Occi::Api::Client::Errors::AuthnError,
-                  "Unable to get a token from Keystone!"
+                  "Unable to get a token from Keystone, fallback failed!"
           end
         end
 
@@ -85,32 +86,43 @@ module Occi::Api::Client
             }
           else
             raise ::Occi::Api::Client::Errors::AuthnError,
-                  "Unable to request a token from Keystone! Chosen AuthN not supported."
+                  "Unable to request a token from Keystone! Chosen " \
+                  "AuthN is not supported, fallback failed!"
           end
 
-          body['auth']['tenantName'] = tenant if tenant && !tenant.empty?
+          body['auth']['tenantName'] = tenant unless tenant.blank?
           body.to_json
         end
 
         def get_prefered_tenant(match = nil)
-          headers = @env_ref.class.headers.clone
-          headers['Content-Type'] = "application/json"
-          headers['Accept'] = headers['Content-Type']
-
           response = @env_ref.class.get(
             "#{@keystone_url}/v2.0/tenants",
-            :headers => headers
+            :headers => get_req_headers
           )
           Occi::Api::Log.debug response.inspect
 
-          # TODO: impl match with regexp in case of multiple tenants?
-          raise ::Occi::Api::Client::Errors::AuthnError,
-                "Keystone didn't return any tenants!" unless response['tenants'] && response['tenants'].first
-          tenant = response['tenants'].first['name'] if response.success?
           raise ::Occi::Api::Client::Errors::AuthnError,
-                "Unable to get a tenant from Keystone!" unless tenant
+                "Keystone didn't return any tenants, fallback failed!" if response['tenants'].blank?
+
+          response['tenants'].each do |tenant|
+            begin
+              Occi::Api::Log.debug "Authenticating for tenant #{tenant['name'].inspect}"
+              set_auth_token(tenant['name'])
+
+              # found a working tenant, stop looking
+              break
+            rescue ::Occi::Api::Client::Errors::AuthnError
+              # ignoring and trying the next tenant
+            end
+          end
+        end
+
+        def get_req_headers
+          headers = @env_ref.class.headers.clone
+          headers['Content-Type'] = "application/json"
+          headers['Accept'] = headers['Content-Type']
 
-          tenant
+          headers
         end
 
       end

data/lib/occi/api/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Api
-    VERSION = "4.2.5" unless defined?(::Occi::Api::VERSION)
+    VERSION = "4.2.6" unless defined?(::Occi::Api::VERSION)
   end
 end

data/occi-api.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec}/*`.split("\n")
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'occi-core', '~> 4.2.15'
+  gem.add_dependency 'occi-core', '~> 4.2.16'
   gem.add_dependency 'httparty'
   gem.add_dependency 'json'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-api
 version: !ruby/object:Gem::Version
-  version: 4.2.5
+  version: 4.2.6
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.15
+        version: 4.2.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.15
+        version: 4.2.16
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement