net-ssh 2.0.3 → 2.0.4

data/CHANGELOG.rdoc

@@ -1,3 +1,14 @@
+=== 2.0.4 / 27 Aug 2008
+
+* Added Connection::Session#closed? and Transport::Session#closed? [Jamis Buck]
+
+* Numeric host names in .ssh/config are now parsed correct [Yanko Ivanov]
+
+* Make sure the error raised when a public key file is malformed is more informative than a MethodMissing error [Jamis Buck]
+
+* Cipher#reset is now called after Cipher#final, with the last n bytes used as the next initialization vector [Jamis Buck]
+
+
 === 2.0.3 / 27 Jun 2008
 
 * Make Net::SSH::Version comparable [Brian Candler]

data/lib/net/ssh/config.rb

@@ -160,7 +160,7 @@ module Net; module SSH
         # Converts an ssh_config pattern into a regex for matching against
         # host names.
         def pattern2regex(pattern)
-          pattern = "^" + pattern.gsub(/\./, "\\.").
+          pattern = "^" + pattern.to_s.gsub(/\./, "\\.").
             gsub(/\?/, '.').
             gsub(/\*/, '.*') + "$"
           Regexp.new(pattern, true)

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

@@ -81,6 +81,15 @@ module Net; module SSH; module Connection
       transport.host
     end
 
+    # Returns true if the underlying transport has been closed. Note that
+    # this can be a little misleading, since if the remote server has
+    # closed the connection, the local end will still think it is open
+    # until the next operation on the socket. Nevertheless, this method can
+    # be useful if you just want to know if _you_ have closed the connection.
+    def closed?
+      transport.closed?
+    end
+
     # Closes the session gracefully, blocking until all channels have
     # successfully closed, and then closes the underlying transport layer
     # connection.

data/lib/net/ssh/key_factory.rb

@@ -74,6 +74,8 @@ module Net; module SSH
         data = File.read(File.expand_path(filename))
         type, blob = data.split(/ /)
 
+        raise Net::SSH::Exception, "public key at #{filename} is not valid" if blob.nil?
+
         blob = blob.unpack("m*").first
         reader = Net::SSH::Buffer.new(blob)
         reader.read_key or raise OpenSSL::PKey::PKeyError, "not a public key #{filename.inspect}"

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

@@ -10,6 +10,11 @@ module Net; module SSH; module Transport
         8
       end
 
+      # Returns an arbitrary integer.
+      def iv_len
+        4
+      end
+
       # Does nothing. Returns self.
       def encrypt
         self

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

@@ -134,7 +134,7 @@ module Net; module SSH; module Transport
       unencrypted_data = [packet_length, padding_length, payload, padding].pack("NCA*A*")
       mac = client.hmac.digest([client.sequence_number, unencrypted_data].pack("NA*"))
 
-      encrypted_data = client.cipher.update(unencrypted_data) << client.cipher.final
+      encrypted_data = client.update_cipher(unencrypted_data) << client.final_cipher
       message = encrypted_data + mac
 
       debug { "queueing packet nr #{client.sequence_number} type #{payload[0]} len #{packet_length}" }
@@ -187,7 +187,7 @@ module Net; module SSH; module Transport
           data = read_available(minimum)
 
           # decipher it
-          @packet = Net::SSH::Buffer.new(server.cipher.update(data))
+          @packet = Net::SSH::Buffer.new(server.update_cipher(data))
           @packet_length = @packet.read_long
         end
 
@@ -199,14 +199,14 @@ module Net; module SSH; module Transport
         if need > 0
           # read the remainder of the packet and decrypt it.
           data = read_available(need)
-          @packet.append(server.cipher.update(data))
+          @packet.append(server.update_cipher(data))
         end
 
         # get the hmac from the tail of the packet (if one exists), and
         # then validate it.
         real_hmac = read_available(server.hmac.mac_length) || ""
 
-        @packet.append(server.cipher.final)
+        @packet.append(server.final_cipher)
         padding_length = @packet.read_byte
 
         payload = @packet.read(@packet_length - padding_length - 1)

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

@@ -93,6 +93,11 @@ module Net; module SSH; module Transport
       end
     end
 
+    # Returns true if the underlying socket has been closed.
+    def closed?
+      socket.closed?
+    end
+
     # Cleans up (see PacketStream#cleanup) and closes the underlying socket.
     def close
       socket.cleanup

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

@@ -16,9 +16,6 @@ module Net; module SSH; module Transport
     # The next packet sequence number for this socket endpoint.
     attr_reader :sequence_number
 
-    # The cipher algorithm in use for this socket endpoint.
-    attr_reader :cipher
-
     # The hmac algorithm in use for this endpoint.
     attr_reader :hmac
 
@@ -55,6 +52,8 @@ module Net; module SSH; module Transport
       @hmac = HMAC.get("none")
       @compression = nil
       @compressor = @decompressor = nil
+      @next_iv = nil
+      @cipher_needs_reset = false
     end
 
     # A convenience method for quickly setting multiple values in a single
@@ -66,6 +65,27 @@ module Net; module SSH; module Transport
       reset!
     end
 
+    # The cipher algorithm in use for this socket endpoint.
+    def cipher
+      if @cipher_needs_reset
+        @cipher.reset
+        @cipher.iv = @next_iv
+        @cipher_needs_reset = false
+      end
+
+      @cipher
+    end
+
+    def update_cipher(data)
+      @next_iv = data[-cipher.iv_len..-1]
+      cipher.update(data)
+    end
+
+    def final_cipher
+      @cipher_needs_reset
+      cipher.final
+    end
+
     # Increments the counters. The sequence number is incremented (and remapped
     # so it always fits in a 32-bit integer). The number of packets and blocks
     # are also incremented.

data/lib/net/ssh/version.rb

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

data/net-ssh.gemspec

@@ -1,14 +1,14 @@
 
-# Gem::Specification for Net-ssh-2.0.3
+# Gem::Specification for Net-ssh-2.0.4
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{net-ssh}
-  s.version = "2.0.3"
+  s.version = "2.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamis Buck"]
-  s.date = %q{2008-06-27}
+  s.date = %q{2008-08-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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net-ssh
 version: !ruby/object:Gem::Version 
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors: 
 - Jamis Buck
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-27 00:00:00 -06:00
+date: 2008-08-27 00:00:00 -06:00
 default_executable: 
 dependencies: []