misty 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8871dd676eb4b94f5ba8c83606aa8c058b3308bd
-  data.tar.gz: 1189ed46c9ff27f495195777eab3738e868c19c7
+  metadata.gz: ef6194d780346c6ece1d31df96eb3ee0b9238cfd
+  data.tar.gz: 647ec752cc79508e49f5b7be38197634f787921b
 SHA512:
-  metadata.gz: 94215114f14ce374973f08066ec787156b7863740ba85c748cfb7d5c2d29552996ca47d433b893ec3c17c585ec5fa8fc0a46d6a298913db76203ca29b529166f
-  data.tar.gz: 740e770a49088a9a7c86b8bbc54e8b576837932fcb546ee99da12f67566a977632c282039c56e127ff70135458c77bb7976af57c92dc4e151c8653584d8420fb
+  metadata.gz: d44270f88d2790dd75c7c47641c88f1c4bf0217dcfb3baf95ca36b99c2b88d82306791e5a45171c0760a2c5360946c8b406fbc5a5cdc7b7db190aad951444c70
+  data.tar.gz: ee7884149c42462497317b8305c5b10edacfe584e44edc6273ce04314daca7339c90b33a8753d4d0f76b1ce1e7361616bcab823a6bd279a6d094be898c636d25

data/lib/misty/auth/auth_v3.rb

@@ -3,19 +3,22 @@ require 'misty/auth'
 module Misty
   class AuthV3 < Misty::Auth
     def initialize(options, *args)
-      domain_id = options[:domain_id] ? options[:domain_id] : Misty::DOMAIN_ID
-      project_domain_id = options[:project_domain_id] ? options[:project_domain_id] : Misty::DOMAIN_ID
-      user_domain_id = options[:user_domain_id] ? options[:user_domain_id] : Misty::DOMAIN_ID
-
-      @domain = Misty::Auth::Name.new(domain_id, options[:domain])
+      if options[:project_id] || options[:project]
+        # scope: project
+        project_domain_id = options[:project_domain_id] ? options[:project_domain_id] : Misty::DOMAIN_ID
+        @project = Misty::Auth::ProjectScope.new(options[:project_id], options[:project])
+        @project.domain = Misty::Auth::Name.new(project_domain_id, options[:user_domain])
+      else
+        # scope: domain
+        domain_id = options[:domain_id] ? options[:domain_id] : Misty::DOMAIN_ID
+        @domain = Misty::Auth::DomainScope.new(domain_id, options[:domain]) if domain_id || options[:domain]
+      end
 
+      user_domain_id = options[:user_domain_id] ? options[:user_domain_id] : Misty::DOMAIN_ID
       @user =  Misty::Auth::User.new(options[:user_id], options[:user])
       @user.password = options[:password]
       @user.domain = Misty::Auth::Name.new(user_domain_id, options[:user_domain])
 
-      @project = Misty::Auth::Project.new(options[:project_id], options[:project])
-      @project.domain = Misty::Auth::Name.new(project_domain_id, options[:user_domain])
-
       super(options, *args)
     end
 

data/lib/misty/auth/name.rb

@@ -29,7 +29,13 @@ module Misty
       end
     end
 
-    class Project < Name
+    class DomainScope < Name
+      def identity
+        { :domain => super }
+      end
+    end
+
+    class ProjectScope < Name
       include Misty::Auth::Domain
 
       def identity

data/lib/misty/version.rb

@@ -1,3 +1,3 @@
 module Misty
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/test/unit/auth/name_test.rb

@@ -83,28 +83,28 @@ describe Misty::Auth::User do
   end
 end
 
-describe Misty::Auth::Project do
+describe Misty::Auth::ProjectScope do
   describe "#identity" do
     it "when id is provided it doesn't require domain" do
-      project = Misty::Auth::Project.new("project_id", "Project")
+      project = Misty::Auth::ProjectScope.new("project_id", "Project")
       project.identity.must_equal ({:project=>{:id=>"project_id"}})
     end
 
     it "when id is nul and name is provided it uses domain id" do
-      project = Misty::Auth::Project.new(nil, "Project")
+      project = Misty::Auth::ProjectScope.new(nil, "Project")
       project.domain = Misty::Auth::Name.new("default", nil)
       project.identity.must_equal ({:project=>{:name=>"Project", :domain=>{:id=>"default"}}})
     end
 
     it "when id is nul and name is provided it uses domain name" do
-      project = Misty::Auth::Project.new(nil, "Project")
+      project = Misty::Auth::ProjectScope.new(nil, "Project")
       project.domain = Misty::Auth::Name.new(nil, "Default")
       project.identity.must_equal ({:project=>{:name=>"Project", :domain=>{:name=>"Default"}}})
     end
 
     it "raises an error with no project id and no domain are provided" do
       proc do
-        project = Misty::Auth::Project.new(nil, "Project")
+        project = Misty::Auth::ProjectScope.new(nil, "Project")
         project.identity
       end.must_raise Misty::Auth::CredentialsError
     end

data/test/unit/auth_helper.rb

@@ -3,7 +3,7 @@ def auth_response_v3(type, name)
     { 'methods' => ['password'],
       'roles' => [{ 'id' => 'id_roles', 'name' => 'admin' }],
       'expires_at' => '2016-11-29T07:45:29.908554Z',
-      'project' => { 'domain' => { 'id' => 'default', 'name' => 'Default' }, 'id' => 'id_project', 'name' => 'admin' },
+      'project' => { 'domain' => { 'id' => 'default', 'name' => 'Default' }, 'id' => 'project_id', 'name' => 'admin' },
       'catalog' =>
       [{ 'endpoints' =>
         [{ 'region_id' => 'regionOne',

data/test/unit/auth_test.rb

@@ -2,41 +2,66 @@ require 'test_helper'
 require 'auth_helper'
 
 describe Misty::Auth do
-  describe ".new" do
-    let(:authv3_creds) do
-      {
-        :url      => "http://localhost:5000",
-        :user     => "admin",
-        :password => "secret",
-        :project  => "admin",
-        :domain   => "default"
-      }
-    end
+  let(:log) { Logger.new('/dev/null') }
+
+  describe Misty::AuthV3 do
+    describe "#new" do
+      it "authenticates using project scoped authorization" do
+        auth = {
+          :url        => "http://localhost:5000",
+          :user_id    => "user_id",
+          :password   => "secret",
+          :project_id => "project_id"
+        }
+
+        stub_request(:post, "http://localhost:5000/v3/auth/tokens").
+          with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"project\":{\"id\":\"project_id\"}}}}",
+            :headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json'}).
+          to_return(:status => 200, :body => JSON.dump(auth_response_v3("identity", "keystone")), :headers => {"x-subject-token"=>"token_data"})
+
+        Misty::AuthV3.new(auth, false, log)
+      end
+
+      it "authenticates using domain scoped authorization" do
+        auth = {
+          :url      => "http://localhost:5000",
+          :user_id  => "user_id",
+          :password => "secret"
+        }
+
+        stub_request(:post, "http://localhost:5000/v3/auth/tokens").
+          with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"domain\":{\"id\":\"default\"}}}}",
+            :headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json'}).
+          to_return(:status => 200, :body => JSON.dump(auth_response_v3("identity", "keystone")), :headers => {"x-subject-token"=>"token_data"})
 
-    let(:authv2_creds) do
-      {
-        :url      => "http://localhost:5000",
-        :user     => "admin",
-        :password => "secret",
-        :tenant   => "admin"
-      }
+        Misty::AuthV3.new(auth, false, log)
+      end
     end
 
-    describe Misty::AuthV3 do
-      it "#new fails when missing credentials" do
+    describe "with credentials" do
+      let(:authv3_creds) do
+        {
+          :url      => "http://localhost:5000",
+          :user     => "admin",
+          :password => "secret",
+          :project  => "admin"
+        }
+      end
+
+      it "fails when missing credentials" do
         stub_request(:post, "http://localhost:5000/v3/auth/tokens").
-          to_return(:status => 200, :body => "{\"token\":{\"catalog\":[]}}", :headers => {"x-subject-token"=>"token_data"})
+        to_return(:status => 200, :body => "{\"token\":{\"catalog\":[]}}", :headers => {"x-subject-token"=>"token_data"})
 
         proc do
-          Misty::AuthV3.new({}, false, Logger.new('/dev/null'))
+          Misty::AuthV3.new({}, false, log)
         end.must_raise Misty::Auth::CredentialsError
       end
 
       it "#get_token" do
         stub_request(:post, "http://localhost:5000/v3/auth/tokens").
-          to_return(:status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {"x-subject-token"=>"token_data"})
+        to_return(:status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {"x-subject-token"=>"token_data"})
 
-        auth = Misty::AuthV3.new(authv3_creds, false, Logger.new('/dev/null'))
+        auth = Misty::AuthV3.new(authv3_creds, false, log)
         auth.stub :expired?, false do
           auth.get_token.must_equal "token_data"
         end
@@ -44,36 +69,49 @@ describe Misty::Auth do
 
       it "#catalog" do
         stub_request(:post, "http://localhost:5000/v3/auth/tokens").
-          to_return(:status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {"x-subject-token"=>"token_data"})
+        to_return(:status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {"x-subject-token"=>"token_data"})
 
-        auth = Misty::AuthV3.new(authv3_creds, false, Logger.new('/dev/null'))
+        auth = Misty::AuthV3.new(authv3_creds, false, log)
         auth.catalog.must_equal ["catalog_data"]
       end
 
       it "#get_endpoint" do
         stub_request(:post, "http://localhost:5000/v3/auth/tokens").
-          to_return(:status => 200, :body => JSON.dump(auth_response_v3("identity", "keystone")), :headers => {"x-subject-token"=>"token_data"})
+        to_return(:status => 200, :body => JSON.dump(auth_response_v3("identity", "keystone")), :headers => {"x-subject-token"=>"token_data"})
 
-        auth = Misty::AuthV3.new(authv3_creds, false, Logger.new('/dev/null'))
+        auth = Misty::AuthV3.new(authv3_creds, false, log)
         auth.get_endpoint(%w{identity}, "regionOne", "public").must_equal "http://localhost"
       end
     end
+  end
 
-    describe Misty::AuthV2 do
-      it "#new fails when missing credentials" do
+  describe Misty::AuthV2 do
+    describe "#new" do
+      it "fails when missing credentials" do
         stub_request(:post, "http://localhost:5000/v2.0/tokens").
           to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"}}}", :headers => {})
 
         proc do
-          Misty::AuthV2.new({}, false, Logger.new('/dev/null'))
+          Misty::AuthV2.new({}, false, log)
         end.must_raise Misty::Auth::CredentialsError
       end
+    end
+
+    describe "with credentials" do
+      let(:authv2_creds) do
+        {
+          :url      => "http://localhost:5000",
+          :user     => "admin",
+          :password => "secret",
+          :tenant   => "admin"
+        }
+      end
 
       it "#get_token" do
         stub_request(:post, "http://localhost:5000/v2.0/tokens").
           to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"},\"serviceCatalog\":[\"catalog_data\"]}}", :headers => {})
 
-        auth = Misty::AuthV2.new(authv2_creds, false, Logger.new('/dev/null'))
+        auth = Misty::AuthV2.new(authv2_creds, false, log)
         auth.stub :expired?, false do
           auth.get_token.must_equal "token_data"
         end
@@ -83,7 +121,7 @@ describe Misty::Auth do
         stub_request(:post, "http://localhost:5000/v2.0/tokens").
           to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"},\"serviceCatalog\":[\"catalog_data\"]}}", :headers => {})
 
-        auth = Misty::AuthV2.new(authv2_creds, false, Logger.new('/dev/null'))
+        auth = Misty::AuthV2.new(authv2_creds, false, log)
         auth.catalog.must_equal ["catalog_data"]
       end
 
@@ -91,7 +129,7 @@ describe Misty::Auth do
         stub_request(:post, "http://localhost:5000/v2.0/tokens").
           to_return(:status => 200, :body => JSON.dump(auth_response_v2("identity", "keystone")), :headers => {"x-subject-token"=>"token_data"})
 
-        auth = Misty::AuthV2.new(authv2_creds, false, Logger.new('/dev/null'))
+        auth = Misty::AuthV2.new(authv2_creds, false, log)
         auth.get_endpoint(%w{identity}, "regionOne", "public").must_equal "http://localhost"
       end
     end

data/test/unit/cloud/services_test.rb

@@ -4,11 +4,10 @@ require 'auth_helper'
 describe "Misty::Cloud" do
   let(:cloud) do
     auth = {
-      :url      => "http://localhost:5000",
-      :user     => "admin",
-      :password => "secret",
-      :project  => "admin",
-      :domain   => "default"
+      :url               => "http://localhost:5000",
+      :user              => "admin",
+      :password          => "secret",
+      :project           => "admin"
     }
 
     Misty::Cloud.new(:auth => auth)

data/test/unit/cloud_test.rb

@@ -22,7 +22,6 @@ describe Misty::Cloud do
         :user     => "admin",
         :password => "secret",
         :project  => "admin",
-        :domain   => "default"
       }
     end
 
@@ -89,8 +88,7 @@ describe Misty::Cloud do
         authv3_data = {
           :user     => "admin",
           :password => "secret",
-          :project  => "admin",
-          :domain   => "default"
+          :project  => "admin"
         }
 
         proc do
@@ -103,8 +101,7 @@ describe Misty::Cloud do
           :url      => "",
           :user     => "admin",
           :password => "secret",
-          :project  => "admin",
-          :domain   => "default"
+          :project  => "admin"
         }
 
         proc do
@@ -140,8 +137,7 @@ describe Misty::Cloud do
             :url      => "http://localhost:5000",
             :user     => "admin",
             :password => "secret",
-            :project  => "admin",
-            :domain   => "default"
+            :project  => "admin"
           }
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: misty
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Gilles Dubreuil
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json