cf-uaa-lib 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bf9b6c77939ea097c5e4e04bb84b56fcc2ee251
-  data.tar.gz: 3363c83dc1fa3b1b946296b492f8652f2190cd2f
+  metadata.gz: 6b4d37f1fd550f4599f73272b8585b71000afb91
+  data.tar.gz: 857e2c137890ee3dc1dd0b699581c1e644935885
 SHA512:
-  metadata.gz: a6be5ce23db43f6dd8e30f4ea127239abd1b77145d3ead280530e2c11a30ee693a40c18c5ff1f3387c7fd98d904b080f381cef5913e9227bc813263c006513a2
-  data.tar.gz: 9bacf86eea0a2215a87131aacabe7c48d7967419a0e2e8ae407ebf67b10b1baefa46c3f88898c58aaf7f9f7a4ebe7926d6e800578753bd599bd4608c89c0b374
+  metadata.gz: a9ab7f79ec21ae03a11c40731395eaef4ac6239277b54c9270aabad6c44a203350a0337a4d320f4aa5cdf03f0b485ec562a3fe26c9214a02838e25ba3c79300f
+  data.tar.gz: 5c5127f173c8b05d6ec032783b40cb4c69c142e3368f2188375d1aa1448d8f71e4955cbe4eb8f1ee46100285c57e858a6bd042423142b2cfe8d68f99de26dc12

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/cf-uaa-lib.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 "uaa/version"

data/lib/uaa/http.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/uaa/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/uaa/proxy_options.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.
+#++
+
 module CF::UAA
   module ProxyOptions
     def proxy_options_for(uri)

data/lib/uaa/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.
@@ -70,7 +70,7 @@ class Scim
   # an attempt to hide some scim and uaa oddities
   def type_info(type, elem)
     scimfo = {:user => ["/Users", "userName"], :group => ["/Groups", "displayName"],
-      :client => ["/oauth/clients", 'client_id'], :user_id => ["/ids/Users", 'userName']}
+      :client => ["/oauth/clients", 'client_id'], :user_id => ["/ids/Users", 'userName'], :group_mapping => ["/Groups/External", "externalGroup"]}
     unless elem == :path || elem == :name_attr
       raise ArgumentError, "scim schema element must be :path or :name_attr"
     end
@@ -307,6 +307,23 @@ class Scim
         'authorization' => @auth_header))
   end
 
+  def map_group(group, is_id, external_group)
+    key_name = is_id ? :groupId : :displayName
+    request = {key_name => group, :externalGroup => external_group, :schemas => ["urn:scim:schemas:core:1.0"] }
+    result = json_parse_reply(@key_style, *json_post(@target,
+                                                     "#{type_info(:group_mapping, :path)}", request,
+                                                     'authorization' => @auth_header))
+    result
+  end
+
+  def unmap_group(group_id, external_group)
+    http_delete(@target, "#{type_info(:group_mapping, :path)}/id/#{group_id}/#{external_group}",
+                          @auth_header)
+  end
+
+  def list_group_mappings(start = nil, count = nil)
+    json_get(@target, "#{type_info(:group_mapping, :path)}/list?startIndex=#{start}&count=#{count}", @key_style, 'authorization' => @auth_header)
+  end
 end
 
 end

data/lib/uaa/token_coder.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/uaa/token_issuer.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/uaa/util.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/uaa/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
-    VERSION = "3.0.0"
+    VERSION = "3.1.0"
   end
 end

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.

data/spec/integration_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/scim_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,6 +13,8 @@
 
 require 'spec_helper'
 require 'uaa/scim'
+require 'uri'
+require 'cgi'
 
 module CF::UAA
 
@@ -139,6 +141,72 @@ describe Scim do
     result['id'].should == "id12345"
   end
 
+  it "adds a mapping from uaa groups to external group" do
+    subject.set_request_handler do |url, method, body, headers|
+      url.should == "#{@target}/Groups/External"
+      method.should == :post
+      check_headers(headers, :json, :json)
+      body.should include('"displayName":"uaa-scope-name"', '"externalGroup":"external-group-name"', '"schemas":["urn:scim:schemas:core:1.0"]')
+      [201, '{"displayName":"uaa-scope-name", "externalGroup": "external-group-name"}', {"content-type" => "application/json"}]
+    end
+    result = subject.map_group("uaa-scope-name", false, "external-group-name")
+    result['displayname'].should == "uaa-scope-name"
+    result['externalgroup'].should == "external-group-name"
+  end
+
+  it "unmaps a uaa group from an external group" do
+    subject.set_request_handler do |url, method, body, headers|
+      url.should == "#{@target}/Groups/External/id/uaa-group-id/external-group-name"
+      method.should == :delete
+      check_headers(headers, nil, nil)
+
+      [200, '{"displayName":"uaa-scope-name", "groupId": "uaa-group-id", "externalGroup": "external-group-name"}', {"content-type" => "application/json"}]
+    end
+    subject.unmap_group("uaa-group-id", "external-group-name")
+  end
+
+  describe "#list_group_mappings" do
+    it "lists all the external group mappings with default pagination" do
+      subject.set_request_handler do |url, method, body, headers|
+        url.should start_with("#{@target}/Groups/External/list")
+        method.should == :get
+        check_headers(headers, nil, :json)
+
+        [
+            200,
+            '{"resources": [{"groupId": "group-id", "displayName": "group-name", "externalGroup": "external-group-name"}], "totalResults": 1 }',
+            {"content-type" => "application/json"}
+        ]
+      end
+
+      result = subject.list_group_mappings
+      result['resources'].length.should == 1
+      result['totalresults'].should == 1
+    end
+
+    it "lists a page of external group mappings starting from an index" do
+      subject.set_request_handler do |url, method, body, headers|
+        url.should start_with("#{@target}/Groups/External/list")
+        method.should == :get
+        check_headers(headers, nil, :json)
+
+        query_params = CGI::parse(URI.parse(url).query)
+        start_index = query_params["startIndex"].first
+        count = query_params["count"].first
+
+        start_index.should == "3"
+        count.should == "10"
+
+        [
+            200,
+            '{"resources": [{"groupId": "group-id", "displayName": "group-name", "externalGroup": "external-group-name"}], "totalResults": 1 }',
+            {"content-type" => "application/json"}
+        ]
+      end
+
+      subject.list_group_mappings(3, 10)
+    end
+  end
 end
 
 end

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/token_coder_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/token_issuer_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.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaa-lib
 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-06 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json