fog-brightbox 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf3d66886dcbcc3b322d8d7cbc9d2d1b44e170b0
-  data.tar.gz: 6b077cbd2c3247965692c8fa65da922d4d611817
+  metadata.gz: 8e284d72c08bde3b84dde44cd5eddf1cf54da198
+  data.tar.gz: 668a97efaef6e604174b3178eb3857fdd8e3d240
 SHA512:
-  metadata.gz: 1adfefa1c678d7c4916d171a813c7b6de86e25bfcaf0c05e989de5994415ad60bf14f1fef8edd51e52867b4256d9302637a86e65e7f817af5c504b82002ded29
-  data.tar.gz: 0d6033997d99c661ff1cdb81f147c2e32d5d883c0b794ec4f631dab4250be57717e066145d58ac2db5a2ce776f5b4a712a0287777488f2357241ca5c32770fb0
+  metadata.gz: f86b3f5e1f72d0f621e594b0eea69184b263cefde28891ccb12de854a2c634c9bbbd6e35b94438750f89ac3d174ad1af5c8fede4807699e4532abf346d4d7e8f
+  data.tar.gz: 0c4d0996fb3d7eb4670e8cdd01800dea3d81ee7472bb7f9992a98e0cda7a0f0ac2aba3e8a6071d806f6c218be3d4f0a70856ca4c74eba9ba77753b3c8ed0fac5

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 0.5.1 / 2014-09-15
+
+Bug fixes:
+
+* Fix a possible authentication loop when bad credentials or expired tokens
+  would trigger repeated attempts to authenticate with no changes to the
+  bad credentials.
+
 ### 0.5.0 / 2014-09-01
 
 Enhancements:

data/lib/fog/brightbox/storage/authentication_request.rb

@@ -15,8 +15,8 @@ module Fog
           self.access_token = response.headers["X-Auth-Token"]
           self.management_url = response.headers["X-Server-Management-Url"] || response.headers["X-Storage-Url"]
           self
-        rescue Excon::Errors::Error
-          nil
+        rescue Excon::Errors::Unauthorized => error
+          raise Fog::Brightbox::Storage::AuthenticationRequired.slurp(error)
         end
 
         private

data/lib/fog/brightbox/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Brightbox
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/spec/fog/brightbox/storage/authentication_request_spec.rb

@@ -3,6 +3,8 @@ require "webmock/minitest"
 require "fog/brightbox"
 
 describe Fog::Brightbox::Storage::AuthenticationRequest do
+  include StockStorageResponses
+
   describe "when initialised with blank config" do
     before do
       stub_request(:get, "https://orbit.brightbox.com/v1").
@@ -10,14 +12,14 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
         "Host" => "orbit.brightbox.com:443",
         "X-Auth-User" => "",
         "X-Auth-Key" => ""
-      }).to_return(:status => 412, :body => "Bad URL", :headers => {})
+      }).to_return(bad_url_response)
     end
 
-    it "fails" do
+    it "raises error" do
       settings = {}
       @config = Fog::Brightbox::Config.new(settings)
       @request = Fog::Brightbox::Storage::AuthenticationRequest.new(@config)
-      refute @request.authenticate
+      assert_raises(Excon::Errors::PreconditionFailed) { @request.authenticate }
     end
   end
 
@@ -28,12 +30,7 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
           "Host" => "orbit.brightbox.com:443",
           "X-Auth-User" => "cli-12345",
           "X-Auth-Key" => "12345"
-      }).to_return(:status => 200, :body => "Authenticated", :headers => {
-        "X-Storage-Url" => "https://orbit.brightbox.com/v1/acc-12345",
-        "X-Storage-Token" => "abcdefghijklmnopqrstuvwxyz1234567890",
-        "X-Auth-Token" => "abcdefghijklmnopqrstuvwxyz1234567890",
-        "Content-Type" => "text/plain"
-      })
+      }).to_return(authorized_response)
     end
 
     it "authenticates correctly" do
@@ -54,12 +51,7 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
           "Host" => "orbit.brightbox.com:443",
           "X-Auth-User" => "user@example.com",
           "X-Auth-Key" => "abcde"
-      }).to_return(:status => 200, :body => "Authenticated", :headers => {
-        "X-Storage-Url" => "https://orbit.brightbox.com/v1/acc-12345",
-        "X-Storage-Token" => "abcdefghijklmnopqrstuvwxyz1234567890",
-        "X-Auth-Token" => "abcdefghijklmnopqrstuvwxyz1234567890",
-        "Content-Type" => "text/plain"
-      })
+      }).to_return(authorized_response)
     end
 
     it "authenticates correctly" do
@@ -74,4 +66,27 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
       assert @request.authenticate
     end
   end
+
+  describe "when initialised with bad user details" do
+    before do
+      stub_request(:get, "https://orbit.brightbox.com/v1").
+        with(:headers => {
+          "Host" => "orbit.brightbox.com:443",
+          "X-Auth-User" => "user@example.com",
+          "X-Auth-Key" => "abcde"
+      }).to_return(unauthorized_response)
+    end
+
+    it "raises error" do
+      settings = {
+        :brightbox_client_id => "app-12345",
+        :brightbox_secret => "12345",
+        :brightbox_username => "user@example.com",
+        :brightbox_password => "abcde"
+      }
+      @config = Fog::Brightbox::Config.new(settings)
+      @request = Fog::Brightbox::Storage::AuthenticationRequest.new(@config)
+      assert_raises(Fog::Brightbox::Storage::AuthenticationRequired) { @request.authenticate }
+    end
+  end
 end

data/spec/fog/storage/brightbox_spec.rb

@@ -3,21 +3,8 @@ require "webmock/minitest"
 require "fog/brightbox"
 
 describe Fog::Storage::Brightbox do
-  let(:valid_auth_response) do
-    {
-      :status => 200,
-      :body => "Authenticated",
-      :headers => {
-        "X-Storage-Url"=>"https://orbit.brightbox.com:443/v1/acc-12345",
-        "Content-Length"=>"13",
-        "X-Storage-Token"=>"c1236c8c34d668df497c06075d8a76a79c6fdd0d",
-        "Content-Type"=>"text/plain",
-        "X-Auth-Token"=>"c1236c8c34d668df497c06075d8a76a79c6fdd0d",
-        "X-Trans-Id"=>"txcb228b8b9bfe4d5184828-0053568313",
-        "Date"=>"Tue, 22 Apr 2014 14:56:20 GMT"
-      }
-    }
-  end
+  include StockStorageResponses
+
   let(:config) { Fog::Brightbox::Config.new(settings) }
   let(:service) { Fog::Storage::Brightbox.new(config) }
 
@@ -64,7 +51,8 @@ describe Fog::Storage::Brightbox do
     end
 
     before do
-      stub_request(:get, "https://orbit.brightbox.com/v1").to_return(valid_auth_response)
+      stub_request(:get, "https://orbit.brightbox.com/v1").
+        to_return(authorized_response)
     end
 
     it "requires a call to authenticate" do
@@ -90,18 +78,10 @@ describe Fog::Storage::Brightbox do
     end
 
     it "fails to authenticate" do
-      response =  {
-        :body=>"Bad URL",
-        :headers=>
-        {"Content-Length"=>"7",
-         "Content-Type"=>"text/html; charset=UTF-8",
-         "X-Trans-Id"=>"txab03ff4864ff42989f4a1-0053568282",
-         "Date"=>"Tue, 22 Apr 2014 14:53:54 GMT"},
-         :status=>412
-      }
-      stub_request(:get, "https://orbit.brightbox.com/v1").to_return(response)
+      stub_request(:get, "https://orbit.brightbox.com/v1").
+        to_return(unauthorized_response)
 
-      service.authenticate
+      assert_raises(Fog::Brightbox::Storage::AuthenticationRequired) { service.authenticate }
       assert_nil service.management_url
     end
   end
@@ -118,7 +98,8 @@ describe Fog::Storage::Brightbox do
     end
 
     before do
-      stub_request(:get, "https://orbit.brightbox.com/v1").to_return(valid_auth_response)
+      stub_request(:get, "https://orbit.brightbox.com/v1").
+        to_return(authorized_response)
     end
 
     it "uses the configured account" do
@@ -138,7 +119,8 @@ describe Fog::Storage::Brightbox do
     end
 
     before do
-      stub_request(:get, "https://orbit.brightbox.com/v1").to_return(valid_auth_response)
+      stub_request(:get, "https://orbit.brightbox.com/v1").
+        to_return(authorized_response)
     end
 
     it "extracts the account from the management URL" do
@@ -186,7 +168,8 @@ describe Fog::Storage::Brightbox do
     end
 
     it "keeps setting after authentication" do
-      stub_request(:get, "https://orbit.brightbox.com/v1").to_return(valid_auth_response)
+      stub_request(:get, "https://orbit.brightbox.com/v1").
+        to_return(authorized_response)
       config.expire_tokens!
       service.authenticate
       assert_equal "https://files.gb2.brightbox.com/v1/acc-12345", service.management_url.to_s
