knife-windows 1.4.0 → 1.4.1

data/spec/dummy_winrm_service.rb

@@ -0,0 +1,24 @@
+module Dummy
+  class WinRMTransport
+    attr_reader :httpcli
+
+    def initialize
+      @httpcli = HTTPClient.new
+    end
+  end
+
+  class WinRMService
+    attr_reader :xfer
+
+    def initialize
+      @xfer = WinRMTransport.new
+    end
+
+    def set_timeout(timeout); end
+    def open_shell; end
+    def run_command; end
+    def get_command_output; end
+    def cleanup_command; end
+    def close_shell; end
+  end
+end

data/spec/unit/knife/bootstrap_windows_winrm_spec.rb

@@ -28,6 +28,7 @@ describe Chef::Knife::BootstrapWindowsWinrm do
     allow(bootstrap).to receive(:validate_options!).and_return(nil)
     allow(bootstrap).to receive(:sleep).and_return(10)
     allow(Chef::Knife::WinrmSession).to receive(:new).and_return(session)
+    allow(File).to receive(:exist?).with(anything).and_call_original
     allow(File).to receive(:exist?).with(File.expand_path(Chef::Config[:validation_key])).and_return(true)
   end
 

data/spec/unit/knife/winrm_session_spec.rb

@@ -17,12 +17,13 @@
 #
 
 require 'spec_helper'
+require 'dummy_winrm_service'
 
 Chef::Knife::Winrm.load_deps
 
 
 describe Chef::Knife::WinrmSession do
-  let(:winrm_service) { double('WinRMWebService') }
+  let(:winrm_service) { Dummy::WinRMService.new }
   let(:options) { { transport: :plaintext } }
 
   before do
@@ -40,6 +41,7 @@ describe Chef::Knife::WinrmSession do
   describe "#initialize" do
     context "when a proxy is configured" do
       let(:proxy_uri) { 'blah.com' }
+      let(:ssl_policy) { double('DefaultSSLPolicy', :set_custom_certs => nil) }
 
       before do
         Chef::Config[:http_proxy] = proxy_uri
@@ -49,6 +51,15 @@ describe Chef::Knife::WinrmSession do
         subject
         expect(ENV['HTTP_PROXY']).to eq("http://#{proxy_uri}")
       end
+
+      it "sets the ssl policy on the winrm client" do
+        expect(Chef::HTTP::DefaultSSLPolicy).to receive(:new)
+          .with(winrm_service.xfer.httpcli.ssl_config)
+          .and_return(ssl_policy)
+        expect(ssl_policy).to receive(:set_custom_certs)
+        subject
+      end
+
     end
   end
 

data/spec/unit/knife/winrm_spec.rb

@@ -17,6 +17,7 @@
 #
 
 require 'spec_helper'
+require 'dummy_winrm_service'
 
 Chef::Knife::Winrm.load_deps
 
@@ -95,11 +96,7 @@ describe Chef::Knife::Winrm do
       ]
     end
     let(:winrm_session) { double('winrm_session') }
-    let(:winrm_service) { double('WinRMWebService') }
-
-    before do
-      allow(winrm_service).to receive(:set_timeout)
-    end
+    let(:winrm_service) { Dummy::WinRMService.new }
 
     subject { Chef::Knife::Winrm.new(knife_args) }
 
@@ -185,11 +182,6 @@ describe Chef::Knife::Winrm do
     end
 
     context "when configuring the WinRM transport" do
-      before(:all) do
-        @winrm_session = Object.new
-        @winrm_session.define_singleton_method(:set_timeout){|timeout| ""}
-      end
-
       context "kerberos option is set" do
         let(:winrm_command_http) { Chef::Knife::Winrm.new([
           '-m', 'localhost',
@@ -201,7 +193,7 @@ describe Chef::Knife::Winrm do
         ]) }
 
         it "sets the transport to kerberos" do
