occi-api 4.3.3 → 4.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b31a4ef31f01497fb6bc37b720e2bc129dfb8e1c
-  data.tar.gz: 34839545df78237a7667522561c6c1dce2a201c3
+  metadata.gz: 615c238e6d6852e6dd7291fae45fedb4c454a233
+  data.tar.gz: 158844cef470a5e5eabe0839c57932629522f67f
 SHA512:
-  metadata.gz: 98b21d80f28f2dc681e61e466e9100cefc2ee23b5989ffd2c2f9acefdbc80538b81bc3555c4c6c0c02fb530cbdf21f51fb232e3852ae350b55baa6a14c327552
-  data.tar.gz: 88f422c97daed701da92242e1a311d9011ce868d6b58ec9a6db96d245a6957e0383d30e167550696407f1bd70fe9cece40d6324ad8ac6eb706ee9c23017f4517
+  metadata.gz: 47554b26fcaf8fb1b39bfec2bed82b529cea387b2a00714c1d08053f2b3bcdfc930fb2c26a41174683fe8100640a7b4348e102e1754ec286d0f93bb28a4fda48
+  data.tar.gz: e47ff7daa781b85849b46cf5cc6a1718dcf3b4d833c51d9cca9b49ec0c905f4815ed48a245b6650926cca5c6a8519babc4de172158fed97636ce5bc59e20f497

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

@@ -0,0 +1,18 @@
+module Occi::Api::Client
+  module Http
+    module AuthnPlugins
+
+      class Token < Base
+
+        def setup(options = {})
+          # set up token auth
+          raise ArgumentError, "Missing required option 'token' for token auth!" if @options[:token].blank?
+          raise ArgumentError, "Token cannot be a multi-line string!" if @options[:token].strip.lines.count > 1
+          @env_ref.class.headers['X-Auth-Token'] = @options[:token].strip
+        end
+
+      end
+
+    end
+  end
+end

data/lib/occi/api/client/http/helpers.rb

@@ -20,21 +20,22 @@ module Occi::Api::Client
       # @see Occi::Api::Client::ClientBase
       def get_auth(auth_options, fallback = false)
         # select appropriate authN type
-        case auth_options[:type]
-        when "basic"
-          @authn_plugin = Http::AuthnPlugins::Basic.new self, auth_options
-        when "digest"
-          @authn_plugin = Http::AuthnPlugins::Digest.new self, auth_options
-        when "x509"
-          @authn_plugin = Http::AuthnPlugins::X509.new self, auth_options
-        when "keystone"
-          raise ::Occi::Api::Client::Errors::AuthnError, "This authN method is for fallback only!" unless fallback
-          @authn_plugin = Http::AuthnPlugins::Keystone.new self, auth_options
-        when "none", nil
-          @authn_plugin = Http::AuthnPlugins::Dummy.new self
-        else
-          raise ::Occi::Api::Client::Errors::AuthnError, "Unknown authN method [#{@auth_options[:type]}]!"
-        end
+        @authn_plugin = case auth_options[:type]
+                        when "basic", "digest", "x509", "token"
+                          Http::AuthnPlugins.const_get(auth_options[:type].capitalize).new(
+                            self,
+                            auth_options
+                          )
+                        when "keystone"
+                          raise ::Occi::Api::Client::Errors::AuthnError,
+                                "This authN method is for fallback only!" unless fallback
+                          Http::AuthnPlugins::Keystone.new self, auth_options
+                        when "none", nil
+                          Http::AuthnPlugins::Dummy.new self
+                        else
+                          raise ::Occi::Api::Client::Errors::AuthnError,
+                                "Unknown authN method [#{@auth_options[:type]}]!"
+                        end
 
         @authn_plugin.setup
 
@@ -100,4 +101,4 @@ module Occi::Api::Client
     end
 
   end
-end
+end

data/lib/occi/api/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-api
 version: !ruby/object:Gem::Version
-  version: 4.3.3
+  version: 4.3.4
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-core
@@ -118,6 +118,7 @@ files:
 - lib/occi/api/client/http/authn_plugins/digest.rb
 - lib/occi/api/client/http/authn_plugins/dummy.rb
 - lib/occi/api/client/http/authn_plugins/keystone.rb
+- lib/occi/api/client/http/authn_plugins/token.rb
 - lib/occi/api/client/http/authn_plugins/x509.rb
 - lib/occi/api/client/http/code_helpers.rb
 - lib/occi/api/client/http/helpers.rb