dradis-nessus 3.6.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cc963449349533ff36a39bf7a5338de17af5bdf
-  data.tar.gz: 72fdc4c22873c9ce4b2d8718d23f34fdf9ba459f
+  metadata.gz: a14b2a69eab17116cc157efa4f8d1b295f5635c6
+  data.tar.gz: e5bfed8770eed64b75b5800ba518762c9ae1820e
 SHA512:
-  metadata.gz: eea8e61c79488f36a540089d3222cd40044a2bf290fac5f1b58fe651c4dcbef2c341b5d98b61e92d85a3997c1d7eb2faadcd52d8d6d0bfdd940c2927f927600b
-  data.tar.gz: 3e76531c1ef2f4df25b1487af2b5ab7d181ecdb870dc7cd8da6e7ac02930a581e4b73e245242726dc353cee5b034632ddd3eff5c08b60824e21d4940a04e5cb8
+  metadata.gz: 423de525cac3910168f9423db7da9a28ef9bdd7a20192f179728bc1a58e0c265b79aa5feffaae799761af470a19f2cf191bd96022999fab97f05f631f4461fd6
+  data.tar.gz: c5e29c4c84d65f5995db98ce4f4f6c7105b7466ac5ecd2493867b9ca6309108276271ab56a72bb894d0eb5881fdcec882aefbd667bc161fce259b4b57da499ff

data/CHANGELOG.md

@@ -1,3 +1,8 @@
-## Dradis Framework 3.6 (March XX, 2017) ##
+## Dradis Framework 3.7 (July, 2017) ##
+
+*   No changes.
+
+
+## Dradis Framework 3.6 (March, 2017) ##
 
 *   No changes.

data/lib/dradis/plugins/nessus/gem_version.rb

@@ -8,7 +8,7 @@ module Dradis
 
       module VERSION
         MAJOR = 3
-        MINOR = 6
+        MINOR = 7
         TINY = 0
         PRE = nil
 

data/lib/tasks/thorfile.rb

@@ -7,19 +7,15 @@ class NessusTasks < Thor
   def upload(file_path)
     require 'config/environment'
 
-    logger = Logger.new(STDOUT)
-    logger.level = Logger::DEBUG
-
     unless File.exists?(file_path)
       $stderr.puts "** the file [#{file_path}] does not exist"
       exit(-1)
     end
 
     detect_and_set_project_scope
-    importer = Dradis::Plugins::Nessus::Importer.new(logger: logger)
-    importer.import(file: file_path)
 
-    logger.close
+    importer = Dradis::Plugins::Nessus::Importer.new(task_options)
+    importer.import(file: file_path)
   end
 
 end

data/spec/dradis/plugins/nessus/importer_spec.rb

@@ -13,12 +13,13 @@ describe Dradis::Plugins::Nessus::Importer do
     # Init services
     plugin = Dradis::Plugins::Nessus
 
-    @content_service = Dradis::Plugins::ContentService.new(plugin: plugin)
-    template_service = Dradis::Plugins::TemplateService.new(plugin: plugin)
+    @content_service = Dradis::Plugins::ContentService::Base.new(
+      logger: Logger.new(STDOUT),
+      plugin: plugin
+    )
 
     @importer = plugin::Importer.new(
-      content_service: @content_service,
-      template_service: template_service
+      content_service: @content_service
     )
 
     # Stub dradis-plugins methods
@@ -26,7 +27,9 @@ describe Dradis::Plugins::Nessus::Importer do
     # They return their argument hashes as objects mimicking
     # Nodes, Issues, etc
     allow(@content_service).to receive(:create_node) do |args|
-      OpenStruct.new(args)
+      obj = OpenStruct.new(args)
+      obj.define_singleton_method(:set_property) { |_, __| }
+      obj
     end
     allow(@content_service).to receive(:create_note) do |args|
       OpenStruct.new(args)
@@ -48,4 +51,4 @@ describe Dradis::Plugins::Nessus::Importer do
     # Run the import
     @importer.import(file: 'spec/fixtures/files/example_v2.nessus')
   end
-end
+end

data/spec/fixtures/files/host-01.xml

@@ -6,15 +6,13 @@
       <tag name="HOST_END">Tue Aug  9 09:59:24 2011</tag>
       <tag name="HOST_START">Tue Aug  9 09:50:18 2011</tag>
     </HostProperties>
-    <ReportItem
-      port="0"
-      svc_name="general"
-      protocol="udp"
-      severity="1"
-      pluginID="10287"
-      pluginName="Traceroute Information"
-      pluginFamily="General">
-    </ReportIem>
+    <ReportItem port="0" svc_name="general" protocol="udp" severity="1" pluginID="10287" pluginName="Traceroute Information" pluginFamily="General" />
+    <ReportItem port="0" svc_name="unknown" protocol="icmp" severity="0" pluginID="0" pluginName="" pluginFamily=""/>
+    <ReportItem port="0" svc_name="unknown" protocol="tcp" severity="0" pluginID="0" pluginName="" pluginFamily=""/>
+    <ReportItem port="0" svc_name="unknown" protocol="udp" severity="0" pluginID="0" pluginName="" pluginFamily=""/>
+    <ReportItem port="21" svc_name="ftp?" protocol="tcp" severity="0" pluginID="0" pluginName="" pluginFamily=""/>
+    <ReportItem port="22" svc_name="ssh" protocol="tcp" severity="0" pluginID="0" pluginName="" pluginFamily=""/>
+    <ReportItem port="9090" svc_name="www" protocol="tcp" severity="0" pluginID="0" pluginName="" pluginFamily=""/>
   </ReportHost>
 </Report>
 </NessusClientData_v2>

data/spec/nessus/host_spec.rb

@@ -3,6 +3,11 @@ require 'spec_helper'
 describe Nessus::Host do
   let(:host1_xml) { File.expand_path('../../fixtures/files/host-01.xml', __FILE__) }
 
+  before do
+    doc = Nokogiri::XML(File.read(host1_xml))
+    @host = Nessus::Host.new(doc.xpath('/NessusClientData_v2/Report/ReportHost').first)
+  end
+
   # These are the properties we need to support:
   # host.name                 The name given at scan time, usually an IP address
   # host.ip                   The ip address of the host
@@ -13,11 +18,12 @@ describe Nessus::Host do
   # host.scan_start_time      The date/time the scan started
   # host.scan_stop_time       The date/time the scan ended
   it 'Nessus::Host responds to all the expected fields' do
-    doc = Nokogiri::XML(File.read(host1_xml))
-    host = Nessus::Host.new( doc.xpath('/NessusClientData_v2/Report/ReportHost').first )
-    expect(host.name).to eq('10.0.0.1')
-    expect(host.scan_start_time).to eq('Tue Aug  9 09:50:18 2011')
+    expect(@host.name).to eq('10.0.0.1')
+    expect(@host.scan_start_time).to eq('Tue Aug  9 09:50:18 2011')
   end
 
-  pending 'Nessus::Host should provide access to each of its ReportItems'
-end
+  it 'provides access to each of its ReportItems' do
+    report_items = @host.report_items
+    report_items.each { |item| expect(item).to be_a(Nessus::ReportItem) }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-nessus
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dradis-plugins
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Nessus upload add-on for the Dradis Framework.