cf-uaac 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac80747a5648fea9abc3e07787564eeadff44248
-  data.tar.gz: cc69ad42a01ec016cd07509772bf770155d844b0
+  metadata.gz: f975b934d93193d3d23935f98683510bff81a468
+  data.tar.gz: 7b1b63c9a22b67fed10faa292668623ef960dcae
 SHA512:
-  metadata.gz: b1b30fb6191e498d26d8a8db083ec244f72b4529360b6179b7f988e5d02484ac9fa7f89d393603df16940a6ba7fe5e0a83fecc4fb6311cffe7b652e1a4769a40
-  data.tar.gz: a55e1a8ca96dbfb6a750ae90717d0178071547604a9afbd63160dcf0ce5033e7eb6b5ab6816c6b756095cbc174daa6456ed0b6f578c6e1d80b42b9a1dc4c915f
+  metadata.gz: 4b2d1575c80cfb76cf72d151fc0765a327bbae04c4e617fe434732873b74055b285df2810aa9150df636e30a333aa29a0adf8edf17d2ced159793a2c62a27492
+  data.tar.gz: 0f4901450bff3c9b06d6e559376aa0dd8aeb54b8819f81670edbfa71aa4cb29d5e308d806dbfea0c3d0c392f6a039f69fa91b26f35ab4554d2cfb3be1cbc345e

data/Gemfile

@@ -1,5 +1,6 @@
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+#--
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.
@@ -8,7 +9,7 @@
 # separate copyright notices and license terms. Your use of these
 # subcomponents is subject to the terms and conditions of the
 # subcomponent's license, as noted in the LICENSE file.
-#
+#++
 
 source "http://rubygems.org"
 

data/NOTICE.TXT

@@ -1,10 +1,10 @@
-Cloud Foundry 2012.02.03 Beta
-Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved. 
+Cloud Foundry
+Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 
-This product is licensed to you under the Apache License, Version 2.0 (the "License").  
-You may not use this product except in compliance with the License.  
+This product is licensed to you under the Apache License, Version 2.0 (the "License").
+You may not use this product except in compliance with the License.
 
 This product includes a number of subcomponents with
 separate copyright notices and license terms. Your use of these
-subcomponents is subject to the terms and conditions of the 
-subcomponent's license, as noted in the LICENSE file. 
+subcomponents is subject to the terms and conditions of the
+subcomponent's license, as noted in the LICENSE file.

data/Rakefile

@@ -1,5 +1,6 @@
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+#--
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.
@@ -8,7 +9,7 @@
 # separate copyright notices and license terms. Your use of these
 # subcomponents is subject to the terms and conditions of the
 # subcomponent's license, as noted in the LICENSE file.
-#
+#++
 
 require "rspec/core/rake_task"
 require "bundler/gem_tasks" # only available in bundler >= 1.0.15

data/bin/completion-helper

@@ -1,5 +1,18 @@
 #!/usr/bin/env ruby
 
+#--
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
+#
+# This product is licensed to you under the Apache License, Version 2.0 (the "License").
+# You may not use this product except in compliance with the License.
+#
+# This product includes a number of subcomponents with
+# separate copyright notices and license terms. Your use of these
+# subcomponents is subject to the terms and conditions of the
+# subcomponent's license, as noted in the LICENSE file.
+#++
+
 # given the indents, find sub-commands of a given command
 def find_sub_commands (lines, indents, i)
   result = Array.new

data/bin/uaac

@@ -1,5 +1,18 @@
 #!/usr/bin/env ruby
 
+#--
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
+#
+# This product is licensed to you under the Apache License, Version 2.0 (the "License").
+# You may not use this product except in compliance with the License.
+#
+# This product includes a number of subcomponents with
+# separate copyright notices and license terms. Your use of these
+# subcomponents is subject to the terms and conditions of the
+# subcomponent's license, as noted in the LICENSE file.
+#++
+
 $:.unshift File.expand_path File.join __FILE__, '..', '..', 'lib'
-require 'cli'
+require 'uaac_cli'
 exit CF::UAA::Cli.configure("#{ENV['HOME']}/.uaac.yml").run ? 0 : 1

data/bin/uaac-completion.sh

@@ -1,4 +1,18 @@
 #! /bin/bash
+
+#--
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
+#
+# This product is licensed to you under the Apache License, Version 2.0 (the "License").
+# You may not use this product except in compliance with the License.
+#
+# This product includes a number of subcomponents with
+# separate copyright notices and license terms. Your use of these
+# subcomponents is subject to the terms and conditions of the
+# subcomponent's license, as noted in the LICENSE file.
+#++
+
 GLOBAL_OPTS="--help --no-help -h --version --no-version -v --debug --no-debug -d --trace --no-trace -t --config"
 
 _debug() {

data/bin/uaas

@@ -1,5 +1,18 @@
 #!/usr/bin/env ruby
 
+#--
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
+#
+# This product is licensed to you under the Apache License, Version 2.0 (the "License").
+# You may not use this product except in compliance with the License.
+#
+# This product includes a number of subcomponents with
+# separate copyright notices and license terms. Your use of these
+# subcomponents is subject to the terms and conditions of the
+# subcomponent's license, as noted in the LICENSE file.
+#++
+
 $:.unshift File.expand_path File.join __FILE__, '..', '..', 'lib'
 require 'stub/uaa'
 require 'cli/base'

data/cf-uaac.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 #
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.
@@ -10,7 +10,7 @@
 # separate copyright notices and license terms. Your use of these
 # subcomponents is subject to the terms and conditions of the
 # subcomponent's license, as noted in the LICENSE file.
-#
+#++
 
 $:.push File.expand_path("../lib", __FILE__)
 require "cli/version"
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "simplecov", "~> 0.8.2"
   s.add_development_dependency "simplecov-rcov", "~> 0.2.3"
   s.add_development_dependency "ci_reporter", "~> 1.9.2"
-  s.add_runtime_dependency "cf-uaa-lib", "~> 3.0.0"
+  s.add_runtime_dependency "cf-uaa-lib", "~> 3.1.0"
   s.add_runtime_dependency "highline", "~> 1.6.21"
   s.add_runtime_dependency "eventmachine", "~> 1.0.3"
   s.add_runtime_dependency "launchy", "~> 2.4.2"

data/lib/cli/base.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.

data/lib/cli/client_reg.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.

data/lib/cli/common.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.
@@ -83,9 +83,15 @@ class CommonCli < Topic
   def scim_common_list(type, filter)
     pp scim_request { |sr|
       query = { attributes: opts[:attrs], filter: filter }
-      info = opts[:start] || opts[:count] ?
-        sr.query(type, query.merge!(startIndex: opts[:start], count: opts[:count])):
-        sr.all_pages(type, query)
+      info = nil
+      if type == :user
+        info = sr.query(type, query.merge!(startIndex: opts[:start], count: opts[:count]))
+      else
+        info = opts[:start] || opts[:count] ?
+               sr.query(type, query.merge!(startIndex: opts[:start], count: opts[:count])):
+               sr.all_pages(type, query)
+      end
+
       nattr = sr.name_attr(type).downcase
       info.is_a?(Array) && info.length > 0 && info[0][nattr] ?
           info.each_with_object({}) { |v, h| h[v.delete(nattr)] = v } : info

data/lib/cli/config.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.

data/lib/cli/curl.rb

@@ -1,3 +1,16 @@
+#--
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
+#
+# This product is licensed to you under the Apache License, Version 2.0 (the "License").
+# You may not use this product except in compliance with the License.
+#
+# This product includes a number of subcomponents with
+# separate copyright notices and license terms. Your use of these
+# subcomponents is subject to the terms and conditions of the
+# subcomponent's license, as noted in the LICENSE file.
+#++
+
 require 'cli/common'
 require 'rack'
 require 'net/http'

data/lib/cli/group.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.
@@ -42,6 +42,57 @@ class GroupCli < CommonCli
     }
   end
 
+  define_option :start, "--start <start>", "show results starting at this index"
+  define_option :count, "--count <count>", "number of results to show"
+  desc "group mappings", "List all the mappings between uaa scopes and external groups", :start, :count do
+    start, count = opts[:start], opts[:count]
+    return gripe "Please enter a valid start index" if start unless is_integer?(start)
+    return gripe "Please enter a valid count" if count unless is_natural_number?(count)
+
+    response = scim_request { |scim| scim.list_group_mappings(start, count) }
+
+    if response
+      grouped_group_mappings = []
+      response["resources"].each do |resource|
+        grouped_group_mappings << {resource['displayname'] => resource['externalgroup']}
+      end
+      response["resources"] = grouped_group_mappings
+      pp response
+    end
+  end
+
+  define_option :id, "--id <id>", "map uaa group using group id"
+  define_option :name, "--name <name>", "map uaa scope using group name"
+  desc "group map [external_group]", "Map uaa groups to external groups", :id, :name do |external_group|
+    return gripe "Please provide a group name or id" unless opts[:id] || opts[:name]
+    return gripe "Please provide an external group" unless external_group
+
+    group = opts[:id] ? opts[:id] : opts[:name]
+    is_id = opts[:id] ? true : false
+    pp scim_request { |ua|
+      response = ua.map_group(group, is_id, external_group)
+      raise BadResponse, "no  group id found in response of external group mapping" unless response["groupid"]
+      "Successfully mapped #{response["displayname"]} to #{external_group}"
+    }
+  end
+
+  desc "group unmap [group_name] [external_group]", "Unmaps an external group from a uaa group" do |group_name, external_group|
+    return gripe "Please provide a group name and external group" unless group_name && external_group
+
+    group_id = nil
+    response = Cli.run("group get #{group_name}")
+    if response
+      group_id = response['id']
+    else
+      return gripe "Group #{group_name} not found"
+    end
+
+    pp scim_request { |ua|
+      ua.unmap_group(group_id, external_group)
+      "Successfully unmapped #{external_group} from #{group_name}"
+    }
+  end
+
   def id_set(objs)
     objs.each_with_object(Set.new) {|o, s|
       id = o.is_a?(String)? o: (o["id"] || o["value"] || o["memberid"])
@@ -92,6 +143,16 @@ class GroupCli < CommonCli
     pp scim_request { |scim| update_members(scim, name, "writers", users, false) }
   end
 
+  private
+
+  def is_natural_number?(input)
+    is_integer?(input) && input.to_i > -1
+  end
+
+  def is_integer?(input)
+    input && (input.to_i.to_s == input)
+  end
 end
 
 end
+

data/lib/cli/info.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.

data/lib/cli/runner.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.

data/lib/cli/token.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.

data/lib/cli/user.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.

data/lib/cli/version.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.
@@ -14,6 +14,6 @@
 # Cloud Foundry namespace
 module CF
   module UAA
-    CLI_VERSION = "3.0.0"
+    CLI_VERSION = "3.1.0"
   end
 end

data/lib/stub/scim.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.
@@ -61,7 +61,7 @@ class StubScim
         :authorized_grant_types, :scope, :autoapprove,
         :access_token_validity, :refresh_token_validity, :redirect_uri,
         :'signup_redirect_url'].to_set,
-      group: [*COMMON_ATTRS, :displayname, :members, :writers, :readers].to_set }
+      group: [*COMMON_ATTRS, :displayname, :members, :writers, :readers, :external_groups].to_set }
   VISIBLE_ATTRS = {user: Set.new(LEGAL_ATTRS[:user] - HIDDEN_ATTRS),
       client: Set.new(LEGAL_ATTRS[:client] - HIDDEN_ATTRS),
       group: Set.new(LEGAL_ATTRS[:group] - HIDDEN_ATTRS)}
@@ -279,6 +279,30 @@ class StubScim
     [objs, total]
   end
 
+  def add_group_mapping(external_group, group_id, group_name)
+    group = group_id ? ref_by_id(group_id, :group) : ref_by_name(group_name, :group)
+    return unless group
+    (group[:external_groups] ||= Set.new) << external_group
+    group
+  end
+
+  def delete_group_mapping(group_id, external_group)
+    raise NotFound unless group = ref_by_id(group_id, :group)
+    raise NotFound unless group[:external_groups] && group[:external_groups].include?(external_group)
+    group[:external_groups].delete(external_group)
+  end
+
+  def get_group_mappings
+    group_mappings = []
+    @things_by_id.each do |id, thing|
+      if thing[:rtype] == :group
+        thing[:external_groups].each do |external_group|
+          group_mappings << { groupid: thing[:id], displayname: thing[:displayname], externalgroup: external_group }
+        end if thing[:external_groups]
+      end
+    end unless @things_by_id.empty?
+    group_mappings
+  end
 end
 
 class ScimFilter

data/lib/stub/server.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.

data/lib/stub/uaa.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.
@@ -424,6 +424,44 @@ class StubUAAConn < Stub::Base
     end
   end
 
+  route :post, %r{^/Groups/External$}, "content-type" => %r{application/json} do
+    json = Util.json_parse(request.body, :down)
+    external_group = json["externalgroup"]
+    group_name = json["displayname"]
+    group_id = json["groupid"]
+    group = server.scim.add_group_mapping(external_group, group_id, group_name)
+    reply_in_kind(displayName: group[:displayname], externalGroup: external_group, groupId: group[:id])
+  end
+
+  route :get, %r{^/Groups/External/list(\?|$)(.*)} do
+    return unless valid_token("scim.read")
+
+    query_params = CGI::parse(match[2])
+
+    start_index_param = query_params["startIndex"].first
+    start_index = start_index_param.empty? ? 1 : start_index_param.to_i
+
+    count_param = query_params["count"].first
+    count = count_param.empty? ? 100 : count_param.to_i
+
+    group_mappings = server.scim.get_group_mappings
+    paginated_group_mappings = group_mappings.slice([start_index,1].max - 1, count)
+
+    reply_in_kind(resources: paginated_group_mappings, itemsPerPage: count, startIndex: start_index, totalResults: group_mappings.length)
+  end
+
+  route :delete, %r{^/Groups/External/id/([^/]+)/([^/]+)$} do
+    return unless valid_token("scim.write")
+
+    group_id = match[1]
+    external_group = match[2]
+    begin
+      server.scim.delete_group_mapping(group_id, external_group)
+    rescue NotFound
+      not_found("Mapping for group ID #{match[1]} and external group #{match[2]}")
+    end
+  end
+
   def sanitize_int(arg, default, min, max = nil)
     return default if arg.nil?
     return unless arg.to_i.to_s == arg && (i = arg.to_i) >= min

data/lib/{cli.rb → uaac_cli.rb}

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.

data/spec/client_reg_spec.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.
@@ -12,7 +12,7 @@
 #++
 
 require 'spec_helper'
-require 'cli'
+require 'uaac_cli'
 
 module CF::UAA
 

data/spec/common_spec.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.
@@ -13,7 +13,7 @@
 
 require 'spec_helper'
 require 'stringio'
-require 'cli'
+require 'uaac_cli'
 
 module CF::UAA
 

data/spec/curl_spec.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.
@@ -12,7 +12,7 @@
 #++
 
 require 'spec_helper'
-require 'cli'
+require 'uaac_cli'
 
 module CF::UAA
   describe CurlCli do

data/spec/group_spec.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.
@@ -12,7 +12,7 @@
 #++
 
 require 'spec_helper'
-require 'cli'
+require 'uaac_cli'
 
 module CF::UAA
 
@@ -114,7 +114,6 @@ describe GroupCli do
   it "gets readers and writers in the group" do
     Cli.run("group get #{@test_group}").should be
     Cli.output.string.should be
-    #puts Cli.output.string
   end
 
   it "reads members as a reader" do
@@ -163,6 +162,105 @@ describe GroupCli do
     Cli.output.string.should_not match /members/i # they should really be gone
   end
 
