winrm 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b3888d1c74753ca3c7f99f8b122d2f51783a798
-  data.tar.gz: ae7a25622013aeac39f158e7a334b09bac11c0e6
+  metadata.gz: 0b3159eb24cc6e87747e3ac2572ace61f33c49a7
+  data.tar.gz: 5b7a5fd51836a9cb57981e3409949c51b94eca53
 SHA512:
-  metadata.gz: 3770a27858e89944a0469a05990573edf9791f9eae24e73324ecf3a82c43095d30887bbbc1877371d2f15cdfbccbcb5266d94fae73bee089ec0a95c8cb6e718e
-  data.tar.gz: 58b89418571027756d11655b2ec8e56263d05bd66edc4e29c3f4e3e82d767bc39e142f823ddd90e9a4945f590d6e55481409d23b657e5a4c1d43c481775f25ef
+  metadata.gz: 2cbdb867c4ef6cc8174291f270a27c2d06e5254158a826c711e6a85fcf4b15acfd0509b10b6d938f8339d691e296acc5cda7067dd9caf7e5cdba887cc05d2c23
+  data.tar.gz: 3ad40706cdf3183eebd038921a933fac788b27c138e54330c8430bb96edf3291e53e7c78912577569ddcbb36b0e152fc49a615877b3507bb02cede84e2bac65a

data/README.md

@@ -107,6 +107,8 @@ Perform the following steps to authenticate with a certificate instead of a user
 
 5. Add a winrm user mapping for the issuing certificate: `New-Item -Path WSMan:\localhost\ClientCertificate -Subject <user UPN> -URI * -Issuer <issuing certificate thumbprint> -Credential (Get-Credential) -Force`
 
+See [this post](http://www.hurryupandwait.io/blog/certificate-password-less-based-authentication-in-winrm) for more details on certificate authentication.
+
 #### Kerberos
 ```ruby
 WinRM::WinRMWebService.new(endpoint, :kerberos, :realm => 'MYREALM.COM')

data/changelog.md

@@ -1,5 +1,8 @@
 # WinRM Gem Changelog
 
+# 1.8.1
+- Http receive timeout should always be equal to 10 seconds greater than the winrm operation timeout and not default to one hour
+
 # 1.8.0
 - Add certificate authentication
 

data/lib/winrm/http/transport.rb

@@ -22,15 +22,12 @@ module WinRM
     # This backend will maintain state for every WinRMWebService instance that is instantiated so it
     # is possible to use GSSAPI with Keep-Alive.
     class HttpTransport
-      # Set this to an unreasonable amount because WinRM has its own timeouts
-      DEFAULT_RECEIVE_TIMEOUT = 3600
 
       attr_reader :endpoint
 
       def initialize(endpoint)
         @endpoint = endpoint.is_a?(String) ? URI.parse(endpoint) : endpoint
         @httpcli = HTTPClient.new(agent_name: 'Ruby WinRM Client')
-        @httpcli.receive_timeout = DEFAULT_RECEIVE_TIMEOUT
         @logger = Logging.logger[self]
       end
 

data/lib/winrm/version.rb

@@ -3,5 +3,5 @@
 # WinRM module
 module WinRM
   # The version of the WinRM library
-  VERSION = '1.8.0'
+  VERSION = '1.8.1'
 end

data/lib/winrm/winrm_service.rb

@@ -25,7 +25,7 @@ module WinRM
   # This is the main class that does the SOAP request/response logic. There are a few helper
   # classes, but pretty much everything comes through here first.
   class WinRMWebService
-    DEFAULT_TIMEOUT = 'PT60S'
+    DEFAULT_TIMEOUT = 60
     DEFAULT_MAX_ENV_SIZE = 153600
     DEFAULT_LOCALE = 'en-US'
 
@@ -42,7 +42,6 @@ module WinRM
     #   @see WinRM::HTTP::HttpSSL
     def initialize(endpoint, transport = :kerberos, opts = {})
       @endpoint = endpoint
-      @timeout = DEFAULT_TIMEOUT
       @max_env_sz = DEFAULT_MAX_ENV_SIZE
       @locale = DEFAULT_LOCALE
       @output_decoder = CommandOutputDecoder.new
@@ -50,7 +49,8 @@ module WinRM
       configure_retries(opts)
       begin
         @xfer = send "init_#{transport}_transport", opts.merge({endpoint: endpoint})
-      rescue NoMethodError => e
+        set_timeout(DEFAULT_TIMEOUT)
+      rescue NoMethodError
         raise "Invalid transport '#{transport}' specified, expected: negotiate, kerberos, plaintext, ssl."
       end
     end
@@ -227,7 +227,7 @@ module WinRM
           env_body << Gyoku.xml(body)
         end
       end
-      resp = send_message(builder.target!)
+      send_message(builder.target!)
       true
     end
 
@@ -299,7 +299,7 @@ module WinRM
           env_body.tag!("#{NS_WIN_SHELL}:Signal", {'CommandId' => command_id}) { |cl| cl << Gyoku.xml(body) }
         end
       end
-      resp = send_message(builder.target!)
+      send_message(builder.target!)
       true
     end
 
@@ -316,7 +316,7 @@ module WinRM
         env.tag!('env:Body')
       end
 
-      resp = send_message(builder.target!)
+      send_message(builder.target!)
       logger.debug("[WinRM] remote shell #{shell_id} closed")
       true
     end

data/spec/response_handler_spec.rb

@@ -2,42 +2,44 @@
 require 'winrm/http/response_handler'
 
 describe 'response handler', unit: true do
-  %w(v1, v2).each do |winrm_version|
-    let(:soap_fault) { File.read("spec/stubs/responses/soap_fault_#{winrm_version}.xml") }
-    let(:open_shell) { File.read("spec/stubs/responses/open_shell_#{winrm_version}.xml") }
+  %w(v1 v2).each do |winrm_version|
+    context "winrm_version #{winrm_version}" do
+      let(:soap_fault) { File.read("spec/stubs/responses/soap_fault_#{winrm_version}.xml") }
+      let(:open_shell) { File.read("spec/stubs/responses/open_shell_#{winrm_version}.xml") }
 
-    describe "successful 200 #{winrm_version} response" do
-      it 'returns an xml doc' do
-        handler = WinRM::ResponseHandler.new(open_shell, 200)
-        xml_doc = handler.parse_to_xml
-        expect(xml_doc).to be_instance_of(REXML::Document)
-        expect(xml_doc.to_s).to eq(REXML::Document.new(open_shell).to_s)
+      describe "successful 200 #{winrm_version} response" do
+        it 'returns an xml doc' do
+          handler = WinRM::ResponseHandler.new(open_shell, 200)
+          xml_doc = handler.parse_to_xml
+          expect(xml_doc).to be_instance_of(REXML::Document)
+          expect(xml_doc.to_s).to eq(REXML::Document.new(open_shell).to_s)
+        end
       end
-    end
 
-    describe "failed 500 #{winrm_version} response" do
-      it 'raises a WinRMHTTPTransportError' do
-        handler = WinRM::ResponseHandler.new('', 500)
-        expect { handler.parse_to_xml }.to raise_error(WinRM::WinRMHTTPTransportError)
+      describe "failed 500 #{winrm_version} response" do
+        it 'raises a WinRMHTTPTransportError' do
+          handler = WinRM::ResponseHandler.new('', 500)
+          expect { handler.parse_to_xml }.to raise_error(WinRM::WinRMHTTPTransportError)
+        end
       end
-    end
 
-    describe "failed 401 #{winrm_version} response" do
-      it 'raises a WinRMAuthorizationError' do
-        handler = WinRM::ResponseHandler.new('', 401)
-        expect { handler.parse_to_xml }.to raise_error(WinRM::WinRMAuthorizationError)
+      describe "failed 401 #{winrm_version} response" do
+        it 'raises a WinRMAuthorizationError' do
+          handler = WinRM::ResponseHandler.new('', 401)
+          expect { handler.parse_to_xml }.to raise_error(WinRM::WinRMAuthorizationError)
+        end
       end
-    end
 
-    describe "failed 400 #{winrm_version} response" do
-      it 'raises a WinRMWSManFault' do
-        handler = WinRM::ResponseHandler.new(soap_fault, 400)
-        begin
-          handler.parse_to_xml
-        rescue WinRM::WinRMWSManFault => e
-          expect(e.fault_code).to eq('2150858778')
-          expect(e.fault_description).to include(
-            'The specified class does not exist in the given namespace')
+      describe "failed 400 #{winrm_version} response" do
+        it 'raises a WinRMWSManFault' do
+          handler = WinRM::ResponseHandler.new(soap_fault, 400)
+          begin
+            handler.parse_to_xml
+          rescue WinRM::WinRMWSManFault => e
+            expect(e.fault_code).to eq('2150858778')
+            expect(e.fault_description).to include(
+              'The specified class does not exist in the given namespace')
+          end
         end
       end
     end

data/spec/winrm_options_spec.rb

@@ -52,9 +52,9 @@ describe 'WinRM options', unit: true do
 
   context 'default' do
     describe '#receive_timeout' do
-      it 'should be 3600ms' do
+      it 'should be 70s' do
         transportclass = subject.instance_variable_get(:@xfer)
-        expect(transportclass.receive_timeout).to eql(3600)
+        expect(transportclass.receive_timeout).to eql(70)
       end
     end
     describe '#timeout' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winrm
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Dan Wanek
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gssapi