net-ssh 5.0.0.beta1 → 5.0.0.beta2

data/lib/net/ssh/verifiers/null.rb

@@ -1,12 +1,16 @@
-module Net; module SSH; module Verifiers
+module Net 
+  module SSH 
+    module Verifiers
+
+      # The Null host key verifier simply allows every key it sees, without
+      # bothering to verify. This is simple, but is not particularly secure.
+      class Null
+        # Returns true.
+        def verify(arguments)
+          true
+        end
+      end
 
-  # The Null host key verifier simply allows every key it sees, without
-  # bothering to verify. This is simple, but is not particularly secure.
-  class Null
-    # Returns true.
-    def verify(arguments)
-      true
     end
   end
-
-end; end; end
+end

data/lib/net/ssh/verifiers/secure.rb

@@ -1,52 +1,52 @@
 require 'net/ssh/errors'
 require 'net/ssh/known_hosts'
 
-module Net; module SSH; module Verifiers
-
-  # Does a strict host verification, looking the server up in the known
-  # host files to see if a key has already been seen for this server. If this
-  # server does not appear in any host file, an exception will be raised
-  # (HostKeyUnknown). This is in contrast to the "Strict" class, which will
-  # silently add the key to your known_hosts file. If the server does appear at
-  # least once, but the key given does not match any known for the server, an
-  # exception will be raised (HostKeyMismatch).
-  # Otherwise, this returns true.
-  class Secure
-    def verify(arguments)
-      host_keys = arguments[:session].host_keys
-
-      # We've never seen this host before, so raise an exception.
-      if host_keys.empty?
-        process_cache_miss(host_keys, arguments, HostKeyUnknown, "is unknown")
-      end
-
-      # If we found any matches, check to see that the key type and
-      # blob also match.
-      found = host_keys.any? do |key|
-        key.ssh_type == arguments[:key].ssh_type &&
-        key.to_blob  == arguments[:key].to_blob
-      end
-
-      # If a match was found, return true. Otherwise, raise an exception
-      # indicating that the key was not recognized.
-      unless found
-        process_cache_miss(host_keys, arguments, HostKeyMismatch, "does not match")
+module Net 
+  module SSH 
+    module Verifiers
+
+      # Does a strict host verification, looking the server up in the known
+      # host files to see if a key has already been seen for this server. If this
+      # server does not appear in any host file, an exception will be raised
+      # (HostKeyUnknown). This is in contrast to the "Strict" class, which will
+      # silently add the key to your known_hosts file. If the server does appear at
+      # least once, but the key given does not match any known for the server, an
+      # exception will be raised (HostKeyMismatch).
+      # Otherwise, this returns true.
+      class Secure
+        def verify(arguments)
+          host_keys = arguments[:session].host_keys
+    
+          # We've never seen this host before, so raise an exception.
+          process_cache_miss(host_keys, arguments, HostKeyUnknown, "is unknown") if host_keys.empty?
+    
+          # If we found any matches, check to see that the key type and
+          # blob also match.
+          found = host_keys.any? do |key|
+            key.ssh_type == arguments[:key].ssh_type &&
+            key.to_blob  == arguments[:key].to_blob
+          end
+    
+          # If a match was found, return true. Otherwise, raise an exception
+          # indicating that the key was not recognized.
+          process_cache_miss(host_keys, arguments, HostKeyMismatch, "does not match") unless found
+    
+          found
+        end
+    
+        private
+    
+        def process_cache_miss(host_keys, args, exc_class, message)
+          exception = exc_class.new("fingerprint #{args[:fingerprint]} " +
+                                    "#{message} for #{host_keys.host.inspect}")
+          exception.data = args
+          exception.callback = Proc.new do
+            host_keys.add_host_key(args[:key])
+          end
+          raise exception
+        end
       end
 
-      found
-    end
-
-    private
-
-    def process_cache_miss(host_keys, args, exc_class, message)
-      exception = exc_class.new("fingerprint #{args[:fingerprint]} " +
-                                "#{message} for #{host_keys.host.inspect}")
-      exception.data = args
-      exception.callback = Proc.new do
-        host_keys.add_host_key(args[:key])
-      end
-      raise exception
     end
   end
-
-end; end; end
+end

data/lib/net/ssh/verifiers/strict.rb

@@ -2,23 +2,27 @@ require 'net/ssh/errors'
 require 'net/ssh/known_hosts'
 require 'net/ssh/verifiers/secure'
 
-module Net; module SSH; module Verifiers
+module Net 
+  module SSH 
+    module Verifiers
 
-  # Does a strict host verification, looking the server up in the known
-  # host files to see if a key has already been seen for this server. If this
-  # server does not appear in any host file, this will silently add the
-  # server. If the server does appear at least once, but the key given does
-  # not match any known for the server, an exception will be raised (HostKeyMismatch).
-  # Otherwise, this returns true.
-  class Strict < Secure
-    def verify(arguments)
-      begin
-        super
-      rescue HostKeyUnknown => err
-        err.remember_host!
-        return true
+      # Does a strict host verification, looking the server up in the known
+      # host files to see if a key has already been seen for this server. If this
+      # server does not appear in any host file, this will silently add the
+      # server. If the server does appear at least once, but the key given does
+      # not match any known for the server, an exception will be raised (HostKeyMismatch).
+      # Otherwise, this returns true.
+      class Strict < Secure
+        def verify(arguments)
+          begin
+            super
+          rescue HostKeyUnknown => err
+            err.remember_host!
+            return true
+          end
+        end
       end
+
     end
   end
-
-end; end; end
+end

data/lib/net/ssh/version.rb

@@ -1,66 +1,68 @@
-module Net; module SSH
-  # A class for describing the current version of a library. The version
-  # consists of three parts: the +major+ number, the +minor+ number, and the
-  # +tiny+ (or +patch+) number.
-  #
-  # Two Version instances may be compared, so that you can test that a version
-  # of a library is what you require:
-  #
-  #   require 'net/ssh/version'
-  #
-  #   if Net::SSH::Version::CURRENT < Net::SSH::Version[2,1,0]
-  #     abort "your software is too old!"
-  #   end
-  class Version
-    include Comparable
+module Net
+  module SSH
+    # A class for describing the current version of a library. The version
+    # consists of three parts: the +major+ number, the +minor+ number, and the
+    # +tiny+ (or +patch+) number.
+    #
+    # Two Version instances may be compared, so that you can test that a version
+    # of a library is what you require:
+    #
+    #   require 'net/ssh/version'
+    #
+    #   if Net::SSH::Version::CURRENT < Net::SSH::Version[2,1,0]
+    #     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, pre = nil)
-      new(major, minor, tiny, pre)
-    end
+      # A convenience method for instantiating a new Version instance with the
+      # given +major+, +minor+, and +tiny+ components.
+      def self.[](major, minor, tiny, pre = nil)
+        new(major, minor, tiny, pre)
+      end
 
-    attr_reader :major, :minor, :tiny
+      attr_reader :major, :minor, :tiny
 
-    # Create a new Version object with the given components.
-    def initialize(major, minor, tiny, pre = nil)
-      @major, @minor, @tiny, @pre = major, minor, tiny, pre
-    end
+      # Create a new Version object with the given components.
+      def initialize(major, minor, tiny, pre = nil)
+        @major, @minor, @tiny, @pre = major, minor, tiny, pre
+      end
 
-    # Compare this version to the given +version+ object.
-    def <=>(version)
-      to_i <=> version.to_i
-    end
+      # Compare this version to the given +version+ object.
+      def <=>(version)
+        to_i <=> version.to_i
+      end
 
-    # Converts this version object to a string, where each of the three
-    # version components are joined by the '.' character. E.g., 2.0.0.
-    def to_s
-      @to_s ||= [@major, @minor, @tiny, @pre].compact.join(".")
-    end
+      # Converts this version object to a string, where each of the three
+      # version components are joined by the '.' character. E.g., 2.0.0.
+      def to_s
+        @to_s ||= [@major, @minor, @tiny, @pre].compact.join(".")
+      end
 
