net-sftp 4.0.1 → 4.1.0

data/lib/net/sftp/session.rb

@@ -68,6 +68,10 @@ module Net; module SFTP
     # the server has not yet responded to will be represented here.
     attr_reader :pending_requests
 
+    # The extensions the server advertised in its FXP_VERSION packet, as a
+    # hash of name => data (e.g. "posix-rename@openssh.com" => "1").
+    attr_reader :extensions
+
     # Creates a new Net::SFTP instance atop the given Net::SSH connection.
     # This will return immediately, before the SFTP connection has been properly
     # initialized. Once the connection is ready, the given block will be called.
@@ -81,6 +85,7 @@ module Net; module SFTP
       @input      = Net::SSH::Buffer.new
       self.logger = session.logger
       @state      = :closed
+      @extensions = {}
       @pending_requests = {}
 
       connect(&block)
@@ -269,6 +274,10 @@ module Net; module SFTP
       # Request object. If a block is given, it will be invoked when the
       # server responds.
       #
+      # +data+ is sent as a single request, so it must stay within the
+      # server's packet limit (OpenSSH drops the connection on packets over
+      # 256 KiB). Net::SFTP::Operations::File#write splits large data for you.
+      #
       #   request = sftp.write(handle, 0, "hello, world!\n")
       #   request.wait
       def write(handle, offset, data, &callback)
@@ -772,6 +781,7 @@ module Net; module SFTP
         when :closed
           @state = :opening
           @channel = session.open_channel(&method(:when_channel_confirmed))
+          @input = Net::SSH::Buffer.new
           @packet_length = nil
           @protocol = nil
           @on_ready = Array(block)
@@ -919,19 +929,27 @@ module Net; module SFTP
       # version negotiation, instantiating the appropriate Protocol instance
       # and invoking the callback given to #connect, if any.
       def do_version(packet)
+        # Negotiation happens once. A later FXP_VERSION would swap the protocol
+        # driver and drop every pending request.
+        unless state == :init
+          raise Net::SFTP::Exception, "unexpected FXP_VERSION packet while session is #{state}"
+        end
+
         debug { "negotiating sftp protocol version, mine is #{HIGHEST_PROTOCOL_VERSION_SUPPORTED}" }
 
         server_version = packet.read_long
         debug { "server reports sftp version #{server_version}" }
 
-        negotiated_version = [server_version, HIGHEST_PROTOCOL_VERSION_SUPPORTED].min
+        # Servers reply with their own version whatever we offered (OpenSSH
+        # always says 3), so cap at the version we offered as well.
+        negotiated_version = [server_version, @version, HIGHEST_PROTOCOL_VERSION_SUPPORTED].compact.min
         info { "negotiated version is #{negotiated_version}" }
 
-        extensions = {}
+        @extensions = {}
         until packet.eof?
           name = packet.read_string
           data = packet.read_string
-          extensions[name] = data
+          @extensions[name] = data
         end
 
         @protocol = Protocol.load(self, negotiated_version)

data/lib/net/sftp/version.rb

@@ -49,10 +49,10 @@ module Net
       MAJOR = 4
 
       # The minor component of this version of the Net::SFTP library
-      MINOR = 0
+      MINOR = 1
 
       # The tiny component of this version of the Net::SFTP library
-      TINY  = 1
+      TINY  = 0
 
       # The prerelease component of this version of the Net::SFTP library
       # nil allowed

data/lib/net/sftp.rb

@@ -34,18 +34,24 @@ module Net
     #   set the SFTP protocol version to be used)
     def self.start(host, user, ssh_options={}, sftp_options={}, &block)
       session = Net::SSH.start(host, user, ssh_options)
-      # We only use a single option here, but this leaves room for more later
-      # without breaking the external API.
-      version = sftp_options.fetch(:version, nil)
-      sftp = Net::SFTP::Session.new(session, version, &block).connect!
+      begin
+        # We only use a single option here, but this leaves room for more later
+        # without breaking the external API.
+        version = sftp_options.fetch(:version, nil)
+        sftp = Net::SFTP::Session.new(session, version, &block).connect!
 
-      if block_given?
-        sftp.loop
-        session.close
-        return nil
-      end
+        if block_given?
+          sftp.loop
+          return nil
+        end
 
-      sftp
+        sftp
+      rescue Object
+        failed = true
+        raise
+      ensure
+        session.close if block_given? && !failed
+      end
     rescue Object => anything
       begin
         session.shutdown!

data/net-sftp.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/net-ssh/net-sftp"
   spec.license       = "MIT"
   spec.required_rubygems_version = Gem::Requirement.new(">= 0") if spec.respond_to? :required_rubygems_version=
+  spec.required_ruby_version = ">= 2.6"
 
   spec.extra_rdoc_files = [
     "LICENSE.txt",

data.tar.gz.sig

@@ -1,3 +1 @@
-�>N٤/)�	����h�Gٟ7��H+l}H�\�Kij
-��}h��tk14�_��08���H���+�0�k�D/��R�*�������H��A��/犅-/0ƛ|�^w�ʿ��p� �`
���F�
-K @nK�A��kxx*���_Zk�5!5���$�K5�q�Ԯ@�zP�������r�
+l{������G���>~��g�����w}�Z

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-sftp
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Jamis Buck
@@ -32,7 +32,7 @@ cert_chain:
   mMdUtmMoVbjbik3hqkY/18G03c3PoFNpL38VLKuyyROYz1DaCqOaRju3sbOoirD+
   piQTZDCWxeKuX0Iuxq02uxkYHfoGB6In0y3OOQ==
   -----END CERTIFICATE-----
-date: 2026-10-22 00:00:00.000000000 Z
+date: 2026-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -91,14 +91,18 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
+- ".github/pull_request_template.md"
+- ".github/workflows/changelog.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - CHANGES.txt
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - Manifest
 - README.rdoc
 - Rakefile
+- changelog.d/README.md
 - lib/net/sftp.rb
 - lib/net/sftp/constants.rb
 - lib/net/sftp/errors.rb
@@ -121,6 +125,7 @@ files:
 - lib/net/sftp/protocol/06/attributes.rb
 - lib/net/sftp/protocol/06/base.rb
 - lib/net/sftp/protocol/base.rb
+- lib/net/sftp/protocol/bounded_read.rb
 - lib/net/sftp/request.rb
 - lib/net/sftp/response.rb
 - lib/net/sftp/session.rb
@@ -140,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="