net-sftp 2.1.1 → 2.1.2

data/CHANGES.txt

@@ -1,4 +1,8 @@
 
+=== 2.1.2 / 07 May 2013
+
+* Fix fragmentation download failure [accardi]
+
 === 2.1.0 / 06 Feb 2013
 
 * Added public cert. All gem releases are now signed. See INSTALL in readme.

data/lib/net/sftp/session.rb

@@ -898,7 +898,7 @@ module Net; module SFTP
             @packet_length = input.read_long
           end
 
-          return unless input.length >= @packet_length
+          return unless input.length >= @packet_length + 4
           packet = Net::SFTP::Packet.new(input.read(@packet_length))
           input.consume!
           @packet_length = nil

data/lib/net/sftp/version.rb

@@ -6,7 +6,7 @@ module Net; module SFTP
   class Version < Net::SSH::Version
     MAJOR = 2
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     # The current version, as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/net-sftp.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "net-sftp"
-  s.version = "2.1.1"
+  s.version = "2.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamis Buck", "Delano Mandelbaum"]
   s.cert_chain = ["gem-public_cert.pem"]
-  s.date = "2013-02-06"
+  s.date = "2013-05-07"
   s.description = "A pure Ruby implementation of the SFTP client protocol"
   s.email = "net-ssh@solutious.com"
   s.extra_rdoc_files = [

data/test/common.rb

@@ -125,6 +125,18 @@ class Net::SSH::Test::Channel
     gets_data(sftp_packet(type, *args))
   end
 
+  def gets_packet_in_two(fragment_len, type, *args)
+    fragment_len ||= 0
+    whole_packet = sftp_packet(type, *args)
+
+    if 0 < fragment_len && fragment_len < whole_packet.length
+      gets_data(whole_packet[0, whole_packet.length - fragment_len])
+      gets_data(whole_packet[-fragment_len..-1])
+    else
+      gets_data(whole_packet)
+    end
+  end
+
   def sends_packet(type, *args)
     sends_data(sftp_packet(type, *args))
   end

data/test/test_download.rb

@@ -21,6 +21,20 @@ class DownloadTest < Net::SFTP::TestCase
     assert_equal text, file.string
   end
 
+  def test_download_file_should_transfer_remote_to_local_in_spite_of_fragmentation
+    local = "/path/to/local"
+    remote = "/path/to/remote"
+    text = "this is some text\n"
+
+    expect_file_transfer(remote, text, :fragment_len => 1)
+
+    file = StringIO.new
+    File.stubs(:open).with(local, "wb").returns(file)
+
+    assert_scripted_command { sftp.download(remote, local) }
+    assert_equal text, file.string
+  end
+
   def test_download_large_file_should_transfer_remote_to_local
     local = "/path/to/local"
     remote = "/path/to/remote"
@@ -130,12 +144,12 @@ class DownloadTest < Net::SFTP::TestCase
 
   private
 
-    def expect_file_transfer(remote, text)
+    def expect_file_transfer(remote, text, opts={})
       expect_sftp_session :server_version => 3 do |channel|
         channel.sends_packet(FXP_OPEN, :long, 0, :string, remote, :long, 0x01, :long, 0)
         channel.gets_packet(FXP_HANDLE, :long, 0, :string, "handle")
         channel.sends_packet(FXP_READ, :long, 1, :string, "handle", :int64, 0, :long, 32_000)
-        channel.gets_packet(FXP_DATA, :long, 1, :string, text)
+        channel.gets_packet_in_two(opts[:fragment_len], FXP_DATA, :long, 1, :string, text)
         channel.sends_packet(FXP_READ, :long, 2, :string, "handle", :int64, text.bytesize, :long, 32_000)
         channel.gets_packet(FXP_STATUS, :long, 2, :long, 1)
         channel.sends_packet(FXP_CLOSE, :long, 3, :string, "handle")
@@ -160,7 +174,7 @@ class DownloadTest < Net::SFTP::TestCase
         channel.sends_packet(FXP_CLOSE, :long, data_packet_count + 2, :string, "handle")
         channel.gets_packet(FXP_STATUS, :long, data_packet_count + 2, :long, 0)
       end
-      
+
       file = StringIO.new
       File.stubs(:open).with(local, "wb").returns(file)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-sftp
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -38,7 +38,7 @@ cert_chain:
   MVhNUThCTTJKejBYb1BhblBlMzU0K2xXd2pwa1JLYkZvdy9aYlFIY0NMQ3Ey
   NCtONmI2ZwpkZ0tmTkR6d2lEcHFDQT09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh