dradis-saint 4.10.0 → 4.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96f38eb364bd514a2b8698a981586cc6496a981e01778a1a5d9a458567ee2e9f
-  data.tar.gz: feb6625a95b86d798fabd4fc12d55e6c7eac283d865fec9c3aaefe8f655d753b
+  metadata.gz: 3c046f7a52c587c2ebdcaffc1928118b21d78139373693395e0718dd88b9f8e3
+  data.tar.gz: 87c780f3a7b04df73c766c51265b42dce7ea35a91e37d11232bb860c0a50198b
 SHA512:
-  metadata.gz: ee0cd6926d03d142ca256b6275d7462ee00a365cff045da4e2f63fedd2261ee9eb41b9d88180ef0b47984805d9ac52de8ec8b9ca54925d214a54798c867d9459
-  data.tar.gz: 1d76a5e1bcdb7bb1a8fb6e506404763b4278c080edcb76058f9dc21726f5e894ee8e698d5223cf856a80b453b10012a732734a400d105fcda536ee318a810ad2
+  metadata.gz: ddd85b802e8ebb9356fb7eef16253cfa282bad383dfd1f443d9798c6addfd662ce5b094aaf29d50aec32bacf528edd09edec733f5751e5344b49d52a55a81426
+  data.tar.gz: cb9695ca477bf3b3f73dbeb1013bf32dfa71279b6aed38973bab962736f9d0e311eb20784b6ab5d74c0032a8d5a5b8d8719cb613f168c5fdbcebb77310f3a98e

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)
+ - Update Dradis links in README
+ - Migrate integration to use Mappings Manager
+
+v4.11.0 (January 2024)
+  - No changes
+
 v4.10.0 (September 2023)
   - Update gemspec links
 

data/README.md

@@ -2,17 +2,16 @@
 
 This add-on will enable the user to upload Saint output files in the XML format (.xml) to create a structure of Dradis nodes, issues, and evidences that contain the same information about the hosts and vulnerabilities in the original file.
 
-The add-on requires Dradis 3.0 or higher.
-
+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/dradis-ce/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/dradis-ce/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/saint/gem_version.rb

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

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

@@ -66,7 +66,7 @@ module Dradis::Plugins::Saint
       issue_plugin_id = Digest::SHA1.hexdigest(evidence_desc)
       issue = @issues[issue_plugin_id]
 
-      evidence_text = template_service.process_template(template: 'evidence', data: xml_evidence)
+      evidence_text = mapping_service.apply_mapping(source: 'evidence', data: xml_evidence)
 
       if issue
         # Create Dradis evidence
@@ -109,7 +109,7 @@ module Dradis::Plugins::Saint
         logger.info{ "\t\t => Creating new issue..." }
         plugin_id = Digest::SHA1.hexdigest(element_desc)
 
-        issue_text = template_service.process_template(template: 'vulnerability', data: xml_vuln)
+        issue_text = mapping_service.apply_mapping(source: 'vulnerability', data: xml_vuln)
         issue = content_service.create_issue(text: issue_text, id: plugin_id)
       else
         # Create Note in Host

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

@@ -0,0 +1,55 @@
+module Dradis::Plugins::Saint
+  module Mapping
+    DEFAULT_MAPPING = {
+      evidence: {
+        'Port' => '{{ saint[evidence.port] }}',
+        'Severity' => '{{ saint[evidence.severity] }}',
+        'Class' => '{{ saint[evidence.class] }}',
+        'cve' => '{{ saint[evidence.cve] }}',
+        'CVSS Base Score' => '{{ saint[evidence.cvss_base_score] }}'
+      },
+      vulnerability: {
+        'Title' => '{{ saint[vulnerability.description] }}',
+        'Host Name' => '{{ saint[vulnerability.hostname] }}',
+        'IP Address' => '{{ saint[vulnerability.ipaddr] }}',
+        'Host Type' => '{{ saint[vulnerability.hosttype] }}',
+        'Scan Time' => '{{ saint[vulnerability.scan_time] }}',
+        'Status' => '{{ saint[vulnerability.status] }}',
+        'Severity' => '{{ saint[vulnerability.severity] }}',
+        'CVE' => '{{ saint[vulnerability.cve] }}',
+        'CVSS Base Score' => '{{ saint[vulnerability.cvss_base_score] }}',
+        'Impact' => '{{ saint[vulnerability.impact] }}',
+        'Background' => '{{ saint[vulnerability.background] }}',
+        'Problem' => '{{ saint[vulnerability.problem] }}',
+        'Resolution' => '{{ saint[vulnerability.resolution] }}',
+        'Reference' => '{{ saint[vulnerability.reference] }}'
+      }
+    }.freeze
+
+    SOURCE_FIELDS = {
+      evidence: [
+        'evidence.port',
+        'evidence.severity',
+        'evidence.class',
+        'evidence.cve',
+        'evidence.cvss_base_score'
+      ],
+      vulnerability: [
+        'vulnerability.description',
+        'vulnerability.hostname',
+        'vulnerability.ipaddr',
+        'vulnerability.hosttype',
+        'vulnerability.scan_time',
+        'vulnerability.status',
+        'vulnerability.severity',
+        'vulnerability.cve',
+        'vulnerability.cvss_base_score',
+        'vulnerability.impact',
+        'vulnerability.background',
+        'vulnerability.problem',
+        'vulnerability.resolution',
+        'vulnerability.reference'
+      ]
+    }.freeze
+  end
+end

data/lib/dradis/plugins/saint.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-saint
 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
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: This add-on allows you to upload and parse reports from Saint.
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -117,6 +117,7 @@ files:
 - lib/dradis/plugins/saint/field_processor.rb
 - lib/dradis/plugins/saint/gem_version.rb
 - lib/dradis/plugins/saint/importer.rb
+- lib/dradis/plugins/saint/mapping.rb
 - lib/dradis/plugins/saint/version.rb
 - lib/saint/base.rb
 - lib/saint/evidence.rb
@@ -134,17 +135,13 @@ files:
 - spec/saint/vulnerability_spec.rb
 - spec/spec_helper.rb
 - spec/xml_element.rb
-- templates/evidence.fields
 - templates/evidence.sample
-- templates/evidence.template
-- templates/vulnerability.fields
 - templates/vulnerability.sample
-- templates/vulnerability.template
 homepage: https://dradis.com/integrations/saint.html
 licenses:
 - GPL-2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -160,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Saint upload add-on for Dradis Framework.
 test_files: []

data/templates/evidence.fields

@@ -1,5 +0,0 @@
-evidence.port
-evidence.severity
-evidence.class
-evidence.cve
-evidence.cvss_base_score

data/templates/evidence.template

@@ -1,14 +0,0 @@
-#[Port]#
-%evidence.port%
-
-#[Severity]#
-%evidence.severity%
-
-#[Class]#
-%evidence.class%
-
-#[cve]#
-%evidence.cve%
-
-#[CVSS Base Score]#
-%evidence.cvss_base_score%

data/templates/vulnerability.fields

@@ -1,14 +0,0 @@
-vulnerability.description
-vulnerability.hostname
-vulnerability.ipaddr
-vulnerability.hosttype
-vulnerability.scan_time
-vulnerability.status
-vulnerability.severity
-vulnerability.cve
-vulnerability.cvss_base_score
-vulnerability.impact
-vulnerability.background
-vulnerability.problem
-vulnerability.resolution
-vulnerability.reference

data/templates/vulnerability.template

@@ -1,41 +0,0 @@
-#[Title]#
-%vulnerability.description%
-
-#[Host Name]#
-%vulnerability.hostname%
-
-#[IP Address]#
-%vulnerability.ipaddr%
-
-#[Host Type]#
-%vulnerability.hosttype%
-
-#[Scan Time]#
-%vulnerability.scan_time%
-
-#[Status]#
-%vulnerability.status%
-
-#[Severity]#
-%vulnerability.severity%
-
-#[CVE]#
-%vulnerability.cve%
-
-#[CVSS Base Score]#
-%vulnerability.cvss_base_score%
-
-#[Impact]#
-%vulnerability.impact%
-
-#[Background]#
-%vulnerability.background%
-
-#[Problem]#
-%vulnerability.problem%
-
-#[Resolution]#
-%vulnerability.resolution%
-
-#[Reference]#
-%vulnerability.reference%