cf-uaac 1.3.1 → 1.3.3

data/lib/stub/uaa.rb

@@ -74,7 +74,7 @@ class StubUAAConn < Stub::Base
   route :get, '/token_key' do reply_in_kind(alg: "none", value: "none") end
 
   route :post, '/password/score', "content-type" => %r{application/x-www-form-urlencoded} do
-    info = Util.decode_form_to_hash(request.body)
+    info = Util.decode_form(request.body)
     return bad_request "no password to score" unless pwd = info["password"]
     score = pwd.length > 10 || pwd.length < 0 ? 10 : pwd.length
     reply_in_kind(score: score, requiredScore: 0)
@@ -110,7 +110,7 @@ class StubUAAConn < Stub::Base
   end
 
   route :post, '/login.do', "content-type" => %r{application/x-www-form-urlencoded} do
-    creds = Util.decode_form_to_hash(request.body)
+    creds = Util.decode_form(request.body)
     user = find_user(creds['username'], creds['password'])
     reply.headers[:location] = "login"
     reply.status = 302
@@ -118,7 +118,7 @@ class StubUAAConn < Stub::Base
   end
 
   route :get, %r{^/logout.do(\?|$)(.*)} do
-    query = Util.decode_form_to_hash(match[2])
+    query = Util.decode_form(match[2])
     reply.headers[:location] = query['redirect_uri'] || "login"
     reply.status = 302
     reply.set_cookie(:stubsession, encode_cookie, max_age: -1)
@@ -140,7 +140,7 @@ class StubUAAConn < Stub::Base
       token_body[:email] = primary_email(user[:emails])
       token_body[:user_name] = user[:username]
     end