-          expect(WinRM::WinRMWebService).to receive(:new).with('http://localhost:5985/wsman', :kerberos, anything).and_return(@winrm_session)
+          expect(WinRM::WinRMWebService).to receive(:new).with('http://localhost:5985/wsman', :kerberos, anything).and_return(winrm_service)
           winrm_command_http.configure_chef
           winrm_command_http.configure_session
         end
@@ -218,7 +210,7 @@ describe Chef::Knife::Winrm do
 
         it "sets the transport to plaintext" do
           winrm_command_http.config[:kerberos_realm] = nil
-          expect(WinRM::WinRMWebService).to receive(:new).with('http://localhost:5985/wsman', :plaintext, anything).and_return(@winrm_session)
+          expect(WinRM::WinRMWebService).to receive(:new).with('http://localhost:5985/wsman', :plaintext, anything).and_return(winrm_service)
           winrm_command_http.configure_chef
           winrm_command_http.configure_session
         end
@@ -248,15 +240,15 @@ describe Chef::Knife::Winrm do
 
         it "defaults to the http uri scheme" do
           expect(Chef::Knife::WinrmSession).to receive(:new).with(hash_including(:transport => :plaintext)).and_call_original
-          expect(WinRM::WinRMWebService).to receive(:new).with('http://localhost:5985/wsman', anything, anything).and_return(@winrm_session)
+          expect(WinRM::WinRMWebService).to receive(:new).with('http://localhost:5985/wsman', anything, anything).and_return(winrm_service)
           winrm_command_http.configure_chef
           winrm_command_http.configure_session
         end
 
         it "sets the operation timeout and verifes default" do
           expect(Chef::Knife::WinrmSession).to receive(:new).with(hash_including(:transport => :plaintext)).and_call_original
-          expect(WinRM::WinRMWebService).to receive(:new).with('http://localhost:5985/wsman', anything, anything).and_return(@winrm_session)
-          expect(@winrm_session).to receive(:set_timeout).with(1800)
+          expect(WinRM::WinRMWebService).to receive(:new).with('http://localhost:5985/wsman', anything, anything).and_return(winrm_service)
+          expect(winrm_service).to receive(:set_timeout).with(1800)
           winrm_command_http.configure_chef
           winrm_command_http.configure_session
         end
@@ -264,7 +256,7 @@ describe Chef::Knife::Winrm do
         it "sets the user specified winrm port" do
           Chef::Config[:knife] = {winrm_port: "5988"}
           expect(Chef::Knife::WinrmSession).to receive(:new).with(hash_including(:transport => :plaintext)).and_call_original
-          expect(WinRM::WinRMWebService).to receive(:new).with('http://localhost:5988/wsman', anything, anything).and_return(@winrm_session)
+          expect(WinRM::WinRMWebService).to receive(:new).with('http://localhost:5988/wsman', anything, anything).and_return(winrm_service)
           winrm_command_http.configure_chef
           winrm_command_http.configure_session
         end
@@ -273,8 +265,8 @@ describe Chef::Knife::Winrm do
 
         it "sets operation timeout and verify 10 Minute timeout" do
           expect(Chef::Knife::WinrmSession).to receive(:new).with(hash_including(:transport => :plaintext)).and_call_original
-          expect(WinRM::WinRMWebService).to receive(:new).with('http://localhost:5985/wsman', anything, anything).and_return(@winrm_session)
-          expect(@winrm_session).to receive(:set_timeout).with(600)
+          expect(WinRM::WinRMWebService).to receive(:new).with('http://localhost:5985/wsman', anything, anything).and_return(winrm_service)
+          expect(winrm_service).to receive(:set_timeout).with(600)
           winrm_command_timeout.configure_chef
           winrm_command_timeout.configure_session
         end
@@ -284,7 +276,7 @@ describe Chef::Knife::Winrm do
         it "uses the https uri scheme if the ssl transport is specified" do
           Chef::Config[:knife] = {:winrm_transport => 'ssl'}
           expect(Chef::Knife::WinrmSession).to receive(:new).with(hash_including(:transport => :ssl)).and_call_original
