dradis-nmap 3.13.0 → 3.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f34b975a92cc1846c69ebbdfef6a7556c4ae4433
-  data.tar.gz: 04b6b0ee97c658baab549e066fbd486f84c18dfd
+SHA256:
+  metadata.gz: 45c948807e28ec6a5221d4b96f6c6cea89704150634378abbb1d00d02143fc5b
+  data.tar.gz: 6b947c4c39a41c4be5c8b1e27f864fc1fa721f5f2b3e838994f9eff26edfd85c
 SHA512:
-  metadata.gz: df31ca4a7068eb1533b64d6d9a38732bed1b3d31bac3c3948f85dc829158c8e8f7b9d088e2dfc2d95397ff92063da1de119f9230f5333e28162ac2234e5b8b20
-  data.tar.gz: 4fcc6f0c0815d784c7e264641ccf22fe63a5d0e0145d6a47d530ec458671ad4c38b56528c3937a95161f6216b524d306a7b866a244f78b61eec3c2d16b305c18
+  metadata.gz: 3289979220eb1a17b726e715c515922d0eee2a520e5fc11d887da5a357f4f9cf98e061125dafaa845ba3eb7cbf29f208e2a4efca2e794e83efdc69c6a784d51e
+  data.tar.gz: b83f554912f1bc5601ac92ab973f3ded5c683ad12c256ebaf143527035f431e0f259eca3428a13ade1c4ee639774d2ee8747fea6040f801b8b52a68c64f38035

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.18 (July, 2020) ##
+
+*   No changes.
+
+## 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.

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 = 13
+        MINOR = 18
         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.13.0
+  version: 3.18.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2020-07-22 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.1.2
 signing_key: 
 specification_version: 4
 summary: Nmap add-on for the Dradis Framework.