cf-uaa-lib 3.1.0 → 3.2.0

data/lib/uaa/http.rb

@@ -50,7 +50,7 @@ module Http
 
   def self.included(base)
     base.class_eval do
-      attr_accessor :http_proxy, :https_proxy, :skip_ssl_validation
+      attr_accessor :http_proxy, :https_proxy, :skip_ssl_validation, :ssl_ca_file
     end
   end
 
@@ -182,7 +182,13 @@ module Http
 
     if uri.is_a?(URI::HTTPS)
       http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE if skip_ssl_validation
+
+      if skip_ssl_validation
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      elsif ssl_ca_file
+        http.ca_file = File.expand_path(ssl_ca_file)
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      end
     end
 
     @http_cache[cache_key] = http

data/lib/uaa/info.rb

@@ -32,6 +32,7 @@ class Info
   def initialize(target, options = {})
     self.target = target
     self.skip_ssl_validation = options[:skip_ssl_validation]
+    self.ssl_ca_file = options[:ssl_ca_file]
     self.symbolize_keys = options[:symbolize_keys]
     self.http_proxy = options[:http_proxy]
     self.https_proxy = options[:https_proxy]

data/lib/uaa/scim.rb

@@ -100,6 +100,7 @@ class Scim
     @target, @auth_header = target, auth_header
     @key_style = options[:symbolize_keys] ? :downsym : :down
     self.skip_ssl_validation = options[:skip_ssl_validation]
+    self.ssl_ca_file = options[:ssl_ca_file]
     self.http_proxy = options[:http_proxy]
     self.https_proxy = options[:https_proxy]
   end

data/lib/uaa/token_coder.rb

@@ -42,7 +42,7 @@ class InvalidAudience < AuthError; end
 class TokenCoder
 
   def self.init_digest(algo) # @private
-    OpenSSL::Digest::Digest.new(algo.sub('HS', 'sha').sub('RS', 'sha'))
+    OpenSSL::Digest.new(algo.sub('HS', 'sha').sub('RS', 'sha'))
   end
 
   def self.normalize_options(opts) # @private

data/lib/uaa/token_issuer.rb

@@ -110,6 +110,7 @@ class TokenIssuer
     @token_target = options[:token_target] || target
     @key_style = options[:symbolize_keys] ? :sym : nil
     self.skip_ssl_validation = options[:skip_ssl_validation]
+    self.ssl_ca_file = options[:ssl_ca_file]
     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 = "3.1.0"
+    VERSION = "3.2.0"
   end
 end

data/spec/http_spec.rb

@@ -69,6 +69,17 @@ describe Http do
     http_instance.http_get("https://uncached.example.com")
     expect(http_double).to have_received(:verify_mode=).with(OpenSSL::SSL::VERIFY_NONE)
   end
+
+  it "passes ssl certificate file if provided" do
+    http_double = double('http').as_null_object
+    Net::HTTP.stub(:new).and_return(http_double)
+
+    http_instance.ssl_ca_file = "/fake-ca-file"
+    http_instance.http_get("https://uncached.example.com")
+
+    expect(http_double).to have_received(:ca_file=).with("/fake-ca-file")
+    expect(http_double).to have_received(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER)
+  end
 end
 
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaa-lib
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Dave Syer
@@ -12,118 +13,134 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   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'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.9.2
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.1
 description: Client library for interacting with the CloudFoundry User Account and
@@ -141,9 +158,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- ".yardopts"
+- .gitignore
+- .travis.yml
+- .yardopts
 - CHANGELOG.md
 - Gemfile
 - LICENSE.TXT
@@ -170,26 +187,27 @@ files:
 homepage: https://github.com/cloudfoundry/cf-uaa-lib
 licenses:
 - Apache 2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: cf-uaa-lib
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Client library for CloudFoundry UAA
 test_files:
 - spec/http_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 6b4d37f1fd550f4599f73272b8585b71000afb91
-  data.tar.gz: 857e2c137890ee3dc1dd0b699581c1e644935885
-SHA512:
-  metadata.gz: a9ab7f79ec21ae03a11c40731395eaef4ac6239277b54c9270aabad6c44a203350a0337a4d320f4aa5cdf03f0b485ec562a3fe26c9214a02838e25ba3c79300f
-  data.tar.gz: 5c5127f173c8b05d6ec032783b40cb4c69c142e3368f2188375d1aa1448d8f71e4955cbe4eb8f1ee46100285c57e858a6bd042423142b2cfe8d68f99de26dc12