dradis-nmap 3.12.0 → 3.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 878cee3cce8af3f03460de821fce3cf4223d7a3c
-  data.tar.gz: 7cac57433eb24cdd32665d1261132eb6b61651bb
+SHA256:
+  metadata.gz: 996eb518d872fbf970088967f347bba0add8ca7963f92e545868f3fb27e0c6d4
+  data.tar.gz: cb3780eaf7828f25f1a3a68575f6dfe0bf19f92982b826dbafe0735fd7d4d716
 SHA512:
-  metadata.gz: d15d383fd0aa9808c8e36496a24113415e4a0464ba9950cb4f1e26be679c356008a7e42767485d92e9ca604c6056843c83bc36bf3d058d282880ac13a3f8fbf8
-  data.tar.gz: 134af0300d00ece7acac850f636ad164d10eea5e5a6c5adc3e3da8f770a4595b2e3d6afea6f4aad396912d6211fa6c1b13661339be417c43b140bb9c0bb81952
+  metadata.gz: f7e8855e9cd9db4141aa4428a21506553b77cda637c7b7967928e26815d1415a30c1eccc0c6c9f7fc9c675a4cf9d9d1f6863ca808ceb8b6a50534af75b6a16e7
+  data.tar.gz: 1542f8590c01c392ecbf35e6c2c32e8fa5f1f310f4da0d9a92bc4dea016947d783f5d604017f2ba6f14d839eb532be7451aae5a1463542854a5461a082843d19

data/.github/issue_template.md

@@ -0,0 +1,16 @@
+### Steps to reproduce
+
+Help us help you, how can we reproduce the problem?
+
+### Expected behavior
+Tell us what should happen
+
+### Actual behavior
+Tell us what happens instead
+
+### System configuration
+**Dradis version**:
+
+**Ruby version**:
+
+**OS version**:

data/.github/pull_request_template.md

@@ -0,0 +1,36 @@
+### Summary
+
+Provide a general description of the code changes in your pull
+request... were there any bugs you had fixed? If so, mention them. If
+these bugs have open GitHub issues, be sure to tag them here as well,
+to keep the conversation linked together.
+
+
+### Other Information
+
+If there's anything else that's important and relevant to your pull
+request, mention that information here. This could include
+benchmarks, or other information.
+
+Thanks for contributing to Dradis!
+
+
+### Copyright assignment
+
+Collaboration is difficult with commercial closed source but we want
+to keep as much of the OSS ethos as possible available to users
+who want to fix it themselves.
+
+In order to unambiguously own and sell Dradis Framework commercial
+products, we must have the copyright associated with the entire
+codebase. Any code you create which is merged must be owned by us.
+That's not us trying to be a jerks, that's just the way it works.
+
+Please review the [CONTRIBUTING.md](https://github.com/dradis/dradis-ce/blob/master/CONTRIBUTING.md)
+file for the details.
+
+You can delete this section, but the following sentence needs to
+remain in the PR's description:
+
+> I assign all rights, including copyright, to any future Dradis
+> work by myself to Security Roots.

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## Dradis Framework 3.17 (May, 2020) ##
+
+*   No changes.
+
+## Dradis Framework 3.16 (February, 2020) ##
+
+*   No changes.
+
+## Dradis Framework 3.15 (November, 2019) ##
+
+*   No changes.
+
+## Dradis Framework 3.14 (August, 2019) ##
+
+*   Add port.service.tunnel field to the port template
+
+## Dradis Framework 3.13 (June, 2019) ##
+
+*   No changes.
+
 ## Dradis Framework 3.12 (March, 2019) ##
 
 *   No changes.

data/dradis-nmap.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'dradis-plugins', '~> 3.6'
   spec.add_dependency 'ruby-nmap', '~> 0.7'
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'combustion', '~> 0.5.2'

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

@@ -41,7 +41,11 @@ module Dradis
             # port.service.product
             # port.service.version
             if @nmap_object.service
-              @nmap_object.service.try(attribute) || 'n/a'
+              if attribute == 'tunnel'
+                @nmap_object.service.try(:ssl?) ? 'ssl' : 'n/a'
+              else
+                @nmap_object.service.try(attribute) || 'n/a'
+              end
             end
           else
             @nmap_object.try(name) || 'n/a'

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

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

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

@@ -50,6 +50,7 @@ module Dradis::Plugins::Nmap
             reason: port.reason,
             name: port.try(:service).try(:name),
             product: port.try(:service).try(:product),
+            tunnel: port.try(:service).try(:ssl?) ? 'ssl' : 'n/a',
             version: port.try(:service).try(:version),
             source: :nmap,
           }