@@ -208,9 +191,7 @@ describe Fog::Storage::Brightbox do
     before do
       # Ongoing request but tokens are expired
       stub_request(:get, "https://files.gb2.brightbox.com/v1/acc-12345/fnord").
-        to_return(:status => 401,
-                  :body => "Authentication required",
-                  :headers => { "Content-Type" => "text/plain" })
+        to_return(unauthorized_response)
     end
 
     let(:params) { { :expects => [200], :path => "fnord" } }
@@ -238,18 +219,16 @@ describe Fog::Storage::Brightbox do
       # Ongoing request but tokens are expired
       stub_request(:get, "https://files.gb2.brightbox.com/v1/acc-12345/fnord").
         with(:headers => { "X-Auth-Token" => "1234567890abcdefghijklmnopqrstuvwxyz" }).
-        to_return(:status => 401,
-                  :body => "Authentication required",
-                  :headers => { "Content-Type" => "text/plain" })
+        to_return(unauthorized_response)
 
       # The reauthentication
       stub_request(:get, "https://files.gb2.brightbox.com/v1").
         with(:headers => { "X-Auth-User" => "user@example.com", "X-Auth-Key" => "12345" }).
-        to_return(valid_auth_response)
+        to_return(authorized_response)
 
       # Repeated request
       stub_request(:get, "https://files.gb2.brightbox.com/v1/acc-12345/fnord").
-        with(:headers => { "X-Auth-Token" => "c1236c8c34d668df497c06075d8a76a79c6fdd0d" }).
+        with(:headers => { "X-Auth-Token" => "abcdefghijklmnopqrstuvwxyz1234567890" }).
         to_return(:status => 200)
     end
 
@@ -272,11 +251,11 @@ describe Fog::Storage::Brightbox do
     before do
       # Initial authentication
       stub_request(:get, "https://orbit.brightbox.com/v1").
-        with(:headers => {"X-Auth-Key" => "12345", "X-Auth-User" => "cli-12345"}).
-        to_return(valid_auth_response)
+        with(:headers => { "X-Auth-Key" => "12345", "X-Auth-User" => "cli-12345" }).
+        to_return(authorized_response)
 
       stub_request(:get, "https://orbit.brightbox.com/v1/acc-12345/fnord").
-        with(:headers => { "X-Auth-Token" => "c1236c8c34d668df497c06075d8a76a79c6fdd0d" }).
+        with(:headers => { "X-Auth-Token" => "abcdefghijklmnopqrstuvwxyz1234567890" }).
         to_return(:status => 200)
     end
 

data/spec/spec_helper.rb

@@ -2,3 +2,4 @@ require "minitest/autorun"
 require "fog/brightbox"
 require "model_helper"
 require "supports_resource_locking"
+require "stock_storage_responses"

data/spec/stock_storage_responses.rb

@@ -0,0 +1,36 @@
+module StockStorageResponses
+  def authorized_response
+    {
+      :status => 200,
+      :body => "Authenticated",
+      :headers => {
+        "X-Storage-Url" => "https://orbit.brightbox.com/v1/acc-12345",
+        "X-Storage-Token" => "abcdefghijklmnopqrstuvwxyz1234567890",
+        "X-Auth-Token" => "abcdefghijklmnopqrstuvwxyz1234567890",
+        "Content-Type" => "text/plain"
+      }
+    }
+  end
+
+  def unauthorized_response
+    {
+      :status => 401,
+      :body => "<html><h1>Unauthorized</h1><p>This server could not verify that you are authorized to access the document you requested.</p></html>",
+      :headers => {
+        "Content-Length" => 131,
+        "Content-Type" => "text/html; charset=UTF-8"
+      }
+    }
+  end
+
+  def bad_url_response
+    {
+      :status => 412,
+      :body => "Bad URL",
+      :headers => {
+        "Content-Length" => 7,
+        "Content-Type" => "text/html; charset=UTF-8"
+      }
+    }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-brightbox
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Paul Thornthwaite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -359,6 +359,7 @@ files:
 - spec/model_helper.rb
 - spec/model_setup.rb
 - spec/spec_helper.rb
+- spec/stock_storage_responses.rb
 - spec/supports_resource_locking.rb
 homepage: ''
 licenses:
@@ -415,4 +416,5 @@ test_files:
 - spec/model_helper.rb
 - spec/model_setup.rb
 - spec/spec_helper.rb
+- spec/stock_storage_responses.rb
 - spec/supports_resource_locking.rb