winrm 2.3.1 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc2dfd4574c525ca194a12eb9cbc41b8bc0213b5927c5a7bf570d3010e58d9c8
-  data.tar.gz: f3a9877260b7fd617653d7665136534c5e3761da289ab51d89bbd674cefd80d6
+  metadata.gz: d70e24f7a32d8dac9c3d3a7c1675c40af3431df4e5c9a1b202cd87de21bb0a1f
+  data.tar.gz: 839b983ad19d3172c56cac95955efd20191a5f80880a53197366d2ef44b7dd4a
 SHA512:
-  metadata.gz: ac8268cd7fad1e4d9a04deddbe4fdb097e4869fb52304d27fb23f55b79a0b44a00028f6c1e7fa3833d45f5d59f350c16c2f23d3cd105ccfe7e76b6f4d27c2936
-  data.tar.gz: 271f9696f1d960a19ad73315b363f626cd8d51eda1ce742d499b5419b57c58665612b196add8e43fd8dfd5a7461822676bf3bb03b374b09cf8aa2db6cc667d77
+  metadata.gz: 20d3f20e5ddf0dc50519145c6bb13b40c1e5da21770510a50fd529bb2afb4b87ea3f55cde0a6653ccffdd1368a041c98992957800a9b45a016e8f6fd113eac61
+  data.tar.gz: 01ad60c5c78598ebf17434a02b0b4848eaeb605d2f5871edd11dc16be8c627d1bb8bf4390a282f80ebaaced51564858b5d2a82c552c608115054b78e4ad0e4dc

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

@@ -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_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

data/lib/winrm/shells/base.rb

@@ -147,6 +147,7 @@ module WinRM
       end
 
       def cleanup_command(command_id)
+        return unless shell_id
         logger.debug("[WinRM] cleaning up command_id: #{command_id} on shell_id #{shell_id}")
         cleanup_msg = WinRM::WSMV::CleanupCommand.new(
           connection_opts,

data/lib/winrm/shells/power_shell.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'securerandom'
+require 'securerandom' unless defined?(SecureRandom)
 require_relative 'base'
 require_relative '../psrp/message_fragmenter'
 require_relative '../psrp/receive_response_reader'
@@ -152,8 +152,9 @@ module WinRM
           msg = config_msg.build
           resp_doc = transport.send_request(msg)
           REXML::XPath.first(resp_doc, "//*[local-name() = 'MaxEnvelopeSizekb']").text.to_i
-        ensure
-          logger.debug("[WinRM] Endpoint doesn't support config request for MaxEnvelopsizekb")
+        rescue REXML::ParseException
+          logger.debug("[WinRM] Endpoint doesn't support config request for MaxEnvelopeSizekb")
+          raise
         end
         # rubocop:enable Layout/RescueEnsureAlignment
       end

data/lib/winrm/version.rb

@@ -1,5 +1,5 @@
 # WinRM module
 module WinRM
   # The version of the WinRM library
-  VERSION = '2.3.1'.freeze
+  VERSION = '2.3.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winrm
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.6
 platform: ruby
 authors:
 - Dan Wanek
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -28,19 +28,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.1.2
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: erubi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: gssapi
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +171,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +222,7 @@ dependencies:
         version: 0.6.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -218,7 +232,7 @@ dependencies:
         version: 0.6.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.3
 description: "    Ruby library for Windows Remote Management\n"
 email:
 - dan.wanek@gmail.com
@@ -311,8 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Ruby library for Windows Remote Management