dradis-nmap 4.10.0 → 4.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 699a744dd4dd677e95e578d22f1e161ef5bae45ba9b4756a80abbb4c8ce084d7
-  data.tar.gz: 7746d013c5e8e6e691ba8a9b9afd07f5463a0181f6de662288062a887ad8ff66
+  metadata.gz: 4ba84196cfdcaaa2d3d284bb95dc6c7ca3a6dcc4d4279e25052ecf47eef67e23
+  data.tar.gz: 9ce92665dfcf08eb3281a5f9934ec58201bbe1b7ae53602b9ae8e9e1c74738b5
 SHA512:
-  metadata.gz: ad8d81ba71be5da76fcf4eae1a896c3c56594b5067871477746233864bbe4c2a6aae466fa19c7b21825531fe767b4bd201b8e72a1a6f2574de6dd81ba150d13f
-  data.tar.gz: 4e9f518322977ddff874a3a4d52d67098237c67f306e8f8e24816aab801f4072717c631b30ebdb32a3165f35f12262345249db881b7332922367dbe2499681ca
+  metadata.gz: 1c7517d0ce2ef561e2446ae8d3f23bec382a3bcc7d5b551e7142ca3e1a4241f1b3b07970983ecc2015142dca834fd3034d8e13fe9e799c7c5770db87ad440aef
+  data.tar.gz: 2f8df32b179544eb79b9b6a95643c2e2acf2fd9b89dc8cefd868a976dab4efebe59a8658c6ba5ac33044422eb82fbe06eb77d2821626bdf717cb8775bef83349

data/.github/pull_request_template.md

@@ -1,3 +1,5 @@
+Please review [CONTRIBUTING.md](https://github.com/dradis/dradis-ce/blob/develop/CONTRIBUTING.md) and remove this line.
+
 ### Summary
 
 Provide a general description of the code changes in your pull
@@ -6,6 +8,11 @@ these bugs have open GitHub issues, be sure to tag them here as well,
 to keep the conversation linked together.
 
 
+### Testing Steps
+
+Provide steps to test functionality, described in detail for someone not familiar with this part of the application / code base
+
+
 ### Other Information
 
 If there's anything else that's important and relevant to your pull
@@ -26,11 +33,13 @@ 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.
+
+### Check List
+
+- [ ] Added a CHANGELOG entry
+- [ ] Added specs

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+v4.12.0 (May 2024)
+ - Migrate integration to use Mappings Manager
+ - Update Dradis links in README
+
+v4.11.0 (January 2024)
+  - No changes
+
 v4.10.0 (September 2023)
   - Update gemspec links
 

data/README.md

@@ -4,17 +4,16 @@
 
 Upload Nmap files into Dradis.
 
-The add-on requires [Dradis CE](https://dradisframework.org/) > 3.0, or [Dradis Pro](https://dradisframework.com/pro/).
-
+The add-on requires [Dradis CE](https://dradis.com/ce/) > 3.0, or [Dradis Pro](https://dradis.com/).
 
 ## More information
 
-See the Dradis Framework's [README.md](https://github.com/dradis/dradisframework/blob/master/README.md)
+See the Dradis Framework's [README.md](https://github.com/dradis/dradis-ce/blob/develop/README.md)
 
 
 ## Contributing
 
-See the Dradis Framework's [CONTRIBUTING.md](https://github.com/dradis/dradisframework/blob/master/CONTRIBUTING.md)
+See the Dradis Framework's [CONTRIBUTING.md](https://github.com/dradis/dradis-ce/blob/develop/CONTRIBUTING.md)
 
 
 ## License

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

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

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

@@ -41,7 +41,7 @@ module Dradis::Plugins::Nmap
         host_node.set_property(:os, host.os.matches.map(&:name)) if host.os.present?
 
         # Old-style properties-in-a-note approach
-        host_text = template_service.process_template(template: 'host', data: host)
+        host_text = mapping_service.apply_mapping(source: 'host', data: host)
         content_service.create_note(text: host_text, node: host_node)
 
         host.each_port do |port|
@@ -71,7 +71,7 @@ module Dradis::Plugins::Nmap
           port.host = host.ip
 
           # Add a note with the port information
-          port_text = template_service.process_template(template: 'port', data: port)
+          port_text = mapping_service.apply_mapping(source: 'port', data: port)
           content_service.create_note(
             text: port_text,
             node: host_node)

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

@@ -0,0 +1,41 @@
+module Dradis::Plugins::Nmap
+  module Mapping
+    DEFAULT_MAPPING = {
+      host: {
+        'Title' => 'Nmap info: {{ nmap[host.ip] }}',
+        'IP' => '{{ nmap[host.ip] }}',
+        'Hostnames' => '{{ nmap[host.hostnames] }}',
+        'OS' => '{{ nmap[host.os] }}',
+        'Services' => "|_. Port number |_. Protocol |_. State |_. Service |_. Product |_. Version |\n{{ nmap[host.service_table] }}",
+        'Type' => 'Properties'
+      },
+      port: {
+        'Title' => '{{ nmap[port.number] }}/{{ nmap[port.protocol] }} is {{ nmap[port.state] }} ({{ nmap[port.reason] }})',
+        'Service' => '{{ nmap[port.service.name] }}',
+        'Product' => '{{ nmap[port.service.product] }}',
+        'Version' => '{{ nmap[port.service.version] }}',
+        'Host' => '{{ nmap[port.host] }}'
+      }
+    }.freeze
+
+    SOURCE_FIELDS = {
+      host: [
+        'host.hostnames',
+        'host.ip',
+        'host.service_table',
+        'host.os'
+      ],
+      port: [
+        'port.number',
+        'port.protocol',
+        'port.state',
+        'port.reason',
+        'port.service.name',
+        'port.service.product',
+        'port.service.tunnel',
+        'port.service.version',
+        'port.host'
+      ]
+    }.freeze
+  end
+end

data/lib/dradis/plugins/nmap.rb

@@ -7,5 +7,6 @@ end
 
 require 'dradis/plugins/nmap/engine'
 require 'dradis/plugins/nmap/field_processor'
+require 'dradis/plugins/nmap/mapping'
 require 'dradis/plugins/nmap/importer'
 require 'dradis/plugins/nmap/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-nmap
 version: !ruby/object:Gem::Version
-  version: 4.10.0
+  version: 4.12.0
 platform: ruby
 authors:
 - Daniel Martin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-07 00:00:00.000000000 Z
+date: 2024-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dradis-plugins
@@ -96,7 +96,7 @@ dependencies:
         version: 0.5.2
 description: This add-on allows you to upload and parse output produced from Nmap
   web server scanner into Dradis.
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -119,6 +119,7 @@ files:
 - lib/dradis/plugins/nmap/field_processor.rb
 - lib/dradis/plugins/nmap/gem_version.rb
 - lib/dradis/plugins/nmap/importer.rb
+- lib/dradis/plugins/nmap/mapping.rb
 - lib/dradis/plugins/nmap/version.rb
 - lib/tasks/thorfile.rb
 - spec/fixtures/files/invalid.xml
@@ -126,17 +127,13 @@ files:
 - spec/fixtures/files/sample.xml
 - spec/nmap_upload_spec.rb
 - spec/spec_helper.rb
-- templates/host.fields
 - templates/host.sample
-- templates/host.template
-- templates/port.fields
 - templates/port.sample
-- templates/port.template
 homepage: https://dradis.com/integrations/nmap.html
 licenses:
 - GPL-2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -152,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Nmap add-on for the Dradis Framework.
 test_files:

data/templates/host.fields

@@ -1,4 +0,0 @@
-host.hostnames
-host.ip
-host.service_table
-host.os

data/templates/host.template

@@ -1,19 +0,0 @@
-#[Title]#
-Nmap info: %host.ip%
-
-#[IP]#
-%host.ip%
-
-#[Hostnames]#
-%host.hostnames%
-
-#[OS]#
-%host.os%
-
-#[Services]#
-|_. Port number |_. Protocol |_. State |_. Service |_. Product |_. Version |
-%host.service_table%
-
-
-#[Type]#
-Properties

data/templates/port.fields

@@ -1,9 +0,0 @@
-port.number
-port.protocol
-port.state
-port.reason
-port.service.name
-port.service.product
-port.service.tunnel
-port.service.version
-port.host

data/templates/port.template

@@ -1,14 +0,0 @@
-#[Title]#
-%port.number%/%port.protocol% is %port.state% (%port.reason%)
-
-#[Service]#
-%port.service.name%
-
-#[Product]#
-%port.service.product%
-
-#[Version]#
-%port.service.version%
-
-#[Host]#
-%port.host%