-          expect(WinRM::WinRMWebService).to receive(:new).with('https://localhost:5986/wsman', anything, anything).and_return(@winrm_session)
+          expect(WinRM::WinRMWebService).to receive(:new).with('https://localhost:5986/wsman', anything, anything).and_return(winrm_service)
           winrm_command_https.configure_chef
           winrm_command_https.configure_session
         end
@@ -292,14 +284,14 @@ describe Chef::Knife::Winrm do
         it "uses the winrm port '5986' by default for ssl transport" do
           Chef::Config[:knife] = {:winrm_transport => 'ssl'}
           expect(Chef::Knife::WinrmSession).to receive(:new).with(hash_including(:transport => :ssl)).and_call_original
-          expect(WinRM::WinRMWebService).to receive(:new).with('https://localhost:5986/wsman', anything, anything).and_return(@winrm_session)
+          expect(WinRM::WinRMWebService).to receive(:new).with('https://localhost:5986/wsman', anything, anything).and_return(winrm_service)
           winrm_command_https.configure_chef
           winrm_command_https.configure_session
         end
 
         it "defaults to validating the server when the ssl transport is used" do
           expect(Chef::Knife::WinrmSession).to receive(:new).with(hash_including(:transport => :ssl)).and_call_original
-          expect(WinRM::WinRMWebService).to receive(:new).with(anything, anything, hash_including(:no_ssl_peer_verification => false)).and_return(@winrm_session)
+          expect(WinRM::WinRMWebService).to receive(:new).with(anything, anything, hash_including(:no_ssl_peer_verification => false)).and_return(winrm_service)
           winrm_command_https.configure_chef
           winrm_command_https.configure_session
         end
@@ -308,7 +300,7 @@ describe Chef::Knife::Winrm do
 
         it "validates the server when the ssl transport is used and the :winrm_ssl_verify_mode option is not configured to :verify_none" do
           expect(Chef::Knife::WinrmSession).to receive(:new).with(hash_including(:transport => :ssl)).and_call_original
-          expect(WinRM::WinRMWebService).to receive(:new).with(anything, anything, hash_including(:no_ssl_peer_verification => false)).and_return(@winrm_session)
+          expect(WinRM::WinRMWebService).to receive(:new).with(anything, anything, hash_including(:no_ssl_peer_verification => false)).and_return(winrm_service)
           winrm_command_verify_peer.configure_chef
           winrm_command_verify_peer.configure_session
         end
@@ -320,14 +312,14 @@ describe Chef::Knife::Winrm do
 
           it "does not validate the server when the ssl transport is used and the :winrm_ssl_verify_mode option is set to :verify_none" do
             expect(Chef::Knife::WinrmSession).to receive(:new).with(hash_including(:transport => :ssl)).and_call_original
-            expect(WinRM::WinRMWebService).to receive(:new).with(anything, anything, hash_including(:no_ssl_peer_verification => true)).and_return(@winrm_session)
+            expect(WinRM::WinRMWebService).to receive(:new).with(anything, anything, hash_including(:no_ssl_peer_verification => true)).and_return(winrm_service)
             subject.configure_chef
             subject.configure_session
           end
 
           it "prints warning output when the :winrm_ssl_verify_mode set to :verify_none to disable server validation" do
             expect(Chef::Knife::WinrmSession).to receive(:new).with(hash_including(:transport => :ssl)).and_call_original
-            expect(WinRM::WinRMWebService).to receive(:new).with(anything, anything, hash_including(:no_ssl_peer_verification => true)).and_return(@winrm_session)
+            expect(WinRM::WinRMWebService).to receive(:new).with(anything, anything, hash_including(:no_ssl_peer_verification => true)).and_return(winrm_service)
             expect(subject).to receive(:warn_no_ssl_peer_verification)
 
             subject.configure_chef
@@ -352,7 +344,7 @@ describe Chef::Knife::Winrm do
 
         it "validates the server when the ssl transport is used and the :ca_trust_file option is specified even if the :winrm_ssl_verify_mode option is set to :verify_none" do
           expect(Chef::Knife::WinrmSession).to receive(:new).with(hash_including(:transport => :ssl)).and_call_original
-          expect(WinRM::WinRMWebService).to receive(:new).with(anything, anything, hash_including(:no_ssl_peer_verification => false)).and_return(@winrm_session)
+          expect(WinRM::WinRMWebService).to receive(:new).with(anything, anything, hash_including(:no_ssl_peer_verification => false)).and_return(winrm_service)
           winrm_command_ca_trust.configure_chef
           winrm_command_ca_trust.configure_session
         end

data/spec/unit/knife/wsman_test_spec.rb

@@ -20,51 +20,35 @@ require 'spec_helper'
 
 describe Chef::Knife::WsmanTest do
   let(:http_client_mock) { HTTPClient.new }
+  let(:ssl_policy) { double('DefaultSSLPolicy', :set_custom_certs => nil) }
 
   before(:all) do
     Chef::Config.reset
   end
 
   before(:each) do
+    response_body = '<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Header/><s:Body><wsmid:IdentifyResponse xmlns:wsmid="http://schemas.dmtf.org/wbem/wsman/identity/1/wsmanidentity.xsd"><wsmid:ProtocolVersion>http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd</wsmid:ProtocolVersion><wsmid:ProductVendor>Microsoft Corporation</wsmid:ProductVendor><wsmid:ProductVersion>OS: 0.0.0 SP: 0.0 Stack: 2.0</wsmid:ProductVersion></wsmid:IdentifyResponse></s:Body></s:Envelope>'
+    http_response_mock = HTTP::Message.new_response(response_body)
+    allow(http_client_mock).to receive(:post).and_return(http_response_mock)
     allow(HTTPClient).to receive(:new).and_return(http_client_mock)
     subject.config[:verbosity] = 0
     allow(subject.ui).to receive(:ask).and_return('prompted_password')
+    allow(Chef::HTTP::DefaultSSLPolicy).to receive(:new)
+      .with(http_client_mock.ssl_config)
+      .and_return(ssl_policy)
   end
 
   subject { Chef::Knife::WsmanTest.new(['-m', 'localhost']) }
 
-  context 'when testing the WSMAN endpoint' do
-    context 'and the service does not respond' do
-      error_message = 'A connection attempt failed because the connected party did not properly respond after a period of time.'
-
-      before(:each) do
-        allow(http_client_mock).to receive(:post).and_raise(Exception.new(error_message))
-      end
-
-      it 'exits with a status code of 1' do
-        expect(subject).to receive(:exit).with(1)
-        subject.run
-      end
-
-      it 'writes a warning message for each node it fails to connect to' do
-        expect(subject.ui).to receive(:warn)
-        expect(subject).to receive(:exit).with(1)
-        subject.run
-      end
-
-      it 'writes an error message if it fails to connect to any nodes' do
-        expect(subject.ui).to receive(:error)
-        expect(subject).to receive(:exit).with(1)
-        subject.run
-      end
-    end
+  it 'sets the ssl policy' do
+    expect(ssl_policy).to receive(:set_custom_certs).twice
+    subject.run
+  end
 
+  context 'when testing the WSMAN endpoint' do
     context 'and the service responds' do
       context 'successfully' do
         it 'writes a message about a successful connection' do
-          response_body = '<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Header/><s:Body><wsmid:IdentifyResponse xmlns:wsmid="http://schemas.dmtf.org/wbem/wsman/identity/1/wsmanidentity.xsd"><wsmid:ProtocolVersion>http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd</wsmid:ProtocolVersion><wsmid:ProductVendor>Microsoft Corporation</wsmid:ProductVendor><wsmid:ProductVersion>OS: 0.0.0 SP: 0.0 Stack: 2.0</wsmid:ProductVersion></wsmid:IdentifyResponse></s:Body></s:Envelope>'
-          http_response_mock = HTTP::Message.new_response(response_body)
-          allow(http_client_mock).to receive(:post).and_return(http_response_mock)
           expect(subject.ui).to receive(:msg)
           subject.run
         end
@@ -94,12 +78,35 @@ describe Chef::Knife::WsmanTest do
         end
       end
     end
+
+    context 'and the service does not respond' do
+      error_message = 'A connection attempt failed because the connected party did not properly respond after a period of time.'
+
+      before(:each) do
+        allow(http_client_mock).to receive(:post).and_raise(Exception.new(error_message))
+      end
+
+      it 'exits with a status code of 1' do
+        expect(subject).to receive(:exit).with(1)
+        subject.run
+      end
+
+      it 'writes a warning message for each node it fails to connect to' do
+        expect(subject.ui).to receive(:warn)
+        expect(subject).to receive(:exit).with(1)
+        subject.run
+      end
+
+      it 'writes an error message if it fails to connect to any nodes' do
+        expect(subject.ui).to receive(:error)
+        expect(subject).to receive(:exit).with(1)
+        subject.run
+      end
+    end
   end
 
   context 'when not validating ssl cert' do
     before(:each) do
-      response_body = '<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Header/><s:Body><wsmid:IdentifyResponse xmlns:wsmid="http://schemas.dmtf.org/wbem/wsman/identity/1/wsmanidentity.xsd"><wsmid:ProtocolVersion>http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd</wsmid:ProtocolVersion><wsmid:ProductVendor>Microsoft Corporation</wsmid:ProductVendor><wsmid:ProductVersion>OS: 0.0.0 SP: 0.0 Stack: 2.0</wsmid:ProductVersion></wsmid:IdentifyResponse></s:Body></s:Envelope>'
-      allow(http_client_mock).to receive(:post).and_return(HTTP::Message.new_response(response_body))
       expect(subject.ui).to receive(:msg)
       subject.config[:winrm_ssl_verify_mode] = :verify_none
       subject.config[:winrm_transport] = :ssl

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-windows
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
@@ -85,6 +85,7 @@ files:
 - spec/assets/win_template_rendered_without_bootstrap_install_command.txt
 - spec/assets/win_template_rendered_without_bootstrap_install_command_on_12_5_client.txt
 - spec/assets/win_template_unrendered.txt
+- spec/dummy_winrm_service.rb
 - spec/functional/bootstrap_download_spec.rb
 - spec/spec_helper.rb
 - spec/unit/knife/bootstrap_options_spec.rb
@@ -117,28 +118,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Plugin that adds functionality to Chef's Knife CLI for configuring/interacting
   with nodes running Microsoft Windows
-test_files:
-- features/knife_help.feature
-- features/support/env.rb
-- spec/assets/win_template_rendered_with_bootstrap_install_command.txt
-- spec/assets/win_template_rendered_with_bootstrap_install_command_on_12_5_client.txt
-- spec/assets/win_template_rendered_without_bootstrap_install_command.txt
-- spec/assets/win_template_rendered_without_bootstrap_install_command_on_12_5_client.txt
-- spec/assets/win_template_unrendered.txt
-- spec/functional/bootstrap_download_spec.rb
-- spec/spec_helper.rb
-- spec/unit/knife/bootstrap_options_spec.rb
-- spec/unit/knife/bootstrap_template_spec.rb
-- spec/unit/knife/bootstrap_windows_winrm_spec.rb
-- spec/unit/knife/core/windows_bootstrap_context_spec.rb
-- spec/unit/knife/windows_cert_generate_spec.rb
-- spec/unit/knife/windows_cert_install_spec.rb
-- spec/unit/knife/windows_listener_create_spec.rb
-- spec/unit/knife/winrm_session_spec.rb
-- spec/unit/knife/winrm_spec.rb
-- spec/unit/knife/wsman_test_spec.rb
+test_files: []