ssh_scan 0.0.36 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7760b60b6fa4f036f588147286c1049b440bd80405de36ecb50632e71d30ec8
-  data.tar.gz: af61813309a141954d6569308ed9d7c74f9872d7e73ef2ae76898828714e8600
+  metadata.gz: 195a5119e3da26d5ec580e04515eaebc535a14a6339876bd1f706613ed7e5e66
+  data.tar.gz: c3a7c0ed4c3dc3856f947d351fa2fca337c0087ffa35d6bca72718dbdba9f034
 SHA512:
-  metadata.gz: daa1acd4b9fcd8b0a5b7fd301e0360137c61f068cb0b343db402c6d5e82fbb62f814acb3d4809bca0b35aaeaf7f98d58f8b73bcb89cdfc904e5358fdac45f9e9
-  data.tar.gz: 288603cba2a480716ba48dddd3fda0632e91d6dbbbefd5f47353b46846ce41babf722ec7b755780e960071d81a30744527410b485257822e2d6b6fa12477cbca
+  metadata.gz: c12b131fe0ea8f32572479f50ad75325346e4bded4e37b83d73a6405b60d06d3e20657108b1cd61554497896039da0562273c5f91bf95d37ead4c7b74105a67d
+  data.tar.gz: 35fd82e8beca94d613992d8db2cee74955c822d9bfbaed291bf15d19f73a6acff827c6af5212d35db36cb5374e017272bedfeecd97c1f6b62db4bd462f6ad893

data/bin/ssh_scan

@@ -18,7 +18,7 @@ options = {
   "threads" => 5,
   "verbosity" => nil,
   "logger" => Logger.new(STDERR),
-  "fingerprint_database" => File.join(File.dirname(__FILE__),"../data/fingerprints.yml")
+  "fingerprint_database" => ENV['HOME']+'/.ssh_scan_fingerprints.yml'
 }
 
 # Reorder arguments before parsing
@@ -247,9 +247,9 @@ end
 #end
 
 # Limit scope of fingerprints DB to (per scan)
-if options["fingerprint_database"] && File.exists?(options["fingerprint_database"])
-  File.unlink(options["fingerprint_database"])
-end
+# if options["fingerprint_database"] && File.exists?(options["fingerprint_database"])
+#   File.unlink(options["fingerprint_database"])
+# end
 
 options["policy_file"] = SSHScan::Policy.from_file(options["policy"])
 

data/lib/ssh_scan/constants.rb

@@ -50,43 +50,5 @@ d6374722c6165733235362d63747200000021686d61632d6d6435\
 00021686d61632d6d64352c686d61632d736861312c686d61632d\
 726970656d64313630000000046e6f6e65000000046e6f6e65000\
 000000000000000000000006e05b3b4".freeze
-
-    CONTRIBUTE_JSON = {
-      :name => "ssh_scan api",
-      :description => "An api for performing ssh compliance \
-and policy scanning",
-      :repository => {
-        :url => "https://github.com/mozilla/ssh_scan",
-        :tests => "https://travis-ci.org/mozilla/ssh_scan",
-      },
-      :participate => {
-        :home => "https://github.com/mozilla/ssh_scan",
-        :docs => "https://github.com/mozilla/ssh_scan",
-        :irc => "irc://irc.mozilla.org/#infosec",
-        :irc_contacts => [
-          "claudijd",
-          "pwnbus",
-          "kang",
-        ],
-        :gitter => "https://gitter.im/mozilla-ssh_scan/Lobby",
-        :gitter_contacts => [
-          "claudijd",
-          "pwnbus",
-          "kang",
-          "jinankjain",
-          "agaurav77"
-        ],
-      },
-      :bugs => {
-        :list => "https://github.com/mozilla/ssh_scan/issues",
-      },
-      :keywords => [
-        "ruby",
-        "sinatra",
-      ],
-      :urls => {
-        :dev => "https://sshscan.rubidus.com",
-      }
-    }.freeze
   end
 end

data/lib/ssh_scan/scan_engine.rb

@@ -1,7 +1,8 @@
 require 'socket'
 require 'ssh_scan/client'
 require 'ssh_scan/crypto'
-#require 'ssh_scan/fingerprint_database'
+require 'ssh_scan/fingerprint_database'
+require 'ssh_scan/subprocess'
 require 'net/ssh'
 require 'logger'
 require 'open3'
@@ -122,17 +123,10 @@ module SSHScan
 
       output = ""
 
-      begin
-        Timeout::timeout(timeout) {
-          stdin, stdout, stderr, wait_thr = Open3.popen3('ssh-keyscan', '-t', 'rsa,dsa', '-p', port.to_s, target)
-          output = stdout.gets(nil) if port.nil?
-          stdout.close
-          output = stderr.gets(nil) if !port.nil?
-          stderr.close
-          exit_code = wait_thr.value
-        }
-      rescue Timeout::Error
-        #nop
+      cmd = ['ssh-keyscan', '-t', 'rsa,dsa', '-p', port.to_s, target].join(" ")
+
+      Utils::Subprocess.new(cmd) do |stdout, stderr, thread|
+        output += stdout
       end
 
       host_keys = output.split

data/lib/ssh_scan/subprocess.rb

@@ -0,0 +1,26 @@
+require 'open3'
+
+module Utils
+  class Subprocess
+    def initialize(cmd, &block)
+      # see: http://stackoverflow.com/a/1162850/83386
+      Open3.popen3(cmd) do |stdin, stdout, stderr, thread|
+        # read each stream from a new thread
+        { :out => stdout, :err => stderr }.each do |key, stream|
+          Thread.new do
+            until (line = stream.gets).nil? do
+              # yield the block depending on the stream
+              if key == :out
+                yield line, nil, thread if block_given?
+              else
+                yield nil, line, thread if block_given?
+              end
+            end
+          end
+        end
+
+        thread.join # don't exit until the external process is done
+      end
+    end
+  end
+end

data/lib/ssh_scan/version.rb

@@ -1,3 +1,3 @@
 module SSHScan
-  VERSION = '0.0.36'
+  VERSION = '0.0.37'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssh_scan
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors:
 - Jonathan Claudius
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -158,7 +158,6 @@ files:
 - config/policies/mozilla_intermediate.yml
 - config/policies/mozilla_modern.yml
 - data/README
-- data/fingerprints.yml
 - lib/ssh_scan.rb
 - lib/ssh_scan/attribute.rb
 - lib/ssh_scan/banner.rb
@@ -207,6 +206,7 @@ files:
 - lib/ssh_scan/ssh_lib/rosssh.rb
 - lib/ssh_scan/ssh_lib/sentryssh.rb
 - lib/ssh_scan/ssh_lib/unknown.rb
+- lib/ssh_scan/subprocess.rb
 - lib/ssh_scan/target_parser.rb
 - lib/ssh_scan/update.rb
 - lib/ssh_scan/version.rb
@@ -232,8 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Ruby-based SSH Scanner

data/data/fingerprints.yml

@@ -1,2 +0,0 @@
----
-98.207.250.115: []