winrm 2.0.3 → 2.1.0

data/lib/winrm/http/transport_factory.rb

@@ -1,68 +1,68 @@
-# -*- encoding: utf-8 -*-
-#
-# 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 'transport'
-
-module WinRM
-  module HTTP
-    # Factory for creating a HTTP transport that can be used for WinRM SOAP calls.
-    class TransportFactory
-      # Creates a new WinRM HTTP transport using the specified connection options.
-      # @param connection_opts [ConnectionOpts|Hash] The connection ConnectionOpts.
-      # @return [HttpTransport] A transport instance for making WinRM calls.
-      def create_transport(connection_opts)
-        transport = connection_opts[:transport]
-        validate_transport!(transport)
-        send "init_#{transport}_transport", connection_opts
-      end
-
-      private
-
-      def init_negotiate_transport(opts)
-        HTTP::HttpNegotiate.new(opts[:endpoint], opts[:user], opts[:password], opts)
-      end
-
-      def init_kerberos_transport(opts)
-        HTTP::HttpGSSAPI.new(opts[:endpoint], opts[:realm], opts, opts[:service])
-      end
-
-      def init_plaintext_transport(opts)
-        HTTP::HttpPlaintext.new(opts[:endpoint], opts[:user], opts[:password], opts)
-      end
-
-      def init_ssl_transport(opts)
-        if opts[:basic_auth_only]
-          HTTP::BasicAuthSSL.new(opts[:endpoint], opts[:user], opts[:password], opts)
-        elsif opts[:client_cert]
-          HTTP::ClientCertAuthSSL.new(opts[:endpoint], opts[:client_cert],
-                                      opts[:client_key], opts[:key_pass], opts)
-        else
-          HTTP::HttpNegotiate.new(opts[:endpoint], opts[:user], opts[:password], opts)
-        end
-      end
-
-      def validate_transport!(transport)
-        valid = private_methods
-                .select { |m| m.to_s.start_with?('init_') && m.to_s.end_with?('_transport') }
-                .map { |tm| tm.to_s.split('_')[1] }
-
-        unless valid.include?(transport.to_s)
-          raise WinRM::InvalidTransportError.new(transport, valid)
-        end
-      end
-    end
-  end
-end
+# -*- encoding: utf-8 -*-
+#
+# 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 'transport'
+
+module WinRM
+  module HTTP
+    # Factory for creating a HTTP transport that can be used for WinRM SOAP calls.
+    class TransportFactory
+      # Creates a new WinRM HTTP transport using the specified connection options.
+      # @param connection_opts [ConnectionOpts|Hash] The connection ConnectionOpts.
+      # @return [HttpTransport] A transport instance for making WinRM calls.
+      def create_transport(connection_opts)
+        transport = connection_opts[:transport]
+        validate_transport!(transport)
+        send "init_#{transport}_transport", connection_opts
+      end
+
+      private
+
+      def init_negotiate_transport(opts)
+        HTTP::HttpNegotiate.new(opts[:endpoint], opts[:user], opts[:password], opts)
+      end
+
+      def init_kerberos_transport(opts)
+        HTTP::HttpGSSAPI.new(opts[:endpoint], opts[:realm], opts, opts[:service])
+      end
+
+      def init_plaintext_transport(opts)
+        HTTP::HttpPlaintext.new(opts[:endpoint], opts[:user], opts[:password], opts)
+      end
+
+      def init_ssl_transport(opts)
+        if opts[:basic_auth_only]
+          HTTP::BasicAuthSSL.new(opts[:endpoint], opts[:user], opts[:password], opts)
+        elsif opts[:client_cert]
+          HTTP::ClientCertAuthSSL.new(opts[:endpoint], opts[:client_cert],
+                                      opts[:client_key], opts[:key_pass], opts)
+        else
+          HTTP::HttpNegotiate.new(opts[:endpoint], opts[:user], opts[:password], opts)
+        end
+      end
+
+      def validate_transport!(transport)
+        valid = private_methods
+                .select { |m| m.to_s.start_with?('init_') && m.to_s.end_with?('_transport') }
+                .map { |tm| tm.to_s.split('_')[1] }
+
+        unless valid.include?(transport.to_s)
+          raise WinRM::InvalidTransportError.new(transport, valid)
+        end
+      end
+    end
+  end
+end

data/lib/winrm/output.rb

@@ -1,59 +1,59 @@
-# encoding: UTF-8
-#
-# Copyright 2014 Max Lincoln <max@devopsy.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.
-
-module WinRM
-  # This class holds raw output and has convenience methods to parse.
-  class Output
-    def initialize
-      @data = []
-    end
-
-    # @return [Integer] exitcode returned from command
-    attr_reader :exitcode
-
-    # @return [String] Aggregated stdout and stderr streams
-    def output
-      @data.flat_map do |line|
-        [line[:stdout], line[:stderr]]
-      end.compact.join
-    end
-
-    # @return [String] stdout stream output
-    def stdout
-      @data.map do |line|
-        line[:stdout]
-      end.compact.join
-    end
-
-    # @return [String] stderr stream output
-    def stderr
-      @data.map do |line|
-        line[:stderr]
-      end.compact.join
-    end
-
-    # Sets the exitcode
-    def exitcode=(code)
-      raise WinRM::InvalidExitCode unless code.is_a? Integer
-      @exitcode = code
-    end
-
-    # Appends stream data to the output
-    def <<(data)
-      @data << data
-    end
-  end
-end
+# encoding: UTF-8
+#
+# Copyright 2014 Max Lincoln <max@devopsy.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.
+
+module WinRM
+  # This class holds raw output and has convenience methods to parse.
+  class Output
+    def initialize
+      @data = []
+    end
+
+    # @return [Integer] exitcode returned from command
+    attr_reader :exitcode
+
+    # @return [String] Aggregated stdout and stderr streams
+    def output
+      @data.flat_map do |line|
+        [line[:stdout], line[:stderr]]
+      end.compact.join
+    end
+
+    # @return [String] stdout stream output
+    def stdout
+      @data.map do |line|
+        line[:stdout]
+      end.compact.join
+    end
+
+    # @return [String] stderr stream output
+    def stderr
+      @data.map do |line|
+        line[:stderr]
+      end.compact.join
+    end
+
+    # Sets the exitcode
+    def exitcode=(code)
+      raise WinRM::InvalidExitCode unless code.is_a? Integer
+      @exitcode = code
+    end
+
+    # Appends stream data to the output
+    def <<(data)
+      @data << data
+    end
+  end
+end

data/lib/winrm/psrp/create_pipeline.xml.erb

@@ -1,167 +1,167 @@
-<Obj RefId="0">
-  <MS>
-    <Obj N="PowerShell" RefId="1">
-      <MS>
-        <Obj N="Cmds" RefId="2">
-          <TN RefId="0">
-            <T>System.Collections.Generic.List`1[[System.Management.Automation.PSObject, System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35]]</T>
-            <T>System.Object</T>
-          </TN>
-          <LST>
-            <Obj RefId="3">
-              <MS>
-                <S N="Cmd">Invoke-expression</S>
-                <B N="IsScript">false</B>
-                <Nil N="UseLocalScope" />
-                <Obj N="MergeMyResult" RefId="4">
-                  <TN RefId="1">
-                    <T>System.Management.Automation.Runspaces.PipelineResultTypes</T>
-                    <T>System.Enum</T>
-                    <T>System.ValueType</T>
-                    <T>System.Object</T>
-                  </TN>
-                  <ToString>None</ToString>
-                  <I32>0</I32>
-                </Obj>
-                <Obj N="MergeToResult" RefId="5">
-                  <TNRef RefId="1" />
-                  <ToString>None</ToString>
-                  <I32>0</I32>
-                </Obj>
-                <Obj N="MergePreviousResults" RefId="6">
-                  <TNRef RefId="1" />
-                  <ToString>None</ToString>
-                  <I32>0</I32>
-                </Obj>
-                <Obj N="MergeError" RefId="7">
-                  <TNRef RefId="1" />
-                  <ToString>None</ToString>
-                  <I32>0</I32>
-                </Obj>
-                <Obj N="MergeWarning" RefId="8">
-                  <TNRef RefId="1" />
-                  <ToString>None</ToString>
-                  <I32>0</I32>
-                </Obj>
-                <Obj N="MergeVerbose" RefId="9">
-                  <TNRef RefId="1" />
-                  <ToString>None</ToString>
-                  <I32>0</I32>
-                </Obj>
-                <Obj N="MergeDebug" RefId="10">
-                  <TNRef RefId="1" />
-                  <ToString>None</ToString>
-                  <I32>0</I32>
-                </Obj>
-                <Obj N="Args" RefId="11">
-                  <TNRef RefId="0" />
-                  <LST>
-                    <Obj RefId="12">
-                      <MS>
-                        <S N="N">-Command</S>
-                        <Nil N="V" />
-                      </MS>
-                    </Obj>
-                    <Obj RefId="13">
-                      <MS>
-                        <Nil N="N" />
-                        <S N="V"><%= command %></S>
-                      </MS>
-                    </Obj>
-                  </LST>
-                </Obj>
-              </MS>
-            </Obj>
-            <Obj RefId="14">
-              <MS>
-                <S N="Cmd">Out-string</S>
-                <B N="IsScript">false</B>
-                <Nil N="UseLocalScope" />
-                <Obj N="MergeMyResult" RefId="15">
-                  <TNRef RefId="1" />
-                  <ToString>None</ToString>
-                  <I32>0</I32>
-                </Obj>
-                <Obj N="MergeToResult" RefId="16">
-                  <TNRef RefId="1" />
-                  <ToString>None</ToString>
-                  <I32>0</I32>
-                </Obj>
-                <Obj N="MergePreviousResults" RefId="17">
-                  <TNRef RefId="1" />
-                  <ToString>None</ToString>
-                  <I32>0</I32>
-                </Obj>
-                <Obj N="MergeError" RefId="18">
-                  <TNRef RefId="1" />
-                  <ToString>None</ToString>
-                  <I32>0</I32>
-                </Obj>
-                <Obj N="MergeWarning" RefId="19">
-                  <TNRef RefId="1" />
-                  <ToString>None</ToString>
-                  <I32>0</I32>
-                </Obj>
-                <Obj N="MergeVerbose" RefId="20">
-                  <TNRef RefId="1" />
-                  <ToString>None</ToString>
-                  <I32>0</I32>
-                </Obj>
-                <Obj N="MergeDebug" RefId="21">
-                  <TNRef RefId="1" />
-                  <ToString>None</ToString>
-                  <I32>0</I32>
-                </Obj>
-                <Obj N="Args" RefId="22">
-                  <TNRef RefId="0" />
-                  <LST>
-                    <Obj RefId="22">
-                      <MS>
-                         <S N="N">-Stream</S>
-                         <Nil N="V" />
-                      </MS>
-                    </Obj>
-                  </LST>
-                </Obj>
-              </MS>
-            </Obj>
-          </LST>
-        </Obj>
-        <B N="IsNested">false</B>
-        <Nil N="History" />
-        <B N="RedirectShellErrorOutputPipe">true</B>
-      </MS>
-    </Obj>
-    <B N="NoInput">true</B>
-    <Obj N="ApartmentState" RefId="23">
-      <TN RefId="2">
-        <T>System.Threading.ApartmentState</T>
-        <T>System.Enum</T>
-        <T>System.ValueType</T>
-        <T>System.Object</T>
-      </TN>
-      <ToString>Unknown</ToString>
-      <I32>2</I32>
-    </Obj>
-    <Obj N="RemoteStreamOptions" RefId="24">
-      <TN RefId="3">
-        <T>System.Management.Automation.RemoteStreamOptions</T>
-        <T>System.Enum</T>
-        <T>System.ValueType</T>
-        <T>System.Object</T>
-      </TN>
-      <ToString>0</ToString>
-      <I32>0</I32>
-    </Obj>
-    <B N="AddToHistory">true</B>
-    <Obj N="HostInfo" RefId="25">
-      <MS>
-        <B N="_isHostNull">true</B>
-        <B N="_isHostUINull">true</B>
-        <B N="_isHostRawUINull">true</B>
-        <B N="_useRunspaceHost">true</B>
-      </MS>
-    </Obj>
-    <B N="IsNested">false</B>
-  </MS>
-</Obj>
+<Obj RefId="0">
+  <MS>
+    <Obj N="PowerShell" RefId="1">
+      <MS>
+        <Obj N="Cmds" RefId="2">
+          <TN RefId="0">
+            <T>System.Collections.Generic.List`1[[System.Management.Automation.PSObject, System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35]]</T>
+            <T>System.Object</T>
+          </TN>
+          <LST>
+            <Obj RefId="3">
+              <MS>
+                <S N="Cmd">Invoke-expression</S>
+                <B N="IsScript">false</B>
+                <Nil N="UseLocalScope" />
+                <Obj N="MergeMyResult" RefId="4">
+                  <TN RefId="1">
+                    <T>System.Management.Automation.Runspaces.PipelineResultTypes</T>
+                    <T>System.Enum</T>
+                    <T>System.ValueType</T>
+                    <T>System.Object</T>
+                  </TN>
+                  <ToString>None</ToString>
+                  <I32>0</I32>
+                </Obj>
+                <Obj N="MergeToResult" RefId="5">
+                  <TNRef RefId="1" />
+                  <ToString>None</ToString>
+                  <I32>0</I32>
+                </Obj>
+                <Obj N="MergePreviousResults" RefId="6">
+                  <TNRef RefId="1" />
+                  <ToString>None</ToString>
+                  <I32>0</I32>
+                </Obj>
+                <Obj N="MergeError" RefId="7">
+                  <TNRef RefId="1" />
+                  <ToString>None</ToString>
+                  <I32>0</I32>
+                </Obj>
+                <Obj N="MergeWarning" RefId="8">
+                  <TNRef RefId="1" />
+                  <ToString>None</ToString>
+                  <I32>0</I32>
+                </Obj>
+                <Obj N="MergeVerbose" RefId="9">
+                  <TNRef RefId="1" />
+                  <ToString>None</ToString>
+                  <I32>0</I32>
+                </Obj>
+                <Obj N="MergeDebug" RefId="10">
+                  <TNRef RefId="1" />
+                  <ToString>None</ToString>
+                  <I32>0</I32>
+                </Obj>
+                <Obj N="Args" RefId="11">
+                  <TNRef RefId="0" />
+                  <LST>
+                    <Obj RefId="12">
+                      <MS>
+                        <S N="N">-Command</S>
+                        <Nil N="V" />
+                      </MS>
+                    </Obj>
+                    <Obj RefId="13">
+                      <MS>
+                        <Nil N="N" />
+                        <S N="V"><%= command %></S>
+                      </MS>
+                    </Obj>
+                  </LST>
+                </Obj>
+              </MS>
+            </Obj>
+            <Obj RefId="14">
+              <MS>
+                <S N="Cmd">Out-string</S>
+                <B N="IsScript">false</B>
+                <Nil N="UseLocalScope" />
+                <Obj N="MergeMyResult" RefId="15">
+                  <TNRef RefId="1" />
+                  <ToString>None</ToString>
+                  <I32>0</I32>
+                </Obj>
+                <Obj N="MergeToResult" RefId="16">
+                  <TNRef RefId="1" />
+                  <ToString>None</ToString>
+                  <I32>0</I32>
+                </Obj>
+                <Obj N="MergePreviousResults" RefId="17">
+                  <TNRef RefId="1" />
+                  <ToString>None</ToString>
+                  <I32>0</I32>
+                </Obj>
+                <Obj N="MergeError" RefId="18">
+                  <TNRef RefId="1" />
+                  <ToString>None</ToString>
+                  <I32>0</I32>
+                </Obj>
+                <Obj N="MergeWarning" RefId="19">
+                  <TNRef RefId="1" />
+                  <ToString>None</ToString>
+                  <I32>0</I32>
+                </Obj>
+                <Obj N="MergeVerbose" RefId="20">
+                  <TNRef RefId="1" />
+                  <ToString>None</ToString>
+                  <I32>0</I32>
+                </Obj>
+                <Obj N="MergeDebug" RefId="21">
+                  <TNRef RefId="1" />
+                  <ToString>None</ToString>
+                  <I32>0</I32>
+                </Obj>
+                <Obj N="Args" RefId="22">
+                  <TNRef RefId="0" />
+                  <LST>
+                    <Obj RefId="22">
+                      <MS>
+                         <S N="N">-Stream</S>
+                         <Nil N="V" />
+                      </MS>
+                    </Obj>
+                  </LST>
+                </Obj>
+              </MS>
+            </Obj>
+          </LST>
+        </Obj>
+        <B N="IsNested">false</B>
+        <Nil N="History" />
+        <B N="RedirectShellErrorOutputPipe">true</B>
+      </MS>
+    </Obj>
+    <B N="NoInput">true</B>
+    <Obj N="ApartmentState" RefId="23">
+      <TN RefId="2">
+        <T>System.Threading.ApartmentState</T>
+        <T>System.Enum</T>
+        <T>System.ValueType</T>
+        <T>System.Object</T>
+      </TN>
+      <ToString>Unknown</ToString>
+      <I32>2</I32>
+    </Obj>
+    <Obj N="RemoteStreamOptions" RefId="24">
+      <TN RefId="3">
+        <T>System.Management.Automation.RemoteStreamOptions</T>
+        <T>System.Enum</T>
+        <T>System.ValueType</T>
+        <T>System.Object</T>
+      </TN>
+      <ToString>0</ToString>
+      <I32>0</I32>
+    </Obj>
+    <B N="AddToHistory">true</B>
+    <Obj N="HostInfo" RefId="25">
+      <MS>
+        <B N="_isHostNull">true</B>
+        <B N="_isHostUINull">true</B>
+        <B N="_isHostRawUINull">true</B>
+        <B N="_useRunspaceHost">true</B>
+      </MS>
+    </Obj>
+    <B N="IsNested">false</B>
+  </MS>
+</Obj>