dradis-nmap 3.1.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5bfe321835fa4b3ee758bde3398175718898c42
-  data.tar.gz: ff2402d0d92f9fdfa0fddcb9b4e6db8910bb5d3d
+  metadata.gz: ad88aa579df07ddec0d385d367fe10330d3ccb6a
+  data.tar.gz: 38c604da41ded39e24fa23ce1caa173dead61530
 SHA512:
-  metadata.gz: 018b218455d151deb2ff71250c573baeba78828f3ba265b2114d53b7f01c418f61ba03034d51348cdbe907db40b0753d752747bc1373de70026381f77e5e866b
-  data.tar.gz: 5bec210835b089db2f67e4bd1905b12e0d07ff95e26a3b302e2e4026e9fcec8851afcae317d805875b3b32066eb2061057fa46a12cfeb1f5875485b3df7b7dd0
+  metadata.gz: 562b18567f3fe7d3c912b728172a7d8deb0dfb9aa4690f5da11fcf0add3e823ab72ae7520e800194b0802e157f86d21c8fa56a9276e9bd365ec9571a8725ca88
+  data.tar.gz: d77b30f6f67c6e6ee581eda0778df247eeffb0c071cc9e06879ffc5567f8092117660b52c2473fcb01388399662cadfc5b65823b076b02aeb174ceda8c70b1f6

data/CHANGELOG.md

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

data/README.md

@@ -4,7 +4,7 @@
 
 Upload Nmap files into Dradis.
 
-The plugin requires Dradis 3.0 or higher.
+The add-on requires [Dradis CE](https://dradisframework.org/) > 3.0, or [Dradis Pro](https://dradisframework.com/pro/).
 
 
 ## More information
@@ -20,3 +20,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-nmap.gemspec

@@ -24,7 +24,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 'ruby-nmap', '~> 0.7'
 
   spec.add_development_dependency 'bundler', '~> 1.6'

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

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

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

@@ -46,8 +46,8 @@ module Dradis::Plugins::Nmap
           # Add service to host properties
           host_node.set_property(:services, {
               port: port.number,
-              protocol: port.protocol,
-              state: port.state,
+              protocol: port.protocol.to_s,
+              state: port.state.to_s,
               reason: port.reason,
               name: port.try('service').try('name'),
               product: port.try('service').try('product'),

data/lib/tasks/thorfile.rb

@@ -1,42 +1,28 @@
 class NmapTasks < Thor
-  include Core::Pro::ProjectScopedTask if defined?(::Core::Pro)
+  include Rails.application.config.dradis.thor_helper_module
 
   namespace "dradis:plugins:nmap"
 
   desc      "upload FILE", "upload the results of an Nmap scan"
   long_desc "Upload an Nmap scan to create nodes and notes for the hosts and "\
             "ports discovered during scanning."
+
   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
 
-    # Set project scope from the PROJECT_ID env variable:
-    detect_and_set_project_scope if defined?(::Core::Pro)
-
-    plugin = Dradis::Plugins::Nmap
+    detect_and_set_project_scope
 
-    Dradis::Plugins::Nmap::Importer.new(
-      logger:           logger,
-      content_service:  service_namespace::ContentService.new(plugin: plugin),
-      template_service: service_namespace::TemplateService.new(plugin: plugin)
-    ).import(file: file_path)
+    importer = Dradis::Plugins::Nmap::Importer.new(logger: logger)
+    importer.import(file: file_path)
 
     logger.close
   end
-
-
-  private
-
-  def logger
-    @logger ||= Logger.new(STDOUT).tap { |l| l.level = Logger::DEBUG }
-  end
-
-  def service_namespace
-    defined?(Dradis::Pro) ? Dradis::Pro::Plugins : Dradis::Plugins
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-nmap
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-12 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: ruby-nmap
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +104,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -149,7 +150,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: Nmap add-on for the Dradis Framework.