net-ssh-kerberos 0.2.6 → 0.2.7

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :minor: 2
-:patch: 6
+:patch: 7
 :build: 
 :major: 0

data/example/sspi.rb

@@ -21,7 +21,7 @@ if result.ok?
   pkg_info = API._args_[1]
   $stderr.puts "querySecurityPackageInfo: (#{result}) #{pkg_info.comment} (max_token=#{pkg_info.max_token})"
   @max_token = pkg_info.max_token
-  result = API.freeContextBuffer pkg_info
+  result = API.freeContextBuffer pkg_info.to_ptr
   $stderr.puts "freeContextBuffer: (#{result})"
 else
   $stderr.puts "querySecurityPackageInfo: (#{result})"
@@ -39,21 +39,15 @@ if result.ok?
       result = API.freeContextBuffer names
       $stderr.puts "freeContextBuffer: (#{result})"
 
-      token = API::SecBuffer.malloc
-      token.type = SECBUFFER_TOKEN
-      token.data = "\0" * @max_token
-      token.length = @max_token
-      output = API::SecBufferDesc.malloc
-      output.version = 0
-      output.count = 1
-      output.buffers = token.to_ptr
+      output = API::SecBufferDesc.create @max_token
+      if $DEBUG
+        $stderr.puts "SecBufferDesc.create: #{output.inspect} => #{output.buffer(0).inspect} => #{output.buffer(0).data.inspect}"
+      end
       result = API.initializeSecurityContext creds, nil, 'host/'+Socket.gethostbyname('localhost')[0], 
                                              ISC_REQ_DELEGATE | ISC_REQ_MUTUAL_AUTH | ISC_REQ_INTEGRITY, 0, SECURITY_NATIVE_DREP,
                                              nil, 0, ctx=API::SecHandle.malloc, output, 0, ts=API::TimeStamp.malloc
       if result.ok?
         $stderr.puts "initializeSecurityContext: (#{result}) ctx=#{! ctx.nil?} token.length=#{output.buffer(0).length}"
-        result = API.freeContextBuffer token.data
-        $stderr.puts "freeContextBuffer: (#{result})"
         result = API.deleteSecurityContext ctx
         $stderr.puts "deleteSecurityContext: (#{result})"
       else

data/lib/net/ssh/kerberos/context.rb

@@ -26,7 +26,7 @@ module Net; module SSH; module Kerberos
 	      @credentials = creds
 	    ensure
 	      if @credentials.nil?
-	        release_credentials creds
+	        release_credentials creds unless creds.nil?
 	        @cred_name = @cred_krb_name = nil
 	      end
 	    end

data/lib/net/ssh/kerberos/drivers/sspi.rb

@@ -57,7 +57,7 @@ module Net; module SSH; module Kerberos; module Drivers
       SecPkgInfo = struct [ "ULONG capabilities", "USHORT version", "USHORT rpcid",
                             "ULONG max_token", "SEC_CHAR *name", "SEC_CHAR *comment" ]
       typealias "PSecPkgInfo", "p", PTR_REF_ENC, PTR_REF_DEC(SecPkgInfo)
-      SecHandle = struct2([ "ULONG lower", "ULONG upper" ]) do def nil?; lower.zero? && upper.zero? end end
+      SecHandle = struct2([ "S lower", "S upper" ]) do def nil?; lower.nil? && upper.nil? end end
       typealias "PSecHandle", "P"
       typealias "PCredHandle", "PSecHandle"
       typealias "PCtxtHandle", "PSecHandle"
@@ -69,7 +69,7 @@ module Net; module SSH; module Kerberos; module Drivers
         def buffer(n) SecBuffer.new(@ptr[:buffers] + SecBuffer.size * n) end
       end
       typealias "PSecBufferDesc", "P"
-      TimeStamp = SecHandle
+      TimeStamp = struct2([ "ULONG lower", "ULONG upper" ]) do def nil?; lower.zero? && upper.zero? end end
       typealias "PTimeStamp", "P"
       SecPkgSizes = struct [ "ULONG max_token", "ULONG max_signature",
                              "ULONG block_size", "ULONG security_trailer" ]
@@ -147,7 +147,7 @@ module Net; module SSH; module Kerberos; module Drivers
     result = API.querySecurityPackageInfo "Kerberos", nil
     if result.ok? and ! (pkg_info = API._args_[1]).nil?
       @@max_token = pkg_info.max_token
-      API.freeContextBuffer pkg_info
+      API.freeContextBuffer pkg_info.to_ptr
     else
       raise "SSPI reports no support for Kerberos authentication"
     end
@@ -157,14 +157,14 @@ module Net; module SSH; module Kerberos; module Drivers
 			  prev = @state.handle if @state && ! @state.handle.nil?
 			  ctx = prev || API::SecHandle.malloc
 			  input = API::SecBufferDesc.create(token) if token
-			  output = API::SecBufferDesc.create(12288)
+			  output = API::SecBufferDesc.create(SSPI.max_token || 12288)
 			  result = API.initializeSecurityContext @credentials, prev, @target,
 				                 ISC_REQ_DELEGATE | ISC_REQ_MUTUAL_AUTH | ISC_REQ_INTEGRITY, 0,
 				                 SECURITY_NATIVE_DREP, input, 0, ctx, output, 0, ts=API::TimeStamp.malloc
 			  result.failure? and raise GeneralError, "Error initializing security context: #{result}"
 			  result = API.completeAuthToken ctx, output if result.incomplete?
 			  result.failure? and raise GeneralError, "Error initializing security context: #{result}"
-        bdata = output.buffer(0).to_s if output.buffers and output.count > 0 and output.buffer(0)
+        bdata = output.buffer(0).to_s if output.count > 0 and output.buffers and output.buffer(0)
 			  @state = State.new(ctx, result, bdata, ts)
 			  if result.complete?
 			    result = API.queryContextAttributes @state.handle, SECPKG_ATTR_SIZES, @sizes=API::SecPkgSizes.malloc

data/net-ssh-kerberos.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{net-ssh-kerberos}
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Khoobyar"]
-  s.date = %q{2011-04-27}
+  s.date = %q{2011-04-28}
   s.description = %q{Extends Net::SSH by adding Kerberos authentication capability for password-less logins on multiple platforms.
 }
   s.email = %q{joe@ankhcraft.com}

data/test/sspi_test.rb

@@ -14,7 +14,7 @@ if Net::SSH::Kerberos::Drivers.available.include? 'SSPI'
     assert_equal pkg_info.name.to_s, "Kerberos"
     assert pkg_info.max_token >= 128, "The maximum token size is assumed to be greater than 127 bytes"
     assert pkg_info.max_token <= 12288, "The maximum token size is assumed to be less than 12289 bytes"
-    result = API.freeContextBuffer pkg_info
+    result = API.freeContextBuffer pkg_info.to_ptr
     assert result.ok?, "freeContextBuffer failed: #{result}"
   end
 
@@ -40,7 +40,7 @@ if Net::SSH::Kerberos::Drivers.available.include? 'SSPI'
             begin
               assert ! ctx.nil?, "Should initialize a context handle"
               assert ! output.buffer(0).data.nil?, "Should output a token into the buffer"
-              assert output.buffer(0).length < 12288, "Should output a token into the buffer"
+              assert output.buffer(0).length <= 12288, "Should output a token into the buffer"
             ensure
               ctx = nil if (result = API.deleteSecurityContext(ctx)).ok?
             end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: net-ssh-kerberos
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Joe Khoobyar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 Z
+date: 2011-04-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh