net-ssh 2.6.6 → 2.6.7

data/CHANGES.txt

@@ -1,4 +1,10 @@
 
+=== 2.6.7 / 11 Apr 2013
+
+* Decreased default packet size to 32768 as described in RFC 4253 [Olipro]
+* Added max_pkt_size and max_win_size options to Net::SSH.start [Olipro]
+
+
 === 2.6.6 / 03 Mar 2013
 
 * Fix for ruby 2.0 in windows [jansegre]

data/lib/net/ssh.rb

@@ -61,12 +61,13 @@ module Net
     # This is the set of options that Net::SSH.start recognizes. See
     # Net::SSH.start for a description of each option.
     VALID_OPTIONS = [
-      :auth_methods, :bind_address, :compression, :compression_level, :config, 
-      :encryption, :forward_agent, :hmac, :host_key, :kex, :keys, :key_data, 
-      :languages, :logger, :paranoid, :password, :port, :proxy, 
+      :auth_methods, :bind_address, :compression, :compression_level, :config,
+      :encryption, :forward_agent, :hmac, :host_key, :kex, :keys, :key_data,
+      :languages, :logger, :paranoid, :password, :port, :proxy,
       :rekey_blocks_limit,:rekey_limit, :rekey_packet_limit, :timeout, :verbose,
       :global_known_hosts_file, :user_known_hosts_file, :host_key_alias,
-      :host_name, :user, :properties, :passphrase, :keys_only
+      :host_name, :user, :properties, :passphrase, :keys_only, :max_pkt_size,
+      :max_win_size
     ]
 
     # The standard means of starting a new SSH connection. When used with a
@@ -120,7 +121,7 @@ module Net
     #   host to a known_hosts dictionary file
     # * :host_name => the real host name or IP to log into. This is used
     #   instead of the +host+ parameter, and is primarily only useful when
-    #   specified in an SSH configuration file. It lets you specify an 
+    #   specified in an SSH configuration file. It lets you specify an
     #   "alias", similarly to adding an entry in /etc/hosts but without needing
     #   to modify /etc/hosts.
     # * :kex => the key exchange algorithm (or algorithms) to use
@@ -133,6 +134,11 @@ module Net
     #   option is intended for situations where ssh-agent offers many different
     #   identites.
     # * :logger => the logger instance to use when logging
+    # * :max_pkt_size => maximum size we tell the other side that is supported per
+    #   packet. Default is 0x8000 (32768 bytes). Increase to 0x10000 (65536 bytes)
+    #   for better performance if your SSH server supports it (most do).
+    # * :max_win_size => maximum size we tell the other side that is supported for
+    #   the window.
     # * :paranoid => either false, true, :very, or :secure specifying how
     #   strict host-key verification should be (in increasing order here)
     # * :passphrase => the passphrase to use when loading a private key (default
@@ -217,7 +223,7 @@ module Net
         when false, nil then return {}
         else Array(use_ssh_config)
         end
-      
+
       Net::SSH::Config.for(host, files)
     end
   end

data/lib/net/ssh/connection/channel.rb

@@ -107,15 +107,15 @@ module Net; module SSH; module Connection
     # that time (see #do_open_confirmation).
     #
     # This also sets the default maximum packet size and maximum window size.
-    def initialize(connection, type, local_id, &on_confirm_open)
+    def initialize(connection, type, local_id, max_pkt_size = 0x8000, max_win_size = 0x20000, &on_confirm_open)
       self.logger = connection.logger
 
       @connection = connection
       @type       = type
       @local_id   = local_id
 
-      @local_maximum_packet_size = 0x10000
-      @local_window_size = @local_maximum_window_size = 0x20000
+      @local_maximum_packet_size = max_pkt_size
+      @local_window_size = @local_maximum_window_size = max_win_size
 
       @on_confirm_open = on_confirm_open
 

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

@@ -72,6 +72,9 @@ module Net; module SSH; module Connection
       @channel_open_handlers = {}
       @on_global_request = {}
       @properties = (options[:properties] || {}).dup
