winrm 2.3.0 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd8c4887729128df19666c0a4f2b099b088261f5cb60ecb1b2adf52810188710
-  data.tar.gz: 8711a914b783a6f6a6a5f5f8eb15ad74d4798dcf29242ff4b3b59679858e0c9e
+  metadata.gz: 83ddbf7bb422d247c6719bac48f839c8415622056719da00b5a9fc3b36daea43
+  data.tar.gz: ff0a22885967f76514207f8742f1c673eb2a3f2ba641b0ab5b8e9f97de2deeec
 SHA512:
-  metadata.gz: 87eb8b34f189b70da6d6fd21e70142892cd9a8485f952a649229fb8cde0f073796af6ed9eb904e6c6b2f6d270ee901ec3d8ad69c36cd575e0b8def04faf5f9c9
-  data.tar.gz: eaf8d672f6f53d62029d41452cfeda2f1c9fba0164528ce057376b1ceb8805b5deb5dfd76d320c4f4eac695c66f3ac517460fbe72ca7de1b0a899bacb7cf9c91
+  metadata.gz: 854abafdd7d5484bc2611c0bc65d4852c2b2ba84e175185b486b66b9d4ec802ac65ded1b763b734f43d3994d60f7d85b1416fbf13ac0f61120e37c5e335b7488
+  data.tar.gz: fe87f65ada719004ae3ccb349517823f103981b1377c7d0c1b70dea755c183be203e99eab72cbfcbf9b05ce0366f069344a21cedebd772931ad85ef8f6212884

data/lib/winrm/http/response_handler.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'rexml/document'
+require 'rexml/document' unless defined?(REXML::Document)
 require_relative '../wsmv/soap'
 
 module WinRM

data/lib/winrm/http/transport.rb

@@ -74,7 +74,7 @@ module WinRM
         return unless @ssl_peer_fingerprint && !@ssl_peer_fingerprint_verified
 
         with_untrusted_ssl_connection do |connection|
-          connection_cert = connection.peer_cert_chain.last
+          connection_cert = connection.peer_cert
           verify_ssl_fingerprint(connection_cert)
         end
         @logger.info("initial ssl fingerprint #{@ssl_peer_fingerprint} verified\n")
@@ -435,7 +435,7 @@ module WinRM
         str.sub!(%r{^.*Content-Type: application\/octet-stream\r\n(.*)--Encrypted.*$}m, '\1')
 
         len = str.unpack('L').first
-        iov_data = str.unpack("LA#{len}A*")
+        iov_data = str.unpack("La#{len}a*")
         iov0[:buffer].value = iov_data[1]
         iov1[:buffer].value = iov_data[2]
 

data/lib/winrm/psrp/message.rb

@@ -1,128 +1,128 @@
-# Copyright 2015 Matt Wrock <matt@mattwrock.com>
-# Copyright 2016 Shawn Neal <sneal@sneal.net>
-#
-# 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_relative 'uuid'
-require_relative 'message_data'
-
-module WinRM
-  # PowerShell Remoting Protcol module
-  module PSRP
-    # PowerShell Remoting Protocol base message.
-    # http://download.microsoft.com/download/9/5/E/95EF66AF-9026-4BB0-A41D-A4F81802D92C/%5BMS-PSRP%5D.pdf
-    class Message
-      include UUID
-
-      # Value of message destination when sent to a client
-      CLIENT_DESTINATION = 1
-
-      # Value of message destination when sent to a server
-      SERVER_DESTINATION = 2
-
-      # All known PSRP message types
-      MESSAGE_TYPES = {
-        session_capability:         0x00010002,
-        init_runspacepool:          0x00010004,
-        public_key:                 0x00010005,
-        encrypted_session_key:      0x00010006,
-        public_key_request:         0x00010007,
-        connect_runspacepool:       0x00010008,
-        runspace_init_data:         0x0002100b,
-        reset_runspace_state:       0x0002100c,
-        set_max_runspaces:          0x00021002,
-        set_min_runspaces:          0x00021003,
-        runspace_availability:      0x00021004,
-        runspacepool_state:         0x00021005,
-        create_pipeline:            0x00021006,
-        get_available_runspaces:    0x00021007,
-        user_event:                 0x00021008,
-        application_private_data:   0x00021009,
-        get_command_metadata:       0x0002100a,
-        runspacepool_host_call:     0x00021100,
-        runspacepool_host_response: 0x00021101,
-        pipeline_input:             0x00041002,
-        end_of_pipeline_input:      0x00041003,
-        pipeline_output:            0x00041004,
-        error_record:               0x00041005,
-        pipeline_state:             0x00041006,
-        debug_record:               0x00041007,
-        verbose_record:             0x00041008,
-        warning_record:             0x00041009,
-        progress_record:            0x00041010,
-        information_record:         0x00041011,
-        pipeline_host_call:         0x00041100,
-        pipeline_host_response:     0x00041101
-      }.freeze
-
-      # Creates a new PSRP message instance
-      # @param runspace_pool_id [String] The UUID of the remote shell/runspace pool.
-      # @param pipeline_id [String] The UUID to correlate the command/pipeline response
-      # @param type [Integer] The PSRP MessageType. This is most commonly
-      # specified in hex, e.g. 0x00010002.
-      # @param data [String] The PSRP payload as serialized XML
-      # @param destination [Integer] The destination for this message - client or server
-      def initialize(
-        runspace_pool_id,
-        type,
-        data,
-        pipeline_id = nil,
-        destination = SERVER_DESTINATION
-      )
-        raise 'invalid message type' unless MESSAGE_TYPES.value?(type)
-
-        @data = data
-        @destination = destination
-        @type = type
-        @pipeline_id = pipeline_id
-        @runspace_pool_id = runspace_pool_id
-      end
-
-      attr_reader :destination, :type, :runspace_pool_id, :pipeline_id, :data
-
-      # Returns the raw PSRP message bytes ready for transfer to Windows inside a
-      # WinRM message.
-      # @return [Array<Byte>] Unencoded raw byte array of the PSRP message.
-      def bytes
-        [
-          int16le(destination),
-          int16le(type),
-          uuid_to_windows_guid_bytes(runspace_pool_id),
-          uuid_to_windows_guid_bytes(pipeline_id),
-          byte_order_mark,
-          data_bytes
-        ].flatten
-      end
-
-      # Parses the raw data to a MessageData class
-      # @return [MessageData::Base] MessageData corresponding to this message type
-      def parsed_data
-        @parsed_data ||= MessageData.parse(self)
-      end
-
-      private
-
-      def byte_order_mark
-        [239, 187, 191]
-      end
-
-      def data_bytes
-        @data_bytes ||= data.force_encoding('utf-8').bytes
-      end
-
-      def int16le(int16)
-        [int16].pack('N').unpack('C4').reverse
-      end
-    end
-  end
-end
+# Copyright 2015 Matt Wrock <matt@mattwrock.com>
+# Copyright 2016 Shawn Neal <sneal@sneal.net>
+#
+# 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_relative 'uuid'
+require_relative 'message_data'
+
+module WinRM
+  # PowerShell Remoting Protcol module
+  module PSRP
+    # PowerShell Remoting Protocol base message.
+    # http://download.microsoft.com/download/9/5/E/95EF66AF-9026-4BB0-A41D-A4F81802D92C/%5BMS-PSRP%5D.pdf
+    class Message
+      include UUID
+
+      # Value of message destination when sent to a client
+      CLIENT_DESTINATION = 1
+
+      # Value of message destination when sent to a server
+      SERVER_DESTINATION = 2
+
+      # All known PSRP message types
+      MESSAGE_TYPES = {
+        session_capability: 0x00010002,
+        init_runspacepool: 0x00010004,
+        public_key: 0x00010005,
+        encrypted_session_key: 0x00010006,
+        public_key_request: 0x00010007,
+        connect_runspacepool: 0x00010008,
+        runspace_init_data: 0x0002100b,
+        reset_runspace_state: 0x0002100c,
+        set_max_runspaces: 0x00021002,
+        set_min_runspaces: 0x00021003,
+        runspace_availability: 0x00021004,
+        runspacepool_state: 0x00021005,
+        create_pipeline: 0x00021006,
+        get_available_runspaces: 0x00021007,
+        user_event: 0x00021008,
+        application_private_data: 0x00021009,
+        get_command_metadata: 0x0002100a,
+        runspacepool_host_call: 0x00021100,
+        runspacepool_host_response: 0x00021101,
+        pipeline_input: 0x00041002,
+        end_of_pipeline_input: 0x00041003,
+        pipeline_output: 0x00041004,
+        error_record: 0x00041005,
+        pipeline_state: 0x00041006,
+        debug_record: 0x00041007,
+        verbose_record: 0x00041008,
+        warning_record: 0x00041009,
+        progress_record: 0x00041010,
+        information_record: 0x00041011,
+        pipeline_host_call: 0x00041100,
+        pipeline_host_response: 0x00041101
+      }.freeze
+
+      # Creates a new PSRP message instance
+      # @param runspace_pool_id [String] The UUID of the remote shell/runspace pool.
+      # @param pipeline_id [String] The UUID to correlate the command/pipeline response
+      # @param type [Integer] The PSRP MessageType. This is most commonly
+      # specified in hex, e.g. 0x00010002.
+      # @param data [String] The PSRP payload as serialized XML
+      # @param destination [Integer] The destination for this message - client or server
+      def initialize(
+        runspace_pool_id,
+        type,
+        data,
+        pipeline_id = nil,
+        destination = SERVER_DESTINATION
+      )
+        raise 'invalid message type' unless MESSAGE_TYPES.value?(type)
+
+        @data = data
+        @destination = destination
+        @type = type
+        @pipeline_id = pipeline_id
+        @runspace_pool_id = runspace_pool_id
+      end
+
+      attr_reader :destination, :type, :runspace_pool_id, :pipeline_id, :data
+
+      # Returns the raw PSRP message bytes ready for transfer to Windows inside a
+      # WinRM message.
+      # @return [Array<Byte>] Unencoded raw byte array of the PSRP message.
+      def bytes
+        [
+          int16le(destination),
+          int16le(type),
+          uuid_to_windows_guid_bytes(runspace_pool_id),
+          uuid_to_windows_guid_bytes(pipeline_id),
+          byte_order_mark,
+          data_bytes
+        ].flatten
+      end
+
+      # Parses the raw data to a MessageData class
+      # @return [MessageData::Base] MessageData corresponding to this message type
+      def parsed_data
+        @parsed_data ||= MessageData.parse(self)
+      end
+
+      private
+
+      def byte_order_mark
+        [239, 187, 191]
+      end
+
+      def data_bytes
+        @data_bytes ||= data.force_encoding('utf-8').bytes
+      end
+
+      def int16le(int16)
+        [int16].pack('N').unpack('C4').reverse
+      end
+    end
+  end
+end

data/lib/winrm/psrp/message_data/error_record.rb

@@ -48,6 +48,8 @@ module WinRM
 
         def property_hash(prop_name)
           prop_nodes = REXML::XPath.first(doc, "//*[@N='#{prop_name}']/Props")
+          return {} if prop_nodes.nil?
+
           prop_nodes.elements.each_with_object({}) do |node, props|
             name = node.attributes['N']
             props[underscore(name).to_sym] = node.text if node.text

data/lib/winrm/psrp/message_data/pipeline_output.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'rexml/document'
+require 'rexml/document' unless defined?(REXML::Document)
 
 module WinRM
   module PSRP

data/lib/winrm/psrp/message_factory.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'erubis'
+require 'erubi'
 require_relative 'message'
 
 module WinRM
@@ -66,7 +66,19 @@ module WinRM
             "#{File.dirname(__FILE__)}/#{template}.xml.erb"
           )
           template = File.read(template_path)
-          Erubis::Eruby.new(template).result(context)
+          case context
+          when Hash
+            b = binding
+            locals = context.collect { |k, _| "#{k} = context[#{k.inspect}]; " }
+            b.eval(locals.join)
+          when Binding
+            b = context
+          when NilClass
+            b = binding
+          else
+            raise ArgumentError
+          end
+          b.eval(Erubi::Engine.new(template).src)
         end
       end
     end

data/lib/winrm/psrp/powershell_output_decoder.rb

@@ -1,142 +1,142 @@
-# Copyright 2016 Matt Wrock <matt@mattwrock.com>
-#
-# 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 'base64'
-require_relative 'message'
-require_relative 'message_data/pipeline_state'
-
-module WinRM
-  module PSRP
-    # Handles decoding a raw powershell output response
-    class PowershellOutputDecoder
-      # rubocop:disable Metrics/CyclomaticComplexity
-      # Decode the raw SOAP output into decoded PSRP message,
-      # Removes BOM and replaces encoded line endings
-      # @param raw_output [String] The raw encoded output
-      # @return [String] The decoded output
-      def decode(message)
-        case message.type
-        when WinRM::PSRP::Message::MESSAGE_TYPES[:pipeline_output]
-          decode_pipeline_output(message)
-        when WinRM::PSRP::Message::MESSAGE_TYPES[:runspacepool_host_call]
-          decode_host_call(message)
-        when WinRM::PSRP::Message::MESSAGE_TYPES[:pipeline_host_call]
-          decode_host_call(message)
-        when WinRM::PSRP::Message::MESSAGE_TYPES[:error_record]
-          decode_error_record(message)
-        when WinRM::PSRP::Message::MESSAGE_TYPES[:pipeline_state]
-          if message.parsed_data.pipeline_state == WinRM::PSRP::MessageData::PipelineState::FAILED
-            decode_error_record(message)
-          end
-        end
-      end
-      # rubocop:enable Metrics/CyclomaticComplexity
-
-      protected
-
-      def decode_pipeline_output(message)
-        message.parsed_data.output
-      end
-
-      def decode_host_call(message)
-        text = begin
-          case message.parsed_data.method_identifier
-          when /WriteLine/, 'WriteErrorLine'
-            "#{message.parsed_data.method_parameters[:s]}\r\n"
-          when 'WriteDebugLine'
-            "Debug: #{message.parsed_data.method_parameters[:s]}\r\n"
-          when 'WriteWarningLine'
-            "Warning: #{message.parsed_data.method_parameters[:s]}\r\n"
-          when 'WriteVerboseLine'
-            "Verbose: #{message.parsed_data.method_parameters[:s]}\r\n"
-          when /Write[1-2]/
-            message.parsed_data.method_parameters[:s]
-          end
-        end
-
-        hex_decode(text)
-      end
-
-      def decode_error_record(message)
-        parsed = message.parsed_data
-        text = begin
-          if message.type == WinRM::PSRP::Message::MESSAGE_TYPES[:pipeline_state]
-            render_exception_as_error_record(parsed.exception_as_error_record)
-          else
-            case parsed.fully_qualified_error_id
-            when 'Microsoft.PowerShell.Commands.WriteErrorException'
-              render_write_error_exception(parsed)
-            when 'NativeCommandError'
-              render_native_command_error(parsed)
-            when 'NativeCommandErrorMessage'
-              parsed.exception[:message]
-            else
-              render_exception(parsed)
-            end
-          end
-        end
-
-        hex_decode(text)
-      end
-
-      def render_write_error_exception(parsed)
-        <<EOH
-#{parsed.invocation_info[:line]} : #{parsed.exception[:message]}
-    + CategoryInfo          : #{parsed.error_category_message}
-    + FullyQualifiedErrorId : #{parsed.fully_qualified_error_id}
-EOH
-      end
-
-      def render_exception(parsed)
-        <<EOH
-#{parsed.exception[:message]}
-#{parsed.invocation_info[:position_message]}
-    + CategoryInfo          : #{parsed.error_category_message}
-    + FullyQualifiedErrorId : #{parsed.fully_qualified_error_id}
-EOH
-      end
-
-      def render_native_command_error(parsed)
-        <<EOH
-#{parsed.invocation_info[:my_command]} : #{parsed.exception[:message]}
-    + CategoryInfo          : #{parsed.error_category_message}
-    + FullyQualifiedErrorId : #{parsed.fully_qualified_error_id}
-EOH
-      end
-
-      def render_exception_as_error_record(parsed)
-        <<EOH
-#{parsed.exception[:message]}
-    + CategoryInfo          : #{parsed.error_category_message}
-    + FullyQualifiedErrorId : #{parsed.fully_qualified_error_id}
-EOH
-      end
-
-      private
-
-      def hex_decode(text)
-        return unless text
-
-        text.gsub(/_x(\h\h\h\h)_/) do
-          decoded_text = Regexp.last_match[1].hex.chr.force_encoding('utf-8')
-          if decoded_text.respond_to?(:scrub)
-            decoded_text.scrub
-          else
-            decoded_text.encode('utf-16', invalid: :replace, undef: :replace).encode('utf-8')
-          end
-        end
-      end
-    end
-  end
-end
+# Copyright 2016 Matt Wrock <matt@mattwrock.com>
+#
+# 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 'base64' unless defined?(Base64)
+require_relative 'message'
+require_relative 'message_data/pipeline_state'
+
+module WinRM
+  module PSRP
+    # Handles decoding a raw powershell output response
+    class PowershellOutputDecoder
+      # rubocop:disable Metrics/CyclomaticComplexity
+      # Decode the raw SOAP output into decoded PSRP message,
+      # Removes BOM and replaces encoded line endings
+      # @param raw_output [String] The raw encoded output
+      # @return [String] The decoded output
+      def decode(message)
+        case message.type
+        when WinRM::PSRP::Message::MESSAGE_TYPES[:pipeline_output]
+          decode_pipeline_output(message)
+        when WinRM::PSRP::Message::MESSAGE_TYPES[:runspacepool_host_call]
+          decode_host_call(message)
+        when WinRM::PSRP::Message::MESSAGE_TYPES[:pipeline_host_call]
+          decode_host_call(message)
+        when WinRM::PSRP::Message::MESSAGE_TYPES[:error_record]
+          decode_error_record(message)
+        when WinRM::PSRP::Message::MESSAGE_TYPES[:pipeline_state]
+          if message.parsed_data.pipeline_state == WinRM::PSRP::MessageData::PipelineState::FAILED
+            decode_error_record(message)
+          end
+        end
+      end
+      # rubocop:enable Metrics/CyclomaticComplexity
+
+      protected
+
+      def decode_pipeline_output(message)
+        message.parsed_data.output
+      end
+
+      def decode_host_call(message)
+        text = begin
+          case message.parsed_data.method_identifier
+          when /WriteLine/, 'WriteErrorLine'
+            "#{message.parsed_data.method_parameters[:s]}\r\n"
+          when 'WriteDebugLine'
+            "Debug: #{message.parsed_data.method_parameters[:s]}\r\n"
+          when 'WriteWarningLine'
+            "Warning: #{message.parsed_data.method_parameters[:s]}\r\n"
+          when 'WriteVerboseLine'
+            "Verbose: #{message.parsed_data.method_parameters[:s]}\r\n"
+          when /Write[1-2]/
+            message.parsed_data.method_parameters[:s]
+          end
+        end
+
+        hex_decode(text)
+      end
+
+      def decode_error_record(message)
+        parsed = message.parsed_data
+        text = begin
+          if message.type == WinRM::PSRP::Message::MESSAGE_TYPES[:pipeline_state]
+            render_exception_as_error_record(parsed.exception_as_error_record)
+          else
+            case parsed.fully_qualified_error_id
+            when 'Microsoft.PowerShell.Commands.WriteErrorException'
+              render_write_error_exception(parsed)
+            when 'NativeCommandError'
+              render_native_command_error(parsed)
+            when 'NativeCommandErrorMessage'
+              parsed.exception[:message]
+            else
+              render_exception(parsed)
+            end
+          end
+        end
+
+        hex_decode(text)
+      end
+
+      def render_write_error_exception(parsed)
+        <<EOH
+#{parsed.invocation_info[:line]} : #{parsed.exception[:message]}
+    + CategoryInfo          : #{parsed.error_category_message}
+    + FullyQualifiedErrorId : #{parsed.fully_qualified_error_id}
+EOH
+      end
+
+      def render_exception(parsed)
+        <<EOH
+#{parsed.exception[:message]}
+#{parsed.invocation_info[:position_message]}
+    + CategoryInfo          : #{parsed.error_category_message}
+    + FullyQualifiedErrorId : #{parsed.fully_qualified_error_id}
+EOH
+      end
+
+      def render_native_command_error(parsed)
+        <<EOH
+#{parsed.invocation_info[:my_command]} : #{parsed.exception[:message]}
+    + CategoryInfo          : #{parsed.error_category_message}
+    + FullyQualifiedErrorId : #{parsed.fully_qualified_error_id}
+EOH
+      end
+
+      def render_exception_as_error_record(parsed)
+        <<EOH
+#{parsed.exception[:message]}
+    + CategoryInfo          : #{parsed.error_category_message}
+    + FullyQualifiedErrorId : #{parsed.fully_qualified_error_id}
+EOH
+      end
+
+      private
+
+      def hex_decode(text)
+        return unless text
+
+        text.gsub(/_x(\h\h\h\h)_/) do
+          decoded_text = Regexp.last_match[1].hex.chr.force_encoding('utf-8')
+          if decoded_text.respond_to?(:scrub)
+            decoded_text.scrub
+          else
+            decoded_text.encode('utf-16', invalid: :replace, undef: :replace).encode('utf-8')
+          end
+        end
+      end
+    end
+  end
+end