net-ssh 2.0.2 → 2.0.3

data/CHANGELOG.rdoc

@@ -1,3 +1,15 @@
+=== 2.0.3 / 27 Jun 2008
+
+* Make Net::SSH::Version comparable [Brian Candler]
+
+* Fix errors in port forwarding when a channel could not be opened due to a typo in the exception name [Matthew Todd]
+
+* Use #chomp instead of #strip when cleaning the version string reported by the remote host, so that trailing whitespace is preserved (this is to play nice with servers like Mocana SSH) [Timo Gatsonides]
+
+* Correctly parse ssh_config entries with eq-sign delimiters [Jamis Buck]
+
+* Ignore malformed ssh_config entries [Jamis Buck]
+
 === 2.0.2 / 29 May 2008
 
 * Make sure the agent client understands both RSA "identities answers" [Jamis Buck]

data/lib/net/ssh/config.rb

@@ -62,10 +62,18 @@ module Net; module SSH
         IO.foreach(file) do |line|
           next if line =~ /^\s*(?:#.*)?$/
 
-          key, value = line.strip.split(/\s+/, 2)
-          key.downcase!
+          if line =~ /^\s*(\S+)\s*=(.*)$/
+            key, value = $1, $2
+          else
+            key, value = line.strip.split(/\s+/, 2)
+          end
+
+          # silently ignore malformed entries
+          next if value.nil?
 
+          key.downcase!
           value = $1 if value =~ /^"(.*)"$/
+
           value = case value.strip
             when /^\d+$/ then value.to_i
             when /^no$/i then false

data/lib/net/ssh/service/forward.rb

@@ -259,7 +259,7 @@ module Net; module SSH; module Service
           prepare_client(agent.socket, channel, :agent)
         rescue Exception => e
           error { "attempted to connect to agent but failed: #{e.class.name} (#{e.message})" }
-          raise ChannelOpenFailure.new(2, "could not connect to authentication agent")
+          raise Net::SSH::ChannelOpenFailed.new(2, "could not connect to authentication agent")
         end
       end
   end

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

@@ -46,15 +46,14 @@ module Net; module SSH; module Transport
           @header << @version
         end
 
-        debug { "remote is #{@version.strip}" }
+        @version.chomp!
+        debug { "remote is `#{@version}'" }
 
         unless @version.match(/^SSH-(1\.99|2\.0)-/)
           raise Net::SSH::Exception, "incompatible SSH version `#{@version}'"
         end
 
-        @version.strip!
-
-        debug { "local is #{PROTO_VERSION}" }
+        debug { "local is `#{PROTO_VERSION}'" }
         socket.write "#{PROTO_VERSION}\r\n"
       end
   end

data/lib/net/ssh/version.rb

@@ -12,6 +12,8 @@ module Net; module SSH
   #     abort "your software is too old!"
   #   end
   class Version
+    include Comparable
+
     # A convenience method for instantiating a new Version instance with the
     # given +major+, +minor+, and +tiny+ components.
     def self.[](major, minor, tiny)
@@ -49,7 +51,7 @@ module Net; module SSH
     MINOR = 0
 
     # The tiny component of this version of the Net::SSH library
-    TINY  = 2
+    TINY  = 3
 
     # The current version of the Net::SSH library as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/net-ssh.gemspec

@@ -1,16 +1,14 @@
 
-# Gem::Specification for Net-ssh-2.0.2
+# Gem::Specification for Net-ssh-2.0.3
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{net-ssh}
-  s.version = "2.0.2"
-
-  s.specification_version = 2 if s.respond_to? :specification_version=
+  s.version = "2.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamis Buck"]
-  s.date = %q{2008-05-29}
+  s.date = %q{2008-06-27}
   s.description = %q{a pure-Ruby implementation of the SSH2 client protocol}
   s.email = %q{jamis@jamisbuck.org}
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "lib/net/ssh/authentication/agent.rb", "lib/net/ssh/authentication/constants.rb", "lib/net/ssh/authentication/key_manager.rb", "lib/net/ssh/authentication/methods/abstract.rb", "lib/net/ssh/authentication/methods/hostbased.rb", "lib/net/ssh/authentication/methods/keyboard_interactive.rb", "lib/net/ssh/authentication/methods/password.rb", "lib/net/ssh/authentication/methods/publickey.rb", "lib/net/ssh/authentication/pageant.rb", "lib/net/ssh/authentication/session.rb", "lib/net/ssh/buffer.rb", "lib/net/ssh/buffered_io.rb", "lib/net/ssh/config.rb", "lib/net/ssh/connection/channel.rb", "lib/net/ssh/connection/constants.rb", "lib/net/ssh/connection/session.rb", "lib/net/ssh/connection/term.rb", "lib/net/ssh/errors.rb", "lib/net/ssh/key_factory.rb", "lib/net/ssh/known_hosts.rb", "lib/net/ssh/loggable.rb", "lib/net/ssh/packet.rb", "lib/net/ssh/prompt.rb", "lib/net/ssh/proxy/errors.rb", "lib/net/ssh/proxy/http.rb", "lib/net/ssh/proxy/socks4.rb", "lib/net/ssh/proxy/socks5.rb", "lib/net/ssh/service/forward.rb", "lib/net/ssh/test/channel.rb", "lib/net/ssh/test/extensions.rb", "lib/net/ssh/test/kex.rb", "lib/net/ssh/test/local_packet.rb", "lib/net/ssh/test/packet.rb", "lib/net/ssh/test/remote_packet.rb", "lib/net/ssh/test/script.rb", "lib/net/ssh/test/socket.rb", "lib/net/ssh/test.rb", "lib/net/ssh/transport/algorithms.rb", "lib/net/ssh/transport/cipher_factory.rb", "lib/net/ssh/transport/constants.rb", "lib/net/ssh/transport/hmac/abstract.rb", "lib/net/ssh/transport/hmac/md5.rb", "lib/net/ssh/transport/hmac/md5_96.rb", "lib/net/ssh/transport/hmac/none.rb", "lib/net/ssh/transport/hmac/sha1.rb", "lib/net/ssh/transport/hmac/sha1_96.rb", "lib/net/ssh/transport/hmac.rb", "lib/net/ssh/transport/identity_cipher.rb", "lib/net/ssh/transport/kex/diffie_hellman_group1_sha1.rb", "lib/net/ssh/transport/kex/diffie_hellman_group_exchange_sha1.rb", "lib/net/ssh/transport/kex.rb", "lib/net/ssh/transport/openssl.rb", "lib/net/ssh/transport/packet_stream.rb", "lib/net/ssh/transport/server_version.rb", "lib/net/ssh/transport/session.rb", "lib/net/ssh/transport/state.rb", "lib/net/ssh/verifiers/lenient.rb", "lib/net/ssh/verifiers/null.rb", "lib/net/ssh/verifiers/strict.rb", "lib/net/ssh/version.rb", "lib/net/ssh.rb", "README.rdoc", "THANKS.rdoc"]
@@ -20,9 +18,19 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Net-ssh", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{net-ssh}
-  s.rubygems_version = %q{1.1.1}
+  s.rubygems_version = %q{1.2.0}
   s.summary = %q{a pure-Ruby implementation of the SSH2 client protocol}
   s.test_files = ["test/test_all.rb"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if current_version >= 3 then
+    else
+    end
+  else
+  end
 end
 
 

data/test/test_config.rb

@@ -38,6 +38,12 @@ class TestConfig < Test::Unit::TestCase
     assert !config.key?(:rekey_limit)
   end
 
+  def test_load_should_parse_equal_sign_delimiters
+    config = Net::SSH::Config.load(config(:eqsign), "test.test")
+    assert config['compression']
+    assert_equal 1234, config['port']
+  end
+
   def test_translate_should_correctly_translate_from_openssh_to_net_ssh_names
     open_ssh = {
       'ciphers'                 => "a,b,c",

data/test/transport/test_server_version.rb

@@ -17,9 +17,11 @@ module Transport
       assert_equal "SSH-2.0-Testing_1.0", s.version
     end
 
-    def test_trailing_whitespace_should_be_stripped
+    def test_trailing_whitespace_should_be_preserved
+      # some servers, like Mocana, send a version string with trailing
+      # spaces, which are significant when exchanging keys later.
       s = subject(socket(true, "SSH-2.0-Testing_1.0    \r\n"))
-      assert_equal "SSH-2.0-Testing_1.0", s.version
+      assert_equal "SSH-2.0-Testing_1.0    ", s.version
     end
 
     def test_unacceptible_server_version_should_raise_exception

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net-ssh
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors: 
 - Jamis Buck
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-29 00:00:00 -06:00
+date: 2008-06-27 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: net-ssh
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: a pure-Ruby implementation of the SSH2 client protocol