data/spec/nmap_upload_spec.rb

@@ -12,34 +12,11 @@ describe 'Nmap upload plugin' do
       # Init services
       plugin = Dradis::Plugins::Nmap
 
-      @content_service = Dradis::Plugins::ContentService.new(plugin: plugin)
-      template_service = Dradis::Plugins::TemplateService.new(plugin: plugin)
+      @content_service = Dradis::Plugins::ContentService::Base.new(plugin: plugin)
 
       @importer = plugin::Importer.new(
-        content_service: @content_service,
-        template_service: template_service
+        content_service: @content_service
       )
-
-      # Stub dradis-plugins methods
-      #
-      # They return their argument hashes as objects mimicking
-      # Nodes, Issues, etc
-      allow(@content_service).to receive(:create_node) do |args|
-        # puts "create_node: #{ args.inspect }"
-        OpenStruct.new(args)
-      end
-      allow(@content_service).to receive(:create_note) do |args|
-        # puts "create_note: #{ args.inspect }"
-        OpenStruct.new(args)
-      end
-      allow(@content_service).to receive(:create_issue) do |args|
-        # puts "create_issue: #{ args.inspect }"
-        OpenStruct.new(args)
-      end
-      allow(@content_service).to receive(:create_evidence) do |args|
-        # puts "create_evidence: #{ args.inspect }"
-        OpenStruct.new(args)
-      end
     end
 
     it "creates an error note when the xml is not valid" do
@@ -47,16 +24,20 @@ describe 'Nmap upload plugin' do
         expect(args[:text]).to include("#[Title]#\nInvalid file format")
         OpenStruct.new(args)
       end.once
+      
       # Run the import
       @importer.import(file: 'spec/fixtures/files/invalid.xml')
     end
 
     it "creates nodes, issues, notes and an evidences as needed" do
       expect(@content_service).to receive(:create_node) do |args|
-        # puts "create_node: #{ args.inspect }"
+        puts "create_node: #{ args.inspect }"
         expect(args[:label]).to eq('74.207.244.221')
         expect(args[:type]).to eq(:host)
-        OpenStruct.new(args)
+        obj = OpenStruct.new(args)
+        obj.define_singleton_method(:set_property) { |*| }
+        obj.define_singleton_method(:set_service) { |*| }
+        obj
       end.once
       expect(@content_service).to receive(:create_note) do |args|
         puts "create_note: #{ args.inspect }"

data/templates/port.fields

@@ -4,5 +4,6 @@ port.state
 port.reason
 port.service.name
 port.service.product
+port.service.tunnel
 port.service.version
 port.host

data/templates/port.sample

@@ -10,5 +10,6 @@
   <service
     name="smtp"
     method="table"
-    conf="3"/>
-</port>
+    conf="3"
+    tunnel="ssl"/>
+</port>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-nmap
 version: !ruby/object:Gem::Version
-  version: 3.12.0
+  version: 3.17.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dradis-plugins
@@ -42,16 +42,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +102,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/issue_template.md"
+- ".github/pull_request_template.md"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md
@@ -149,8 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Nmap add-on for the Dradis Framework.