vmware-vra 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ac2699b418d64fce4f9120bb6ba446153b0a8b8
-  data.tar.gz: f9fd06ca3a0b903424bf3844e077e291711d0140
+  metadata.gz: 2c05eec01ac6553d3123ba37195f222122f35973
+  data.tar.gz: 13dcedf5c874c5b28177dea101a1eb877b1cb873
 SHA512:
-  metadata.gz: b94be722c12fb7a9543757e369fa8ab53c4ece8855cbf197282761cc4086aefeba315f91b55b497bf62f5577111574236d970238acd817674a6ac065ae959466
-  data.tar.gz: c1afa96be5492f647b90a0aa3ecda8a751fa58d5231f0158cd4e5b10c4b3471d7407263b1a18af141bc388c01df66b511382f8ce9c05a3cb69cfe86e90ea9c99
+  metadata.gz: 725f77a6be89f33ca1df6e227e430c410dfd601ddf334c37c76f9fc1ec8cd6891f409a21f234b43140d642118245b3a8cd6ae5c22d06d12174f46f591116a22e
+  data.tar.gz: b1bec412ef1899b76f60fac938fa6ad3926d857833cd7b334880710710eb4dcdaff4966679f67fb63de71f5a4fc65d8a77b5d41575c5650566015ccd6215ad31

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # vmware-vra-gem CHANGELOG
 
+## v1.7.0 (2016-08-02)
+* [pr#31](https://github.com/chef-partners/vmware-vra-gem/pull/31) instructing Net::HTTP not to verify SSL when verify_ssl is false
+
 ## v1.6.1 (2016-05-10)
 * Bowing to the Rubocop gods.
 

data/lib/vra/http.rb

@@ -36,8 +36,10 @@ module Vra
       def call
         uri = URI(params[:url]) || fail(':url required')
 
-        Net::HTTP.start(uri.host, uri.port,
-                        use_ssl: uri.scheme == 'https') do |http|
+        ssl_params = { use_ssl: uri.scheme == 'https' }
+        ssl_params[:verify_mode] = OpenSSL::SSL::VERIFY_NONE unless verify_ssl?
+
+        Net::HTTP.start(uri.host, uri.port, ssl_params) do |http|
           request = http_request(params[:method], uri)
           request.initialize_http_header(params[:headers] || {})
           request.body = params[:payload] || ''
@@ -63,6 +65,11 @@ module Vra
       def new(new_params)
         self.class.new(params.dup.merge(new_params))
       end
+
+      def verify_ssl?
+        return true if params[:verify_ssl].nil?
+        params[:verify_ssl]
+      end
     end
 
     class Response

data/lib/vra/version.rb

@@ -17,5 +17,5 @@
 #
 
 module Vra
-  VERSION = '1.6.1'.freeze
+  VERSION = '1.7.0'.freeze
 end

data/spec/catalog_request_spec.rb

@@ -121,4 +121,38 @@ describe Vra::CatalogRequest do
       end
     end
   end
+
+  let(:client_without_ssl) do
+    Vra::Client.new(username: 'user@corp.local',
+                    password: 'password',
+                    tenant: 'tenant',
+                    base_url: 'https://vra.corp.local',
+                    verify_ssl: false)
+  end
+
+  context 'when ssl is not verified by the client' do
+    let(:request) do
+      client_without_ssl.catalog.request('catalog-12345',
+                                         cpus: 2,
+                                         memory: 1024,
+                                         lease_days: 15,
+                                         requested_for: 'tester@corp.local',
+                                         notes: 'test notes',
+                                         subtenant_id: 'user_subtenant')
+    end
+
+    describe do
+      it 'passes verify_false to Vra::Http' do
+        allow(request.client).to receive(:authorized?).and_return(true)
+        expect(request.client.instance_variable_get('@verify_ssl')).to eq false
+
+        expect(Vra::Http).to receive(:execute).and_wrap_original do |_http, *args|
+          expect(*args).to include(verify_ssl: false)
+          double(location: 'auth/request_id')
+        end
+
+        request.submit
+      end
+    end
+  end
 end

data/spec/client_spec.rb

@@ -352,6 +352,33 @@ describe Vra::Client do
       client.http_post(path, payload)
     end
 
+    context 'when not verifying ssl' do
+      let(:unverified_client) do
+        Vra::Client.new(username: 'user@corp.local',
+                        password: 'password',
+                        tenant: 'tenant',
+                        base_url: 'https://vra.corp.local',
+                        verify_ssl: false)
+      end
+
+      before(:each) do
+        allow(unverified_client).to receive(:authorized?).and_return(true)
+      end
+
+      it 'configures Net::HTTP with VERIFY_NONE' do
+        allow(Net::HTTP).to receive(:start).and_wrap_original do |_http, *args|
+          expect(args.last).to include(verify_mode: OpenSSL::SSL::VERIFY_NONE)
+          double('response', final?: true, success?: true)
+        end
+
+        unverified_client.http_post('/path', 'payload')
+
+        [:head, :get].each do |method|
+          unverified_client.http_fetch(method, '/test', true)
+        end
+      end
+    end
+
     it 'calls raise_http_exception upon error' do
       allow(client).to receive(:authorize!)
       allow(Vra::Http).to receive(:execute).and_raise(StandardError)

data/spec/http_spec.rb

@@ -69,6 +69,15 @@ describe Vra::Http do
       expect(response.code).to eq 204
     end
 
+    it 'configures ssl verification' do
+      allow(Net::HTTP).to receive(:start).and_wrap_original do |_http, *args|
+        expect(args.last).to include(verify_mode: OpenSSL::SSL::VERIFY_NONE)
+        double('response', final?: true, success?: true)
+      end
+
+      execute(:get, url: 'https://test.local', verify_ssl: false)
+    end
+
     context 'when successful' do
       it 'returns a successful response given a status 200' do
         stub_request(:head, 'http://test.local')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmware-vra
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Adam Leff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Client gem for interacting with VMware vRealize Automation.