cf-uaa-lib 2.1.0 → 3.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9bf9b6c77939ea097c5e4e04bb84b56fcc2ee251
+  data.tar.gz: 3363c83dc1fa3b1b946296b492f8652f2190cd2f
+SHA512:
+  metadata.gz: a6be5ce23db43f6dd8e30f4ea127239abd1b77145d3ead280530e2c11a30ee693a40c18c5ff1f3387c7fd98d904b080f381cef5913e9227bc813263c006513a2
+  data.tar.gz: 9bacf86eea0a2215a87131aacabe7c48d7967419a0e2e8ae407ebf67b10b1baefa46c3f88898c58aaf7f9f7a4ebe7926d6e800578753bd599bd4608c89c0b374

data/cf-uaa-lib.gemspec

@@ -36,11 +36,11 @@ Gem::Specification.new do |s|
   s.add_dependency "multi_json"
 
   s.add_development_dependency "bundler"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "simplecov"
-  s.add_development_dependency "simplecov-rcov"
-  s.add_development_dependency "ci_reporter"
-  s.add_development_dependency "json_pure"
+  s.add_development_dependency "rake", "~> 10.3.2"
+  s.add_development_dependency "rspec", "~> 2.14.1"
+  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_development_dependency "json_pure", "~> 1.8.1"
 
 end

data/lib/uaa/http.rb

@@ -21,6 +21,9 @@ module CF::UAA
 # Indicates URL for the target is bad or not accessible.
 class BadTarget < UAAError; end
 
+# Indicates invalid SSL Certification for the target.
+class SSLException < UAAError; end
+
 # Indicates the resource within the target server was not found.
 class NotFound < UAAError; end
 
@@ -47,7 +50,7 @@ module Http
 
   def self.included(base)
     base.class_eval do
-      attr_accessor :http_proxy, :https_proxy
+      attr_accessor :http_proxy, :https_proxy, :skip_ssl_validation
     end
   end
 
@@ -97,6 +100,10 @@ module Http
     http_put(target, path, Util.json(body), headers.merge("content-type" => JSON_UTF8))
   end
 
+  def json_patch(target, path, body, headers = {})
+    http_patch(target, path, Util.json(body), headers.merge("content-type" => JSON_UTF8))
+  end
+
   def json_parse_reply(style, status, body, headers)
     raise ArgumentError unless style.nil? || style.is_a?(Symbol)
     unless [200, 201, 204, 400, 401, 403, 409].include? status
@@ -119,6 +126,7 @@ module Http
   def http_get(target, path = nil, headers = {}) request(target, :get, path, nil, headers) end
   def http_post(target, path, body, headers = {}) request(target, :post, path, body, headers) end
   def http_put(target, path, body, headers = {}) request(target, :put, path, body, headers) end
+  def http_patch(target, path, body, headers = {}) request(target, :patch, path, body, headers) end
 
   def http_delete(target, path, authorization)
     status = request(target, :delete, path, nil, "authorization" => authorization)[0]
@@ -147,7 +155,7 @@ module Http
 
   def net_http_request(url, method, body, headers)
     raise ArgumentError unless reqtype = {:delete => Net::HTTP::Delete,
-        :get => Net::HTTP::Get, :post => Net::HTTP::Post, :put => Net::HTTP::Put}[method]
+        :get => Net::HTTP::Get, :post => Net::HTTP::Post, :put => Net::HTTP::Put, :patch => Net::HTTP::Patch}[method]
     headers["content-length"] = body.length if body
     uri = URI.parse(url)
     req = reqtype.new(uri.request_uri)
@@ -157,6 +165,8 @@ module Http
     reply.each_header { |k, v| outhdrs[k] = v }
     [reply.code.to_i, reply.body, outhdrs]
 
+  rescue OpenSSL::SSL::SSLError => e
+    raise SSLException, "Invalid SSL Cert for #{url}. Use '--skip-ssl-validation' to continue with an insecure target"
   rescue URI::Error, SocketError, SystemCallError => e
     raise BadTarget, "error: #{e.message}"
   rescue Net::HTTPBadResponse => e
@@ -172,7 +182,7 @@ module Http
 
     if uri.is_a?(URI::HTTPS)
       http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE if skip_ssl_validation
     end
 
     @http_cache[cache_key] = http

data/lib/uaa/info.rb

@@ -31,6 +31,7 @@ class Info
   #     string keys are returned.
   def initialize(target, options = {})
     self.target = target
+    self.skip_ssl_validation = options[:skip_ssl_validation]
     self.symbolize_keys = options[:symbolize_keys]
     self.http_proxy = options[:http_proxy]
     self.https_proxy = options[:https_proxy]

data/lib/uaa/scim.rb

@@ -99,6 +99,7 @@ class Scim
   def initialize(target, auth_header, options = {})
     @target, @auth_header = target, auth_header
     @key_style = options[:symbolize_keys] ? :downsym : :down
+    self.skip_ssl_validation = options[:skip_ssl_validation]
     self.http_proxy = options[:http_proxy]
     self.https_proxy = options[:https_proxy]
   end
@@ -148,6 +149,24 @@ class Scim
     type == :client && !reply ? get(type, info['client_id']): reply
   end
 
+  # Modifies the contents of a SCIM object.
+  # @param (see #add)
+  # @return (see #add)
+  def patch(type, info)
+    path, info = type_info(type, :path), force_case(info)
+    ida = type == :client ? 'client_id' : 'id'
+    raise ArgumentError, "info must include #{ida}" unless id = info[ida]
+    hdrs = {'authorization' => @auth_header}
+    if info && info['meta'] && (etag = info['meta']['version'])
+      hdrs.merge!('if-match' => etag)
+    end
+    reply = json_parse_reply(@key_style,
+        *json_patch(@target, "#{path}/#{URI.encode(id)}", info, hdrs))
+
+    # hide client endpoints that are not quite scim compatible
+    type == :client && !reply ? get(type, info['client_id']): reply
+  end
+
   # Gets a set of attributes for each object that matches a given filter.
   # @param (see #add)
   # @param [Hash] query may contain the following keys:

data/lib/uaa/token_issuer.rb

@@ -109,6 +109,7 @@ class TokenIssuer
     @target, @client_id, @client_secret = target, client_id, client_secret
     @token_target = options[:token_target] || target
     @key_style = options[:symbolize_keys] ? :sym : nil
+    self.skip_ssl_validation = options[:skip_ssl_validation]
     self.http_proxy = options[:http_proxy]
     self.https_proxy = options[:https_proxy]
   end

data/lib/uaa/version.rb

@@ -14,6 +14,6 @@
 # Cloud Foundry namespace
 module CF
   module UAA
-    VERSION = "2.1.0"
+    VERSION = "3.0.0"
   end
 end

data/spec/http_spec.rb

@@ -49,6 +49,26 @@ describe Http do
     expect(Net::HTTP).to have_received(:new).with(anything, anything, 'http-proxy.example.com', 1234, 'user', 'password')
   end
 
+  it "raises an SSLException when the certificate is not valid" do
+    http_double = double('http').as_null_object
+    Net::HTTP.stub(:new).and_return(http_double)
+    http_double.stub(:request).and_raise(OpenSSL::SSL::SSLError)
+
+    expect { http_instance.http_get("https://example.com") }.to raise_error(CF::UAA::SSLException)
+  end
+
+  it "skips ssl validation if requested" do
+    http_double = double('http').as_null_object
+    Net::HTTP.stub(:new).and_return(http_double)
+    http_double.stub(:verify_mode=)
+
+    http_instance.http_get("https://example.com")
+    expect(http_double).not_to have_received(:verify_mode=)
+
+    http_instance.skip_ssl_validation = true
+    http_instance.http_get("https://uncached.example.com")
+    expect(http_double).to have_received(:verify_mode=).with(OpenSSL::SSL::VERIFY_NONE)
+  end
 end
 
 end

data/spec/info_spec.rb

@@ -34,11 +34,12 @@ module CF::UAA
     end
 
     describe "initialize" do
-      let(:options) { {:http_proxy => 'http-proxy.com', :https_proxy => 'https-proxy.com'} }
+      let(:options) { {:http_proxy => 'http-proxy.com', :https_proxy => 'https-proxy.com', :skip_ssl_validation => true} }
 
       it "sets proxy information" do
         uaa_info.http_proxy.should == 'http-proxy.com'
         uaa_info.https_proxy.should == 'https-proxy.com'
+        uaa_info.skip_ssl_validation == true
       end
     end
 

data/spec/scim_spec.rb

@@ -36,12 +36,16 @@ describe Scim do
   end
 
   describe "initialize" do
-    let(:options) { {:http_proxy => 'http-proxy.com', :https_proxy => 'https-proxy.com'} }
+    let(:options) { {:http_proxy => 'http-proxy.com', :https_proxy => 'https-proxy.com', :skip_ssl_validation => true} }
 
     it "sets proxy information" do
       subject.http_proxy.should == 'http-proxy.com'
       subject.https_proxy.should == 'https-proxy.com'
     end
+
+    it "sets skip_ssl_validation" do
+      subject.skip_ssl_validation == true
+    end
   end
 
   it "adds an object" do
@@ -70,6 +74,20 @@ describe Scim do
     result["id"].should == "id12345"
   end
 
+  it "modifies an object" do
+    obj = {:hair => "black", :shoe_size => "medium", :eye_color => ["hazel", "brown"],
+          :name => "fredrick", :meta => {:version => 'v567'}, :id => "id12345"}
+    subject.set_request_handler do |url, method, body, headers|
+      url.should == "#{@target}/Users/id12345"
+      method.should == :patch
+      check_headers(headers, :json, :json)
+      headers["if-match"].should == "v567"
+      [200, '{"ID":"id12345"}', {"content-type" => "application/json"}]
+    end
+    result = subject.patch(:user, obj)
+    result["id"].should == "id12345"
+  end
+
   it "gets an object" do
     subject.set_request_handler do |url, method, body, headers|
       url.should == "#{@target}/Users/id12345"

data/spec/token_issuer_spec.rb

@@ -29,12 +29,16 @@ describe TokenIssuer do
   subject { @issuer }
 
   describe "initialize" do
-    let(:options) { {:http_proxy => 'http-proxy.com', :https_proxy => 'https-proxy.com'} }
+    let(:options) { {:http_proxy => 'http-proxy.com', :https_proxy => 'https-proxy.com', :skip_ssl_validation => true} }
 
     it "sets proxy information" do
       subject.http_proxy.should == 'http-proxy.com'
       subject.https_proxy.should == 'https-proxy.com'
     end
+
+    it "sets skip_ssl_validation" do
+      subject.skip_ssl_validation == true
+    end
   end
 
   context "with client credentials grant" do

metadata

@@ -1,15 +1,9 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cf-uaa-lib
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: 
-  segments: 
-  - 2
-  - 1
-  - 0
-  version: 2.1.0
+version: !ruby/object:Gem::Version
+  version: 3.0.0
 platform: ruby
-authors: 
+authors:
 - Dave Syer
 - Dale Olds
 - Joel D'sa
@@ -18,138 +12,138 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-04-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-08-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: multi_json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.3.2
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.3.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.1
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.2
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: simplecov-rcov
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.2
+- !ruby/object:Gem::Dependency
+  name: simplecov-rcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: ci_reporter
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
+- !ruby/object:Gem::Dependency
+  name: ci_reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.9.2
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: json_pure
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.9.2
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.1
   type: :development
-  version_requirements: *id008
-description: Client library 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 on behalf of users.  The tokens can then be used to access protected resources in a Resource Server.  This library is for use by UAA client applications or resource servers.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+description: Client library 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 on behalf
+  of users.  The tokens can then be used to access protected resources in a Resource
+  Server.  This library is for use by UAA client applications or resource servers.
+email:
 - dsyer@vmware.com
 - olds@vmware.com
 - jdsa@vmware.com
 - vidya@vmware.com
 - ltaylor@vmware.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .travis.yml
-- .yardopts
+files:
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.TXT
@@ -174,37 +168,34 @@ files:
 - spec/token_coder_spec.rb
 - spec/token_issuer_spec.rb
 homepage: https://github.com/cloudfoundry/cf-uaa-lib
-licenses: 
+licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: cf-uaa-lib
-rubygems_version: 1.8.15
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Client library for CloudFoundry UAA
-test_files: []
-
+test_files:
+- spec/http_spec.rb
+- spec/info_spec.rb
+- spec/integration_spec.rb
+- spec/scim_spec.rb
+- spec/spec_helper.rb
+- spec/token_coder_spec.rb
+- spec/token_issuer_spec.rb