ssh_scan 0.0.38.pre → 0.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58aac2fcecc90ba9f2ad0c148f10e7596a700e6d07257f0ba97808ec6b222ae2
-  data.tar.gz: 75c59e14931ddc0d849136ae371f83093eddf429b3919df6d5677b0af4104da8
+  metadata.gz: 2256af6879617ca3c773dfe970eb2614923210c5e12c4a0e0195b07de6bd5dd6
+  data.tar.gz: 33e2317b550a08fd59baf2a6d8f6472cef671422552aca00453a612b72c12bae
 SHA512:
-  metadata.gz: 5554e8a633d3a5aac0330956b6bcc0cbeee2f5b340bd6db874088f6120eaa1aad40634120937659df10092fb61878f819878b151715d7bec395d56d488e61f47
-  data.tar.gz: c7af58d84e3f90d21c6a47ad9e35c623b8f64443527a705011d75a54403c2d256eccd59998a24e6dfe1d62bba2245e4cbfbfa3fea0314f8d28dfd6b894c661b4
+  metadata.gz: aa9c2bcc2ba4a8b959a2518e74dc55851d6e631f260de76d711acc350e32ecd8e10746ea8792661276d10d40e8651b9203cea533a8ec02e241a39f8577c225e4
+  data.tar.gz: 9319c177d2cf3eaca666f54c29367293ff525be8d9e6f04d17529b9488905529a01994a6c9ef4c37901a918b8aec72b0d3f2675458fc786ad0b7a8ceac0f8cd9

data/bin/ssh_scan

@@ -8,6 +8,7 @@ require 'netaddr'
 require 'optparse'
 require 'ssh_scan'
 require 'logger'
+require 'yaml'
 
 #Default options
 options = {
@@ -18,7 +19,8 @@ options = {
   "threads" => 5,
   "verbosity" => nil,
   "logger" => Logger.new(STDERR),
-  "fingerprint_database" => ENV['HOME']+'/.ssh_scan_fingerprints.yml'
+  "fingerprint_database" => ENV['HOME']+'/.ssh_scan_fingerprints.yml',
+  "output_type" => "json"
 }
 
 # Reorder arguments before parsing
@@ -107,6 +109,11 @@ scan") do |file|
     $stdout.reopen(file, "w")
   end
 
+  opts.on("--output-type [json, yaml]",
+          "Format to write stdout to json or yaml") do |output_type|
+    options["output_type"] = output_type
+  end
+
   opts.on("-p", "--port [PORT]", Array,
           "Port (Default: 22)") do |ports|
     temp = []
@@ -225,39 +232,17 @@ unless File.exist?(options["policy"])
   exit 1
 end
 
-# Check to see if we're running the latest released version
-#if !options["suppress_update_status"]
-#  update = SSHScan::Update.new
-#  if update.newer_gem_available?
-#    options["logger"].warn(
-#      "You're NOT using the latest version of ssh_scan, try 'gem update \
-#ssh_scan' to get the latest"
-#    )
-#  else
-#    if update.errors.any?
-#      update.errors.each do |error|
-#        options["logger"].error(error)
-#      end
-#    else
-#      options["logger"].info(
-#        "You're using the latest version of ssh_scan #{SSHScan::VERSION}"
-#      )
-#    end
-#  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
-
 options["policy_file"] = SSHScan::Policy.from_file(options["policy"])
 
 # Perform scan and get results
 scan_engine = SSHScan::ScanEngine.new()
 results = scan_engine.scan(options)
 
-puts JSON.pretty_generate(results)
+if options["output_type"] == "yaml"
+  puts YAML.dump(results)
+elsif options["output_type"] == "json"
+  puts JSON.pretty_generate(results)
+end
 
 if options["unit_test"] == true
   results.each do |result|

data/lib/ssh_scan/version.rb

@@ -1,3 +1,3 @@
 module SSHScan
-  VERSION = '0.0.38.pre'
+  VERSION = '0.0.38'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssh_scan
 version: !ruby/object:Gem::Version
-  version: 0.0.38.pre
+  version: 0.0.38
 platform: ruby
 authors:
 - Jonathan Claudius
@@ -228,9 +228,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.2
 signing_key: