dradis-nessus 3.3.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 527a7b4db254c8fd1308271a84d6acaa161839e1
-  data.tar.gz: f8b98514caef3641c22e133999f335bf8f7ce857
+  metadata.gz: 9cc963449349533ff36a39bf7a5338de17af5bdf
+  data.tar.gz: 72fdc4c22873c9ce4b2d8718d23f34fdf9ba459f
 SHA512:
-  metadata.gz: b6da76530fb5fc37e677fb9c70a32f354e6d7d81727d639038332677b0db4cf3fcb33651fdec4df7a8bc32b8a3a03973d8dec018249f0a38e4d7fcd6de3cb445
-  data.tar.gz: 563431b2d37630c685266dfd1f3b2c7cc2214610cdabc67deefa6e2783b2c0c76353e28aca4943684e315d3aacbe45f74fb5513e43b1ff3bcd9f7026f118449a
+  metadata.gz: eea8e61c79488f36a540089d3222cd40044a2bf290fac5f1b58fe651c4dcbef2c341b5d98b61e92d85a3997c1d7eb2faadcd52d8d6d0bfdd940c2927f927600b
+  data.tar.gz: 3e76531c1ef2f4df25b1487af2b5ab7d181ecdb870dc7cd8da6e7ac02930a581e4b73e245242726dc353cee5b034632ddd3eff5c08b60824e21d4940a04e5cb8

data/CHANGELOG.md

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

data/README.md

@@ -24,3 +24,8 @@ See the Dradis Framework's [CONTRIBUTING.md](https://github.com/dradis/dradisfra
 ## License
 
 Dradis Framework and all its components are released under [GNU General Public License version 2.0](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) as published by the Free Software Foundation and appearing in the file LICENSE included in the packaging of this file.
+
+
+## Feature requests and bugs
+
+Please use the [Dradis Framework issue tracker](https://github.com/dradis/dradis-ce/issues) for add-on improvements and bug reports.

data/dradis-nessus.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   # versions of Rails (a sure recipe for disaster, I'm sure), which is needed
   # until we bump Dradis Pro to 4.1.
   # s.add_dependency 'rails', '~> 4.1.1'
-  spec.add_dependency 'dradis-plugins', '~> 3.2'
+  spec.add_dependency 'dradis-plugins', '~> 3.6'
   spec.add_dependency 'nokogiri'
 
   spec.add_development_dependency 'bundler', '~> 1.6'

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

@@ -7,18 +7,7 @@ module Dradis
         include ::Dradis::Plugins::Base
         description 'Processes Nessus XML v2 format (.nessus)'
         provides :upload
-
-        #     generators do
-        #       require "path/to/my_railtie_generator"
-        #     end
-
-        # Configuring the gem
-        # class Configuration < Core::Configurator
-        #   configure :namespace => 'burp'
-        #   setting :category, :default => 'Burp Scanner output'
-        #   setting :author, :default => 'Burp Scanner plugin'
-        # end
       end
     end
   end
-end
+end

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

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

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

@@ -62,7 +62,7 @@ module Dradis::Plugins::Nessus
         protocol: protocol,
         state:    'open',
         name:     xml_report_item['svc_name'],
-        x_nessus: xml_report_item.at_xpath('./plugin_output').text
+        x_nessus: xml_report_item.at_xpath('./plugin_output').try(:text)
       })
 
       host_node.save
@@ -128,10 +128,9 @@ module Dradis::Plugins::Nessus
     def process_report_item(xml_host, host_node, xml_report_item)
       # 3.1. Add Issue to the project
       plugin_id = xml_report_item.attributes['pluginID'].value
-      logger.info{ "\t\t\t => Creating new issue (plugin_id: #{plugin_id})" }
+      logger.info{ "\t\t => Creating new issue (plugin_id: #{plugin_id})" }
 
       issue_text = template_service.process_template(template: 'report_item', data: xml_report_item)
-      issue_text << "\n\n#[Host]#\n#{xml_host.attributes['name']}\n\n"
 
       issue = content_service.create_issue(text: issue_text, id: plugin_id)
 
@@ -162,7 +161,7 @@ module Dradis::Plugins::Nessus
     def process_service_detection(xml_host, host_node, xml_report_item)
       port     = xml_report_item['port'].to_i
       protocol = xml_report_item['protocol']
-      logger.info{ "\t\t\t => Creating new service: #{protocol}/#{port}" }
+      logger.info{ "\t\t => Creating new service: #{protocol}/#{port}" }
 
       host_node.set_property(:services, {
         port:     port,

data/lib/tasks/thorfile.rb

@@ -1,5 +1,5 @@
 class NessusTasks < Thor
-  include Core::Pro::ProjectScopedTask if defined?(::Core::Pro)
+  include Rails.application.config.dradis.thor_helper_module
 
   namespace "dradis:plugins:nessus"
 
@@ -15,23 +15,8 @@ class NessusTasks < Thor
       exit(-1)
     end
 
-    content_service = nil
-    template_service = nil
-
-    template_service = Dradis::Plugins::TemplateService.new(plugin: Dradis::Plugins::Nessus)
-    if defined?(Dradis::Pro)
-      detect_and_set_project_scope
-      content_service = Dradis::Pro::Plugins::ContentService.new(plugin: Dradis::Plugins::Nessus)
-    else
-      content_service = Dradis::Plugins::ContentService.new(plugin: Dradis::Plugins::Nessus)
-    end
-
-    importer = Dradis::Plugins::Nessus::Importer.new(
-                logger: logger,
-       content_service: content_service,
-      template_service: template_service
-    )
-
+    detect_and_set_project_scope
+    importer = Dradis::Plugins::Nessus::Importer.new(logger: logger)
     importer.import(file: file_path)
 
     logger.close

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-nessus
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dradis-plugins
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +104,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -156,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Nessus upload add-on for the Dradis Framework.