NexposeRunner 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14af137aa0fe36babae76eb4a57ff85e0f99e9dd
-  data.tar.gz: b5df6752cf43fd40f6dc61547e39fb0f2b2b1d8e
+  metadata.gz: 13adebf5deaf318e68db7a8965cd1aaddbe75003
+  data.tar.gz: 44ccda32d83f9aa9064fb26f63072935033b0812
 SHA512:
-  metadata.gz: a5a9984d083d2a29a283f6f0277e1ccb2b7c480c0688d836e788f669ddf285b4219180ea476712e28449d86078010f36c870baf5dc82e70f5f7c48b9afc5bcd2
-  data.tar.gz: b9ca3bac277f635b3fb9f9e432882eced063a7fee9d2c4580425db77f493bcbb56292fe8e8649d5f88eacef1ad8f94ec4a12cbe9912e80edd94edf3df3d94dd9
+  metadata.gz: a98f08b066853cc72dac0b4378b0ab6a8dba85f70896528a6c338069822424b23dd4165a5beabbbc0e3fe22f735447abbbe8ff82414e6ee8d757db0eecc27457
+  data.tar.gz: 888df0a298044649828885df63b90c7596b2c853bb5f7a45ab520af376d9e03ca8d3c277c00c11d85ec142a7f99b1d6b412920c1490504f383aae8d33d3ae206

data/lib/NexposeRunner/version.rb

@@ -1,4 +1,4 @@
 module NexposeRunner
-    VERSION = '0.0.8'
+    VERSION = '0.0.9'
 end
 

data/lib/nexpose-runner/constants.rb

@@ -10,7 +10,14 @@ module CONSTANTS
   VULNERABILITY_REPORT_NAME = 'nexpose-vulnerability-report.csv'
   SOFTWARE_REPORT_NAME = 'nexpose-software-report.csv'
   POLICY_REPORT_NAME = 'nexpose-policy-report.csv'
-  AUDIT_REPORT_NAME = 'nexpose-audit-report.html'
+
+  AUDIT_REPORT_FILE_NAME = 'nexpose-audit-report.html'
+  AUDIT_REPORT_NAME = 'audit-report'
+  AUDIT_REPORT_FORMAT = 'html'
+
+  XML_REPORT_FILE_NAME = 'nexpose-xml-report.xml'
+  XML_REPORT_NAME = 'audit-report'
+  XML_REPORT_FORMAT = 'raw-xml'
 
   VULNERABILITY_REPORT_QUERY = 'SELECT DISTINCT
                                   ip_address,

data/lib/nexpose-runner/scan.rb

@@ -36,7 +36,10 @@ module NexposeRunner
       generate_csv(policies, CONSTANTS::POLICY_REPORT_NAME)
 
       puts "Scan complete for #{run_details.site_name}, Generating Audit Report"
-      generate_audit_report(site.id, nsc, CONSTANTS::AUDIT_REPORT_NAME)
+      generate_template_report(nsc, site.id, CONSTANTS::AUDIT_REPORT_FILE_NAME, CONSTANTS::AUDIT_REPORT_NAME, CONSTANTS::AUDIT_REPORT_FORMAT)
+      
+      puts "Scan complete for #{run_details.site_name}, Generating Xml Report"
+      generate_template_report(nsc, site.id, CONSTANTS::XML_REPORT_FILE_NAME, CONSTANTS::XML_REPORT_NAME, CONSTANTS::XML_REPORT_FORMAT)
 
       [vulnerbilities, software, policies]
     end
@@ -90,10 +93,10 @@ module NexposeRunner
       CSV.parse(report_output.chomp, {:headers => :first_row})
     end
 
-    def self.generate_audit_report(site, nsc, name)
-      adhoc = Nexpose::AdhocReportConfig.new('audit-report', 'html', site)
+    def self.generate_template_report(nsc, site, file_name, report_name, report_format)
+      adhoc = Nexpose::AdhocReportConfig.new(report_name, report_format, site)
       data = adhoc.generate(nsc)
-      File.open(name, 'w') { |file| file.write(data) }
+      File.open(file_name, 'w') { |file| file.write(data) }
     end
 
     def self.generate_csv(csv_output, name)

data/spec/scan_spec.rb

@@ -209,7 +209,7 @@ describe 'nexpose-runner' do
 
       describe 'it should create reports' do
       it 'should generate, download, and parse an adhoc reports for Vulnerability, Software, and Policies' do
-        expect(Nexpose::AdhocReportConfig).to receive(:new)
+          expect(Nexpose::AdhocReportConfig).to receive(:new)
                                                 .with(nil, 'sql')
                                                 .and_return(@mock_report)
 
@@ -217,6 +217,17 @@ describe 'nexpose-runner' do
           expect_report_to_be_called_with(CONSTANTS::SOFTWARE_REPORT_NAME, CONSTANTS::SOFTWARE_REPORT_QUERY, @mock_software_report)
           expect_report_to_be_called_with(CONSTANTS::POLICY_REPORT_NAME, CONSTANTS::POLICY_REPORT_QUERY, @mock_policy_report)
 
+          expect(Nexpose::AdhocReportConfig).to receive(:new)
+                                                .with(CONSTANTS::AUDIT_REPORT_NAME, CONSTANTS::AUDIT_REPORT_FORMAT, @mock_site_id)
+                                                .and_return(@mock_report)
+        
+          expect(Nexpose::AdhocReportConfig).to receive(:new)
+                                                .with(CONSTANTS::XML_REPORT_NAME, CONSTANTS::XML_REPORT_FORMAT, @mock_site_id)
+                                                .and_return(@mock_report)
+
+          expect_template_report_to_be_called_with(CONSTANTS::AUDIT_REPORT_FILE_NAME)
+          expect_template_report_to_be_called_with(CONSTANTS::XML_REPORT_FILE_NAME)
+          
           expect { 
             NexposeRunner::Scan.start(@options) 
           }.to raise_error(StandardError, CONSTANTS::VULNERABILITY_FOUND_MESSAGE)
@@ -252,6 +263,11 @@ def expect_report_to_be_called_with(report_name, report_query, report_response)
   expect(CSV).to receive(:open).with(report_name, 'w').ordered
 end
 
+def expect_template_report_to_be_called_with(report_file_name)
+  expect(@mock_report).to receive(:generate).with(@mock_nexpose_client).ordered
+  expect(File).to receive(:open).with(report_file_name, 'w').ordered
+end
+
 def get_mock_nexpose_client
   mock_nexpose_client = double(Nexpose::Connection)
 
@@ -333,6 +349,7 @@ def get_mock_report
                           .and_return(mock_report)
 
   allow(CSV).to receive(:open).with(any_args)
+  allow(File).to receive(:open).with(any_args)
 
   mock_report
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: NexposeRunner
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Nathan Gibson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nexpose