+
+      @max_pkt_size = (options.has_key?(:max_pkt_size) ? options[:max_pkt_size] : 0x8000)
+      @max_win_size = (options.has_key?(:max_win_size) ? options[:max_win_size] : 0x20000)
     end
 
     # Retrieves a custom property from this instance. This can be used to
@@ -286,8 +289,8 @@ module Net; module SSH; module Connection
     #   channel.wait
     def open_channel(type="session", *extra, &on_confirm)
       local_id = get_next_channel_id
-      channel = Channel.new(self, type, local_id, &on_confirm)
 
+      channel = Channel.new(self, type, local_id, @max_pkt_size, @max_win_size, &on_confirm)
       msg = Buffer.from(:byte, CHANNEL_OPEN, :string, type, :long, local_id,
         :long, channel.local_maximum_window_size,
         :long, channel.local_maximum_packet_size, *extra)
@@ -503,7 +506,8 @@ module Net; module SSH; module Connection
         info { "channel open #{packet[:channel_type]}" }
 
         local_id = get_next_channel_id
-        channel = Channel.new(self, packet[:channel_type], local_id)
+
+        channel = Channel.new(self, packet[:channel_type], local_id, @max_pkt_size, @max_win_size)
         channel.do_open_confirmation(packet[:remote_id], packet[:window_size], packet[:packet_size])
 
         callback = channel_open_handlers[packet[:channel_type]]

data/lib/net/ssh/version.rb

@@ -51,7 +51,7 @@ module Net; module SSH
     MINOR = 6
 
     # The tiny component of this version of the Net::SSH library
-    TINY  = 6
+    TINY  = 7
 
     # The current version of the Net::SSH library as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/net-ssh.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "net-ssh"
-  s.version = "2.6.6"
+  s.version = "2.6.7"
 
   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-03-03"
+  s.date = "2013-04-11"
   s.description = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2."
   s.email = "net-ssh@solutious.com"
   s.extra_rdoc_files = [

data/test/connection/test_channel.rb

@@ -11,7 +11,7 @@ module Connection
     end
 
     def test_constructor_should_set_defaults
-      assert_equal 0x10000, channel.local_maximum_packet_size
+      assert_equal 0x8000, channel.local_maximum_packet_size
       assert_equal 0x20000, channel.local_maximum_window_size
       assert channel.pending_requests.empty?
     end
@@ -126,7 +126,7 @@ module Connection
         assert_equal CHANNEL_DATA, packet.type
         assert_equal 0, packet[:local_id]
         assert_equal "hello wo", packet[:data]
-        
+
         t.expect do |t2,packet2|
           assert_equal CHANNEL_DATA, packet2.type
           assert_equal 0, packet2[:local_id]

data/test/connection/test_session.rb

@@ -225,7 +225,7 @@ module Connection
       result = nil
       session.on_open_channel("auth-agent") { |*args| result = args }
       process_times(2)
-      assert_equal P(:byte, CHANNEL_OPEN_CONFIRMATION, :long, 14, :long, 0, :long, 0x20000, :long, 0x10000).to_s, socket.write_buffer
+      assert_equal P(:byte, CHANNEL_OPEN_CONFIRMATION, :long, 14, :long, 0, :long, 0x20000, :long, 0x8000).to_s, socket.write_buffer
       assert_not_nil(ch = session.channels[0])
       assert_equal [session, ch, P(:byte, CHANNEL_OPEN, :string, "auth-agent", :long, 14, :long, 0x20001, :long, 0x10001)], result
       assert_equal 0, ch.local_id
@@ -233,7 +233,7 @@ module Connection
       assert_equal 0x20001, ch.remote_maximum_window_size
       assert_equal 0x10001, ch.remote_maximum_packet_size
       assert_equal 0x20000, ch.local_maximum_window_size
-      assert_equal 0x10000, ch.local_maximum_packet_size
+      assert_equal 0x8000, ch.local_maximum_packet_size
       assert_equal "auth-agent", ch.type
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 2.6.6
+  version: 2.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -38,7 +38,7 @@ cert_chain:
   MVhNUThCTTJKejBYb1BhblBlMzU0K2xXd2pwa1JLYkZvdy9aYlFIY0NMQ3Ey
   NCtONmI2ZwpkZ0tmTkR6d2lEcHFDQT09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-03-03 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit