dradis-metasploit 4.11.0 → 4.12.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: fef57fccc9e4980d26507d42fd278e0b5729b2c86ee909c7d878d30ef762bc92
4
- data.tar.gz: ae732341db58bb17cefb685776e854a8d42a63ff3728de17e2e5884c43fde9b9
3
+ metadata.gz: c750c49ae3a4bea93bf35ea7261e347caaa85a62efe81b571d0bdc226c1658a0
4
+ data.tar.gz: db3f3b63e93302c51d3fc8b0e63a7677179a3ad394ad716b0e64ec45eef6d7e5
5
5
  SHA512:
6
- metadata.gz: 9dec16e51dd9f988e4f427a6f80953309d7db99112c6eef0feaa0d876b3c52a82d359161fa6b0186d54d4122a6d537ebdcc3bbe2e1b70e6b45188e7db1c85193
7
- data.tar.gz: e7c58442be3375a3d3b14442babbf17e5c0fcf73be5dba365f0535df502a8e26b7c243f6bfe4a74abd4ce1dc52bd402eae6ac3e6fad66f86029f29c4d9bb5522
6
+ metadata.gz: 63c71070a21f023e1c414727c8bfb5dd2350dd0cfce82fd8c86011ba281abebddcf96a7ea4f5d32af23cb2c6436687956378707dc8857676415b435ced632b5a
7
+ data.tar.gz: ccb270da73e579db026e57e8ea8c549be004940cb5d834ffd5b5cd8c6564809a998e1583ddd4d5d24eb272eac2eca11ea623588cb53a859a453aa032629bcbfc
data/CHANGELOG.md CHANGED
@@ -1,3 +1,8 @@
1
+ v4.12.0 (May 2024)
2
+ - Migrate integration to use Mappings Manager
3
+ - Update Dradis links in README
4
+ - Use the `os` Node property to match other plugins
5
+
1
6
  v4.11.0 (January 2024)
2
7
  - No changes
3
8
 
data/README.md CHANGED
@@ -4,7 +4,7 @@
4
4
 
5
5
  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.
6
6
 
7
- The add-on requires [Dradis CE](https://dradisframework.org/) > 3.0, or [Dradis Pro](https://dradisframework.com/pro/).
7
+ The add-on requires [Dradis CE](https://dradis.com/ce/) > 3.0, or [Dradis Pro](https://dradis.com/).
8
8
 
9
9
 
10
10
 
@@ -8,7 +8,7 @@ module Dradis
8
8
 
9
9
  module VERSION
10
10
  MAJOR = 4
11
- MINOR = 11
11
+ MINOR = 12
12
12
  TINY = 0
13
13
  PRE = nil
14
14
 
@@ -68,7 +68,7 @@ module Dradis::Plugins::Metasploit
68
68
  end
69
69
 
70
70
  if os_name = xml_host.at_xpath('os-name')
71
- host_node.set_property(:os_name, os_name.text)
71
+ host_node.set_property(:os, os_name.text)
72
72
  end
73
73
 
74
74
  # Service-related properties
@@ -94,7 +94,7 @@ module Dradis::Plugins::Metasploit
94
94
  end
95
95
 
96
96
  xml_host.xpath('notes/note').each do |xml_note|
97
- host_note = template_service.process_template(template: 'host_note', data: xml_note)
97
+ host_note = mapping_service.apply_mapping(source: 'host_note', data: xml_note)
98
98
  content_service.create_note(text: host_note, node: host_node)
99
99
  end
100
100
  end
@@ -0,0 +1,19 @@
1
+ module Dradis::Plugins::Metasploit
2
+ module Mapping
3
+ DEFAULT_MAPPING = {
4
+ host_note: {
5
+ 'Title' => 'Note {{ metasploit[host_note.id] }}',
6
+ 'Type' => '{{ metasploit[host_note.ntype] }}',
7
+ 'Data' => '{{ metasploit[host_note.data] }}'
8
+ }
9
+ }.freeze
10
+
11
+ SOURCE_FIELDS = {
12
+ host_note: [
13
+ 'host_note.id',
14
+ 'host_note.ntype',
15
+ 'host_note.data'
16
+ ]
17
+ }.freeze
18
+ end
19
+ end
@@ -7,5 +7,6 @@ end
7
7
 
8
8
  require 'dradis/plugins/metasploit/engine'
9
9
  require 'dradis/plugins/metasploit/field_processor'
10
+ require 'dradis/plugins/metasploit/mapping'
10
11
  require 'dradis/plugins/metasploit/importer'
11
12
  require 'dradis/plugins/metasploit/version'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dradis-metasploit
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.11.0
4
+ version: 4.12.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Daniel Martin
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-01-17 00:00:00.000000000 Z
11
+ date: 2024-05-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: dradis-plugins
@@ -119,6 +119,7 @@ files:
119
119
  - lib/dradis/plugins/metasploit/field_processor.rb
120
120
  - lib/dradis/plugins/metasploit/gem_version.rb
121
121
  - lib/dradis/plugins/metasploit/importer.rb
122
+ - lib/dradis/plugins/metasploit/mapping.rb
122
123
  - lib/dradis/plugins/metasploit/version.rb
123
124
  - lib/tasks/thorfile.rb
124
125
  - spec/dradis/plugins/metasploit/importer_spec.rb
@@ -126,9 +127,7 @@ files:
126
127
  - spec/fixtures/files/msf5.xml
127
128
  - spec/fixtures/files/qualys.xml
128
129
  - spec/spec_helper.rb
129
- - templates/host_note.fields
130
130
  - templates/host_note.sample
131
- - templates/host_note.template
132
131
  homepage: https://dradis.com/integrations/metasploit.html
133
132
  licenses:
134
133
  - GPL-2
@@ -148,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
148
147
  - !ruby/object:Gem::Version
149
148
  version: '0'
150
149
  requirements: []
151
- rubygems_version: 3.3.7
150
+ rubygems_version: 3.1.4
152
151
  signing_key:
153
152
  specification_version: 4
154
153
  summary: Metasploit add-on for the Dradis Framework.
@@ -1,3 +0,0 @@
1
- host_note.id
2
- host_note.ntype
3
- host_note.data
@@ -1,8 +0,0 @@
1
- #[Title]#
2
- Note %host_note.id%
3
-
4
- #[Type]#
5
- %host_note.ntype%
6
-
7
- #[Data]#
8
- %host_note.data%