ssh_scan 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48513bc99f2006e93467bc3ceedc6ac3e0796051
-  data.tar.gz: 6a97bf4458070837295a311580576144c5d6c50a
+  metadata.gz: 1066cba29c8d997c6924ebc2155fa4ecc91d382c
+  data.tar.gz: 10880af54befeb4d528e91e15e17d9827578734b
 SHA512:
-  metadata.gz: 374b93e8d788baad6c862309e720a212a9f1bbf937e0052c5f6c874bdd8cca4146f6fb8486777b51627c78f53ba4b620207b0c5a020074a9c25f6643b87423da
-  data.tar.gz: 19def23166c22b188d09f2a21de66973bb2759c530d13e1a500eafc3834d7b1e7943802e47331edb62c3621a79b04e4f038067848c42b243839bb9fceb25e39b
+  metadata.gz: 698760530885d0c3288f426d9aa97eb2d84462d636c2509acacdbaaa2e24d9c4c53869abc7cb93d741b9dc16f29df6e18426909e0bc91a6fb70c3387b2a2a3ab
+  data.tar.gz: 683e352aec4ce7c2d7fc90ac56fbb050324017d4b155e690ea5ff92445e34eaba460c31cda5b487cda48a2e1f33b8122af2e6dfac30e65caf4ae147180878a6e

data/data/fingerprints.yml

@@ -1,5 +1,5 @@
 ---
-63.245.214.149:
-- 17:97:3a:64:83:4e:4f:fd:5d:d1:f5:fc:d5:9a:fb:15
-- 01:89:8a:f1:07:52:47:54:a5:58:99:77:23:0b:63:a5:d8:07:80:12
-- 23:4e:2e:30:8e:bd:bb:ae:65:55:57:a9:df:70:8c:c6:ac:48:18:f7:a0:3b:1e:ba:aa:c2:f4:d4:e6:f4:4b:6a
+45.55.203.36:
+- 1b:21:eb:44:cd:3c:17:63:fa:6c:b2:58:11:ce:98:f4
+- 88:74:a1:9e:b9:38:a0:a8:ac:2d:bd:82:eb:09:a0:49:84:dc:b8:c6
+- 93:6c:b4:26:21:a8:ff:50:e9:e0:37:7b:2c:71:ea:e2:7e:6f:30:60:2e:8e:d2:b6:d7:8d:0a:78:a5:da:2c:76

data/lib/ssh_scan/client.rb

@@ -28,6 +28,17 @@ module SSHScan
       @server_banner
     end
 
+    def close()
+      begin
+        unless @sock.nil?
+          @sock.close
+        end
+      rescue
+        @sock = nil
+      end
+      return true
+    end
+
     def connect()
       @error = nil
 

data/lib/ssh_scan/result.rb

@@ -211,6 +211,10 @@ module SSHScan
       @error = error.to_s
     end
 
+    def unset_error
+      @error = nil
+    end
+
     def error?
       !@error.nil?
     end

data/lib/ssh_scan/scan_engine.rb

@@ -36,9 +36,10 @@ module SSHScan
           client = SSHScan::Client.new(
             target.resolve_fqdn_as_ipv4.to_s, port, timeout
           )
-          client.connect()
+          client.connect
           result.set_client_attributes(client)
           kex_result = client.get_kex_result()
+          client.close
           result.set_kex_result(kex_result) unless kex_result.nil?
           result.error = client.error if client.error?
         # If it does resolve as IPv6, we're try IPv6
@@ -46,20 +47,23 @@ module SSHScan
           client = SSHScan::Client.new(
             target.resolve_fqdn_as_ipv6.to_s, port, timeout
           )
-          client.connect()
+          client.connect
           result.set_client_attributes(client)
           kex_result = client.get_kex_result()
+          client.close
           result.set_kex_result(kex_result) unless kex_result.nil?
           result.error = client.error if client.error?
 
           # If resolves as IPv6, but somehow we get an client error, fall-back to IPv4
           if result.error?
+            result.unset_error
             client = SSHScan::Client.new(
               target.resolve_fqdn_as_ipv4.to_s, port, timeout
             )
             client.connect()
             result.set_client_attributes(client)
             kex_result = client.get_kex_result()
+            client.close
             result.set_kex_result(kex_result) unless kex_result.nil?
             result.error = client.error if client.error?
           end
@@ -69,6 +73,7 @@ module SSHScan
         client.connect()
         result.set_client_attributes(client)
         kex_result = client.get_kex_result()
+        client.close
 
         unless kex_result.nil?
           result.set_kex_result(kex_result)

data/lib/ssh_scan/target_parser.rb

@@ -28,7 +28,11 @@ module SSHScan
           end
           return ip_array
         elsif ip.include? "/"
-          cidr = NetAddr::CIDR.create(ip)
+          begin
+            cidr = NetAddr::CIDR.create(ip)
+          rescue
+            raise ArgumentError, "Invalid target: #{ip}"
+          end
           ip_array = cidr.enumerate
           ip_array.delete(cidr.network)
           ip_array.delete(cidr.last)

data/lib/ssh_scan/version.rb

@@ -1,3 +1,3 @@
 module SSHScan
-  VERSION = '0.0.23'
+  VERSION = '0.0.24'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssh_scan
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Jonathan Claudius
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata