nexpose_servicenow 0.4.16 → 0.4.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 069e970f4c54d280fa516be42dd68b28d7759eca
-  data.tar.gz: 335ecf4c273e1e2f95a109d9b50a17e881576714
+  metadata.gz: c325a43d283e142343eb252319480592167450ab
+  data.tar.gz: a5177c3ac6503e29cb039a159dcf0b8c508f1bf8
 SHA512:
-  metadata.gz: c7a070f0f11759224e8230ee419d0f955ae2b9e048c1b51ed619cfd23e3e6a424a85024a224e87a1cfb4688c042ea74c71ec2972a0a5359e8de89335f7a862c8
-  data.tar.gz: 38d9dc74e024bc2744f32bdd0a6188f8d1ec6ef13cda9d42e816134e9d911132c8919290b9063da36786b7ed162b944df699167de2d8f446bc241968886dc3d2
+  metadata.gz: a47fb845d6acd135d3411dee4adb77a07ecc4a81bd48387f3f9bbd419d2d152552cfc0cfc42235210ebc512a87f8b2b97cf388382f1518de7de86cc3e5fe49bd
+  data.tar.gz: 7812e7398e897d8ba6d21c29164f5d430f9c63aafd1ffb6c8d68c89aca3c1b571842a20c48341f7b0afac3569449b1a172b35fb1544422349e36102369f90b87

data/lib/nexpose_servicenow.rb

@@ -16,7 +16,11 @@ module NexposeServiceNow
       options = ArgParser.parse(args)
 
       log = setup_logging(options)
-      log.log_message("Options: #{options}")
+      
+      censored_options = options.dup
+      censored_options[:nexpose_username] = "*****"
+      censored_options[:nexpose_password] = "*****"
+      log.log_message("Options: #{censored_options}")
 
       if options[:nexpose_ids].first.to_s == "0"
         log.log_message('Retrieving array of all site IDs')
@@ -115,7 +119,8 @@ module NexposeServiceNow
       end
 
       historical_data = HistoricalData.new(options)
-      sites_to_scan = historical_data.sites_to_scan
+      imported_sites_only = options[:query].to_s.eql? 'vulnerable_old_items'
+      sites_to_scan = historical_data.sites_to_scan(imported_sites_only)
 
       return sites_to_scan unless (sites_to_scan.nil? || sites_to_scan.empty?)
 
@@ -127,8 +132,10 @@ module NexposeServiceNow
 
     #Print the chunk info
     def self.chunk_info_mode(report_details, options)
-      chunker = Chunker.new(report_details, options[:row_limit])
       filtered_sites = filter_sites(options)
+      report_details = report_details.select { |d| d[:id] == -1 or filtered_sites.include? d[:id] }
+      chunker = Chunker.new(report_details, options[:row_limit])
+
       puts chunker.preprocess(filtered_sites)
     end
 

data/lib/nexpose_servicenow/historical_data.rb

@@ -75,7 +75,7 @@ module NexposeServiceNow
 
     #Compares stored scan IDs versus remote scan IDs.
     #This determines which scans are included as filters.
-    def sites_to_scan
+    def sites_to_scan(imported_sites_only=false)
       return @ids unless File.exist? @remote_file
 
       @log.log_message 'Filtering for sites with new scans'
@@ -89,8 +89,11 @@ module NexposeServiceNow
         remote_scan_id = remote_csv.find { |r| r['site_id'] == id.to_s } || {}
         remote_scan_id = remote_scan_id['last_scan_id'] || 1
 
-        local_scan_id = local_csv.find { |r| r['site_id'] == id.to_s }
-        local_scan_id = local_scan_id['last_scan_id']
+        local_scan_id = local_csv.find { |r| r['site_id'] == id.to_s } || {}
+        local_scan_id = local_scan_id['last_scan_id'] || 0
+
+        # Check if only allowing sites which were previously imported
+        next if local_scan_id.to_s == "0" && imported_sites_only
 
         filtered_sites << id if local_scan_id.to_i < remote_scan_id.to_i
       end

data/lib/nexpose_servicenow/queries.rb

@@ -122,11 +122,11 @@ module NexposeServiceNow
     end
 
     def self.software_instance(options={})
-      "SELECT asset_id as Nexpose_ID, coalesce(da.host_name, CAST(da.asset_id as text)) as Installed_On, ds.name, ds.Family, ds.Vendor, ds.version, ds.cpe
-       FROM fact_asset_scan_software
-       LEFT OUTER JOIN (SELECT software_id, name as Name, vendor as Vendor, family as Family, version, cpe FROM dim_software) ds USING (software_id)
-       LEFT OUTER JOIN (SELECT asset_id, host_name FROM dim_asset) da USING (asset_id)
-       WHERE scan_id = lastScan(asset_id)"
+      "SELECT asset_id as Nexpose_ID, coalesce(da.host_name, CAST(da.asset_id as text)) as Installed_On, ds.name, ds.Product_Name, ds.version, ds.cpe
+      FROM fact_asset_scan_software
+      LEFT OUTER JOIN (SELECT software_id, name, vendor || ' ' || family as Product_Name, version, cpe FROM dim_software) ds USING (software_id)
+      LEFT OUTER JOIN (SELECT asset_id, host_name FROM dim_asset) da USING (asset_id)
+      WHERE scan_id = lastScan(asset_id)"
     end
 
     def self.service_instance(options={})

data/lib/nexpose_servicenow/version.rb

@@ -1,5 +1,5 @@
 module NexposeServiceNow
-  VERSION = "0.4.16"
+  VERSION = "0.4.18"
   VENDOR = "ServiceNow"
   PRODUCT = "CMDB"
 end

data/nexpose_servicenow.gemspec

@@ -6,15 +6,24 @@ require 'nexpose_servicenow/version'
 Gem::Specification.new do |spec|
   spec.name          = "nexpose_servicenow"
   spec.version       = NexposeServiceNow::VERSION
-  spec.authors       = ["David Valente", 'JJ Cassidy']
+  spec.authors       = ["David Valente"]
+  spec.email         = ["david_valente@rapid7.com"]
 
   spec.require_paths = ["lib"]
-  spec.summary = %Q{Gem for Nexpose-ServiceNow marketplace application integration. Requires Servicenow Application component available on Servicenow application store.}
+  spec.summary = %Q{Gem for Nexpose-ServiceNow integration.}
   spec.description = %Q{Provides an interface to Nexpose for the Rapid7 ServiceNow MarketPlace application.}
   spec.executables   = ["nexpose_servicenow"]
-  spec.email         = ['support@rapid7.com']
+  spec.homepage      = "http://www.rapid7.com"
   spec.license       = "MIT"
 
+  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
+  # delete this section to allow pushing this gem to any host.
+  if spec.respond_to?(:metadata)
+    spec.metadata['allowed_push_host'] = "https://rubygems.org"
+  else
+    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+  end
+
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "bin"
   spec.require_paths = ["lib"]

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nexpose_servicenow
 version: !ruby/object:Gem::Version
-  version: 0.4.16
+  version: 0.4.18
 platform: ruby
 authors:
 - David Valente
-- JJ Cassidy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,7 +55,7 @@ dependencies:
 description: Provides an interface to Nexpose for the Rapid7 ServiceNow MarketPlace
   application.
 email:
-- support@rapid7.com
+- david_valente@rapid7.com
 executables:
 - nexpose_servicenow
 extensions: []
@@ -78,10 +77,11 @@ files:
 - lib/nexpose_servicenow/queries_original.rb
 - lib/nexpose_servicenow/version.rb
 - nexpose_servicenow.gemspec
-homepage: 
+homepage: http://www.rapid7.com
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -101,6 +101,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Gem for Nexpose-ServiceNow marketplace application integration. Requires
-  Servicenow Application component available on Servicenow application store.
+summary: Gem for Nexpose-ServiceNow integration.
 test_files: []