bits_service_client 0.2.2.pre.8 → 0.2.2.pre.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb0bcb367d39f853361a544498f59409ed01da87
-  data.tar.gz: 721ba2b9da42b314e9bb9fed090563225fb34a64
+  metadata.gz: 8ffe244bb3268bff64c983b8c9bb706e2dc7b134
+  data.tar.gz: 9c5dced93c1563f94ee1da10106e71761b52fd38
 SHA512:
-  metadata.gz: fc71a774e1faf08210fb86e3699f2a39589512dfbcdd3b9877c4cf951d0082d8f90119b07b69a699747c48f53364c3e4fea5bc38b309949149dd77bc2911f8f7
-  data.tar.gz: 89528ee1fde851dc083866810e0fdf2464d818794e50432cebada5594d8662a1aae08de312f46c495e1e87786001d07b90ddc539c2d88e2fe03b831c04a42e98
+  metadata.gz: 7556eee77c0e6b4b813b677306f59387a718722716f6e3725e69193fbe2a3f6bcc9a7c8577b25bc821473f15bea7c4caf9525e40337557aac9932ab9307811c4
+  data.tar.gz: 6f4e47a725c021a74012627bbeb8fdb44368681f5289c36ebe245e974d8e72a231f4495c9b0e0f73dd41081aee9bfb43241c8d284b5e68636c69c7a2d44f7e86

data/lib/bits_service_client/client.rb

@@ -16,20 +16,9 @@ module BitsService
       raise ResourceTypeNotPresent.new('Must specify resource type') unless resource_type
       @resource_type = resource_type
       @vcap_request_id = vcap_request_id
-      @private_http_client = LoggingHttpClient.new(
-        Net::HTTP.new(@private_endpoint.host, @private_endpoint.port).tap do |c|
-          c.read_timeout = request_timeout_in_seconds
-          c.use_ssl = true if @private_endpoint.scheme.start_with?('https')
-          c.verify_mode = OpenSSL::SSL::VERIFY_PEER if @private_endpoint.scheme.start_with?('https')
-        end
-        )
-      @public_http_client = LoggingHttpClient.new(
-        Net::HTTP.new(@public_endpoint.host, @public_endpoint.port).tap do |c|
-          c.read_timeout = request_timeout_in_seconds
-          c.use_ssl = true if @public_endpoint.scheme.start_with?('https')
-          c.verify_mode = OpenSSL::SSL::VERIFY_PEER if @public_endpoint.scheme.start_with?('https')
-        end
-       )
+
+      @private_http_client = create_logging_http_client(@private_endpoint, bits_service_options, request_timeout_in_seconds)
+      @public_http_client = create_logging_http_client(@public_endpoint, bits_service_options, request_timeout_in_seconds)
     end
 
     def local?
@@ -132,6 +121,25 @@ module BitsService
 
     attr_reader :resource_type
 
+    def create_logging_http_client(endpoint, bits_service_options, request_timeout_in_seconds)
+      LoggingHttpClient.new(
+        Net::HTTP.new(endpoint.host, endpoint.port).tap do |c|
+          c.read_timeout = request_timeout_in_seconds
+          enable_ssl(c, validated(bits_service_options, :ca_cert_path)) if endpoint.scheme == 'https'
+        end
+      )
+    end
+
+    def enable_ssl(http_client, ca_cert_path)
+      cert_store = OpenSSL::X509::Store.new
+      cert_store.set_default_paths
+      cert_store.add_file ca_cert_path
+
+      http_client.use_ssl = true
+      http_client.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      http_client.cert_store = cert_store
+    end
+
     def generate_private_url(guid)
       path = resource_path(guid)
 

data/lib/bits_service_client/resource_pool.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 module BitsService
   class ResourcePool
-    def initialize(endpoint:, request_timeout_in_seconds:, vcap_request_id: '')
+    def initialize(endpoint:, request_timeout_in_seconds:, vcap_request_id: '', ca_cert_path: nil)
       @endpoint = URI.parse(endpoint)
       @request_timeout_in_seconds = request_timeout_in_seconds
       @vcap_request_id = vcap_request_id
       @logger = Steno.logger('cc.bits_service_client')
+      @ca_cert_path = ca_cert_path 
     end
 
     def matches(resources_json)
@@ -94,7 +95,20 @@ module BitsService
     end
 
     def http_client
-      @http_client ||= Net::HTTP.new(endpoint.host, endpoint.port).tap { |c| c.read_timeout = @request_timeout_in_seconds }
+      @http_client ||= Net::HTTP.new(endpoint.host, endpoint.port).tap do |c| 
+        c.read_timeout = @request_timeout_in_seconds 
+        enable_ssl(c, @ca_cert_path) if endpoint.scheme == 'https'
+      end
+    end
+
+    def enable_ssl(http_client, ca_cert_path)
+      cert_store = OpenSSL::X509::Store.new
+      cert_store.set_default_paths
+      cert_store.add_file ca_cert_path if ca_cert_path
+      
+      http_client.use_ssl = true
+      http_client.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      http_client.cert_store = cert_store
     end
   end
 end

data/lib/bits_service_client/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module BitsServiceClient
-  VERSION = '0.2.2.pre.8'
+  VERSION = '0.2.2.pre.9'
 end

data/lib/bits_service_client.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require 'json'
 require 'net/http/post/multipart'
+require 'openssl'
 
 require 'bits_service_client/version'
 require 'bits_service_client/blob'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bits_service_client
 version: !ruby/object:Gem::Version
-  version: 0.2.2.pre.8
+  version: 0.2.2.pre.9
 platform: ruby
 authors:
 - Rizwan Reza
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: steno