ssh_scan 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d24a75be619ed3b8567cce7be9e5ac20b0acd720
-  data.tar.gz: 65d64750b90635a8e146752fc74671150cbfddf0
+  metadata.gz: 3a533f0fb3e5546f5453e8aa849e6319e89018da
+  data.tar.gz: 1277467584f2809bc0e6bf7c7e39ea2bd9d45a02
 SHA512:
-  metadata.gz: 699dadeff7f4c746b64f08e9119bc19c2186f79a07843e202b98b7e05178ef10cea6b728e355dab134e2aa33f0c95cb2a4b229a0aa3fa3277f9dc0b1e969fc3b
-  data.tar.gz: 612f62c3345e61807a0fee2a021b3a7f8d83d3e2fb10ad32c7f2acee1929c91f8759e30c46c823c9ea91d9c2390e55e18b0d9989c269ee1b0a7ea3af62fd778c
+  metadata.gz: 3f0e8efa6ec04d54c5cdfebc3b826f4a12a5bd74142101724f829ecc81fcce510101eb3bc498e886435b49aaaa4cb565666ce6967c3b291e382178bc4086cd80
+  data.tar.gz: 0cfe6cb0c6c3e3316511312d48f5cbfc3d97bc869e27870b5174fe95fa62be24d853d1cdd232abcf590235bb8a2151e4d527e7c983d341c0c6074b7000e2c01e

data/data/fingerprints.yml

@@ -1,5 +1,2 @@
 ---
-45.55.176.164:
-- 4f:17:6e:38:63:0c:af:1c:f4:97:4f:ab:04:b4:47:a0
-- 8c:71:d0:85:e5:2e:4c:24:34:4b:97:0a:af:37:f4:09:41:8d:ae:6d
-- b5:b1:f8:2f:99:4e:88:bc:9d:6c:81:2b:9f:1c:db:44:2d:dd:e5:66:cb:49:bf:7e:e1:1a:a2:5f:d1:39:d2:16
+128.65.210.21: []

data/lib/ssh_scan/client.rb

@@ -1,4 +1,5 @@
 require 'socket'
+require 'timeout'
 require 'ssh_scan/constants'
 require 'ssh_scan/protocol'
 require 'ssh_scan/banner'
@@ -43,12 +44,15 @@ module SSHScan
       @error = nil
 
       begin
-        @sock = Socket.tcp(@ip, @port, connect_timeout: @timeout)
-        @raw_server_banner = @sock.gets
+        Timeout::timeout(@timeout) {
+          @sock = Socket.tcp(@ip, @port, connect_timeout: @timeout)
+          @raw_server_banner = @sock.gets
+        }
       rescue SocketError => e
         @error = SSHScan::Error::ConnectionRefused.new(e.message)
         @sock = nil
-      rescue Errno::ETIMEDOUT => e
+      rescue Errno::ETIMEDOUT,
+             Timeout::Error => e
         @error = SSHScan::Error::ConnectTimeout.new(e.message)
         @sock = nil
       rescue Errno::ECONNREFUSED => e
@@ -94,23 +98,28 @@ module SSHScan
         return nil
       end
 
-      begin
-        @sock.write(kex_init_raw)
-        resp = @sock.read(4)
+      kex_exchange_init = nil
 
-        if resp.nil?
-          @error = SSHScan::Error::NoKexResponse.new(
-            "service did not respond to our kex init request"
-          )
-          @sock = nil
-          return nil
-        end
-
-        resp += @sock.read(resp.unpack("N").first)
-        @sock.close
+      begin
+        Timeout::timeout(@timeout) {
+          @sock.write(kex_init_raw)
+          resp = @sock.read(4)
+
+          if resp.nil?
+            @error = SSHScan::Error::NoKexResponse.new(
+              "service did not respond to our kex init request"
+            )
+            @sock = nil
+            return nil
+          end
+
+          resp += @sock.read(resp.unpack("N").first)
+          @sock.close
 
-        kex_exchange_init = SSHScan::KeyExchangeInit.read(resp)
-      rescue Errno::ETIMEDOUT => e
+          kex_exchange_init = SSHScan::KeyExchangeInit.read(resp)
+        }
+      rescue Errno::ETIMEDOUT,
+             Timeout::Error => e
         @error = SSHScan::Error::ConnectTimeout.new(e.message)
         @sock = nil
         return nil

data/lib/ssh_scan/scan_engine.rb

@@ -107,7 +107,7 @@ module SSHScan
         net_ssh_session.close
       rescue Net::SSH::ConnectionTimeout => e
         result.error = SSHScan::Error::ConnectTimeout.new(e.message)
-      rescue Net::SSH::Disconnect => e
+      rescue Net::SSH::Disconnect, Errno::ECONNRESET => e
         result.error = SSHScan::Error::Disconnected.new(e.message)
       rescue Net::SSH::Exception => e
         if e.to_s.match(/could not settle on/)

data/lib/ssh_scan/version.rb

@@ -1,3 +1,3 @@
 module SSHScan
-  VERSION = '0.0.26'
+  VERSION = '0.0.27'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssh_scan
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Jonathan Claudius
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata