winrm 1.0.4 → 1.0.5

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/winrm/http/transport.rb

@@ -12,6 +12,7 @@ module WinRM
         @endpoint = endpoint.is_a?(String) ? URI.parse(endpoint) : endpoint
         @httpcli = HTTPClient.new(:agent_name => 'Ruby WinRM Client')
         @httpcli.receive_timeout = 3600 # Set this to an unreasonable amount for now because WinRM has timeouts
+        @logger = Logging.logger[self]
       end
 
       def send_request(message)
@@ -35,12 +36,19 @@ module WinRM
         auths = @httpcli.www_auth.instance_variable_get('@authenticator')
         auths.delete_if {|i| i.scheme !~ /basic/i}
       end
+
+      # Disable SSPI Auth
+      def no_sspi_auth!
+        auths = @httpcli.www_auth.instance_variable_get('@authenticator')
+        auths.delete_if {|i| i.is_a? HTTPClient::SSPINegotiateAuth }
+      end
     end
 
     class HttpPlaintext < HttpTransport
       def initialize(endpoint, user, pass, opts)
         super(endpoint)
         @httpcli.set_auth(nil, user, pass)
+        no_sspi_auth! if opts[:disable_sspi]
         basic_auth_only! if opts[:basic_auth_only]
       end
     end
@@ -51,6 +59,7 @@ module WinRM
         super(endpoint)
         @httpcli.set_auth(endpoint, user, pass)
         @httpcli.ssl_config.set_trust_ca(ca_trust_path) unless ca_trust_path.nil?
+        no_sspi_auth! if opts[:disable_sspi]
         basic_auth_only! if opts[:basic_auth_only]
       end
     end
@@ -102,6 +111,7 @@ Content-Type: application/octet-stream\r
 
 
       def init_krb
+        @logger.debug "Initializing Kerberos for #{@service}"
         @gsscli = GSSAPI::Simple.new(@endpoint.host, @service)
         token = @gsscli.init_context
         auth = Base64.strict_encode64 token
@@ -110,6 +120,7 @@ Content-Type: application/octet-stream\r
           "Connection" => "Keep-Alive",
           "Content-Type" => "application/soap+xml;charset=UTF-8"
         }
+        @logger.debug "Sending HTTP POST for Kerberos Authentication"
         r = @httpcli.post(@endpoint, '', hdr)
         itok = r.header["WWW-Authenticate"].pop
         itok = itok.split.last
@@ -119,6 +130,7 @@ Content-Type: application/octet-stream\r
 
       # @return [String] the encrypted request string
       def winrm_encrypt(str)
+        @logger.debug "Encrypting SOAP message:\n#{str}"
         iov_cnt = 3
         iov = FFI::MemoryPointer.new(GSSAPI::LibGSSAPI::GssIOVBufferDesc.size * iov_cnt)
 
@@ -148,6 +160,7 @@ Content-Type: application/octet-stream\r
 
       # @return [String] the unencrypted response string
       def winrm_decrypt(str)
+        @logger.debug "Decrypting SOAP message:\n#{str}"
         iov_cnt = 3
         iov = FFI::MemoryPointer.new(GSSAPI::LibGSSAPI::GssIOVBufferDesc.size * iov_cnt)
 
@@ -176,6 +189,8 @@ Content-Type: application/octet-stream\r
 
         maj_stat = GSSAPI::LibGSSAPI.gss_unwrap_iov(min_stat, @gsscli.context, conf_state, qop_state, iov, iov_cnt)
 
+        @logger.debug "SOAP message decrypted (MAJ: #{maj_stat}, MIN: #{min_stat.read_int}):\n#{iov1[:buffer].value}"
+
         Nokogiri::XML(iov1[:buffer].value)
       end
 

data/lib/winrm.rb

@@ -21,6 +21,12 @@
 # We only what one instance of this class so include Singleton
 require 'date'
 require 'kconv' if(RUBY_VERSION.start_with? '1.9') # bug in rubyntlm with ruby 1.9.x
+require 'logging'
+
+module WinRM
+  Logging.logger.root.level = :info
+  Logging.logger.root.appenders = Logging.appenders.stdout
+end
 
 require 'winrm/helpers/iso8601_duration'
 require 'winrm/soap_provider'

data/winrm.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency  'rubyntlm', '~> 0.1.1'
   s.add_runtime_dependency  'uuidtools', '~> 2.1.2'
   s.add_runtime_dependency  'savon', '= 0.9.5'
+  s.add_runtime_dependency  'logging', '~> 1.6.1'
 end

metadata

@@ -1,93 +1,103 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: winrm
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.0.5
   prerelease: 
-  version: 1.0.4
 platform: ruby
-authors: 
+authors:
 - Dan Wanek
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: gssapi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &13630060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *13630060
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &13629380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.4.4
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: httpclient
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *13629380
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: &13628760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.2.0.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rubyntlm
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *13628760
+- !ruby/object:Gem::Dependency
+  name: rubyntlm
+  requirement: &13627940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: uuidtools
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *13627940
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: &13627460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: savon
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *13627460
+- !ruby/object:Gem::Dependency
+  name: savon
+  requirement: &13626900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.9.5
   type: :runtime
-  version_requirements: *id006
-description: "    Ruby library for Windows Remote Management\n"
+  prerelease: false
+  version_requirements: *13626900
+- !ruby/object:Gem::Dependency
+  name: logging
+  requirement: &13626200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *13626200
+description: ! '    Ruby library for Windows Remote Management
+
+'
 email: dan.wanek@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - COPYING.txt
-files: 
+files:
 - .gitignore
 - COPYING.txt
 - README
@@ -110,33 +120,30 @@ files:
 - winrm.gemspec
 homepage: http://github.com/zenchild/WinRM
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - -x
 - test/
 - -x
 - examples/
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.0
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby library for Windows Remote Management
 test_files: []
-