dradis-nexpose 4.14.0 → 4.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fed2206ffe5931c65cc3b1ae1c9007091b99b3f9134a9b81b4ae8b4d5496fc5f
-  data.tar.gz: bf34162969ecdd0d105d551149b51f7c20795a2bfa9b1f97c741b36e5711cfe5
+  metadata.gz: 741c488c76cb9554ce3b2a61997374262453a38e3256cad93c1885602d872bca
+  data.tar.gz: c896b751650744b60e8ddfeae40c4cba4277901d404e95bdb594674024227038
 SHA512:
-  metadata.gz: 9fa49ed385686a5910de33e05f09caafbb624e5227af713c5defd4d0485b38b0d446194bd652b03b77d43861440e1d08a2eb597ea7b13b2f8ccae9a8f1440510
-  data.tar.gz: d84b92cc9d54926f788d78dda9b87e7f1a4262ad7682278f72af62dc4917ca4877ea9e0a8754a3d4a117bee44633dbd4ce2e539e197069b523a5c7615b2d1acf
+  metadata.gz: 93068f684c000bcf4cb4f5944b38dd3e57ae7152c7c9f046b8db9e65c46a76323f5b399feffa47474cb62af5da17e26746af419c4a9eacd824437d5f6d0cae0e
+  data.tar.gz: e812c05c84e2b12e36fdb858eadd2daf02bd87b5c69cf5cc7b4cbaa9cbc8fe7eb213e12d58c8518a0c631fcb08bb0ff78973cdbd264d8f741021a84817adee8c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+v4.15.0 (December 2024)
+  - No changes
+
 v4.14.0 (October 2024)
 - Separate general importer into Full & Simple importers
 
@@ -7,6 +10,7 @@ v4.13.0 (July 2024)
 v4.12.0 (May 2024)
  - Migrate integration to use Mappings Manager
  - Update Dradis links in README
+ - Use 'n/a' as OS node property if there is no product value
 
 v4.11.0 (January 2024)
   - Add port/protocol to evidences

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

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

data/lib/nexpose/node.rb

@@ -83,22 +83,24 @@ module Nexpose
       # Finally the enumerations: names
       if method_name == 'names'
         @xml.xpath('./names/name').collect(&:text)
-
       elsif ['fingerprints', 'software'].include?(method_name)
-
-        xpath_selector = {
-          'fingerprints' => './fingerprints/os',
-          'software' => './software/fingerprint'
-        }[method_name]
-
-        xml_os = @xml.at_xpath(xpath_selector)
-        return '' if xml_os.nil?
-
-        xml_os.attributes['product'].value
+        get_fingerprint_product(method_name)
       else
         # nothing found, the tag is valid but not present in this ReportItem
         return nil
       end
     end
+
+    private
+
+    # returns the first 'product' value from the <fingerprints> or <software> element
+    def get_fingerprint_product(method_name)
+      xpath_selector = {
+        'fingerprints' => './fingerprints/os',
+        'software' => './software/fingerprint'
+      }[method_name]
+
+      @xml.at_xpath(xpath_selector + '/@product')&.value || 'n/a'
+    end
   end
 end

data/spec/fixtures/files/full.xml

@@ -11,6 +11,15 @@
       <fingerprints>
         <os certainty="0.80" family="IOS" product="IOS" vendor="Cisco" arch="x86_64"/>
       </fingerprints>
+      <software>
+        <fingerprint
+          certainty="1.00"
+          software-class="General"
+          vendor="Sun"
+          family="Java"
+          product="JRE"
+          version="1.6.0.22"/>
+      </software>
       <tests/>
       <endpoints>
         <endpoint port="123" protocol="udp" status="open">

data/spec/fixtures/files/full_with_duplicate_node.xml

@@ -9,8 +9,11 @@
         <name>localhost:5000</name>
       </names>
       <fingerprints>
-        <os certainty="0.80" family="IOS" product="IOS" vendor="Cisco" arch="x86_64"/>
+        <os certainty="0.80" family="IOS" vendor="Cisco" arch="x86_64"/>
       </fingerprints>
+      <software>
+        <fingerprint certainty="1.00" vendor="Sun" family="Java"/>
+      </software>
       <tests/>
       <endpoints>
         <endpoint port="123" protocol="udp" status="open">

data/spec/nexpose_upload_spec.rb

@@ -0,0 +1,58 @@
+require 'rails_helper'
+require 'ostruct'
+
+describe 'Nexpose upload plugin' do
+  before do
+    @fixtures_dir = File.expand_path('../fixtures/files/', __FILE__)
+  end
+
+  describe 'Importer: Full with fingerprints elements' do
+    def apply_mapping(doc, field)
+      ms = Dradis::Plugins::MappingService.new(
+        integration: Dradis::Plugins::Nexpose
+      )
+      mapping_fields = [OpenStruct.new(
+        destination_field: 'Fingerprints',
+        content: "{{ nexpose[#{field}] }}"
+      )]
+
+      @result = ms.apply_mapping(
+        data: doc.at_xpath('//nodes/node'),
+        mapping_fields: mapping_fields,
+        source: 'full_node'
+      )
+    end
+
+    describe 'with fingerprints > OS elements' do
+      it 'uses the os product value' do
+        doc = Nokogiri::XML(File.read(@fixtures_dir + '/full.xml'))
+        apply_mapping(doc, 'node.fingerprints')
+
+        expect(@result).to include('IOS')
+      end
+
+      it 'defaults to n/a if there is no os product value' do
+        doc = Nokogiri::XML(File.read(@fixtures_dir + '/full_with_duplicate_node.xml'))
+        apply_mapping(doc, 'node.fingerprints')
+
+        expect(@result).to include('n/a')
+      end
+    end
+
+    describe 'with software > fingerprint elements' do
+      it 'uses the product value given software/fingerprints' do
+        doc = Nokogiri::XML(File.read(@fixtures_dir + '/full.xml'))
+        apply_mapping(doc, 'node.software')
+
+        expect(@result).to include('JRE')
+      end
+
+      it 'defaults to n/a if there is no os product value' do
+        doc = Nokogiri::XML(File.read(@fixtures_dir + '/full_with_duplicate_node.xml'))
+        apply_mapping(doc, 'node.software')
+
+        expect(@result).to include('n/a')
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-nexpose
 version: !ruby/object:Gem::Version
-  version: 4.14.0
+  version: 4.15.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-21 00:00:00.000000000 Z
+date: 2024-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dradis-plugins
@@ -135,6 +135,7 @@ files:
 - spec/fixtures/files/ssl.xml
 - spec/nexpose/full/importer_spec.rb
 - spec/nexpose/simple/importer_spec.rb
+- spec/nexpose_upload_spec.rb
 - spec/spec_helper.rb
 - templates/full_evidence.sample
 - templates/full_node.sample
@@ -172,4 +173,5 @@ test_files:
 - spec/fixtures/files/ssl.xml
 - spec/nexpose/full/importer_spec.rb
 - spec/nexpose/simple/importer_spec.rb
+- spec/nexpose_upload_spec.rb
 - spec/spec_helper.rb