cfoundry 0.6.1.rc2 → 0.6.1.rc3

data/lib/cfoundry/baseclient.rb

@@ -112,6 +112,8 @@ module CFoundry
             raise CFoundry::NotFound.new(response.body, 404)
           when Net::HTTPForbidden
             raise CFoundry::Denied.new(response.body, 403)
+          when Net::HTTPUnauthorized
+            raise CFoundry::Unauthorized.new(response.body, 401)
           else
             raise CFoundry::BadResponse.new(response.body, response.code)
           end
@@ -163,6 +165,8 @@ module CFoundry
           raise CFoundry::NotFound.new(nil, code, request, response)
         when 403
           raise CFoundry::Denied.new(nil, code, request, response)
+        when 401
+          raise CFoundry::Unauthorized.new(nil, code, request, response)
         else
           raise CFoundry::BadResponse.new(nil, code, request, response)
       end

data/lib/cfoundry/errors.rb

@@ -121,6 +121,9 @@ module CFoundry
   class Denied < APIError
   end
 
+  class Unauthorized < APIError
+  end
+
   class BadResponse < APIError
   end
 

data/lib/cfoundry/uaaclient.rb

@@ -18,15 +18,11 @@ module CFoundry
     end
 
     def authorize(username, password)
+      @username = username
+      @password = password
+
       wrap_uaa_errors do
-        begin
-          token_issuer.owner_password_grant(username, password)
-        rescue CF::UAA::BadResponse => e
-          status_code = e.message[/\d+/] || 400
-          raise CFoundry::Denied.new("Authorization failed", status_code)
-        rescue CF::UAA::TargetError
-          token_issuer.implicit_grant_with_creds(:username => username, :password => password)
-        end
+        authenticate_with_password_grant || authenticate_with_implicit_grant
       end
     end
 
@@ -107,6 +103,26 @@ module CFoundry
       @uaa_url ||= CF::UAA::Misc.discover_uaa(target)
     end
 
+    def authenticate_with_password_grant
+      begin
+        token_issuer.owner_password_grant(@username, @password)
+      rescue CF::UAA::BadResponse => e
+        status_code = e.message[/\d+/] || 400
+        raise CFoundry::Denied.new("Authorization failed", status_code)
+      rescue CF::UAA::TargetError
+        false
+      end
+    end
+
+    def authenticate_with_implicit_grant
+      begin
+        token_issuer.implicit_grant_with_creds(:username => @username, :password => @password)
+      rescue CF::UAA::BadResponse => e
+        status_code = e.message[/\d+/] || 400
+        raise CFoundry::Denied.new("Authorization failed", status_code)
+      end
+    end
+
     def wrap_uaa_errors
       yield
     rescue CF::UAA::BadResponse

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "0.6.1.rc2".freeze
+  VERSION = "0.6.1.rc3".freeze
 end

data/spec/cfoundry/baseclient_spec.rb

@@ -215,7 +215,7 @@ describe CFoundry::BaseClient do
       }.to raise_error(CFoundry::NotFound, /result/)
     end
 
-    it "raises NotFound if response is 403" do
+    it "raises Denied if response is 403" do
       stub_request(:get, "http://example.com/something").to_return(
         :status => 403, :body => "result")
 
@@ -224,6 +224,15 @@ describe CFoundry::BaseClient do
       }.to raise_error(CFoundry::Denied, /result/)
     end
 
+    it "raises Unauthorized if response is 401" do
+      stub_request(:get, "http://example.com/something").to_return(
+        :status => 401, :body => "result")
+
+      expect {
+        subject.stream_url("http://example.com/something")
+      }.to raise_error(CFoundry::Unauthorized, /result/)
+    end
+
     it "raises BadRespones if response is unexpected" do
       stub_request(:get, "http://example.com/something").to_return(
         :status => 344, :body => "result")

data/spec/cfoundry/uaaclient_spec.rb

@@ -94,6 +94,7 @@ EOF
         end
       end
 
+
       context 'in an unexpected way' do
         it 'raises a CFoundry::Denied error' do
           mock(issuer).owner_password_grant(anything, anything) { raise CF::UAA::BadResponse.new("no_status_code") }
@@ -102,11 +103,24 @@ EOF
       end
 
       context "with a CF::UAA::TargetError" do
-        it "retries with implicit grant" do
+        before do
           stub(issuer).owner_password_grant { raise CF::UAA::TargetError.new("useless info") }
+        end
+
+        it "retries with implicit grant" do
           mock(issuer).implicit_grant_with_creds(:username => username, :password => password)
           expect { subject }.to_not raise_error
         end
+
+        it "fails with Denied when given a 401" do
+          stub(issuer).implicit_grant_with_creds(anything) { raise CF::UAA::BadResponse.new("status 401") }
+          expect { subject }.to raise_error(CFoundry::Denied, "401: Authorization failed")
+        end
+
+        it "fails with Denied when given any other status code" do
+          stub(issuer).implicit_grant_with_creds(anything) { raise CF::UAA::BadResponse.new("no status code") }
+          expect { subject }.to raise_error(CFoundry::Denied, "400: Authorization failed")
+        end
       end
     end
   end

data/spec/cfoundry/v2/base_spec.rb

@@ -89,6 +89,14 @@ describe CFoundry::V2::Base do
           end
         end
 
+        context 'when an HTTPUnauthorized error occurs' do
+          before { stub_request(:any, url).to_return(:status => 401, :body => "YE FOO SHALL BAR") }
+
+          it 'raises the correct error' do
+            expect { subject }.to raise_error CFoundry::Unauthorized, "401: YE FOO SHALL BAR"
+          end
+        end
+
         context "when any other type of error occurs" do
           before { stub_request(:any, url).to_return(:status => 411, :body => "NOT LONG ENOUGH") }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 0.6.1.rc2
+  version: 0.6.1.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -349,7 +349,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2443474386956052238
+      hash: 808997924378056031
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -358,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: cfoundry
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: High-level library for working with the Cloud Foundry API.