net-ssh 8.0.0 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc22933c7ce50930b6118479820acb8d978d855baade0499b94065d7e245c016
-  data.tar.gz: 3340e9bd30ac3781da55ffdc0362626e32ad8b0c2db0b2352bf879dc6fe743bc
+  metadata.gz: b548f463639f7a9a85eca15cc065ab99d7b3c803330733198f311eb46cbc3c13
+  data.tar.gz: 56dd051e3ff6346e4f5684c571d1136978314762b2eb2a248af00666c4ab136f
 SHA512:
-  metadata.gz: 226a157e20beb49c008e4a3eb3e15a93ea23b7d0b2935f3c0fa4111d4e43815f6a77b0ef2f22e2bab7123f9410f99655459dc42b94c30ce63a295be77dc3b2ce
-  data.tar.gz: fb9269c31afc40374ef1b30cc58008d916cf41f3a633596e2fb04f924917f33e966c3b556df56f3cb10fbc24190d956ac9b59b2d57cb7b23204bded86f5316c6
+  metadata.gz: f2d469ea5e169da065852011e64ecc4c30168baac60f4b241014ec1b7c1d76512e95163f726858f94cbaf722578fd0acddacfd446f31d4dfb65faafd62c97f1d
+  data.tar.gz: 3582df1af6a3686ff510d86268730c6eecb5104ddcc239cfe31c324940b3a57d6522fe74c1b8cde2e42385167ee57958c669284032d39eda947ddfa1b8fc6c43

data/CHANGES.txt

@@ -1,3 +1,8 @@
+=== 8.0.1
+
+  * Fixed `unexpected packet type 94 during initial key exchange` (or 93) when channel data arrives during a client-initiated re-key, which broke bulk transfers at the first re-key (e.g. with `rekey_limit`, or after about 1 GB); a regression in 8.0.0 [#1063]
+  * `control_master: :auto` now ignores `forward_agent` (logged at info level) instead of raising ArgumentError, and logs the ignored connection options at info instead of warn level, so it works with sshkit (Kamal, Capistrano), which always passes `forward_agent: true`, `keys`, `known_hosts` and `keepalive` [#1062]
+
 === 8.0.0
 
   * No changes since 8.0.0 rc5.

data/lib/net/ssh/multiplex.rb

@@ -32,13 +32,9 @@ module Net
       VALUES = [:auto, false, nil].freeze
 
       def self.validate_options!(options)
-        unless VALUES.include?(options[:control_master])
-          raise ArgumentError, "control_master must be :auto or false, got #{options[:control_master].inspect}"
-        end
-        return unless options[:control_master] && options[:forward_agent]
+        return if VALUES.include?(options[:control_master])
 
-        raise ArgumentError, "forward_agent can't be used with control_master: the ControlMaster serves agent requests " \
-                             "from its own agent only if it has ForwardAgent enabled itself, and rejects them otherwise"
+        raise ArgumentError, "control_master must be :auto or false, got #{options[:control_master].inspect}"
       end
 
       # Returns a Connection::Session running through the ControlMaster for
@@ -55,7 +51,7 @@ module Net
         return nil unless socket
 
         logger.info { "control_master: using ControlMaster at #{path}" }
-        warn_master_owned(logger, explicit)
+        log_master_owned(logger, explicit)
         begin
           transport = ProxyTransport.new(socket, host: host, control_path: path, options: options)
           Connection::Session.new(transport, session_options(logger, options))
@@ -108,23 +104,23 @@ module Net
         ControlPath.jump_host(proxy.jump_proxies)
       end
 
-      def self.warn_master_owned(logger, explicit)
+      def self.log_master_owned(logger, explicit)
         bypassed = explicit & MASTER_OWNED_OPTIONS
         return if bypassed.empty?
 
-        logger.warn { "control_master: ignoring #{bypassed.join(', ')}, the ControlMaster's own settings apply" }
+        logger.info { "control_master: ignoring #{bypassed.join(', ')}, the ControlMaster's own settings apply" }
       end
 
       # Keepalive is a global request, which the master doesn't allow; it
-      # watches its own connection anyway. ForwardAgent from ssh_config is
-      # dropped for the reason given in validate_options!.
+      # watches its own connection anyway. The master serves agent requests
+      # from its own agent only if it has ForwardAgent enabled itself.
       def self.session_options(logger, options)
         logger.info { "control_master: keepalive is left to the ControlMaster" } if options[:keepalive]
         logger.info { "control_master: ignoring ForwardAgent, the ControlMaster's own ForwardAgent setting applies" } if options[:forward_agent]
         options.merge(keepalive: false, forward_agent: false)
       end
 
-      private_class_method :open_proxy, :socket_path, :jump_host, :warn_master_owned, :session_options
+      private_class_method :open_proxy, :socket_path, :jump_host, :log_master_owned, :session_options
     end
   end
 end

data/lib/net/ssh/transport/session.rb

@@ -228,7 +228,8 @@ module Net
 
             else
               return packet if algorithms.allow?(packet)
-              raise Net::SSH::Exception, "unexpected packet type #{packet.type} during initial key exchange" unless algorithms.initialized?
+              # Algorithms#rekey! clears initialized?, so the session id is what marks the first key exchange as done.
+              raise Net::SSH::Exception, "unexpected packet type #{packet.type} during initial key exchange" unless algorithms.session_id
 
               push(packet)
             end

data/lib/net/ssh/version.rb

@@ -52,7 +52,7 @@ module Net
       MINOR = 0
 
       # The tiny component of this version of the Net::SSH library
-      TINY  = 0
+      TINY  = 1
 
       # The prerelease component of this version of the Net::SSH library
       # nil allowed

data/lib/net/ssh.rb

@@ -125,21 +125,21 @@ module Net
     #   for setting up a connection (:keys, :key_data, :password, :passphrase,
     #   :auth_methods, :verify_host_key, :known_hosts, :host_key, :kex,
     #   :encryption, :hmac, :compression, :rekey_*, :proxy, :keepalive and the
-    #   like); explicitly passed ones are named in a logger warning. Over the
+    #   like); explicitly passed ones are named at info level. Over the
     #   master, remote port forwarding (Service::Forward#remote and
     #   #cancel_remote) raises Net::SSH::NotSupportedOverControlMaster, as the
     #   master consumes the global request reply, so success, failure and the
     #   port allocated for port 0 can't be observed; other global requests
     #   raise it too. Agent and X11 forwarding requests raise it
-    #   too, and :forward_agent can't be combined with it, because the master
-    #   serves them from its own agent or display only if it has ForwardAgent
-    #   or ForwardX11 enabled itself, and rejects them otherwise. Keepalive and
-    #   rekeying are left to the master. ssh_config's ControlMaster is
-    #   ignored, only this option enables it. An invalid ControlPath raises
-    #   ArgumentError. A missing or stale socket is logged at info level, a
-    #   socket that can't be used (another owner, refused, wrong protocol,
-    #   timed out) at warn level. Has no effect on Windows. Defaults to
-    #   +false+.
+    #   too, and :forward_agent is ignored (logged at info level), because the
+    #   master serves them from its own agent or display only if it has
+    #   ForwardAgent or ForwardX11 enabled itself, and rejects them otherwise.
+    #   Keepalive and rekeying are left to the master. ssh_config's
+    #   ControlMaster is ignored, only this option enables it. An invalid
+    #   ControlPath raises ArgumentError. A missing or stale socket is logged
+    #   at info level, a socket that can't be used (another owner, refused,
+    #   wrong protocol, timed out) at warn level. Has no effect on Windows.
+    #   Defaults to +false+.
     # * :control_path => the ControlMaster socket to use with
     #   :control_master, with the same ~, ${ENV} and % tokens as ssh_config's
     #   ControlPath (%C, %d, %h, %i, %j, %k, %L, %l, %n, %p, %r, %u, %%).
@@ -154,7 +154,8 @@ module Net
     #   files. Defaults to +true+.
     # * :encryption => the encryption cipher (or ciphers) to use
     # * :forward_agent => set to true if you want the SSH agent connection to
-    #   be forwarded
+    #   be forwarded. Ignored for a session through a ControlMaster (see
+    #   :control_master).
     # * :known_hosts => a custom object holding known hosts records.
     #   It must implement #search_for and `add` in a similiar manner as KnownHosts.
     # * :global_known_hosts_file => the location of the global known hosts

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.0.1
 platform: ruby
 authors:
 - Jamis Buck