dradis-openvas 3.6.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4302834824dbe88f400dbd45446400ce13c38b45
-  data.tar.gz: fed650cc7a5a5aace7a927237b60b2e98683dce0
+  metadata.gz: 692a9769414b9089795e601f5ee3e235a20fe4f9
+  data.tar.gz: 67093fd6da54d6169841a5d11be58261f410dccd
 SHA512:
-  metadata.gz: 9d75ad8bcf20192be8f99d652808bd88d13c1e6a9c57904bd635eaebed99aec9e6ff8a7937242563b20690f7c13c6347e965858e63e29953e2a71814e079cf90
-  data.tar.gz: 3c8927eb4d20e7fcdb99dac2166f16a592eeae31bb0e9649674c1ebd6826a57929c51aa2c4a1803ad78c36aa21f1310e5546b6f6bc976dbd99351dcd43b4fc3d
+  metadata.gz: 46576f1f9f587c4a9ce00b0da66e2c0e1da615d0695f36262ce916efd669803127ca00b97e58184305c904f53da4fd721295a0c42ad33cbba884c08635efc739
+  data.tar.gz: 8821f29fbe8e79a1a6c6ea97678ed462226d4046c8d4edac271ecea744a3287729d8d5cc899a273c9b3577799fcebf517310ac609c838cb956765370c7eee653

data/.gitignore

@@ -6,3 +6,5 @@ Gemfile.lock
 
 # Gem artifacts
 /pkg/
+
+.DS_Store

data/CHANGELOG.md

@@ -1,3 +1,8 @@
-## Dradis Framework 3.6 (March XX, 2017) ##
+## Dradis Framework 3.7 (Jul, 2017) ##
+*   Add Evidence template.
+*   Add :cvss_base_vector to Result template.
+
+
+## Dradis Framework 3.6 (Apr 6, 2017) ##
 
 *   No changes.

data/lib/dradis/plugins/openvas/gem_version.rb

@@ -8,7 +8,7 @@ module Dradis
 
       module VERSION
         MAJOR = 3
-        MINOR = 6
+        MINOR = 7
         TINY = 0
         PRE = nil
 

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

@@ -51,9 +51,6 @@ module Dradis::Plugins::OpenVAS
       # instance-specific evidence though.
       logger.info{ "\t\t => Adding reference to this host" }
 
-      port_info = xml_result.at_xpath('./port').text
-      evidence_content = "\n#[Port]#\n#{port_info}\n\n"
-
       # There is no way of knowing where OpenVAS is going to place the evidence
       # for each issue. For example:
       #
@@ -91,9 +88,8 @@ module Dradis::Plugins::OpenVAS
       # doesn't provide any per-instance information.
       #
       # Best thing to do is to include the full <description> field and let the user deal with it.
-      description = xml_result.at_xpath('./description').text()
-      evidence_content << "\n#[Description]#\n#{description}\n\n"
-
+      
+      evidence_content = template_service.process_template(template: 'evidence', data: xml_result)
       content_service.create_evidence(issue: issue, node: host_node, content: evidence_content)
     end
 

data/lib/openvas/result.rb

@@ -22,13 +22,13 @@ module OpenVAS
         # NONE
 
         # simple tags
-        :threat, :description, :original_threat, :notes, :overrides,
+        :port, :threat, :description, :original_threat, :notes, :overrides,
 
         # nested tags
         :name, :cvss_base, :risk_factor, :cve, :bid, :xref,
 
-        # fields inside :description
-        :summary, :info_gathered, :insight, :impact, :impact_level, :affected_software, :solution
+        # fields inside :tags
+        :summary, :info_gathered, :cvss_base_vector, :insight, :impact, :impact_level, :affected_software, :solution
       ]
     end
 

data/lib/openvas/v7/result.rb