+  it "does not blow up if scope is invalid" do
+    Cli.run("token owner get #{@test_client} -s #{@test_secret} #{@test_user}m -p #{@test_pwd}").should be
+    Cli.run "group map ldap-id --name #{@test_group}"
+    Cli.run "group mappings"
+    Cli.output.string.should_not include "NoMethodError"
+  end
+
+  it "lists all the mappings between uaa scopes and external groups" do
+    Cli.run "context #{@test_client}"
+    Cli.run "group map ldap-id --name #{@test_group}"
+    Cli.output.string.should include "Successfully mapped #{@test_group} to ldap-id"
+
+    Cli.run "group mappings"
+    Cli.output.string.should include("#{@test_group}: ldap-id")
+  end
+
+  it "lists mappings between uaa scopes and external groups with pagination" do
+    Cli.run "context #{@test_client}"
+    Cli.run("group add new-group")
+
+    Cli.run "group map ldap-id --name #{@test_group}"
+    Cli.run "group map ldap-id-2 --name #{@test_group}"
+    Cli.run "group map ldap-id --name new-group"
+    Cli.run "group map ldap-id-3 --name #{@test_group}"
+    Cli.run "group map ldap-id-3 --name new-group"
+    Cli.run "group map ldap-id-4 --name #{@test_group}"
+
+    Cli.output.string.should include "Successfully mapped #{@test_group} to ldap-id"
+
+    Cli.run "group mappings"
+    Cli.output.string.should include("#{@test_group}: ldap-id", "#{@test_group}: ldap-id-2", "#{@test_group}: ldap-id-3", "#{@test_group}: ldap-id-4")
+
+    Cli.run "group mappings --start 1 --count 3"
+    Cli.output.string.should include("#{@test_group}: ldap-id", "#{@test_group}: ldap-id-2", "#{@test_group}: ldap-id-3")
+    Cli.output.string.should_not include("ldap-id-4")
+
+    Cli.run "group mappings --start 1 --count -3"
+    Cli.output.string.should_not include("ldap-id", "ldap-id-2", "ldap-id-3")
+    Cli.output.string.should include("Please enter a valid count")
+
+    Cli.run "group mappings --start 1 --count a"
+    Cli.output.string.should_not include("ldap-id", "ldap-id-2", "ldap-id-3")
+    Cli.output.string.should include("Please enter a valid count")
+
+    Cli.run "group mappings --start -1 --count 5"
+    Cli.output.string.should include("#{@test_group}: ldap-id", "#{@test_group}: ldap-id-2", "#{@test_group}: ldap-id-3")
+
+    Cli.run "group mappings --start a --count 1"
+    Cli.output.string.should_not include("ldap-id", "ldap-id-2", "ldap-id-3")
+    Cli.output.string.should include("Please enter a valid start index")
+
+    Cli.run "group mappings --start 2"
+    Cli.output.string.should include("#{@test_group}: ldap-id-2", "#{@test_group}: ldap-id-3", "#{@test_group}: ldap-id-4")
+
+    Cli.run "group mappings --count 2"
+    Cli.output.string.should include("#{@test_group}: ldap-id", "#{@test_group}: ldap-id-2")
+  end
+
+  it "maps a uaa scope to an external group" do
+    Cli.run "context #{@test_client}"
+
+    Cli.run "group map ldap-id"
+    Cli.output.string.should include "Please provide a group name or id"
+
+    Cli.run "group map --name #{@test_group}"
+    Cli.output.string.should include "Please provide an external group"
+
+    Cli.run "group map ldap-id --name #{@test_group}"
+    Cli.output.string.should include "Successfully mapped #{@test_group} to ldap-id"
+
+    Cli.run("group get #{@test_group}")
+    test_group_id = Cli.output.string.match(/id: ([\S]+)/)[1]
+    Cli.run "group map ldap-id --id #{test_group_id}"
+    Cli.output.string.should include "Successfully mapped #{@test_group} to ldap-id"
+  end
+
+  it "unmaps a uaa scope from an external group" do
+    Cli.run "context #{@test_client}"
+
+    Cli.run "group map ldap-id --name #{@test_group}"
+    Cli.output.string.should include "Successfully mapped #{@test_group} to ldap-id"
+
+    Cli.run("group get #{@test_group}")
+
+    Cli.run "group unmap"
+    Cli.output.string.should include "Please provide a group name and external group"
+
+    Cli.run "group unmap #{@test_group}"
+    Cli.output.string.should include "Please provide a group name and external group"
+
+    Cli.run "group unmap #{@test_group} ldap-id"
+    Cli.output.string.should include "Successfully unmapped ldap-id from #{@test_group}"
+
+    Cli.run "group unmap nonexistent_group unmapped_ldap-id"
+    Cli.output.string.should include "Group nonexistent_group not found"
+
+    Cli.run "group unmap #{@test_group} unmapped_ldap-id"
+    Cli.output.string.should include "NotFound"
+  end
 end
 
 end