-    info = { access_token: TokenCoder.encode(token_body, nil, nil, 'none'),
+    info = { access_token: TokenCoder.encode(token_body, :algorithm => 'none'),
         token_type: "bearer", expires_in: interval, scope: scope}
     info[:state] = state if state
     info[:refresh_token] = "universal_refresh_token" if refresh
@@ -169,14 +169,14 @@ class StubUAAConn < Stub::Base
   def redir_with_fragment(cburi, params)
     reply.status = 302
     uri = URI.parse(cburi)
-    uri.fragment = URI.encode_www_form(params)
+    uri.fragment = Util.encode_form(params)
     reply.headers[:location] = uri.to_s
   end
 
   def redir_with_query(cburi, params)
     reply.status = 302
     uri = URI.parse(cburi)
-    uri.query = URI.encode_www_form(params)
+    uri.query = Util.encode_form(params)
     reply.headers[:location] = uri.to_s
   end
 
@@ -195,7 +195,7 @@ class StubUAAConn < Stub::Base
   end
 
   route [:post, :get], %r{^/oauth/authorize\?(.*)} do
-    query = Util.decode_form_to_hash(match[1])
+    query = Util.decode_form(match[1])
     client = server.scim.get_by_name(query["client_id"], :client)
     cburi, state = query["redirect_uri"], query["state"]
 
@@ -209,7 +209,7 @@ class StubUAAConn < Stub::Base
       end
       if request.method == "post"
         unless request.headers["content-type"] =~ %r{application/x-www-form-urlencoded} &&
-            (creds = Util.decode_form_to_hash(request.body)) &&
+            (creds = Util.decode_form(request.body)) &&
             creds["source"] && creds["source"] == "credentials"
           return redir_err_f(cburi, state, "invalid_request")
         end
@@ -275,7 +275,7 @@ class StubUAAConn < Stub::Base
       reply.headers[:www_authenticate] = "basic"
       return reply.json(401, error: "invalid_client")
     end
-    return if bad_params?(params = Util.decode_form_to_hash(request.body), ['grant_type'])
+    return if bad_params?(params = Util.decode_form(request.body), ['grant_type'])
     unless client[:authorized_grant_types].include?(params['grant_type'])
       return reply.json(400, error: "unauthorized_client")
     end
@@ -419,7 +419,7 @@ class StubUAAConn < Stub::Base
   route :get, %r{^/(Users|Groups)(\?|$)(.*)} do
     return unless valid_token("scim.read")
     rtype = match[1] == "Users"? :user : :group
-    page_query(rtype, Util.decode_form_to_hash(match[3], :down), StubScim::VISIBLE_ATTRS[rtype])
+    page_query(rtype, Util.decode_form(match[3], :down), StubScim::VISIBLE_ATTRS[rtype])
   end
 
   route :get, %r{^/(Users|Groups)/([^/]+)$} do
@@ -449,7 +449,7 @@ class StubUAAConn < Stub::Base
   end
 
   route :get, %r{^/ids/Users(\?|$)(.*)} do
-    page_query(:user, Util.decode_form_to_hash(match[2], :down), [:username, :id])
+    page_query(:user, Util.decode_form(match[2], :down), [:username, :id])
   end
 
 end
@@ -459,7 +459,9 @@ class StubUAA < Stub::Server
   attr_accessor :reply_badly
   attr_reader :scim, :auto_groups
 
-  def initialize(boot_client = "admin", boot_secret = "adminsecret", logger = Util.default_logger)
+  def initialize(options = {})
+    client = options[:boot_client] || "admin"
+    secret = options[:boot_secret] || "adminsecret"
     @scim = StubScim.new
     @auto_groups = ["password.write", "openid"]
         .each_with_object([]) { |g, o| o << @scim.add(:group, 'displayname' => g) }
@@ -467,16 +469,17 @@ class StubUAA < Stub::Server
         .each { |g| @scim.add(:group, 'displayname' => g) }
     gids = ["clients.write", "clients.read", "clients.secret", "uaa.admin"]
         .each_with_object([]) { |s, o| o << @scim.add(:group, 'displayname' => s) }
-    @scim.add(:client, 'client_id' => boot_client, 'client_secret' => boot_secret,
+    @scim.add(:client, 'client_id' => client, 'client_secret' => secret,
         'authorized_grant_types' => ["client_credentials"], 'authorities' => gids,
         'access_token_validity' => 60 * 60 * 24 * 7)
     @scim.add(:client, 'client_id' => "vmc", 'authorized_grant_types' => ["implicit"],
         'scope' => [@scim.id("openid", :group), @scim.id("password.write", :group)],
         'access_token_validity' => 5 * 60 )
     info = { commit_id: "not implemented",
-        app: {name: "Stub UAA", version: CLI_VERSION, description: "User Account and Authentication Service, test server"},
+        app: {name: "Stub UAA", version: CLI_VERSION,
+            description: "User Account and Authentication Service, test server"},
         prompts: {username: ["text", "Username"], password: ["password","Password"]} }
-    super(StubUAAConn, logger, info)
+    super(StubUAAConn, options.merge(info: info, logger: options[:logger] || Util.default_logger))
   end
 
 end

data/spec/group_spec.rb

@@ -23,7 +23,7 @@ describe GroupCli do
   before :all do
     #Util.default_logger(:trace)
     Cli.configure("", nil, StringIO.new, true)
-    setup_target(authorities: "clients.read,scim.read,scim.write")
+    setup_target(authorities: "clients.read,scim.read,scim.write,uaa.admin")
     Cli.run("token client get #{@test_client} -s #{@test_secret}").should be
     @test_user, @test_pwd = "sam_#{Time.now.to_i}", "correcthorsebatterystaple"
     @test_group = "JaNiToRs_#{Time.now.to_i}"

data/spec/http_spec.rb

@@ -36,7 +36,8 @@ describe Http do
   include SpecHelper
 
   before :all do
-    @stub_http = Stub::Server.new(StubHttp, Util.default_logger(:info)).run_on_thread
+    #Util.default_logger(:trace)
+    @stub_http = Stub::Server.new(StubHttp, logger: Util.default_logger).run_on_thread
   end
 
   after :all do @stub_http.stop if @stub_http end
@@ -147,7 +148,7 @@ describe Http do
           raise BadTarget, "unable to resolve address" if /unable.*server.*address/.match result[1]
           raise HTTPException, result[1]
         end
-        [result[0], result[1], Util.hash_keys!(result[2], :todash)]
+        [result[0], result[1], Util.hash_keys!(result[2], :dash)]
       end
     end
     it_should_behave_like "http client"

data/spec/spec_helper.rb

@@ -51,14 +51,14 @@ module SpecHelper
 
   def setup_target(opts = {})
     opts = { authorities: "clients.read,scim.read,scim.write,uaa.resource",
-      grant_types: "client_credentials,password", 
+      grant_types: "client_credentials,password",
       scope: "openid,password.write"}.update(opts)
     @admin_client = ENV["UAA_CLIENT_ID"] || "admin"
     @admin_secret = ENV["UAA_CLIENT_SECRET"] || "adminsecret"
     if ENV["UAA_CLIENT_TARGET"]
       @target, @stub_uaa = ENV["UAA_CLIENT_TARGET"], nil
     else
-      @stub_uaa = StubUAA.new(@admin_client, @admin_secret).run_on_thread
+      @stub_uaa = StubUAA.new(boot_client: @admin_client, boot_secret: @admin_secret).run_on_thread
       @target = @stub_uaa.url
     end
     Cli.run("target #{@target}").should be
@@ -67,7 +67,7 @@ module SpecHelper
     test_client = "test_client_#{Time.now.to_i}"
     @test_secret = "+=tEsTsEcRet~!@"
     Cli.run("client add #{test_client} -s #{@test_secret} " +
-        "--authorities #{opts[:authorities]} --scope #{opts[:scope]} " + 
+        "--authorities #{opts[:authorities]} --scope #{opts[:scope]} " +
         "--authorized_grant_types #{opts[:grant_types]}").should be
     opts.each { |k, a| Util.arglist(a).each {|v| Cli.output.string.should include(v) }}
     @test_client = test_client

data/spec/token_spec.rb

@@ -28,7 +28,7 @@ describe TokenCli do
     Config.yaml.should include("access_token")
     @test_pwd = "TesTpwd$%^"
     @test_user = "tEst_UseR+-#{Time.now.to_i}"
-    Cli.run("user add #{@test_user} -p #{@test_pwd} " + 
+    Cli.run("user add #{@test_user} -p #{@test_pwd} " +
         "--emails sam@example.com,joNES@sample.com --given_name SamueL " +
         "--phones 801-555-1212 --family_name jonES").should be
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaac
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-09 00:00:00.000000000 Z
+date: 2012-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,7 +118,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.3
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -126,7 +129,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.3
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -191,6 +197,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0.beta.3
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Client command line tools for interacting with the CloudFoundry User
   Account and Authorization (UAA) server.  The UAA is an OAuth2 Authorization Server
   so it can be used by webapps and command line apps to obtain access tokens to act
@@ -212,7 +234,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .yardopts
 - Gemfile
+- LICENSE.TXT
+- NOTICE.TXT
 - README.md
 - Rakefile
 - bin/completion-helper
@@ -257,7 +282,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3930876394037723232
+      hash: 2333184341593208411
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -266,10 +291,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3930876394037723232
+      hash: 2333184341593208411
 requirements: []
 rubyforge_project: cf-uaac
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Command line interface for CloudFoundry UAA