ssh_scan 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a161adf0202c747f948c9161675b567c6b715b4f
-  data.tar.gz: 5533118de4e0f7ef6eb26bc60adb915ffbde9cae
+  metadata.gz: 48513bc99f2006e93467bc3ceedc6ac3e0796051
+  data.tar.gz: 6a97bf4458070837295a311580576144c5d6c50a
 SHA512:
-  metadata.gz: 1c7f1fc49e71437001aa5e6cd8f8d63cadc127dde727d469e6d94002533a3f525eb69ce364d40dcf28cce05dcaf17dcb757bb51615a36f5b6497d6a289d6529d
-  data.tar.gz: 654a3c0ec780433fadd09db4bb0eb77f18bc60dc088c28e6073a8876d2f3fe717dd568180347bcc31ce8834fd5e30c4b83a19cff8ba01979587f16f40aacc403
+  metadata.gz: 374b93e8d788baad6c862309e720a212a9f1bbf937e0052c5f6c874bdd8cca4146f6fb8486777b51627c78f53ba4b620207b0c5a020074a9c25f6643b87423da
+  data.tar.gz: 19def23166c22b188d09f2a21de66973bb2759c530d13e1a500eafc3834d7b1e7943802e47331edb62c3621a79b04e4f038067848c42b243839bb9fceb25e39b

data/bin/ssh_scan

@@ -14,7 +14,7 @@ options = {
   "sockets" => [],
   "policy" => File.join(File.dirname(__FILE__),"../config/policies/mozilla_modern.yml"),
   "unit_test" => false,
-  "timeout" => 2,
+  "timeout" => 5,
   "threads" => 5,
   "verbosity" => nil,
   "logger" => Logger.new(STDERR),

data/data/fingerprints.yml

@@ -0,0 +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

data/lib/ssh_scan/result.rb

@@ -174,7 +174,7 @@ module SSHScan
     end
 
     def duplicate_host_key_ips
-      @duplicate_host_key_ips
+      @duplicate_host_key_ips.to_a
     end
 
     def auth_methods()
@@ -220,11 +220,11 @@ module SSHScan
     end
 
     def grade=(grade)
-      @compliance_grade = grade
+      @compliance[:grade] = grade
     end
 
     def grade
-      @compliance_grade
+      @compliance[:grade] 
     end
 
     def to_hash
@@ -258,7 +258,7 @@ module SSHScan
       }
 
       if self.error?
-        hashed_object.error = self.error
+        hashed_object["error"] = self.error
       end
 
       hashed_object

data/lib/ssh_scan/scan_engine.rb

@@ -19,6 +19,7 @@ module SSHScan
       if port.nil?
         port = 22
       end
+
       timeout = opts["timeout"]
       
       result = SSHScan::Result.new()
@@ -68,11 +69,14 @@ module SSHScan
         client.connect()
         result.set_client_attributes(client)
         kex_result = client.get_kex_result()
-        result.set_kex_result(kex_result)
+
+        unless kex_result.nil?
+          result.set_kex_result(kex_result)
+        end
 
         # Attempt to suppliment a hostname that wasn't provided
         result.hostname = target.resolve_ptr
-        
+
         result.error = client.error if client.error?
       end
 
@@ -228,8 +232,7 @@ module SSHScan
           result.set_compliance = policy_mgr.compliance_results
 
           if result.compliance_policy
-            grader = SSHScan::Grader.new(result)
-            result.grade = grader.grade
+            result.grade = SSHScan::Grader.new(result).grade
           end
         end
       end

data/lib/ssh_scan/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssh_scan
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Jonathan Claudius
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -158,6 +158,7 @@ files:
 - config/policies/mozilla_intermediate.yml
 - config/policies/mozilla_modern.yml
 - data/README
+- data/fingerprints.yml
 - data/ssh-badkeys/LICENSE
 - data/ssh-badkeys/README.md
 - data/ssh-badkeys/authorized/array-networks-vapv-vxag.key