cf-uaac 1.3.3 → 1.3.4

data/cf-uaac.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "simplecov"
   s.add_development_dependency "simplecov-rcov"
   s.add_development_dependency "ci_reporter"
-  s.add_runtime_dependency "cf-uaa-lib", ">= 1.3.3", "<= 1.3.3"
+  s.add_runtime_dependency "cf-uaa-lib", ">= 1.3.4", "<= 1.3.4"
   s.add_runtime_dependency "highline"
   s.add_runtime_dependency "eventmachine"
   s.add_runtime_dependency "launchy"

data/lib/cli/token.rb

@@ -24,7 +24,7 @@ class TokenCatcher < Stub::Base
     server.logger.debug "processing grant for path #{request.path}"
     secret = server.info.delete(:client_secret)
     ti = TokenIssuer.new(Config.target, server.info.delete(:client_id), secret,
-        Config.target_value(:token_target))
+        token_target: Config.target_value(:token_target))
     tkn = secret ? ti.authcode_grant(server.info.delete(:uri), data) :
         ti.implicit_grant(server.info.delete(:uri), data)
     server.info.update(Util.hash_keys!(tkn.info, :sym))
@@ -72,7 +72,7 @@ class TokenCli < CommonCli
   def issuer_request(client_id, secret = nil)
     update_target_info
     yield TokenIssuer.new(Config.target.to_s, client_id, secret,
-        :token_target => Config.target_value(:token_endpoint))
+        token_target: Config.target_value(:token_endpoint))
   rescue Exception => e
     complain e
   end
@@ -156,7 +156,7 @@ class TokenCli < CommonCli
       sleep 5
       print "."
     end
-    Config.context = TokenCoder.decode(catcher.info[:access_token], verify: false)[:user_name]
+    Config.context = TokenCoder.decode(catcher.info[:access_token], verify: false)["user_name"]
     Config.add_opts catcher.info
     say_success secret ? "authorization code" : "implicit"
     return unless opts[:vmc]

data/lib/cli/version.rb

@@ -14,6 +14,6 @@
 # Cloud Foundry namespace
 module CF
   module UAA
-    CLI_VERSION = "1.3.3"
+    CLI_VERSION = "1.3.4"
   end
 end

data/lib/stub/uaa.rb

@@ -32,7 +32,7 @@ class StubUAAConn < Stub::Base
 
   def valid_token(required_scope)
     return nil unless (ah = request.headers["authorization"]) && (ah = ah.split(' '))[0] =~ /^bearer$/i
-    contents = TokenCoder.decode(ah[1])
+    contents = TokenCoder.decode(ah[1], accept_algorithms: "none")
     contents["scope"], required_scope = Util.arglist(contents["scope"]), Util.arglist(required_scope)
     return contents if required_scope.nil? || !(required_scope & contents["scope"]).empty?
     reply_in_kind(403, error: "insufficient_scope",

data/spec/token_spec.rb

@@ -35,11 +35,6 @@ describe TokenCli do
 
   after :all do cleanup_target end
 
-  it "gets the server signing key" do
-    Cli.run("signing key -c #{@test_client} -s #{@test_secret}").should be
-    Cli.output.string.should include 'alg:', 'value:'
-  end
-
   it "logs in with implicit grant & posted credentials as a user" do
     Cli.run("token get #{@test_user} #{@test_pwd}").should be
     Cli.output.string.should include("Successfully fetched token")
@@ -102,6 +97,11 @@ describe TokenCli do
     end
   end
 
+  it "gets the server signing key" do
+    Cli.run("signing key -c #{@test_client} -s #{@test_secret}").should be
+    Cli.output.string.should include 'alg:', 'value:'
+  end
+
   it "uses the token endpoint given by the login server" do
     pending "only saml login server returns token endpoint" if ENV["UAA_CLIENT_TARGET"]
     @stub_uaa.info[:token_endpoint] = te = "#{@stub_uaa.url}/alternate"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaac
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2013-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,10 +118,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.3.4
     - - <=
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -129,10 +129,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.3.4
     - - <=
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -282,7 +282,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2333184341593208411
+      hash: 2590273810398717520
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -291,10 +291,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2333184341593208411
+      hash: 2590273810398717520
 requirements: []
 rubyforge_project: cf-uaac
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Command line interface for CloudFoundry UAA