@@ -16,7 +16,7 @@ module OpenVAS::V7
       if @tag_fields.nil?
         delimiters = {
           # Not supported via .fields
-          # 'cvss_base_vector='
+          'cvss_base_vector=' => :cvss_base_vector,
           'impact=' => :impact,
 
           # Not supported via .fields

data/lib/tasks/thorfile.rb

@@ -7,9 +7,6 @@ class OpenVASTasks < Thor
   def upload(file_path)
     require 'config/environment'
 
-    logger = Logger.new(STDOUT)
-    logger.level = Logger::DEBUG
-
     unless File.exists?(file_path)
       $stderr.puts "** the file [#{file_path}] does not exist"
       exit -1
@@ -17,10 +14,8 @@ class OpenVASTasks < Thor
 
     detect_and_set_project_scope
 
-    importer = Dradis::Plugins::OpenVAS::Importer.new(logger: logger)
+    importer = Dradis::Plugins::OpenVAS::Importer.new(task_options)
     importer.import(file: file_path)
-
-    logger.close
   end
 
 end

data/templates/evidence.fields

@@ -0,0 +1,2 @@
+evidence.port
+evidence.description

data/templates/evidence.sample

@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<result id="e2ccf551-ea4e-4186-9b24-76287d6244f3">
+  <subnet>172.31.253.9</subnet>
+  <host>172.31.253.9</host>
+  <port>general/tcp</port>
+  <nvt oid="1.3.6.1.4.1.25623.1.0.802610">
+    <name>Oracle Java SE JRE Multiple Vulnerabilities - February 2012 (Windows - 01)</name>
+    <cvss_base>10.0</cvss_base>
+    <risk_factor>Critical</risk_factor>
+    <cve>CVE-2011-3563, CVE-2012-0499, CVE-2012-0502, CVE-2012-0503, CVE-2012-0505, CVE-2012-0506</cve>
+    <bid>52011, 52012, 52014, 52016, 52017, 52018</bid>
+    <xref>URL:http://secunia.com/advisories/48009, URL:http://www.pre-cert.de/advisories/PRE-SA-2012-01.txt, URL:http://www.oracle.com/technetwork/topics/security/javacpufeb2012-366318.html, URL:http://www.oracle.com/technetwork/java/javase/documentation/overview-142120.html, URL:http://www.oracle.com/technetwork/java/javase/documentation/overview-137139.html</xref>
+  </nvt>
+  <threat>High</threat>
+  <description>
+  Summary:
+  This host is installed with Oracle Java SE JRE and is prone to
+  multiple vulnerabilities.
+
+  Vulnerability Insight:
+  Multiple flaws are caused by unspecified errors in the following
+  components:
+  - 2D
+  - AWT
+  - Sound
+  - I18n
+  - CORBA
+  - Serialization
+
+  Impact:
+  Successful exploitation allows remote attackers to affect confidentiality,
+  integrity, and availability via unknown vectors.
+
+  Impact Level: System/Application
+
+  Affected Software/OS:
+  Oracle Java SE JRE 7 Update 2 and earlier, 6 Update 30 and earlier, 5.0 Update 33
+  and earlier, and 1.4.2_35 and earlier
+
+  Solution:
+  Upgrade to Oracle Java SE JRE versions 7 Update 3, 6 Update 31, 5.0 Update
+  34, 1.4.2_36 or later. For updates refer to
+  http://www.oracle.com/technetwork/topics/security/javacpufeb2012-366318.html
+</description>
+  <original_threat>High</original_threat>
+  <notes/>
+  <overrides/>
+</result>

data/templates/evidence.template

@@ -0,0 +1,6 @@
+#[Port]#
+%evidence.port%
+
+
+#[Description]#
+%evidence.description%

data/templates/result.fields

@@ -5,6 +5,7 @@ result.notes
 result.overrides
 result.name
 result.cvss_base
+result.cvss_base_vector
 result.risk_factor
 result.cve
 result.bid

data/templates/result.template

@@ -16,14 +16,10 @@
 
 
 #[References]#
-CVE
-%result.cve%
-
-BID
-%result.bid%
-
-Other
-%result.xref%
+CVE: %result.cve%
+CVSS Vector: %cvss_base_vector%
+BID: %result.bid%
+Other: %result.xref%
 
 
 #[RawDescription]#

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-openvas
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dradis-plugins
@@ -87,6 +87,9 @@ files:
 - spec/openvas/result_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixture_loader.rb
+- templates/evidence.fields
+- templates/evidence.sample
+- templates/evidence.template
 - templates/result.fields
 - templates/result.sample
 - templates/result.template
@@ -110,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: OpenVAS add-on for the Dradis Framework.