ssh_scan 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1f38d061727ec16f24abe9fa799d74d928764ca
-  data.tar.gz: 1c6e40fa5041aaa45dbaa3fc7a1586ffb19a63f1
+  metadata.gz: 7ed1c774b96d1bb34de978e7c39e82d2206e340f
+  data.tar.gz: 873692c2cd13f0aac4e1bc7842deb2cc6858af7e
 SHA512:
-  metadata.gz: 6504a3a993c90eafdad3be8bd6d63cc11d1dae76260e38e9608939d2525ea6602d7ef24eda0ee43f762bfcf48a08a2b2bdead68f083d946a71f6f234283d93fc
-  data.tar.gz: b21c3e244f176cee08ea1d817e842dbb7cb5effeda59136777b81f0364478d30e2b8e8b209e9b68cd66a334ac1043b062808cd183e3c765997d7819692dd9efc
+  metadata.gz: 25227d81b0b50a3576b8be8266a76fb70e7cac3d72b5c0ac3a764e57b0532fa2541e025e2322139517a1e4661dc049c26af6b6629090402783cf58819a7dcf4d
+  data.tar.gz: fb790b5ddccedcc27d781b9795b5c49b3ad51546fbb9e68b7d434239f5d58047d97e0e02a7c59a15a5f536b32aad7d92d8b981bf97b02e4886321f97566aa509

data/.travis.yml

@@ -11,16 +11,13 @@ matrix:
       - LABEL=unit_tests
     after_success:
       - coveralls
-  - rvm: 2.3.0
-    env:
-      - LABEL=unit_tests
-  - rvm: 2.2.0
+  - rvm: 2.4.1
     env:
       - LABEL=unit_tests
-  - rvm: 2.1.3
+  - rvm: 2.3.0
     env:
       - LABEL=unit_tests
-  - rvm: 2.0.0
+  - rvm: 2.2.0
     env:
       - LABEL=unit_tests
   - rvm: 2.3.0

data/bin/ssh_scan

@@ -226,25 +226,25 @@ unless File.exist?(options["policy"])
 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
+#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"])

data/lib/ssh_scan/version.rb

@@ -1,3 +1,3 @@
 module SSHScan
-  VERSION = '0.0.19'
+  VERSION = '0.0.20'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssh_scan
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Jonathan Claudius
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -144,8 +144,6 @@ description: A Ruby-based SSH scanner for configuration and policy scanning
 email: jclaudius@mozilla.com
 executables:
 - ssh_scan
-- ssh_scan_worker
-- ssh_scan_worker_example_config.yml
 extensions: []
 extra_rdoc_files: []
 files:
@@ -157,11 +155,8 @@ files:
 - README.md
 - Rakefile
 - bin/ssh_scan
-- bin/ssh_scan_worker
-- bin/ssh_scan_worker_example_config.yml
 - config/policies/mozilla_intermediate.yml
 - config/policies/mozilla_modern.yml
-- config/worker/config.yml
 - data/README
 - data/ssh-badkeys/LICENSE
 - data/ssh-badkeys/README.md
@@ -391,7 +386,6 @@ files:
 - lib/ssh_scan/target_parser.rb
 - lib/ssh_scan/update.rb
 - lib/ssh_scan/version.rb
-- lib/ssh_scan/worker.rb
 - lib/string_ext.rb
 - ssh_scan.gemspec
 homepage: http://rubygems.org/gems/ssh_scan

data/bin/ssh_scan_worker

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-$:.unshift File.join(File.dirname(__FILE__), "../lib")
-
-require 'ssh_scan'
-
-# Get the worker config from command-line or via an example location
-config_file = ARGV[0] ||
-              File.join(
-                File.dirname(__FILE__),
-                "../config/worker/config.yml"
-              )
-
-worker = SSHScan::Worker.from_config_file(config_file)
-worker.run!

data/config/worker/config.yml

@@ -1,22 +0,0 @@
-# The location of the API server
-server: 127.0.0.1
-
-# The port of the API server
-port: 8000
-
-# Scheme (http/https)
-# http - useful for development
-# https - recommended for production
-scheme: http
-
-# SSL/TLS verify - has no effect is scheme is not set to https
-# false - don't verify SSL/TLS (useful for development)
-# true - verify SSL/TLS (recommended for production)
-verify: false
-
-# Where to send worker logs to (default: STDOUT)
-#logger: ./bin/ssh_scan_worker.log
-
-# Authentication - if using authentication on the API, you'll 
-# need to have an auth token with matches in the API configuration
-# auth_token: INSERT_WORKER_TOKEN

data/lib/ssh_scan/worker.rb

@@ -1,119 +0,0 @@
-require 'ssh_scan/scan_engine'
-require 'openssl'
-require 'net/https'
-
-module SSHScan
-  class Worker
-    def initialize(opts = {})
-      @server = opts["server"] || "127.0.0.1"
-      @scheme = opts["scheme"] || "http"
-      @verify = opts["verify"] || "false"
-      @port = opts["port"] || 8000
-      @logger = setup_logger(opts["logger"])
-      @poll_interval = 5 # seconds
-      @worker_id = SecureRandom.uuid
-      @verify_ssl = false
-      @auth_token = opts["auth_token"] || nil
-    end
-
-    def setup_logger(logger)
-      case logger
-      when Logger
-        return logger
-      when String
-        return Logger.new(logger)
-      end
-
-      return Logger.new(STDOUT)
-    end
-
-    def self.from_config_file(file_string)
-      opts = YAML.load_file(file_string)
-      SSHScan::Worker.new(opts)
-    end
-
-    def run!
-      loop do
-        begin
-          response = retrieve_work
-          if response["work"]
-            job = response["work"]
-            results = perform_work(job)
-            post_results(results, job)
-          else
-            @logger.info("No jobs available (waiting 5 seconds)")
-            sleep 5
-            next
-          end
-        rescue Errno::ECONNREFUSED
-          @logger.error("Cannot reach API endpoint, waiting 5 seconds")
-          sleep 5
-        rescue RuntimeError => e
-          @logger.error(e.inspect)
-        end
-      end
-    end
-
-    def retrieve_work
-      (Net::HTTP::SSL_IVNAMES << :@ssl_options).uniq!
-      (Net::HTTP::SSL_ATTRIBUTES << :options).uniq!
-
-      Net::HTTP.class_eval do
-        attr_accessor :ssl_options
-      end
-
-      uri = URI(
-        "#{@scheme}://#{@server}:#{@port}/api/v#{SSHScan::API_VERSION}/\
-work?worker_id=#{@worker_id}"
-      )
-      http = Net::HTTP.new(uri.host, uri.port)
-
-      if @scheme == "https"
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE if @verify == false
-        options_mask =
-          OpenSSL::SSL::OP_NO_SSLv2 +
-          OpenSSL::SSL::OP_NO_SSLv3 +
-          OpenSSL::SSL::OP_NO_COMPRESSION
-        http.ssl_options = options_mask
-      end
-
-      request = Net::HTTP::Get.new(uri.path)
-      request.add_field("SSH_SCAN_AUTH_TOKEN", @auth_token) unless @auth_token.nil?
-      response = http.request(request)
-      JSON.parse(response.body)
-    end
-
-    def perform_work(job)
-      @logger.info("Started job: #{job["uuid"]}")
-      scan_engine = SSHScan::ScanEngine.new
-      results = scan_engine.scan(job)
-      @logger.info("Completed job: #{job["uuid"]}")
-      return results
-    end
-
-    def post_results(results, job)
-      uri = URI(
-        "#{@scheme}://#{@server}:#{@port}/api/v#{SSHScan::API_VERSION}/\
-work/results/#{@worker_id}/#{job["uuid"]}"
-      )
-      http = Net::HTTP.new(uri.host, uri.port)
-
-      if @scheme == "https"
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE if @verify == false
-        options_mask =
-          OpenSSL::SSL::OP_NO_SSLv2 +
-          OpenSSL::SSL::OP_NO_SSLv3 +
-          OpenSSL::SSL::OP_NO_COMPRESSION
-        http.ssl_options = options_mask
-      end
-
-      request = Net::HTTP::Post.new(uri.path)
-      request.add_field("SSH_SCAN_AUTH_TOKEN", @auth_token) unless @auth_token.nil?
-      request.body = results.to_json
-      http.request(request)
-      @logger.info("Posted job: #{job["uuid"]}")
-    end
-  end
-end