net-ssh 3.1.0.beta3 → 3.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9170e4ec18254639ebeab82be271d685637f44f
-  data.tar.gz: 02f77daa8e46de9274ee27a9c2a432a3283df456
+  metadata.gz: 1186f0f901ff1e9fcfa25d956c044ee53a54bee8
+  data.tar.gz: edac339140a2f3d294dd1cd2035c53a205178634
 SHA512:
-  metadata.gz: b5c05d3ed42d10f531f644c6eed5d57e481a5c67f0948f17b2e410371e447bcf472293c3821cc66c54eaff6be4d144184e6be92a264402003b552417f6fe7853
-  data.tar.gz: 2014b67019c22d96d73248e90a0c086d90b0824c77b6fe23786dd6a33c38264b60d135f1aacd06087319668d59327c62fc7b9861ec873b8f8d120a14e9e27e5d
+  metadata.gz: ab441807f815f8e6a6ef089643dcb90e2cbcf288aedb63b28f4892ec7daf20f8a2da962e797b7ff7e7454c51f83437dd2a9f61922a982d06caa7fc2692f32fcf
+  data.tar.gz: a393728bbe3395b1a118d43864c414f421cff17061500ad59143c25fafd1c704f7e42b137fb1ad05dde4ec43f78b1c22fe7b4d1675f2f0f639bb6d8f91774542

data/CHANGES.txt

@@ -1,3 +1,8 @@
+=== 3.1.0.rc1
+
+* fix Secure#verify [Jean Boussier]
+* use the smallest of don't spend longer time than keepalive if it's configured [Eugene Kenny]
+
 === 3.1.0.beta3
 
 * forward/on_open_failed should stop listning closed socket otherwise it locks #269 [Miklos Fazekas,Scott McGillivray]

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

@@ -609,9 +609,11 @@ module Net; module SSH; module Connection
       end
 
       def io_select_wait(wait)
-        return wait if wait
-        return wait unless @keepalive.enabled?
-        @keepalive.interval
+        if @keepalive.enabled?
+          [wait, @keepalive.interval].compact.min
+        else
+          wait
+        end
       end
 
       MAP = Constants.constants.inject({}) do |memo, name|

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

@@ -30,7 +30,7 @@ module Net; module SSH; module Verifiers
       # 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, HostKeyMismatch, "does not match")
+        process_cache_miss(host_keys, arguments, HostKeyMismatch, "does not match")
       end
 
       found

data/lib/net/ssh/version.rb

@@ -55,7 +55,7 @@ module Net; module SSH
 
     # The prerelease component of this version of the Net::SSH library 
     # nil allowed
-    PRE   = "beta3"
+    PRE   = "rc1"
 
     # The current version of the Net::SSH library as a Version instance
     CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)

data/net-ssh.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: net-ssh 3.1.0.beta3 ruby lib
+# stub: net-ssh 3.1.0.rc1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "net-ssh"
-  s.version = "3.1.0.beta3"
+  s.version = "3.1.0.rc1"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jamis Buck", "Delano Mandelbaum", "Mikl\u{f3}s Fazekas"]
   s.cert_chain = ["net-ssh-public_cert.pem"]
-  s.date = "2016-03-07"
+  s.date = "2016-03-12"
   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 = [
@@ -184,7 +184,8 @@ Gem::Specification.new do |s|
     "test/transport/test_packet_stream.rb",
     "test/transport/test_server_version.rb",
     "test/transport/test_session.rb",
-    "test/transport/test_state.rb"
+    "test/transport/test_state.rb",
+    "test/verifiers/test_secure.rb"
   ]
   s.homepage = "https://github.com/net-ssh/net-ssh"
   s.licenses = ["MIT"]

data/test/connection/test_session.rb

@@ -427,6 +427,14 @@ module Connection
       session(options).process
     end
 
+    def test_process_should_call_io_select_with_wait_if_provided_and_minimum
+      timeout = 10
+      wait = 5
+      options = { :keepalive => true, :keepalive_interval => timeout }
+      IO.expects(:select).with([socket],[],nil,wait).returns([[],[],[]])
+      session(options).process(wait)
+    end
+
     def test_loop_should_call_process_until_process_returns_false
       IO.stubs(:select).with([socket],[],nil,nil).returns([[],[],[]])
       session.expects(:process).with(nil).times(4).returns(true,true,true,false).yields

data/test/verifiers/test_secure.rb

@@ -0,0 +1,40 @@
+require 'common'
+require 'net/ssh/verifiers/secure'
+require 'ostruct'
+
+class TestSecure < Test::Unit::TestCase
+  def test_raises_unknown_key_error_if_empty
+    secure_verifier = Net::SSH::Verifiers::Secure.new
+    host_keys = []
+    def host_keys.host
+      'foo'
+    end
+    assert_raises(Net::SSH::HostKeyUnknown) {
+      secure_verifier.verify(session:OpenStruct.new(host_keys:host_keys))
+    }
+  end
+
+  def test_passess_if_sam
+    secure_verifier = Net::SSH::Verifiers::Secure.new
+    key = OpenStruct.new(ssh_type:'key_type',to_blob:'keyblob')
+    host_keys = [key]
+    def host_keys.host
+      'foo'
+    end
+    secure_verifier.verify(session:OpenStruct.new(host_keys:host_keys), key:key)
+  end
+
+  def test_raises_mismatch_error_if_not_the_same
+    secure_verifier = Net::SSH::Verifiers::Secure.new
+    key_in_known_hosts = OpenStruct.new(ssh_type:'key_type',to_blob:'keyblob')
+    key_actual = OpenStruct.new(ssh_type:'key_type',to_blob:'not keyblob')
+
+    host_keys = [key_in_known_hosts]
+    def host_keys.host
+      'foo'
+    end
+    assert_raises(Net::SSH::HostKeyMismatch) {
+      secure_verifier.verify(session:OpenStruct.new(host_keys:host_keys), key:key_actual)
+    }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 3.1.0.beta3
+  version: 3.1.0.rc1
 platform: ruby
 authors:
 - Jamis Buck
@@ -31,7 +31,7 @@ cert_chain:
   s/ZUKye79ELwFYKJOhjW5g725OL3hy+llhEleytwKRwgXFQBPTC4f5UkdxZVVWGH
   e2C9M1m/2odPZo8h
   -----END CERTIFICATE-----
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -236,6 +236,7 @@ files:
 - test/transport/test_server_version.rb
 - test/transport/test_session.rb
 - test/transport/test_state.rb
+- test/verifiers/test_secure.rb
 homepage: https://github.com/net-ssh/net-ssh
 licenses:
 - MIT