data/spec/http_spec.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.

data/spec/info_spec.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.
@@ -12,7 +12,7 @@
 #++
 
 require 'spec_helper'
-require 'cli'
+require 'uaac_cli'
 require 'stub/uaa'
 
 module CF::UAA

data/spec/setup_helper.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.
@@ -14,7 +14,7 @@
 #++
 
 $:.unshift File.expand_path File.join __FILE__, '..', '..', 'lib'
-require 'cli'
+require 'uaac_cli'
 
 client = ENV["UAA_CLIENT_ID"] || "admin"
 secret = ENV["UAA_CLIENT_SECRET"] || "adminsecret"

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.

data/spec/ssl_integration_spec.rb

@@ -1,3 +1,4 @@
+#--
 # Cloud Foundry
 # Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
@@ -8,11 +9,12 @@
 # separate copyright notices and license terms. Your use of these
 # subcomponents is subject to the terms and conditions of the
 # subcomponent's license, as noted in the LICENSE file.
+#++
 
 require 'spec_helper'
 require 'fiber'
 require 'em-http'
-require 'cli'
+require 'uaac_cli'
 require 'stub/server'
 
 module CF::UAA

data/spec/token_spec.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.
@@ -12,7 +12,7 @@
 #++
 
 require 'spec_helper'
-require 'cli'
+require 'uaac_cli'
 
 module CF::UAA
 

data/spec/user_spec.rb

@@ -1,6 +1,6 @@
 #--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 #
 # This product is licensed to you under the Apache License, Version 2.0 (the "License").
 # You may not use this product except in compliance with the License.
@@ -12,7 +12,7 @@
 #++
 
 require 'spec_helper'
-require 'cli'
+require 'uaac_cli'
 
 module CF::UAA
 
@@ -61,6 +61,44 @@ describe UserCli do
     Cli.output.string.should =~ /#{@test_user}/
   end
 
+  describe "get list of users" do
+    before :all do
+      i = 1
+      count = 15
+      while i < count  do
+        Cli.run("user add user-#{i} -p password-#{i} " +
+                    "--emails user-#{i}@example.com --given_name user#{i} " +
+                    "--phones 801-555-243#{i} --family_name jonES")
+        i +=1
+      end
+    end
+
+    after :all do
+      i = 1
+      count = 15
+      while i < count  do
+        Cli.run("user delete user-#{i}")
+        i +=1
+      end
+    end
+
+    it "gets users with default pagination" do
+      Cli.run("users")
+      Cli.output.string.should include "user-1"
+      Cli.output.string.should include "user-2"
+      Cli.output.string.should include "user-14"
+      # Default page size for stub uaa is 15
+      Cli.output.string.should_not include "user-15"
+    end
+
+    it "gets count users with pagination" do
+      Cli.run("users --start 1 --count 3")
+      Cli.output.string.should include "user-1"
+      Cli.output.string.should include "user-2"
+      Cli.output.string.should_not include "user-3"
+    end
+  end
+
 end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaac
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Dave Syer
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,14 +104,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -229,7 +229,6 @@ files:
 - bin/uaac-completion.sh
 - bin/uaas
 - cf-uaac.gemspec
-- lib/cli.rb
 - lib/cli/base.rb
 - lib/cli/client_reg.rb
 - lib/cli/common.rb
@@ -245,6 +244,7 @@ files:
 - lib/stub/scim.rb
 - lib/stub/server.rb
 - lib/stub/uaa.rb
+- lib/uaac_cli.rb
 - spec/client_reg_spec.rb
 - spec/common_spec.rb
 - spec/curl_spec.rb