dradis-nexpose 4.1.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fd614ab4ae6d76629846fcc4b4446ae557f34057bc60abee7a10e7e73859bd9
-  data.tar.gz: f41b9074788b7c48ee2868424cceeb0d4857499c1ed1a811920c9887cc283be8
+  metadata.gz: d9b36849f6712c97827772ce7f05c78114e83b82677bf8019fbd2e44b1e505ab
+  data.tar.gz: 91f3fa3599201045962abd082d85069da3aa698f45f4696d3f4729c64d3e5d39
 SHA512:
-  metadata.gz: 5ee4f44de8248385c6fc0d4ced288088bc2561b7dc2ad0e5fce555f2ec86186092cd23d7d85ef790f439df3f27c731c9e78f892042aaad68a5dddedbeb5ff0f0
-  data.tar.gz: 076bffc61f49b676914e19f075fc23da290d4e87f88d227e4c9efcf519e8078d5f0a961e5e59785da2da86ae9b74aa18773cf7e688ddbf10f33d1eeaa29ee5e5
+  metadata.gz: 16491a215ac75a2ae56ed537c3b203c243610b41cea1e5caa5b2550ec6ba3603cbd9bce14dcecc6286882f4035cbbe6b5336e019a5a82a56b9a2847902a71f43
+  data.tar.gz: 051356d800eb248d2186dad362aba87b5bea5e7287c856975b81f63d5b96e25ab120899e146a2d9dcc6fa7f8bdb96fcfb78c60eff6862b0d5249bd166d0e8610

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+v4.4.0 (June 2022)
+  - Registers template mappings locally
+
+v4.3.0 (April 2022)
+  - Update HTML tag cleanup to cover `UnorderedList` tags without spaces and double `Paragraph preformat` tags
+
+v4.2.0 (February 2022)
+  - Pull the Hostname Node property from the `name` rather than `site-name` tag
+
 v4.1.0 (November 2021)
   - Update HTML tag cleanup to better cover `UnorderedList` and `URLLink` tags in the solution field
 

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

@@ -34,7 +34,7 @@ module Dradis::Plugins::Nexpose::Formats
         if host_node.respond_to?(:properties)
           logger.info{ "\tAdding host properties to #{nexpose_node.address}"}
           host_node.set_property(:ip, nexpose_node.address)
-          host_node.set_property(:hostname, nexpose_node.site_name)
+          host_node.set_property(:hostname, nexpose_node.names)
           host_node.set_property(:os, nexpose_node.software)
           host_node.set_property(:risk_score, nexpose_node.risk_score)
           host_node.save

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

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

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

@@ -7,6 +7,10 @@ module Dradis::Plugins::Nexpose
     include Formats::Full
     include Formats::Simple
 
+    def self.templates
+      { evidence: 'full_evidence', issue: 'full_vulnerability' }
+    end
+
     # The framework will call this function if the user selects this plugin from
     # the dropdown list and uploads a file.
     # @returns true if the operation was successful, false otherwise
@@ -31,4 +35,4 @@ module Dradis::Plugins::Nexpose
       end
     end
   end
-end
+end

data/lib/nexpose/vulnerability.rb

@@ -112,10 +112,11 @@ module Nexpose
     def cleanup_html(source)
       result = source.to_s
       result.gsub!(/<ContainerBlockElement>(.*?)<\/ContainerBlockElement>/m){|m| "#{ $1 }"}
+      result.gsub!(/<Paragraph preformat=\"true\">(\s*)<Paragraph preformat=\"true\">(.*?)<\/Paragraph>(\s*)<\/Paragraph>/mi){|m| "\nbc. #{ $2 }\n\n"}
       result.gsub!(/<Paragraph preformat=\"true\">(.*?)<\/Paragraph>/mi){|m| "\nbc. #{ $1 }\n\n"}
       result.gsub!(/<Paragraph>(.*?)<\/Paragraph>/m){|m| "#{ $1 }\n"}
       result.gsub!(/<Paragraph>|<\/Paragraph>/, '')
-      result.gsub!(/<UnorderedList (.*?)>(.*?)<\/UnorderedList>/m){|m| "#{ $2 }"}
+      result.gsub!(/<UnorderedList(.*?)>(.*?)<\/UnorderedList>/m){|m| "#{ $2 }"}
       result.gsub!(/<OrderedList(.*?)>(.*?)<\/OrderedList>/m){|m| "#{ $2 }"}
       result.gsub!(/<ListItem>|<\/ListItem>/, '')
       result.gsub!(/          /, '')

data/spec/fixtures/files/full.xml

@@ -5,6 +5,9 @@
   </scans>
   <nodes>
     <node address="1.1.1.1" device-id="75" risk-score="0.0" scan-template="Edge Standard" site-importance="Normal" site-name="USDA_Internal" status="alive">
+      <names>
+        <name>localhost:5000</name>
+      </names>
       <fingerprints>
         <os certainty="0.80" family="IOS" product="IOS" vendor="Cisco"/>
       </fingerprints>

data/spec/nexpose_upload_spec.rb

@@ -79,7 +79,6 @@ describe 'Nexpose upload plugin' do
 
   describe "Importer: Full" do
     it "creates nodes, issues, notes and an evidences as needed" do
-
       expect(@content_service).to receive(:create_node).with(hash_including label: "Nexpose Scan Summary").once
       expect(@content_service).to receive(:create_note) do |args|
         expect(args[:text]).to include("#[Title]#\nUSDA_Internal (4)")
@@ -123,6 +122,14 @@ describe 'Nexpose upload plugin' do
         expect(args[:node].label).to eq("1.1.1.1")
       end.once
 
+      allow_any_instance_of(OpenStruct).to receive(:respond_to?).with(:properties).and_return(true)
+      allow_any_instance_of(OpenStruct).to receive(:set_service).and_return(true)
+
+      expect_any_instance_of(OpenStruct).to receive(:set_property).with(:hostname, ['localhost:5000'])
+      expect_any_instance_of(OpenStruct).to receive(:set_property).with(:ip, '1.1.1.1')
+      expect_any_instance_of(OpenStruct).to receive(:set_property).with(:os, [])
+      expect_any_instance_of(OpenStruct).to receive(:set_property).with(:risk_score, '0.0')
+
       @importer.import(file: 'spec/fixtures/files/full.xml')
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-nexpose
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-18 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dradis-plugins
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Nexpose add-on for the Dradis Framework.