dradis-nmap 4.11.0 → 4.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4614dd50ccc73b43f8497213c4e0d786e5c71b5ec1d89e0f44333a351a0851df
-  data.tar.gz: ddec528c5f49988522d370789ca939bf7a5cfb8816f5cf50674c651de88c332e
+  metadata.gz: 28df4c2422ea7df986f42170119335f6cbead4763abd4bac31f097374b4f5645
+  data.tar.gz: bd1a3ee824695672a44ed48629693f307f4cd1cde23490da9bc0f125732b7355
 SHA512:
-  metadata.gz: ccb8d74bf410d8136e58cbc5575de0084e5a2a197c7c816251f7ae7cc1dd926a71389de61338f2e8c806a7e646b8d3b90945818a556dbcece8d1480d0545f8c2
-  data.tar.gz: 2591a4aa5ddfee803bb5ef32027afee371f2ccda5e1b237ba79a55cb6e3d7768373f0dc0f57022a24fd4008cf8a031240c038a99a87dc0ed9cf58174909b3cd5
+  metadata.gz: 7871f65a0734bd1e2f4e58c8480f97b8eb47fca33c735a5957df997b5ae57bf48a9e1ca29a0e6f66b9e98da049b246e47cf3a28fc12aa3f4076ac45be59a67b4
+  data.tar.gz: 1174ed549a8b8a33e41c2cfc1705f0c5da972782f69b7872d32802f50d12c678a11fcea41d33a8d04a9b622d252e0fcaddbfed21bdef87f0d013f91045da9251

data/CHANGELOG.md

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

data/README.md

@@ -4,8 +4,7 @@
 
 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
 

data/dradis-nmap.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'dradis-plugins', '~> 4.0'
   spec.add_dependency 'ruby-nmap', '~> 0.7'
 
-  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   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/gem_version.rb

@@ -8,7 +8,7 @@ module Dradis
 
       module VERSION
         MAJOR = 4
-        MINOR = 11
+        MINOR = 13
         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.11.0
+  version: 4.13.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-17 00:00:00.000000000 Z
+date: 2024-08-07 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: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -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,12 +127,8 @@ 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
@@ -151,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Nmap add-on for the Dradis Framework.

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%