dradis-nexpose 3.8.0 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 772ea8fbac2cac2a33e665405d77477b61dddd56
-  data.tar.gz: cd0ad1efa74afed414f96aac1b40e1b6ab3a4e35
+  metadata.gz: 82ca17fb1e1f67e0647d8d1340c37a8a93e376c7
+  data.tar.gz: 4380aeb556cf35d8ddefc2b5306dac66b3b63141
 SHA512:
-  metadata.gz: a02e3e026207ef125f8f58f81ce79c5c875b018a2dd175f679ce5b42c9d57af237f6b2a11db33e1e4d78a741f10130c26c8dab0154b9fe040d6e8c12d16e5c9b
-  data.tar.gz: fe86b51bc4166a8a14ce62f5f2a69c89b59645f6ddbc0757501ca3594c4f204813230522d232f58f6af48a856504304dc04100e540c70effbb58e5588f3a3393
+  metadata.gz: 884ab9ece0604faa63ccc25e6dc2ea089908db16d42fedb52904051d0dc2d01cec9e79e4a951bd5bbd14a33f11add194cd0621cf4ce79aff3228990b8c446191
+  data.tar.gz: bc1e5fe3dd76bf02db753c1acdfda161e559368ee63e892a7206d3bbdd500a22687854d425fb13626de9fe3a7da25bf513be692da0e9fc72d64477be2ca52795

data/.gitignore

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

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## Dradis Framework 3.10 (XXX, 2018) ##
+
+*   Resolve duplicate content in nested `<Paragraph>` tags
+*   Import `<URLLink>` tags as textile links
+*   Import `<Paragraph preformat="true">` tags as code blocks
+*   Improve parsing of `<ListItem>` tags
+*   Import `vulnerability.tags` field as expected
+*   Create `hostname` and `os` Node properties (if present)
+
+## Dradis Framework 3.9 (January, 2018) ##
+
+*   No changes.
+
 ## Dradis Framework 3.8 (September, 2017) ##
 
 *   No changes.

data/lib/dradis/plugins/nexpose/formats/full.rb

@@ -32,9 +32,11 @@ module Dradis::Plugins::Nexpose::Formats
         content_service.create_note(node: host_node, text: note_text)
 
         if host_node.respond_to?(:properties)
-          logger.info{ "\tAdding host properties: :ip and :hostnames"}
+          logger.info{ "\tAdding host properties to #{nexpose_node.address}"}
           host_node.set_property(:ip, nexpose_node.address)
-          host_node.set_property(:hostnames, nexpose_node.names)
+          host_node.set_property(:hostname, nexpose_node.site_name)
+          host_node.set_property(:os, nexpose_node.software)
+          host_node.save
         end
 
         # inject this node's address into any vulnerabilities identified
@@ -114,7 +116,6 @@ module Dradis::Plugins::Nexpose::Formats
       end
 
       # Third, parse vulnerability definitions
-      definitions_node = content_service.create_node(label: 'Definitions')
       logger.info{ "\tProcessing issue definitions:" }
 
       doc.xpath('//VulnerabilityDefinitions/vulnerability').each do |xml_vulnerability|

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

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

data/lib/nexpose/node.rb

@@ -18,15 +18,15 @@ module Nexpose
     def supported_tags
       [
         # attributes
-        :address, :status, :device_id, :hardware_address,
+        :address, :device_id, :hardware_address, :site_name, :status,
 
         # simple tags
 
         # multiple tags
-        :names, :fingerprints,
+        :fingerprints, :names,
 
         # compounded tags
-        :software, :tests, :endpoints
+        :endpoints, :software, :tests
       ]
     end
 
@@ -72,7 +72,8 @@ module Nexpose
       # hyphenated-case is used for some attributes
       translations_table = {
         :device_id => 'device-id',
-        :hardware_address => 'hardware-address'
+        :hardware_address => 'hardware-address',
+        :site_name => 'site-name'
       }
 
       method_name = translations_table.fetch(method, method.to_s)

data/lib/nexpose/vulnerability.rb

@@ -71,29 +71,17 @@ module Nexpose
 
       # Then we try simple children tags: description, solution
       tag = @xml.xpath("./#{method_name}/ContainerBlockElement").first
-      if tag
-        lines = []
-
-        # Go through Paragraphs and extract them.
-        # FIXME: we're using .//. to get paragraphs nested in Nexpose lists,
-        # ideally we'd convert this lists into Textile bullet point lists.
-        tag.xpath(".//Paragraph").each do |xml_paragraph|
-          lines << xml_paragraph.text.split("\n").collect(&:strip).join(' ').strip
-        end
-
-        return lines.join("\n\n")
-      end
-
-      # Finally the enumerations: references, tags
-      if method_name == 'references'
-        references =
-          @xml.xpath("./references/reference").map do |entry|
-            {:source => entry['source'], :text => entry.text}
-          end
-
-        return references
-      elsif method == 'tags'
-        return @xml.xpath("./tags/tag").collect(&:text)
+      # Then we try the tags with nested content
+      nest = @xml.xpath("./#{method_name}").first
+
+      # We need to clean up tags that have HTML content in them
+      if tags_with_html_content.include?(method)
+        return cleanup_html(tag)
+      # And we need to clean up the tags with nested content in them
+      elsif tags_with_nested_content.include?(method)
+        return cleanup_nested(nest)
+      else
+        return tag
       end
 
       # Handle evidence creation
@@ -108,5 +96,45 @@ module Nexpose
 
       nil
     end
+
+    private
+
+    def cleanup_nested(source)
+      result = source.to_s
+      result.gsub!(/<references>/, '')
+      result.gsub!(/<\/references>/, '')
+      result.gsub!(/<reference source=\"(.*?)\">(.*?)<\/reference>/i) {"#{$1.strip}: #{$2.strip}\n"}
+      result.gsub!(/<tags>/, '')
+      result.gsub!(/<\/tags>/, '')
+      result.gsub!(/<tag>(.*?)<\/tag>/) {"#{$1}\n"}
+      result.gsub!(/        /, '')
+      result
+    end
+
+    def cleanup_html(source)
+      result = source.to_s
+      result.gsub!(/<ContainerBlockElement>(.*?)<\/ContainerBlockElement>/m){|m| "#{ $1 }"}
+      result.gsub!(/<Paragraph preformat=\"true\">(.*?)<\/Paragraph>/m){|m| "\nbc. #{ $1 }\n\n"}
+      result.gsub!(/<Paragraph>(.*?)<\/Paragraph>/m){|m| "#{ $1 }\n"}
+      result.gsub!(/<Paragraph>/, '')
+      result.gsub!(/<\/Paragraph>/, '')
+      result.gsub!(/<UnorderedList>(.*?)<\/UnorderedList>/m){|m| "#{ $1 }"}
+      result.gsub!(/<ListItem>(.*?)<\/ListItem>/m){|m| "#{ $1 }\n"}
+      result.gsub!(/          /, '')
+      result.gsub!(/<URLLink LinkTitle=\"(.*?)\" LinkURL=\"(.*?)\"\/>/i) { "\"#{$1.strip}\":#{$2.strip} " }
+      result.gsub!(/<URLLink LinkURL=\"(.*?)\" LinkTitle=\"(.*?)\"\/>/i) { "\"#{$2.strip}\":#{$1.strip} " }
+      result.gsub!(/<URLLink(.*)LinkURL=\"(.*?)\"(.*?)>(.*?)<\/URLLink>/m) {|m| "\"#{$4.strip}\":#{$2.strip} " }
+
+      result
+    end
+
+    def tags_with_html_content
+      [:description, :solution]
+    end
+
+    def tags_with_nested_content
+      [:references, :tags]
+    end
+
   end
 end

data/templates/full_node.fields

@@ -4,5 +4,6 @@ node.fingerprints
 node.hardware_address
 node.names
 node.tests
+node.site_name
 node.status
 node.software

data/templates/full_node.sample

@@ -1,5 +1,6 @@
 <node
   address="10.0.0.1"
+  site-name="snorby"
   status="alive"
   device-id="211"
   hardware-address="00:de:ad:be:ef:00">

data/templates/full_node.template

@@ -1,6 +1,9 @@
-#[Host]#
+#[Title]#
 %node.address%
 
+#[Hostname]#
+%node.site_name%
+
 #[Details]#
 Status: %node.status%
 Device id: %node.device_id%

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-nexpose
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.9.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2018-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dradis-plugins
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Nexpose add-on for the Dradis Framework.