nexpose_servicenow 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84febd71cae74e5f410a05a4bc1a862ba29508e4
-  data.tar.gz: d37e0a05cdc1c1276ab23cbd50a5b7e80ccce0c2
+  metadata.gz: 5e967c074f8c4c535e640903dc77ec5f6c2dd2ed
+  data.tar.gz: c5b213e5bb831222296562b95e7ad20faf7015fc
 SHA512:
-  metadata.gz: 90a4f106d54bd9995ebbd7afd457301b92f1d4bd5272d1ef650a8f11019d51e0265b03ea551a885241d59de49f3ab2538c101a6e753da2ee32512a72590f67fb
-  data.tar.gz: 13598b6b64bb63094f31f9ff43d3ec7e315530f749bfc3f02779c18123fad814b486981df4697be492c54d6fda703802e7d3fdeca2930fc4008972de3a3ada10
+  metadata.gz: 103bf5074a22896ce2af1d2e831ab0e6a6049f4351e29ae98855eb426c66596d6e2d5cdcba84054b14a9383134cc28a395f04106977722c2b60ebe4a03f277ec
+  data.tar.gz: fe10749154c31b158e2081a9c177dcfcf778973d7b8b47fa8adb6e2a52c50fde07e08b1ae01836b8a3d7e9a82f158284c511ca1c14df0e6f386aaae3fd268672

data/README.md

@@ -1,26 +1,62 @@
-# NexposeServicenow
+# ServiceNow Ruby Gem End-of-Life Announcement
 
-## Installation
-The gem may installed via the following command from the RubyGems repository:
+As of June 4, 2019, Rapid7 will start the End of Life (EOL) process for the legacy ServiceNow Ruby Gem integration for InsightVM and Nexpose. The ServiceNow Ruby Gem will no longer be publicly available for download on the [rubygems.org](https://rubygems.org/) page. This EOL announcement does not affect the in-product InsightVM integration, [ServiceNow IT Service Management (ITSM)](https://insightvm.help.rapid7.com/docs/servicenow), or the recently released [ServiceNow app](https://store.servicenow.com/sn_appstore_store.do#!/store/application/8a2aa078e7330300809a268b03f6a988/7.1.0) that leverages the ServiceNow VRM (Vulnerability Response Module) product, a component of ServiceNow Security Operations (SecOps).
 
-`gem install nexpose_servicenow`
+This EOL announcement only pertains to future deployments or feature requests related to ServiceNow Ruby Gem.
 
-## Usage
-The gem is called by the ServiceNow console when a vulnerability integration executes.
+Customers that currently have the Ruby Gem integration will not see changes in functionality, but Rapid7 encourages migration to one of the solutions listed below:
 
-Alternatively, it is also possible to call the following to see a list of parameters:
-`nexpose_servicenow -h`
+* ServiceNow ITSM Integration
+* Service Now SecOps Integration
 
+## ServiceNow ITSM Integration
+Streamline your InsightVM vulnerability remediation workflow with the ServiceNow ITSM integration by tracking remediation progress in real-time.
 
-## Support
-Please visit the following address for support queries:
-[Rapid7 Support Portal](https://rapid7support.force.com/customers/login) 
+### ServiceNow ITSM Integration Benefits
+The ServiceNow ITSM integration provides the following InsightVM benefits:
 
-Please attach both the gem logs and relevant snippets from the agent logs.
+* **Rule Intelligence** - Create targeted and precise tickets automatically with assignment rules that you can reuse across Remediation Projects in InsightVM.
+* **Contextual Information** - Customize ticketing templates to include as much security detail as needed.
+* **Central Tracking** - Manage and track your remediation projects in a central location through the Remediation Projects page.
 
-Documentation is available from the ServiceNow Store Portal.
+### ServiceNow ITSM Integration Overview
+The ServiceNow ITSM integration provides automated ticketing for Remediation Projects. See our help documentation for instruction to [enable automated ticketing](https://insightvm.help.rapid7.com/docs/ticketing-integration-for-remediation-workflow-projects#section-enabling-automated-ticketing-for-remediation-projects).
 
-## License
+You can also integrate ServiceNow ITSM with InsightVM. See our help documentation for [integration instructions](https://insightvm.help.rapid7.com/docs/servicenow).
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+If you run into any issues or have questions, reach out to [Rapid7 Support](https://www.rapid7.com/for-customers/).
 
+## ServiceNow SecOps Integration
+This cloud-to-cloud integration pulls data from InsightVM and helps you automatically identify remediation priorities by determining the impact of vulnerabilities.
+
+### ServiceNow SecOps Integration Benefits
+* **Data Import** - Execute scheduled jobs to import vulnerability, vulnerable items, and solution and site data automatically.
+* **Lookup Rules** - Search for configuration items (CIs) in the Configuration Management Database (CMDB) with matching information from the Rapid7 Vulnerability iIntegration.
+* **Efficient Remediation** - Map vulnerabilities to CIs and business services and display them in a dashboard to facilitate efficient remediation.
+
+### ServiceNow SecOps Integration Overview
+To take advantage of the ServiceNow SecOps integration:
+
+1. Go to the ServiceNow store listing.
+2. Click the Get button on the top right. After logging into ServiceNow, follow the steps accordingly.
+
+If you run into any issues or have questions, reach out to ServiceNow Support.
+
+Schedule of Events
+Date          |  Event
+--------------|------------
+June 4, 2019  | Rapid7 announces that the ServiceNow Ruby Gem will no longer be available for download on rubygems.org
+June 4, 2020  | Rapid7 will no longer support the ServiceNow Ruby Gem.
+
+
+## Frequently Asked Questions
+If you have additional questions not listed here, reach out to your Customer Success Manager or [Rapid7 Support](https://www.rapid7.com/for-customers/).
+
+### If I use the legacy Ruby Gem integration now, how will this impact me?
+Any customers currently utilizing this legacy Ruby Gem will not experience an interruption in service for 12 months from the date of this announcement. You can contact your Customer Success Manager for options after the last date of support.
+
+### How do I get ServiceNow?
+ServiceNow is a third party product that integrates with InsightVM. New or existing InsightVM customers can purchase an account through ServiceNow.
+
+### Who can I contact if I have more questions that are not addressed in this announcement?
+Contact your Customer Success Representative or [contact Rapid7 Support](https://www.rapid7.com/for-customers/). If your questions pertain to setting up the ServiceNow supported integration option, reach out directly to [ServiceNow](https://www.servicenow.com/support/contact-support.html).

data/bin/nexpose_servicenow

@@ -1,4 +1,12 @@
 #!/usr/bin/env ruby
-require 'nexpose_servicenow'
 
-NexposeServiceNow::Main.start(ARGV)
+###################
+#
+# STOP. THIS GEM HAS BEEN DEPRECATED. NO CHANGES SHOULD BE MADE TO THIS CODE ANYMORE.
+#
+###################
+
+require 'nexpose_servicenow/version'
+
+puts NexposeServiceNow::DEPRECATION_NOTICE
+raise RuntimeError

data/lib/nexpose_servicenow.rb

@@ -1,177 +1,4 @@
-require 'csv'
-require 'optparse'
-require 'nexpose'
-require 'uri'
-require_relative './nexpose_servicenow/helpers/connection_helper'
-require_relative './nexpose_servicenow/helpers/nexpose_console_helper'
-require_relative './nexpose_servicenow/helpers/data_warehouse_helper'
-require 'nexpose_servicenow/arg_parser'
-require 'nexpose_servicenow/chunker'
-require 'nexpose_servicenow/nx_logger'
-require 'nexpose_servicenow/historical_data'
 require 'nexpose_servicenow/version'
 
 module NexposeServiceNow
-  class Main
-    def self.start(args)
-      options = ArgParser.parse(args)
-
-      @log = setup_logging(options)
-
-      censored_options = options.dup
-      censored_options[:username] = '*****'
-      censored_options[:password] = '*****'
-      @log.log_message("Options: #{censored_options}")
-
-      query = options[:query]
-      site_ids = options[:nexpose_ids]
-
-      # Filter out irrelevant sites
-      if query == :vulnerable_old_items
-        site_ids = get_historical_data(options).filter_ids(site_ids)
-        if site_ids.count == 0
-          puts 'No sites remaining for vulnerable old items query. Exiting.'
-          exit 0
-        end
-      end
-
-      report_details = ConnectionHelper.get_report_names(query, site_ids)
-
-      report_details.each do |r|
-        r[:report_name] = ConnectionHelper.get_filepath(r[:report_name],
-                                                        options[:output_dir])
-      end
-
-      report_results = create_report(report_details, options)
-
-      # If data was returned, we can short circuit here
-      if !report_results.nil? and options[:mode] == 'chunk_info'
-        puts report_results
-        exit 0
-      end
-
-      @log.log_message("Initialising #{options[:mode]} mode")
-      self.send("#{options[:mode]}_mode", report_details, options)
-    end
-
-    def self.get_historical_data(options)
-      HistoricalData.new(options[:output_dir])
-    end
-
-    def self.get_helper(options)
-      name = options[:conn_type].to_s.split('_').map(&:capitalize).join('')
-
-      helper = eval("#{name}Helper")
-      helper.new(options[:url],
-                 options[:port],
-                 options[:username],
-                 options[:password],
-                 options[:database_name])
-    end
-
-    def self.setup_logging(options)
-      log = NexposeServiceNow::NxLogger.instance
-      log.setup_statistics_collection(NexposeServiceNow::VENDOR, 
-                                      NexposeServiceNow::PRODUCT, 
-                                      NexposeServiceNow::VERSION)
-      log.setup_logging(true,
-                        options[:log_level] || 'info',
-                        false)
-      log
-    end
-
-    # Create a report if explicitly required or else an existing
-    # report file isn't found
-    def self.create_report(report_details, options)
-      if %w(update_ remove_).any? { |m| options[:mode].start_with? m} or
-          (options[:mode] == 'latest_scans' && options[:id_type] != :site)
-        return
-      end
-
-      # Perform all queries if a file is missing, regardless of other settings
-      unless options[:gen_report]
-        return if report_details.all? { |f| File.exists? f[:report_name] }
-      end
-
-      credentials = %i{username password}
-      if credentials.any? { |cred| options[cred].to_s == '' }
-        @log.log_error_message 'Nexpose credentials necessary but not supplied.'
-        exit -1
-      end
-
-      # Filter it down to sites which actively need queried
-      sites_to_scan = options[:nexpose_ids].keys
-
-      query_options = { delta_values: options[:nexpose_ids] }
-      query_options[:vuln_query_date] = options[:vuln_query_date]
-      query_options[:filters] = options[:filters]
-      query_options[:page_size] = options[:row_limit]
-      query_options[:row_limit] = options[:row_limit]
-      query_options[:cvss_v3] = options[:cvss_v3]
-
-      report_helper = get_helper(options)
-      @log.log_message("Querying using the #{report_helper.class}.")
-      report_helper.generate_report(options[:query],
-                                     sites_to_scan,
-                                     options[:id_type],
-                                     options[:output_dir],
-                                     query_options)
-    end
-
-    # Print the chunk info
-    def self.chunk_info_mode(report_details, options)
-      site_ids = options[:nexpose_ids].keys
-
-      # Assign -1 to reports without site IDs
-      report_details = report_details.select do |d|
-        d[:id] == -1 or site_ids.include? d[:id]
-      end
-
-      chunker = Chunker.new(report_details, options[:row_limit])
-
-      puts chunker.preprocess
-    end
-
-    # Prints a chunk of CSV to the console
-    def self.get_chunk_mode(report_details, options)
-      #Get the byte offset and length
-      chunker = Chunker.new(report_details, options[:row_limit])
-
-      puts chunker.read_chunk(options[:chunk_start],
-                              options[:chunk_length],
-                              options[:nexpose_ids].keys.first)
-    end
-
-    def self.latest_scans_mode(report_details, options)
-      historical_data = get_historical_data(options)
-      puts historical_data.filter_report options[:nexpose_ids].keys
-    end
-
-    def self.remove_last_scan_mode(report_details, options)
-      historical_data = get_historical_data(options)
-      historical_data.remove_last_scan_data
-    end
-
-    def self.update_last_scan_mode(report_details, options)
-      historical_data = get_historical_data(options)
-      historical_data.set_last_scan(options[:nexpose_ids].first,
-                                    options[:last_scan_data])
-    end
-    
-    def self.remove_last_vuln_mode(report_details, options)
-      historical_data = get_historical_data(options)
-      historical_data.remove_last_vuln_data
-    end
-    
-    def self.update_last_vuln_mode(report_details, options)
-      historical_data = get_historical_data(options)
-      historical_data.set_last_vuln(options[:last_scan_data],
-                                    options[:nexpose_ids])
-    end
-
-    def self.remove_diff_comparison_mode(report_details, options)
-      historical_data = get_historical_data(options)
-      historical_data.remove_diff_files options[:output_dir]
-    end
-  end
-end
+end

data/lib/nexpose_servicenow/version.rb

@@ -1,5 +1,18 @@
 module NexposeServiceNow
-  VERSION = '0.7.3'
+  VERSION = '0.8.0'
   VENDOR = 'ServiceNow'
   PRODUCT = 'CMDB'
+  DEPRECATION_NOTICE = <<-DEPRECATION
+As of June 4, 2019, the ServiceNow SecOps/Vulnerability Response Ruby Gem 
+has been deprecated and is no longer available for use. An updated integration 
+is currently available in product for ServiceNow ITSM and Secops, the setup 
+instructions for both of which can be found here: 
+
+https://insightvm.help.rapid7.com/docs/servicenow
+
+For more information please see our announcement which can be found here: 
+
+https://kb.help.rapid7.com/docs/servicenow-ruby-gem-end-of-life-announcement
+
+  DEPRECATION
 end

data/nexpose_servicenow.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ['lib']
   spec.summary = %Q{Gem for Nexpose-ServiceNow integration.}
-  spec.description = %Q{Provides an interface to Nexpose for the Rapid7 ServiceNow MarketPlace application.}
+  spec.description = NexposeServiceNow::DEPRECATION_NOTICE
   spec.executables   = ['nexpose_servicenow']
   spec.homepage      = 'http://www.rapid7.com'
   spec.license       = 'MIT'
@@ -27,12 +27,10 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = 'bin'
   spec.require_paths = ['lib']
+  spec.post_install_message = NexposeServiceNow::DEPRECATION_NOTICE
 
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_dependency 'nexpose', '~> 3.2'
-  spec.add_dependency 'csv-diff', '~> 0.3.5'
-  spec.add_dependency 'pg', '~> 0.21.0'
 
   spec.required_ruby_version = ['>= 2.1.5', '< 2.5.0']
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexpose_servicenow
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - David Valente
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2019-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,50 +39,11 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: nexpose
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: csv-diff
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.5
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.0
-description: Provides an interface to Nexpose for the Rapid7 ServiceNow MarketPlace
-  application.
+description: "As of June 4, 2019, the ServiceNow SecOps/Vulnerability Response Ruby
+  Gem \nhas been deprecated and is no longer available for use. An updated integration
+  \nis currently available in product for ServiceNow ITSM and Secops, the setup \ninstructions
+  for both of which can be found here: \n\nhttps://insightvm.help.rapid7.com/docs/servicenow\n\nFor
+  more information please see our announcement which can be found here: \n\nhttps://kb.help.rapid7.com/docs/servicenow-ruby-gem-end-of-life-announcement\n\n"
 email:
 - david_valente@rapid7.com
 executables:
@@ -97,17 +58,6 @@ files:
 - bin/nexpose_servicenow
 - bin/setup
 - lib/nexpose_servicenow.rb
-- lib/nexpose_servicenow/arg_parser.rb
-- lib/nexpose_servicenow/chunker.rb
-- lib/nexpose_servicenow/csv_compare.rb
-- lib/nexpose_servicenow/helpers/connection_helper.rb
-- lib/nexpose_servicenow/helpers/data_warehouse_helper.rb
-- lib/nexpose_servicenow/helpers/nexpose_console_helper.rb
-- lib/nexpose_servicenow/historical_data.rb
-- lib/nexpose_servicenow/nx_logger.rb
-- lib/nexpose_servicenow/queries/nexpose_queries.rb
-- lib/nexpose_servicenow/queries/queries_base.rb
-- lib/nexpose_servicenow/queries/warehouse_queries.rb
 - lib/nexpose_servicenow/version.rb
 - nexpose_servicenow.gemspec
 homepage: http://www.rapid7.com
@@ -115,7 +65,11 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message: "As of June 4, 2019, the ServiceNow SecOps/Vulnerability Response
+  Ruby Gem \nhas been deprecated and is no longer available for use. An updated integration
+  \nis currently available in product for ServiceNow ITSM and Secops, the setup \ninstructions
+  for both of which can be found here: \n\nhttps://insightvm.help.rapid7.com/docs/servicenow\n\nFor
+  more information please see our announcement which can be found here: \n\nhttps://kb.help.rapid7.com/docs/servicenow-ruby-gem-end-of-life-announcement\n\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -134,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Gem for Nexpose-ServiceNow integration.

data/lib/nexpose_servicenow/arg_parser.rb

@@ -1,283 +0,0 @@
-require 'optparse'
-require 'json'
-require 'time'
-require_relative './queries/nexpose_queries'
-require_relative './nx_logger'
-
-module NexposeServiceNow
-  class ArgParser
-    NX_ID_TYPES = %i[site asset_group]
-    NX_CONNECTION_TYPES = %i[nexpose_console data_warehouse]
-    MODES = %i[chunk_info get_chunk latest_scans
-               remove_last_scan remove_last_vuln]
-    REQUIRED_OPTIONS = %i[url port username password]
-    QUERY_NAMES = NexposeQueries.methods(false)
-
-    def self.parse(args)
-      options = Hash.new
-
-      log = NexposeServiceNow::NxLogger.instance
-      log.log_message 'Parsing options.'
-
-      opt_parser = OptionParser.new do |opts|
-        opts.banner = 'Usage: example.rb [options]'
-
-        opts.on('-o', '--output-dir DIRECTORY',
-                'Directory in which to save reports') do |output_dir|
-          options[:output_dir] = output_dir
-        end
-
-        opts.on('-m', '--mode MODE',
-                "Mode for program output. (#{MODES.join(', ')})") do |mode|
-          options[:mode] = mode
-        end
-
-        opts.on('-g', '--generate-report BOOLEAN',
-                'True to generate and download new report') do |gen|
-          char = gen.downcase[0]
-          options[:gen_report] = %w(y t).any? { |c| c == char }
-        end
-
-        opts.separator ''
-        opts.separator 'Query options:'
-
-        opts.on('-q', '--query QUERY', QUERY_NAMES,
-                "Select query (#{QUERY_NAMES.join(', ')})") do |query| 
-          options[:query] = query
-        end
-
-        opts.on('-t', '--type ID~CONNECTION', 'Select ID type ' \
-                "(#{NX_ID_TYPES.join(', ')}) and connection type " \
-                "(#{NX_CONNECTION_TYPES.join(', ')})") do |types|
-          type = types.split('~')
-          options[:id_type] = type[0].intern
-          options[:conn_type] = type[1].intern
-
-          if options[:conn_type].equal? :data_warehouse
-            REQUIRED_OPTIONS << :database_name
-          end
-        end
-
-        opts.on('-i', '--items x~x,y~y,z~z', Array,
-                'IDs of the nexpose items to ' \
-                'scan, provided with their previous scan IDs or timestamp ' \
-                'of last scan') do |items|
-          options[:nexpose_ids] = {}
-
-          # Split the string up into site and scan pairs
-          items = items.map { |s| s.split('~') }
-
-          # Store the information in site:scan_id dict
-          items.each { |site, scan| options[:nexpose_ids][site] = scan }
-        end
-
-        opts.on('-a', '--abs-vulntime TIMESTAMP',
-                'Timestamp of last vulnerability definition import') do |vulnt|
-          # TODO: Does the date need formatted?
-          options[:vuln_query_date] = vulnt
-        end
-
-        opts.on('-y', '--cvss-version VERSION',
-                'The CVSS version to import ' \
-                '(2 or 3 where available)') do |version|
-          options[:cvss_v3] = version == '3'
-        end
-
-        opts.separator ''
-        opts.separator 'Connection options:'
-        
-        opts.on('-n', '--nexpose-datastore URL',
-                'URL of the Nexpose/Data Warehouse server') do |url|
-          port = url.slice!(/:(\d+)$/)
-          port.slice! ':' unless port.nil?
-
-          url.slice! 'https://'
-          options[:url] = url
-          options[:port] = port
-        end
-
-        opts.on('-u', '--user USER',
-                'Username for Nexpose/Data Warehouse') do |username|
-          options[:username] = username
-        end
-
-        opts.on('-p', '--password PASSWORD',
-                'Password for the Nexpose/Data Warehouse user') do |password|
-          options[:password] = password
-        end
-
-        opts.on('-b', '--database DATABASE_NAME',
-                'The name of the Postgres Database '\
-                '(DataWarehouse Only)') do |database|
-          options[:database_name] = database
-        end
-
-        opts.separator ''
-        opts.separator 'Chunk info mode options:'
-        
-        opts.on('-r', '--row-limit LIMIT',
-                'Maximum number of rows per chunk (inc. header).') do |limit|
-          options[:row_limit] = limit.to_i
-          options[:row_limit] = 9_999_999 if options[:row_limit] <= 0
-        end
-
-        opts.separator ''
-        opts.separator 'Get chunk mode options:'
-
-        opts.on('-s', '--start START',
-                'The chunk starting offset.') do |start|
-          options[:chunk_start] = start.to_i
-        end
-
-        opts.on('-l', '--length LENGTH',
-                'The chunk length.') do |length|
-          options[:chunk_length] = length.to_i
-        end
-
-        opts.separator ''
-        opts.separator 'Filter options:'
-
-
-        opts.on('-c', '--cvss-score CVSS',
-                'The minimum CVSS score to import') do |data|
-
-          cvss_range = data.split('~')
-
-          if cvss_range.count != 2
-            error = "Expected two CVSS scores. Received #{cvss_range.count}"
-            puts error
-            log.log_message error
-            exit -1
-          end
-
-          cvss_range.each do |cvss|
-            next if cvss.to_s =~ /^0*(10(\.0+)?|\d(\.\d+)?)?$/
-            error = "Invalid CVSS score supplied: #{cvss}. Exiting"
-            puts error
-            log.log_message error
-            exit -1
-          end
-
-          options[:filters] ||= {}
-          options[:filters][:cvss] = cvss_range
-        end
-
-        opts.on('-d', '--date DATE',
-                'The minimum date for each vulnerability instance.') do |date|
-          # Date should be in format 'YYYY-MM-DD~YYYY-MM-DD'
-          dates = date.to_s.split('~')
-
-          if dates.count != 2
-            error = "Expected two dates. Received #{dates.count}"
-            puts error
-            log.log_message error
-            exit -1
-          end
-
-          # Add the dates
-          dates[0] = dates[0] + ' 00:00:00'
-          dates[1] = dates[1] + ' 23:59:59'
-
-          # Remove rogue '' in datetime format
-          dates[0] = dates[0].gsub("'","")
-          dates[1] = dates[1].gsub("'","")
-
-          # Check for valid dates and placeholders
-          dates.map! do |d|
-            if d =~ /Y{4}-M{1,2}-D{1,2}/i
-              nil
-            elsif d =~ /\d{4}-\d{1,2}-\d{1,2}/
-              d
-            else
-              error = "Invalid date supplied: #{d}. Exiting."
-              puts error
-              log.log_message error
-              exit -1
-            end
-          end
-
-          options[:filters] ||= {}
-          options[:filters][:date] = dates
-        end
-
-        opts.separator ''
-        opts.separator 'Common options:'
-
-        opts.on_tail('-h', '--help', 'Show this message') do
-          puts opts
-          exit
-        end
-      end 
-
-      opt_parser.parse!(args)
-      options = self.get_env_settings(options)
-      options = self.validate_input(options)
-      options
-    end
-
-    def self.validate_input(options)
-      #Insert defaults. Some are mode-specific.
-      options[:output_dir] ||= '.'
-      options[:row_limit] ||= 9_999_999
-      options[:vuln_query_date] ||= '1985-01-01 00:00:00'
-      options[:id_type] ||= 'site'
-      options[:conn_type] ||= :nexpose_console
-      options[:nexpose_ids] ||= {}
-      options[:filters] ||= {}
-      options[:cvss_v3] ||= false
-
-      options[:query] = 'latest_scans' if options[:mode] == 'latest_scans'
-
-      #By default, a report won't be generated if a chunk's being retrieved
-      if options[:gen_report].nil?
-        options[:gen_report] = options[:mode] == 'chunk_info' ||
-                               options[:mode] == 'latest_scans'
-      end
-
-      options[:port] ||= if options[:conn_type].equal? :nexpose_console
-                           '3780'
-                         else
-                           '5432'
-                         end
-
-      log = NexposeServiceNow::NxLogger.instance
-
-      if options[:mode].to_s == ''
-        log.log_message('Script was called without mode.')
-        puts 'No mode selected. Use -h to see command line options.'
-        exit -1
-      end
-
-      #Only need to check these if a query is being performed
-      return options unless options[:gen_report]
-
-      REQUIRED_OPTIONS.each do |setting|
-        if options[setting].nil?
-          error = "Option #{setting} wasn't supplied."
-          log.log_error_message error
-          $stderr.puts "ERROR: #{error}"
-          exit -1
-        end
-      end
-
-      options
-    end
-
-    def self.get_env_settings(options)
-      #Only need these if a query is being performed
-      return options unless options[:gen_report]
-
-      log = NexposeServiceNow::NxLogger.instance
-      log.log_message 'Retrieving environment variables.'
-
-      # Retrieve environment variable settings
-      REQUIRED_OPTIONS.each do |setting|
-        option = "nexpose_#{setting}"
-        env_setting = ENV[option.upcase]
-        options[setting] ||= env_setting
-      end
-
-      options
-    end
-  end
-end