dradis-qualys 4.10.0 → 4.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d098ef2f9fc3fd21e8d09b9d2aa3790c17bfc4b18c86e9969c2c49b677d9bdcc
-  data.tar.gz: 682b88bd9778657a19aa741a9c257fce62130b5c0a72e21b5b5c24c454de7329
+  metadata.gz: 713b00a5f7d23b32165f761846270268623c4fc3185a8ce10d1f15e4dde9bf9c
+  data.tar.gz: 1ce4e1c00ab931cf7d2eb88c56163ca95f5dd28552637481301de1b035cfb8d0
 SHA512:
-  metadata.gz: 11a7e81f2da1d25ebbb870b8b5b6f0940d2a8f5240c267f9dcac2e3a7ba24ce1a2b55c49b019ed4b6d20c5baa40724ccf49189405d35571b80484ac66f047956
-  data.tar.gz: c0d9c50c8179cb2a16cfb3e7529cbe5badf21552d890f31af9e5fb35f3a476ff38e0cd6764420b705efbf320f4f9bc317f6c74ea0c2a2a0f1466e6504171b572
+  metadata.gz: 702b434a597b1e43c113e1a7928cc4cd23be114215e58acf94e3f70b1bd11b9b83ebf4ff88fedb075357339585854c4cf38a80a5fa9d5e773df3be3dd1eb5b2d
+  data.tar.gz: 2d35abd53b2c28e9ad04942593d27384d1f431e288218c21c8a96e541e3f9d84e8063c7253889b2432788110626ee941534b57cccd4e59d479c8fa7666930a6a

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)
+  - Update Dradis links in README  
+  - Migrate integration to use Mappings Manager
+  - Update template names to include uploader
+
+v4.11.0 (January 2023)
+  - Add support for the output for Qualys WAS API 3.13 and later
+
 v4.10.0 (September 2023)
   - Update gemspec links
 

data/README.md

@@ -4,18 +4,17 @@
 
 Upload Qualys 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/qualys/asset/importer.rb

@@ -13,7 +13,7 @@ module Dradis::Plugins::Qualys
 
     class Importer < Dradis::Plugins::Upload::Importer
       def self.templates
-        { evidence: 'asset-evidence', issue: 'asset-issue' }
+        { evidence: 'asset_evidence', issue: 'asset_issue' }
       end
 
       def initialize(args={})
@@ -86,7 +86,7 @@ module Dradis::Plugins::Qualys
       def process_issue(xml_vuln)
         qid = xml_vuln.at_xpath('QID').text
         logger.info { "\t => Creating new issue (plugin_id: #{ qid })" }
-        issue_text = template_service.process_template(template: 'asset-issue', data: xml_vuln)
+        issue_text = mapping_service.apply_mapping(source: 'asset_issue', data: xml_vuln)
         issue = content_service.create_issue(text: issue_text, id: qid)
 
         issue_lookup[qid.to_i] = issue
@@ -107,7 +107,7 @@ module Dradis::Plugins::Qualys
           return
         end
 
-        evidence_content = template_service.process_template(template: 'asset-evidence', data: xml_evidence)
+        evidence_content = mapping_service.apply_mapping(source: 'asset_evidence', data: xml_evidence)
         content_service.create_evidence(issue: issue, node: node, content: evidence_content)
       end
     end

data/lib/dradis/plugins/qualys/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/qualys/mapping.rb

@@ -0,0 +1,137 @@
+module Dradis::Plugins::Qualys
+  module Mapping
+    DEFAULT_MAPPING = {
+      asset_evidence: {
+        'Result' => '{{ qualys[asset-evidence.result] }}',
+        'Status' => '{{ qualys[asset-evidence.vuln_status] }}',
+        'SSL' => '{{ qualys[asset-evidence.ssl] }}',
+        'CVSSv3.Final' => '{{ qualys[asset-evidence.cvss_final] }}'
+      },
+      asset_issue: {
+        'Title' => '{{ qualys[asset-issue.title] }}',
+        'Severity' => '{{ qualys[asset-issue.severity] }}',
+        'Categories' => 'Category: {{ qualys[asset-issue.category] }}',
+        'CVSSv3.BaseScore' => '{{ qualys[asset-issue.cvss3_base] }}',
+        'CVSSv3.TemporalScore' => '{{ qualys[asset-issue.cvss3_temporal] }}',
+        'Threat' => '{{ qualys[asset-issue.threat] }}',
+        'Impact' => '{{ qualys[asset-issue.impact] }}',
+        'Solution' => '{{ qualys[asset-issue.solution] }}'
+      },
+      vuln_element: {
+        'Title' => '{{ qualys[element.title] }}',
+        'CVSSv3.BaseScore' => '{{ qualys[element.cvss_base] }}',
+        'CVSSv3.Vector' => 'Temporal score: {{ qualys[element.cvss_temporal] }}',
+        'Type' => 'External',
+        'Description' => "{{ qualys[element.diagnosis] }}\n{{ qualys[element.consequence] }}",
+        'Solution' => '{{ qualys[element.solution] }}',
+        'References' => '{{ qualys[element.vendor_reference_list] }}',
+      },
+      vuln_evidence: {
+        'Location' => "{{ qualys[evidence.cat_protocol] }}/{{ qualys[evidence.cat_port] }}",
+        'Output' => '{{ qualys[evidence.result] }}'
+      },
+      was_evidence: {
+        'Location' => '{{ qualys[was-evidence.url] }}',
+        'Output' => "*Request*\n\nMethod: {{ qualys[was-evidence.request_method] }}\nURL: {{ qualys[was-evidence.request_url] }}\n\nbc.. {{ qualys[was-evidence.request_headers] }}\n\np. *Response*\n\nEvidence: {{ qualys[was-evidence.response_evidence] }}\n\nbc.. {{ qualys[was-evidence.response_contents] }}"
+      },
+      was_issue: {
+        'Title' => '{{ qualys[was-issue.title] }}',
+        'Severity' => '{{ qualys[was-issue.severity] }}',
+        'Categories' => "Category: {{ qualys[was-issue.category] }}\nGroup: {{ qualys[was-issue.group] }}\nOWASP: {{ qualys[was-issue.owasp] }}\nCWE: {{ qualys[was-issue.cwe] }}",
+        'CVSSv3.Vector' => '{{ qualys[was-issue.cvss3_vector] }}',
+        'CVSSv3.BaseScore' => '{{ qualys[was-issue.cvss3_base] }}',
+        'CVSSv3.TemporalScore' => '{{ qualys[was-issue.cvss3_temporal] }}',
+        'Description' => "{{ qualys[was-issue.description] }}\n\n{{ qualys[was-issue.impact] }}",
+        'Solution' => '{{ qualys[was-issue.solution] }}'
+      }
+    }.freeze
+
+    SOURCE_FIELDS = {
+      asset_evidence: [
+        'asset-evidence.cvss3_final',
+        'asset-evidence.cvss_final',
+        'asset-evidence.first_found',
+        'asset-evidence.last_found',
+        'asset-evidence.result',
+        'asset-evidence.ssl',
+        'asset-evidence.times_found',
+        'asset-evidence.type',
+        'asset-evidence.vuln_status'
+      ],
+      asset_issue: [
+        'asset-issue.category',
+        'asset-issue.cvss3_base',
+        'asset-issue.cvss3_temporal',
+        'asset-issue.cvss_base',
+        'asset-issue.cvss_temporal',
+        'asset-issue.impact',
+        'asset-issue.last_update',
+        'asset-issue.pci_flag',
+        'asset-issue.qid',
+        'asset-issue.result',
+        'asset-issue.severity',
+        'asset-issue.solution',
+        'asset-issue.threat',
+        'asset-issue.title'
+      ],
+      vuln_element: [
+        'element.number',
+        'element.severity',
+        'element.cveid',
+        'element.title',
+        'element.last_update',
+        'element.cvss_base',
+        'element.cvss_temporal',
+        'element.pci_flag',
+        'element.vendor_reference_list',
+        'element.cve_id_list',
+        'element.bugtraq_id_list',
+        'element.diagnosis',
+        'element.consequence',
+        'element.solution',
+        'element.compliance',
+        'element.result',
+        'element.qualys_collection'
+      ],
+      vuln_evidence: [
+        'evidence.cat_fqdn',
+        'evidence.cat_misc',
+        'evidence.cat_port',
+        'evidence.cat_protocol',
+        'evidence.cat_value',
+        'evidence.result'
+      ],
+      was_evidence: [
+        'was-evidence.access_paths',
+        'was-evidence.ajax',
+        'was-evidence.authentication',
+        'was-evidence.ignored',
+        'was-evidence.potential',
+        'was-evidence.request_headers',
+        'was-evidence.request_method',
+        'was-evidence.request_url',
+        'was-evidence.response_contents',
+        'was-evidence.response_evidence',
+        'was-evidence.url'
+      ],
+      was_issue: [
+        'was-issue.category',
+        'was-issue.cvss_base',
+        'was-issue.cvss_temporal',
+        'was-issue.cvss3_base',
+        'was-issue.cvss3_temporal',
+        'was-issue.cvss3_vector',
+        'was-issue.cwe',
+        'was-issue.description',
+        'was-issue.group',
+        'was-issue.impact',
+        'was-issue.owasp',
+        'was-issue.qid',
+        'was-issue.severity',
+        'was-issue.solution',
+        'was-issue.title',
+        'was-issue.wasc'
+      ]
+    }.freeze
+  end
+end

data/lib/dradis/plugins/qualys/vuln/importer.rb

@@ -14,7 +14,7 @@ module Dradis::Plugins::Qualys
       attr_accessor :host_node
 
       def self.templates
-        { evidence: 'evidence', issue: 'element' }
+        { evidence: 'vuln_evidence', issue: 'vuln_element' }
       end
 
       def initialize(args={})
@@ -95,11 +95,11 @@ module Dradis::Plugins::Qualys
       # Issue and Evidence template out of it.
       def process_vuln(vuln_number, xml_cat)
         logger.info{ "\t\t => Creating new issue (plugin_id: #{ vuln_number })" }
-        issue_text = template_service.process_template(template: 'element', data: xml_cat)
+        issue_text = mapping_service.apply_mapping(source: 'vuln_element', data: xml_cat)
         issue = content_service.create_issue(text: issue_text, id: vuln_number)
 
         logger.info{ "\t\t => Creating new evidence" }
-        evidence_content = template_service.process_template(template: 'evidence', data: xml_cat)
+        evidence_content = mapping_service.apply_mapping(source: 'vuln_evidence', data: xml_cat)
         content_service.create_evidence(issue: issue, node: self.host_node, content: evidence_content)
       end
     end

data/lib/dradis/plugins/qualys/was/importer.rb

@@ -1,5 +1,4 @@
 module Dradis::Plugins::Qualys
-
   # This module knows how to parse Qualys Web Application Scanner format.
   module WAS
     def self.meta
@@ -14,20 +13,20 @@ module Dradis::Plugins::Qualys
 
     class Importer < Dradis::Plugins::Upload::Importer
       def self.templates
-        { evidence: 'was-evidence', issue: 'was-issue' }
+        { evidence: 'was_evidence', issue: 'was_issue' }
       end
 
-      def initialize(args={})
+      def initialize(args = {})
         args[:plugin] = Dradis::Plugins::Qualys
         super(args)
 
         @issue_lookup = {}
       end
 
-      def import(params={})
+      def import(params = {})
         file_content = File.read(params[:file])
 
-        logger.info { 'Parsing Qualys WAS XML output file...'}
+        logger.info { 'Parsing Qualys WAS XML output file...' }
         doc = Nokogiri::XML(file_content)
         logger.info { 'Done.' }
 
@@ -38,20 +37,27 @@ module Dradis::Plugins::Qualys
           return false
         end
 
-        logger.info { 'Global Summary information'}
+        logger.info { 'Global Summary information' }
 
         xml_global_summary = doc.at_xpath('WAS_SCAN_REPORT/SUMMARY/GLOBAL_SUMMARY')
         logger.info { 'Security Risk: ' + xml_global_summary.at_xpath('./SECURITY_RISK').text }
         logger.info { 'Vulnerabilities found: ' + xml_global_summary.at_xpath('./VULNERABILITY').text }
 
-        xml_webapp = doc.at_xpath('WAS_SCAN_REPORT/APPENDIX/WEBAPP')
+        xml_webapp =
+          doc.at_xpath('WAS_SCAN_REPORT/APPENDIX/WEBAPP | WAS_SCAN_REPORT/APPENDIX/WEB_APPLICATION')
         process_webapp(xml_webapp)
 
         doc.xpath('WAS_SCAN_REPORT/GLOSSARY/QID_LIST/QID').each do |xml_qid|
           process_issue(xml_qid)
         end
 
-        doc.xpath('WAS_SCAN_REPORT/RESULTS/VULNERABILITY_LIST/VULNERABILITY').each do |xml_vulnerability|
+        vulnerability_list =
+          doc.xpath(
+            'WAS_SCAN_REPORT/RESULTS/VULNERABILITY_LIST/VULNERABILITY | ' +
+            'WAS_SCAN_REPORT/RESULTS/WEB_APPLICATION/VULNERABILITY_LIST/VULNERABILITY'
+          )
+
+        vulnerability_list.each do |xml_vulnerability|
           process_evidence(xml_vulnerability)
         end
 
@@ -68,22 +74,22 @@ module Dradis::Plugins::Qualys
         if issue
           issue_id = issue.respond_to?(:id) ? issue.id : issue.to_issue.id
 
-          logger.info{ "\t => Creating new evidence (plugin_id: #{id})" }
-          logger.info{ "\t\t => Issue: #{issue.title} (plugin_id: #{issue_id})" }
-          logger.info{ "\t\t => Node: #{webapp_node.label} (#{webapp_node.id})" }
+          logger.info { "\t => Creating new evidence (plugin_id: #{id})" }
+          logger.info { "\t\t => Issue: #{issue.title} (plugin_id: #{issue_id})" }
+          logger.info { "\t\t => Node: #{webapp_node.label} (#{webapp_node.id})" }
         else
-          logger.info{ "\t => Couldn't find QID for evidence with ID=#{id}" }
+          logger.info { "\t => Couldn't find QID for evidence with ID=#{id}" }
           return
         end
 
-        evidence_content = template_service.process_template(template: 'was-evidence', data: xml_vulnerability)
+        evidence_content = mapping_service.apply_mapping(source: 'was_evidence', data: xml_vulnerability)
         content_service.create_evidence(issue: issue, node: webapp_node, content: evidence_content)
       end
 
       def process_issue(xml_qid)
         qid = xml_qid.at_xpath('QID').text
-        logger.info{ "\t => Creating new issue (plugin_id: #{ qid })" }
-        issue_text = template_service.process_template(template: 'was-issue', data: xml_qid)
+        logger.info { "\t => Creating new issue (plugin_id: #{ qid })" }
+        issue_text = mapping_service.apply_mapping(source: 'was_issue', data: xml_qid)
         issue = content_service.create_issue(text: issue_text, id: qid)
 
         issue_lookup[qid.to_i] = issue

data/lib/dradis/plugins/qualys.rb

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

data/spec/fixtures/files/simple_was_updated.xml

@@ -0,0 +1,138 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<WAS_SCAN_REPORT>
+    <HEADER>
+        <NAME>Scan Report</NAME>
+        <DESCRIPTION>Vulnerabilities of all selected scans are consolidated into one report so that you can view their evolution.</DESCRIPTION>
+        <GENERATION_DATETIME>10 Nov 2021 10:00AM GMT-0500</GENERATION_DATETIME>
+        <COMPANY_INFO>
+            <NAME>Sample Company</NAME>
+            <ADDRESS>Sample Address</ADDRESS>
+            <CITY>Sample City</CITY>
+            <STATE>Sample State</STATE>
+            <COUNTRY>Sample Country</COUNTRY>
+            <ZIP_CODE>00000</ZIP_CODE>
+        </COMPANY_INFO>
+        <USER_INFO>
+            <NAME>Test User</NAME>
+            <USERNAME>test_user</USERNAME>
+            <ROLE>PC User,VM User</ROLE>
+        </USER_INFO>
+    </HEADER>
+    <FILTERS>
+        <FILTER>
+            <NAME>REMEDIATION</NAME>
+            <VALUE>Include patched findings</VALUE>
+        </FILTER>
+        <FILTER>
+            <NAME>REMEDIATION</NAME>
+            <VALUE>Show ignored findings </VALUE>
+        </FILTER>
+    </FILTERS>
+    <TARGET>
+        <SCAN>Test Scan</SCAN>
+    </TARGET>
+    <SUMMARY>
+        <GLOBAL_SUMMARY>
+            <SECURITY_RISK>High</SECURITY_RISK>
+            <VULNERABILITY>31</VULNERABILITY>
+            <SENSITIVE_CONTENT>0</SENSITIVE_CONTENT>
+            <INFORMATION_GATHERED>30</INFORMATION_GATHERED>
+        </GLOBAL_SUMMARY>
+        <SUMMARY_STATS>
+            <SUMMARY_STAT>
+                <SCAN>test Scan</SCAN>
+                <DATE>12 Oct 2021</DATE>
+                <LEVEL5>5</LEVEL5>
+                <LEVEL4>2</LEVEL4>
+                <LEVEL3>9</LEVEL3>
+                <LEVEL2>2</LEVEL2>
+                <LEVEL1>13</LEVEL1>
+                <SENSITIVE_CONTENT>0</SENSITIVE_CONTENT>
+                <INFORMATION_GATHERED>30</INFORMATION_GATHERED>
+            </SUMMARY_STAT>
+        </SUMMARY_STATS>
+    </SUMMARY>
+    <RESULTS>
+        <WEB_APPLICATION>
+            <ID>12345</ID>
+            <NAME>Example Company</NAME>
+            <VULNERABILITY_LIST>
+                <VULNERABILITY>
+                    <UNIQUE_ID>test-id</UNIQUE_ID>
+                    <ID>1</ID>
+                    <DETECTION_ID>1</DETECTION_ID>
+                    <QID>6</QID>
+                    <URL>http://example.com</URL>
+                    <ACCESS_PATH>
+                        <URL>http://example.com</URL>
+                    </ACCESS_PATH>
+                    <AJAX>false</AJAX>
+                    <AUTHENTICATION>Not Required</AUTHENTICATION>
+                    <DETECTION_DATE>21 Aug 2021 10:00PM GMT-0500</DETECTION_DATE>
+                    <POTENTIAL>false</POTENTIAL>
+                    <PAYLOADS>
+                        <PAYLOAD>
+                            <NUM>1</NUM>
+                            <PAYLOAD>N/A</PAYLOAD>
+                            <REQUEST>
+                                <METHOD>GET</METHOD>
+                                <URL>http://example.com</URL>
+                                <HEADERS>
+                                    <HEADER>
+                                        <key>Host</key>
+                                        <value><![CDATA[ example.com ]]></value>
+                                    </HEADER>
+                                    <HEADER>
+                                        <key>User-Agent</key>
+                                        <value>user-agent</value>
+                                    </HEADER>
+                                    <HEADER>
+                                        <key>Accept</key>
+                                        <value><![CDATA[ */*
+                                    </HEADER>
+                                </HEADERS>
+                                <BODY></BODY>
+                            </REQUEST>
+                            <RESPONSE>
+                                <CONTENTS base64="true"></CONTENTS>
+                            </RESPONSE>
+                        </PAYLOAD>
+                    </PAYLOADS>
+                    <IGNORED>false</IGNORED>
+                </VULNERABILITY>
+            </VULNERABILITY_LIST>
+        </WEB_APPLICATION>
+    </RESULTS>
+    <GLOSSARY>
+        <QID_LIST>
+            <QID>
+                <QID>6</QID>
+                <CATEGORY>Information Gathered</CATEGORY>
+                <SEVERITY>1</SEVERITY>
+                <TITLE>DNS Host Name</TITLE>
+                <GROUP>DIAG</GROUP>
+                <DESCRIPTION>The fully qualified domain name of this host, if it was obtained from a DNS server, is displayed in the RESULT section.</DESCRIPTION>
+                <IMPACT>N/A</IMPACT>
+                <SOLUTION>N/A</SOLUTION>
+                <CVSS_BASE>4.3</CVSS_BASE>
+                <CVSS_TEMPORAL>3.9</CVSS_TEMPORAL>
+                <CVSS_V3>
+                    <BASE>6.1</BASE>
+                    <TEMPORAL>5.8</TEMPORAL>
+                    <ATTACK_VECTOR>Network</ATTACK_VECTOR>
+                </CVSS_V3>
+            </QID>
+        </QID_LIST>
+    </GLOSSARY>
+    <APPENDIX>
+        <WEB_APPLICATION>
+            <ID>1</ID>
+            <NAME>Test</NAME>
+            <URL>http://example.com</URL>
+            <OWNER>Test User</OWNER>
+            <SCOPE>Limit to URL hostname</SCOPE>
+            <CUSTOM_ATTRIBUTES/>
+            <TAGS/>
+        </WEBAPP>
+    </APPENDIX>
+</WAS_SCAN_REPORT>

data/spec/qualys/was/importer_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'ostruct'
 
 module Dradis::Plugins
-  describe 'Qualys upload plugin' do
+  shared_examples 'Qualys upload plugin' do
     before(:each) do
       # Stub template service
       templates_dir = File.expand_path('../../../../templates', __FILE__)
@@ -16,7 +16,6 @@ module Dradis::Plugins
       )
     end
 
-    let(:example_xml) { 'spec/fixtures/files/simple_was.xml' }
     let(:run_import!) { @importer.import(file: example_xml) }
 
     it 'creates nodes as needed' do
@@ -38,4 +37,16 @@ module Dradis::Plugins
       run_import!
     end
   end
+
+  context 'Simple WAS template' do
+    let(:example_xml) { 'spec/fixtures/files/simple_was.xml' }
+
+    include_examples 'Qualys upload plugin'
+  end
+
+  context 'WAS template with WEB_APPLICATION' do
+    let(:example_xml) { 'spec/fixtures/files/simple_was_updated.xml' }
+
+    include_examples 'Qualys upload plugin'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-qualys
 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 Qualys
   Vulnerability Scanner into Dradis.
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -119,6 +119,7 @@ files:
 - lib/dradis/plugins/qualys/engine.rb
 - lib/dradis/plugins/qualys/field_processor.rb
 - lib/dradis/plugins/qualys/gem_version.rb
+- lib/dradis/plugins/qualys/mapping.rb
 - lib/dradis/plugins/qualys/version.rb
 - lib/dradis/plugins/qualys/vuln/importer.rb
 - lib/dradis/plugins/qualys/was/importer.rb
@@ -133,6 +134,7 @@ files:
 - spec/fixtures/files/simple.xml
 - spec/fixtures/files/simple_asset.xml
 - spec/fixtures/files/simple_was.xml
+- spec/fixtures/files/simple_was_updated.xml
 - spec/fixtures/files/two_hosts_common_issue.xml
 - spec/fixtures/files/with_ciphers.xml
 - spec/qualys/asset/importer_spec.rb
@@ -141,29 +143,17 @@ files:
 - spec/qualys/was/importer_spec.rb
 - spec/spec_helper.rb
 - spec/support/spec_macros.rb
-- templates/asset-evidence.fields
-- templates/asset-evidence.sample
-- templates/asset-evidence.template
-- templates/asset-issue.fields
-- templates/asset-issue.sample
-- templates/asset-issue.template
-- templates/element.fields
-- templates/element.sample
-- templates/element.template
-- templates/evidence.fields
-- templates/evidence.sample
-- templates/evidence.template
-- templates/was-evidence.fields
-- templates/was-evidence.sample
-- templates/was-evidence.template
-- templates/was-issue.fields
-- templates/was-issue.sample
-- templates/was-issue.template
+- templates/asset_evidence.sample
+- templates/asset_issue.sample
+- templates/vuln_element.sample
+- templates/vuln_evidence.sample
+- templates/was_evidence.sample
+- templates/was_issue.sample
 homepage: https://dradis.com/integrations/qualys.html
 licenses:
 - GPL-2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -179,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Qualys add-on for the Dradis Framework.
 test_files:
@@ -188,6 +178,7 @@ test_files:
 - spec/fixtures/files/simple.xml
 - spec/fixtures/files/simple_asset.xml
 - spec/fixtures/files/simple_was.xml
+- spec/fixtures/files/simple_was_updated.xml
 - spec/fixtures/files/two_hosts_common_issue.xml
 - spec/fixtures/files/with_ciphers.xml
 - spec/qualys/asset/importer_spec.rb

data/templates/asset-evidence.fields

@@ -1,9 +0,0 @@
-asset-evidence.cvss3_final
-asset-evidence.cvss_final
-asset-evidence.first_found
-asset-evidence.last_found
-asset-evidence.result
-asset-evidence.ssl
-asset-evidence.times_found
-asset-evidence.type
-asset-evidence.vuln_status

data/templates/asset-evidence.template

@@ -1,11 +0,0 @@
-#[Result]#
-%asset-evidence.result%
-
-#[Status]#
-%asset-evidence.vuln_status%
-
-#[SSL]#
-%asset-evidence.ssl%
-
-#[CVSSv3.Final]#
-%asset-evidence.cvss_final%

data/templates/asset-issue.fields

@@ -1,14 +0,0 @@
-asset-issue.category
-asset-issue.cvss3_base
-asset-issue.cvss3_temporal
-asset-issue.cvss_base
-asset-issue.cvss_temporal
-asset-issue.impact
-asset-issue.last_update
-asset-issue.pci_flag
-asset-issue.qid
-asset-issue.result
-asset-issue.severity
-asset-issue.solution
-asset-issue.threat
-asset-issue.title

data/templates/asset-issue.template

@@ -1,22 +0,0 @@
-#[Title]#
-%asset-issue.title%
-
-#[Severity]#
-%asset-issue.severity%
-
-#[Categories]#
-Category: %asset-issue.category%
-
-#[CVSSv3.BaseScore]#
-%asset-issue.cvss3_base%
-
-#[CVSSv3.TemporalScore]#
-%asset-issue.cvss3_temporal%
-
-#[Threat]#
-%asset-issue.threat%
-
-%asset-issue.impact%
-
-#[Solution]#
-%asset-issue.solution%

data/templates/element.fields

@@ -1,17 +0,0 @@
-element.number
-element.severity
-element.cveid
-element.title
-element.last_update
-element.cvss_base
-element.cvss_temporal
-element.pci_flag
-element.vendor_reference_list
-element.cve_id_list
-element.bugtraq_id_list
-element.diagnosis
-element.consequence
-element.solution
-element.compliance
-element.result
-element.qualys_collection

data/templates/element.template

@@ -1,39 +0,0 @@
-#[Title]#
-%element.title%
-
-
-#[Severity]#
-%element.severity%
-
-
-#[CVE]#
-%element.cveid%
-
-
-#[CVSS]#
-Base: %element.cvss_base%
-Temporal: %element.cvss_temporal%
-
-
-#[Diagnosis]#
-%element.diagnosis%
-
-
-#[Consequence]#
-%element.consequence%
-
-
-#[Solution]#
-%element.solution%
-
-
-#[Result]#
-%element.result%
-
-
-#[CVEList]#
-%element.cve_id_list%
-
-
-#[QualysCollection]#
-%element.qualys_collection%

data/templates/evidence.fields

@@ -1,6 +0,0 @@
-evidence.cat_fqdn
-evidence.cat_misc
-evidence.cat_port
-evidence.cat_protocol
-evidence.cat_value
-evidence.result

data/templates/evidence.template

@@ -1,11 +0,0 @@
-#[Category]#
-%evidence.cat_value%
-
-#[Protocol]#
-%evidence.cat_protocol%
-
-#[Port]#
-%evidence.cat_port%
-
-#[Output]#
-%evidence.result%

data/templates/was-evidence.fields

@@ -1,11 +0,0 @@
-was-evidence.access_paths
-was-evidence.ajax
-was-evidence.authentication
-was-evidence.ignored
-was-evidence.potential
-was-evidence.request_headers
-was-evidence.request_method
-was-evidence.request_url
-was-evidence.response_contents
-was-evidence.response_evidence
-was-evidence.url

data/templates/was-evidence.template

@@ -1,16 +0,0 @@
-#[Location]#
-%was-evidence.url%
-
-#[Output]#
-*Request*
-
-Method: %was-evidence.request_method%
-URL: %was-evidence.request_url%
-
-bc.. %was-evidence.request_headers%
-
-p. *Response*
-
-Evidence: %was-evidence.response_evidence%
-
-bc.. %was-evidence.response_contents%

data/templates/was-issue.fields

@@ -1,16 +0,0 @@
-was-issue.category
-was-issue.cvss_base
-was-issue.cvss_temporal
-was-issue.cvss3_base
-was-issue.cvss3_temporal
-was-issue.cvss3_vector
-was-issue.cwe
-was-issue.description
-was-issue.group
-was-issue.impact
-was-issue.owasp
-was-issue.qid
-was-issue.severity
-was-issue.solution
-was-issue.title
-was-issue.wasc

data/templates/was-issue.template

@@ -1,28 +0,0 @@
-#[Title]#
-%was-issue.title%
-
-#[Severity]#
-%was-issue.severity%
-
-#[Categories]#
-Category: %was-issue.category%
-Group: %was-issue.group%
-OWASP: %was-issue.owasp%
-CWE: %was-issue.cwe%
-
-#[CVSSv3.Vector]#
-%was-issue.cvss3_vector%
-
-#[CVSSv3.BaseScore]#
-%was-issue.cvss3_base%
-
-#[CVSSv3.TemporalScore]#
-%was-issue.cvss3_temporal%
-
-#[Description]#
-%was-issue.description%
-
-%was-issue.impact%
-
-#[Solution]#
-%was-issue.solution%