dradis-metasploit 4.10.0 → 4.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9c420c06ed67a602f80e1dac67b324a8008ed12dc1080c75f4bc4f0369e43e2
-  data.tar.gz: bf8d118bf1e3e905c2200d7def6208f6c0d6c4e95a3a430347de757aacb498c1
+  metadata.gz: c750c49ae3a4bea93bf35ea7261e347caaa85a62efe81b571d0bdc226c1658a0
+  data.tar.gz: db3f3b63e93302c51d3fc8b0e63a7677179a3ad394ad716b0e64ec45eef6d7e5
 SHA512:
-  metadata.gz: 2b3f4d8dad62e9301f10b4f582f40d0f7ceeb053d952383968235088a1fa24510778e2a99ff8809737e5220080ef2ec7a5bbf7096ef55d28d46b06e931bdf55c
-  data.tar.gz: 296cd56a7bc319df4dc073d7a6eef19c04fdb43089608606e36e324735aab21e810c495ad67fc7f63852502b956536b3c36ac6978c634bee346937d2a5185e40
+  metadata.gz: 63c71070a21f023e1c414727c8bfb5dd2350dd0cfce82fd8c86011ba281abebddcf96a7ea4f5d32af23cb2c6436687956378707dc8857676415b435ced632b5a
+  data.tar.gz: ccb270da73e579db026e57e8ea8c549be004940cb5d834ffd5b5cd8c6564809a998e1583ddd4d5d24eb272eac2eca11ea623588cb53a859a453aa032629bcbfc

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,11 @@
+v4.12.0 (May 2024)
+ - Migrate integration to use Mappings Manager
+ - Update Dradis links in README
+- Use the `os` Node property to match other plugins
+
+v4.11.0 (January 2024)
+  - No changes
+
 v4.10.0 (September 2023)
   - Update gemspec links
 

data/README.md

@@ -4,18 +4,18 @@
 
 The Metasploit add-on enables users to upload Metasploit XML files to create a structure of nodes/notes that contain the same information about the hosts/ports/services as the original file.
 
-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/metasploit/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/metasploit/importer.rb

@@ -68,7 +68,7 @@ module Dradis::Plugins::Metasploit
         end
 
         if os_name = xml_host.at_xpath('os-name')
-          host_node.set_property(:os_name, os_name.text)
+          host_node.set_property(:os, os_name.text)
         end
 
         # Service-related properties
@@ -94,7 +94,7 @@ module Dradis::Plugins::Metasploit
       end
 
       xml_host.xpath('notes/note').each do |xml_note|
-        host_note = template_service.process_template(template: 'host_note', data: xml_note)
+        host_note = mapping_service.apply_mapping(source: 'host_note', data: xml_note)
         content_service.create_note(text: host_note, node: host_node)
       end
     end

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

@@ -0,0 +1,19 @@
+module Dradis::Plugins::Metasploit
+  module Mapping
+    DEFAULT_MAPPING = {
+      host_note: {
+        'Title' => 'Note {{ metasploit[host_note.id] }}',
+        'Type' => '{{ metasploit[host_note.ntype] }}',
+        'Data' => '{{ metasploit[host_note.data] }}'
+      }
+    }.freeze
+
+    SOURCE_FIELDS = {
+      host_note: [
+        'host_note.id',
+        'host_note.ntype',
+        'host_note.data'
+      ]
+    }.freeze
+  end
+end

data/lib/dradis/plugins/metasploit.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-metasploit
 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.3
 description: This add-on allows you to upload and parse output produced from Metasploit
   Framework into Dradis.
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -119,6 +119,7 @@ files:
 - lib/dradis/plugins/metasploit/field_processor.rb
 - lib/dradis/plugins/metasploit/gem_version.rb
 - lib/dradis/plugins/metasploit/importer.rb
+- lib/dradis/plugins/metasploit/mapping.rb
 - lib/dradis/plugins/metasploit/version.rb
 - lib/tasks/thorfile.rb
 - spec/dradis/plugins/metasploit/importer_spec.rb
@@ -126,14 +127,12 @@ files:
 - spec/fixtures/files/msf5.xml
 - spec/fixtures/files/qualys.xml
 - spec/spec_helper.rb
-- templates/host_note.fields
 - templates/host_note.sample
-- templates/host_note.template
 homepage: https://dradis.com/integrations/metasploit.html
 licenses:
 - GPL-2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -149,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Metasploit add-on for the Dradis Framework.
 test_files:

data/templates/host_note.fields

@@ -1,3 +0,0 @@
-host_note.id
-host_note.ntype
-host_note.data

data/templates/host_note.template

@@ -1,8 +0,0 @@
-#[Title]#
-Note %host_note.id%
-
-#[Type]#
-%host_note.ntype%
-
-#[Data]#
-%host_note.data%