-    # Converts this version to a canonical integer that may be compared
-    # against other version objects.
-    def to_i
-      @to_i ||= @major * 1_000_000 + @minor * 1_000 + @tiny
-    end
+      # Converts this version to a canonical integer that may be compared
+      # against other version objects.
+      def to_i
+        @to_i ||= @major * 1_000_000 + @minor * 1_000 + @tiny
+      end
 
-    # The major component of this version of the Net::SSH library
-    MAJOR = 5
+      # The major component of this version of the Net::SSH library
+      MAJOR = 5
 
-    # The minor component of this version of the Net::SSH library
-    MINOR = 0
+      # The minor component of this version of the Net::SSH library
+      MINOR = 0
 
-    # The tiny component of this version of the Net::SSH library
-    TINY  = 0
+      # The tiny component of this version of the Net::SSH library
+      TINY  = 0
 
-    # The prerelease component of this version of the Net::SSH library
-    # nil allowed
-    PRE   = "beta1"
+      # The prerelease component of this version of the Net::SSH library
+      # nil allowed
+      PRE   = "beta2"
 
-    # The current version of the Net::SSH library as a Version instance
-    CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)
+      # The current version of the Net::SSH library as a Version instance
+      CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)
 
-    # The current version of the Net::SSH library as a String
-    STRING = CURRENT.to_s
+      # The current version of the Net::SSH library as a String
+      STRING = CURRENT.to_s
+    end
   end
-end; end
+end

data/net-ssh.gemspec

@@ -1,4 +1,4 @@
-# coding: utf-8
+
 require_relative 'lib/net/ssh/version'
 
 Gem::Specification.new do |spec|
@@ -29,14 +29,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   unless ENV['NET_SSH_NO_ED25519']
-    spec.add_development_dependency("ed25519", "~> 1.2")
     spec.add_development_dependency("bcrypt_pbkdf", "~> 1.0") unless RUBY_PLATFORM == "java"
+    spec.add_development_dependency("ed25519", "~> 1.2")
   end
 
   spec.add_development_dependency "bundler", "~> 1.11"
 
-  spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "minitest", "~> 5.10"
-  spec.add_development_dependency "rubocop", "~> 0.47.0"
   spec.add_development_dependency "mocha", ">= 1.2.1"
+  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rubocop", "~> 0.54.0"
 end

data/support/ssh_tunnel_bug.rb

@@ -39,8 +39,8 @@ puts "Configure your browser proxy to localhost:#{LOCAL_PORT}"
 begin
   session = Net::SSH.start(host, user, password: pass)  
   session.forward.local(LOCAL_PORT, host, PROXY_PORT)
-  session.loop{true}
-rescue => e
+  session.loop {true}
+rescue StandardError => e
   puts e.message
   puts e.backtrace
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta1
+  version: 5.0.0.beta2
 platform: ruby
 authors:
 - Jamis Buck
@@ -32,36 +32,36 @@ cert_chain:
   ZFwoIuXKeDmTTpryd/vI7sdLXDuV6MbWOLGh6gXn9RDDXG1EqEXW0bjovATBMpdH
   9OGohJvAFzcvhDTWPwT6w3PG5B80pqb9j1hEAg==
   -----END CERTIFICATE-----
-date: 2018-03-11 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ed25519
+  name: bcrypt_pbkdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: bcrypt_pbkdf
+  name: ed25519
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -77,61 +77,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '5.10'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.0
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.0
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 0.54.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 0.54.0
 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.'
@@ -172,6 +172,7 @@ files:
 - lib/net/ssh/authentication/methods/password.rb
 - lib/net/ssh/authentication/methods/publickey.rb
 - lib/net/ssh/authentication/pageant.rb
+- lib/net/ssh/authentication/pub_key_fingerprint.rb
 - lib/net/ssh/authentication/session.rb
 - lib/net/ssh/buffer.rb
 - lib/net/ssh/buffered_io.rb