winrm-s 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75dccd077fbd8acfe0ffffed3307456ccfc21377
-  data.tar.gz: 822adb188680aa6817cc4961f489fb7e04ce87cc
+  metadata.gz: f1ca75e230abc66bf7c5727a7b7b1cf8a91ba371
+  data.tar.gz: 1ea8c69888c111ddaede020425212a12bda2c650
 SHA512:
-  metadata.gz: fea5977424fcfe8b8eec5bfba065e84f7f2f5cdbb98883327cff132f049aaaf0e8679243e348c61c71483a1d4610f12ae350c15717ad58def287a5ef67df3d1b
-  data.tar.gz: e634208bc2d2a68620e2c355e5b2949af1fe1fab2552883d715dffd92cbe0a00a29242d097b7f901aa464cedc4db00ef61ff0b5727f8ddfa74afd4dca1180b47
+  metadata.gz: 39fe8cbc177f8d2986758a833a8ead44719951f027b0dc524ac991026cf33f7e374bd8ac4b88209ad05ef5eb74bbd39a952951111dc79212ae306725c18b8fed
+  data.tar.gz: 0da71b1d4e730c52036ff527d40771d0933b604f16af7ff86b57ee84fd953cfa47a449ba52d40e983d0fe4d5471b7ab7fd18476674b6dc0223d46357f5b3ae6a

data/.travis.yml

@@ -1,8 +1,8 @@
 rvm:
-#  - 1.8.7
-#  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1.0
 
-script: bundle exec rake spec
+script: bundle exec rake
+before_install:
+   - gem update bundler

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 Unreleased
 --------------
 
+Release: 0.3.2
+--------------
+* Strip UTF-8 BOM from response added by win2k8R2 since newer WinRM versions now use UTF-8
+* Decode all authorized payloads, not just successful ones so an unsuccesful command error can be communicated
+
 Release: 0.3.1
 --------------
 * [Issue #27](https://github.com/chef/winrm-s/pull/27): Fixes problem with AllowUnencrypted being true and using negotiate

data/Gemfile

@@ -2,7 +2,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :test, :development do
-  gem "rspec"
+  gem 'pry'
+  gem 'rspec'
   gem 'rake'
   gem 'nokogiri', '~> 1.6.2'
 end

data/Rakefile

@@ -1 +1,16 @@
-require 'bundler/gem_tasks'
+require 'bundler'
+require 'rspec/core/rake_task'
+
+Bundler::GemHelper.install_tasks
+
+task :default => [:unit_spec]
+
+desc "Run all functional specs in spec directory"
+RSpec::Core::RakeTask.new(:functional_spec) do |t|
+t.pattern = 'spec/functional/**/*_spec.rb'
+end
+
+desc "Run all unit specs in spec directory"
+RSpec::Core::RakeTask.new(:unit_spec) do |t|
+t.pattern = 'spec/unit/**/*_spec.rb'
+end

data/lib/winrm-s/version.rb

@@ -17,6 +17,6 @@
 #
 
 module WinrmS
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
   MAJOR, MINOR, TINY = VERSION.split('.')
 end

data/lib/winrm/http/auth.rb

@@ -83,7 +83,7 @@ class HTTPClient
           end
           # ignore unknown authentication scheme
         end
-      elsif res.status == HTTP::Status::OK
+      else
         decrypted_content = res.content
         @authenticator.each do |auth|
           next unless auth.set? # hasn't be set, don't use it

data/lib/winrm/winrm_service_patch.rb

@@ -66,7 +66,7 @@ module WinRM
         output = Output.new
         REXML::XPath.match(resp_doc, "//#{NS_WIN_SHELL}:Stream").each do |n|
           next if n.text.nil? || n.text.empty?
-          stream = { n.attributes['Name'].to_sym => Base64.decode64(n.text) }
+          stream = { n.attributes['Name'].to_sym => Base64.decode64(n.text).force_encoding('utf-8').sub("\xEF\xBB\xBF", "") }
           output[:data] << stream
           yield stream[:stdout], stream[:stderr] if block_given?
         end

data/spec/functional/sspi_nego_encrypt_decrypt_spec.rb

@@ -10,7 +10,7 @@ def assert_prerequisites
 end
 
 
-describe "Test sspinegotiate with encrypt/decrypt via WinRM", :windows_and_func_spec_enabled do
+describe "Test sspinegotiate with encrypt/decrypt via WinRM" do
   before(:all) do
     assert_prerequisites
     # Remember the user setting.
@@ -21,7 +21,7 @@ describe "Test sspinegotiate with encrypt/decrypt via WinRM", :windows_and_func_
 
   before do
     %x{winrm set winrm/config/service @{AllowUnencrypted="false"}}
-    @winrm = WinRM::WinRMWebService.new(ENV["test_winrm_endpoint"], :sspinegotiate, :user => ENV["test_winrm_user"], :pass => ENV["test_winrm_pass"])
+    @winrm = WinRM::WinRMWebService.new(ENV["test_winrm_endpoint"], :sspinegotiate, :user => ENV["test_winrm_user"].dup, :pass => ENV["test_winrm_pass"].dup)
   end
 
   after(:all) do
@@ -47,19 +47,4 @@ describe "Test sspinegotiate with encrypt/decrypt via WinRM", :windows_and_func_
     end
     expect(outvar).to match(/Windows IP Configuration/)
   end
-
-  describe "Negative test:" do
-    before do
-      %x{winrm set winrm/config/service @{AllowUnencrypted="true"}}
-    end
-    after do
-      %x{winrm set winrm/config/service @{AllowUnencrypted="false"}}
-    end
-
-    describe "when AllowUnencrypted is set to true" do
-      it "should raise an exception" do
-        expect{@winrm.run_cmd('ipconfig')}.to raise_exception
-      end
-    end
-  end
-end
+end

data/spec/spec_helper.rb

@@ -10,12 +10,7 @@ def unix?
   !windows?
 end
 
-def windows_and_func_spec_enabled?
-  windows? and ENV["enable_winrms_func_spec"]
-end
-
 RSpec.configure do |config|
   config.filter_run_excluding :windows_only => true unless windows?
-  config.filter_run_excluding :windows_and_func_spec_enabled => true unless windows_and_func_spec_enabled?
   config.filter_run_excluding :unix_only => true unless unix?
 end

data/winrm-s.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{Gem that extends the functionality of the WinRM gem to support the Microsoft Negotiate protocol when authenticating to a remote WinRM endpoint from a Windows system}
   s.description = s.summary
 
-  s.add_dependency "winrm", "~> 1.3.0"
+  s.add_dependency "winrm", "~> 1.3", ">= 1.3.6"
 
   %w(rspec-core rspec-expectations rspec-mocks rspec_junit_formatter).each { |gem| s.add_development_dependency gem }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: winrm-s
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Kaustubh Deorukhkar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
@@ -131,11 +137,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Gem that extends the functionality of the WinRM gem to support the Microsoft
   Negotiate protocol when authenticating to a remote WinRM endpoint from a Windows
   system
 test_files: []
-has_rdoc: true