winrm_session.rb in knife-windows-1.3.0

- old
+ new
@@ -1,87 +1,87 @@
-#
-# Author:: Steven Murawski <smurawski@chef.io>
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'chef/application'
-require 'winrm'
-
-class Chef
-  class Knife
-    class WinrmSession
-      attr_reader :host, :endpoint, :port, :output, :error, :exit_code
-
-      def initialize(options)
-        configure_proxy
-        
-        @host = options[:host]
-        @port = options[:port]
-        url = "#{options[:host]}:#{options[:port]}/wsman"
-        scheme = options[:transport] == :ssl ? 'https' : 'http'
-        @endpoint = "#{scheme}://#{url}"
-        
-        opts = Hash.new
-        opts = {:user => options[:user], :pass => options[:password], :basic_auth_only => options[:basic_auth_only], :disable_sspi => options[:disable_sspi], :no_ssl_peer_verification => options[:no_ssl_peer_verification]}
-        options[:transport] == :kerberos ? opts.merge!({:service => options[:service], :realm => options[:realm], :keytab => options[:keytab]}) : opts.merge!({:ca_trust_path => options[:ca_trust_path]})
-
-        Chef::Log.debug("WinRM::WinRMWebService options: #{opts}")
-        Chef::Log.debug("Endpoint: #{endpoint}")
-        Chef::Log.debug("Transport: #{options[:transport]}")
-        
-        @winrm_session = WinRM::WinRMWebService.new(@endpoint, options[:transport], opts)
-        @winrm_session.set_timeout(options[:operation_timeout]) if options[:operation_timeout]
-      end
-
-      def relay_command(command)
-        remote_id = @winrm_session.open_shell
-        command_id = @winrm_session.run_command(remote_id, command)
-        Chef::Log.debug("#{@host}[#{remote_id}] => :run_command[#{command}]")
-        session_result = get_output(remote_id, command_id)
-        @winrm_session.cleanup_command(remote_id, command_id)
-        Chef::Log.debug("#{@host}[#{remote_id}] => :command_cleanup[#{command}]")
-        @exit_code = session_result[:exitcode]
-        @winrm_session.close_shell(remote_id)
-        Chef::Log.debug("#{@host}[#{remote_id}] => :shell_close")
-      end
-
-      private
-
-      def get_output(remote_id, command_id)
-        @winrm_session.get_command_output(remote_id, command_id) do |out,error|
-          print_data(@host, out) if out
-          print_data(@host, error, :red) if error
-        end
-      end
-
-      def print_data(host, data, color = :cyan)
-        if data =~ /\n/
-          data.split(/\n/).each { |d| print_data(host, d, color) }
-        elsif !data.nil?
-          print Chef::Knife::Winrm.ui.color(host, color)
-          puts " #{data}"
-        end
-      end
-
-      def configure_proxy
-        if Chef::Config.respond_to?(:export_proxies)
-          Chef::Config.export_proxies
-        else
-          Chef::Application.new.configure_proxy_environment_variables
-        end
-      end
-    end
-  end
+#
+# Author:: Steven Murawski <smurawski@chef.io>
+# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/application'
+require 'winrm'
+
+class Chef
+  class Knife
+    class WinrmSession
+      attr_reader :host, :endpoint, :port, :output, :error, :exit_code
+
+      def initialize(options)
+        configure_proxy
+        
+        @host = options[:host]
+        @port = options[:port]
+        url = "#{options[:host]}:#{options[:port]}/wsman"
+        scheme = options[:transport] == :ssl ? 'https' : 'http'
+        @endpoint = "#{scheme}://#{url}"
+        
+        opts = Hash.new
+        opts = {:user => options[:user], :pass => options[:password], :basic_auth_only => options[:basic_auth_only], :disable_sspi => options[:disable_sspi], :no_ssl_peer_verification => options[:no_ssl_peer_verification], :ssl_peer_fingerprint => options[:ssl_peer_fingerprint]}
+        options[:transport] == :kerberos ? opts.merge!({:service => options[:service], :realm => options[:realm], :keytab => options[:keytab]}) : opts.merge!({:ca_trust_path => options[:ca_trust_path]})
+
+        Chef::Log.debug("WinRM::WinRMWebService options: #{opts}")
+        Chef::Log.debug("Endpoint: #{endpoint}")
+        Chef::Log.debug("Transport: #{options[:transport]}")
+        
+        @winrm_session = WinRM::WinRMWebService.new(@endpoint, options[:transport], opts)
+        @winrm_session.set_timeout(options[:operation_timeout]) if options[:operation_timeout]
+      end
+
+      def relay_command(command)
+        remote_id = @winrm_session.open_shell
+        command_id = @winrm_session.run_command(remote_id, command)
+        Chef::Log.debug("#{@host}[#{remote_id}] => :run_command[#{command}]")
+        session_result = get_output(remote_id, command_id)
+        @winrm_session.cleanup_command(remote_id, command_id)
+        Chef::Log.debug("#{@host}[#{remote_id}] => :command_cleanup[#{command}]")
+        @exit_code = session_result[:exitcode]
+        @winrm_session.close_shell(remote_id)
+        Chef::Log.debug("#{@host}[#{remote_id}] => :shell_close")
+      end
+
+      private
+
+      def get_output(remote_id, command_id)
+        @winrm_session.get_command_output(remote_id, command_id) do |out,error|
+          print_data(@host, out) if out
+          print_data(@host, error, :red) if error
+        end
+      end
+
+      def print_data(host, data, color = :cyan)
+        if data =~ /\n/
+          data.split(/\n/).each { |d| print_data(host, d, color) }
+        elsif !data.nil?
+          print Chef::Knife::Winrm.ui.color(host, color)
+          puts " #{data}"
+        end
+      end
+
+      def configure_proxy
+        if Chef::Config.respond_to?(:export_proxies)
+          Chef::Config.export_proxies
+        else
+          Chef::Application.new.configure_proxy_environment_variables
+        end
+      end
+    end
+  end
 end
\ No newline at end of file