nexpose_servicenow 0.4.15 → 0.4.16

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NmE4MDhhMzQ0NDE1ZmZhN2M1NjBjYzI5ODRlYmViMzczOTlkNDRmZg==
-  data.tar.gz: !binary |-
-    NmEyMjJjOGM2YmUzZGRmYThhZGMzNGI5MWFjNGNkMmU3MzYxMjc4Mg==
+SHA1:
+  metadata.gz: 069e970f4c54d280fa516be42dd68b28d7759eca
+  data.tar.gz: 335ecf4c273e1e2f95a109d9b50a17e881576714
 SHA512:
-  metadata.gz: !binary |-
-    OTMzZmFmYTM3YjBkYjliZGI4ZWY4Mzk2YTIxYzg2M2QxYjE4Mzg0NDI5NmUx
-    NmJmNGMzYzEzODRkNGI5YTk2ZTJjNTA0NTFjODRlM2E2NjZjZDkyNzZmYjhl
-    MTEwZWRhOWFiZjI0ZTQzZGI5ODZjYzZlZDAzY2U4ZTdlMTI3ZDM=
-  data.tar.gz: !binary |-
-    Y2ZiZTllNWM2ZDgyM2IwOWRkM2RmY2MwNDQ0NjE5NTI3ODM2YzQ2MGZkYzMw
-    M2U0YzdhNGQ4MzI4Mjg2MWM3NjVjOTYxZjI0MjJhOGJhNzkyMmEwOTI3ZjE2
-    NzUxNjg1YjgxMjAwODZiZjVjMDVmODI1Mjc2NjQ0MjIzZDc4MmQ=
+  metadata.gz: c7a070f0f11759224e8230ee419d0f955ae2b9e048c1b51ed619cfd23e3e6a424a85024a224e87a1cfb4688c042ea74c71ec2972a0a5359e8de89335f7a862c8
+  data.tar.gz: 38d9dc74e024bc2744f32bdd0a6188f8d1ec6ef13cda9d42e816134e9d911132c8919290b9063da36786b7ed162b944df699167de2d8f446bc241968886dc3d2

data/lib/nexpose_servicenow.rb

@@ -61,6 +61,8 @@ module NexposeServiceNow
       return unless options[:mode] == "latest_scans"
       historical_data = HistoricalData.new(options)
       historical_data.update_last_scan_data
+
+      historical_data.save_vuln_timestamp(filter_sites(options))
     end
 
     #Create a report if explicitly required or else an existing
@@ -90,8 +92,6 @@ module NexposeServiceNow
                                               options[:output_dir],
                                               query_options)
 
-      hist_data.create_last_vuln_data(start_time, sites_to_scan) if vuln_query
-
       #A single String may be returned or an Array of Strings
       if filename.class.to_s == "Array"
         filename.map! { |f| File.expand_path(options[:output_dir], f) }

data/lib/nexpose_servicenow/historical_data.rb

@@ -3,17 +3,21 @@ require_relative './nx_logger'
 
 module NexposeServiceNow
   class HistoricalData
-    REPORT_FILE_NAME = "Nexpose-ServiceNow-latest_scans.csv"
-    STORED_FILE_NAME = "last_scan_data.csv"
-    TIMESTAMP_FILE_NAME = "last_vuln_run.csv"
+    REPORT_FILE = "Nexpose-ServiceNow-latest_scans.csv"
+    STORED_FILE = "last_scan_data.csv"
+    TIMESTAMP_FILE = "last_vuln_run.csv"
+    NEW_TIMESTAMP_FILE = "new_vuln_timestamp.csv"
 
     def initialize(options)
-      @local_dir = File.expand_path(options[:output_dir])
+      local_dir = File.expand_path(options[:output_dir])
       @ids = options[:nexpose_ids]
 
-      @local_file = File.join(@local_dir, STORED_FILE_NAME)
-      @remote_file = File.join(@local_dir, REPORT_FILE_NAME)
-      @timestamp_file = File.join(@local_dir, TIMESTAMP_FILE_NAME)
+      @local_file = File.join(local_dir, STORED_FILE)
+      @remote_file = File.join(local_dir, REPORT_FILE)
+
+      # File containing the timestamp used in vulnerability queries
+      @timestamp_file = File.join(local_dir, TIMESTAMP_FILE)
+      @prev_timestamp_file = File.join(local_dir, NEW_TIMESTAMP_FILE)
 
       @log = NexposeServiceNow::NxLogger.instance
       @log.log_message "Retrieving environment variables."
@@ -136,17 +140,47 @@ module NexposeServiceNow
       end
     end
 
+
+    #insert sites?
+    def save_vuln_timestamp(sites=[])
+      start_time = Time.new
+
+      #Read timestamp from new timestamp file (substitute base time)
+      if File.exist? @prev_timestamp_file
+        file = File.expand_path(@prev_timestamp_file)
+        csv = CSV.open(file, headers:true)
+        line = csv.readline
+        last_run = line['Last Scan Time']
+        last_sites = line['Sites']
+        csv.close
+
+        File.delete(file)
+      end
+
+      last_run ||= Time.new(1985)
+      last_sites ||= []
+      last_run = last_run.strftime("%Y-%m-%d") if last_run.class.to_s == 'Time'
+      create_last_vuln_data(last_run, last_sites)
+
+      file = File.expand_path(@prev_timestamp_file)
+      CSV.open(file, 'w') do |csv|
+        csv << ['Last Scan Time', 'Sites']
+        csv << [start_time.strftime("%Y-%m-%d"), sites.join(',')]
+      end
+    end
+
     def create_last_vuln_data(time=nil, sites=[])
       @log.log_message 'Creating last vulnerability scan time file.'
 
       time ||= Time.new(1985)
       time = time.strftime("%Y-%m-%d") if time.class.to_s == 'Time'
+      sites = sites.join(',') if sites.class.to_s == 'Array'
 
       file = File.expand_path(@timestamp_file)
 
       CSV.open(file, 'w') do |csv|
         csv << ['Last Scan Time', 'Sites']
-        csv << [time, sites.join(',')]
+        csv << [time, sites]
       end
     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.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)"
+      "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)"
     end
 
     def self.service_instance(options={})

data/lib/nexpose_servicenow/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexpose_servicenow
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.4.16
 platform: ruby
 authors:
 - David Valente
@@ -9,48 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !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'
 description: Provides an interface to Nexpose for the Rapid7 ServiceNow MarketPlace
@@ -88,17 +88,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Gem for Nexpose-ServiceNow marketplace application integration. Requires