dradis-nipper 3.19.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d766139eb8dcced7115946cb795c3adde1e1d5ffb907a4568ed44477f04bcda
-  data.tar.gz: 122e95b6dd0a3116d95f6fbc93a801b65584254c3c0743f67dcd1164b01195e0
+  metadata.gz: 94d905bbc8c8f66a9ba18750cf230611a87dc0ad6b754bfb7244212a59538063
+  data.tar.gz: 44cc3b043be1e58aa54671c1e85ed8e207a7dc67760aa8ed520436bd834214d0
 SHA512:
-  metadata.gz: 48e3d12732fb8ea20fd40fa034dde7bdc9c83fda2e8bccde502360acaf8a35cb1be4c54d80552531856a2fef357f31218a1ce9b428c9e3d564ac3b995d51edb4
-  data.tar.gz: 3da56d3c1dee84b70528354fbbc25ca224a8cdb5490f9c25b3170f9a659aedb7b39fb72d6f289212d35272cc54b7309aa46a31cd9ae04809d042109430da6db0
+  metadata.gz: eabbe29f7590cbb10324dc6bdcf7ff4b166c6da2a77e29b2358c3a9dba00ea758033dffec2c7b5d8bbfe726504272ec2a63894a219c5c2336188e022bba8bc98
+  data.tar.gz: d38b4f20a2a3fa9563d6215c73be02de1c9782bb7d918555fea88fcebacbbba0192fa4fbb2e9cba4dd6396b10168f2cfaad86ece558168af3878e25fd9c65dc3

data/CHANGELOG.md

@@ -1,3 +1,15 @@
-## Dradis Framework 3.XX (XXX, 2020) ##
+## Dradis Framework 4.0.0 (July, 2021) ##
+
+*  Include multiple paragraphs when importing fields.
+
+## Dradis Framework 3.22 (April, 2021) ##
+
+*  No changes.
+
+## Dradis Framework 3.21 (February, 2021) ##
+
+*  No changes.
+
+## Dradis Framework 3.20 (December, 2020) ##
 
 *  Initial version.

data/dradis-nipper.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.files       = `git ls-files`.split($\)
   spec.test_files  = spec.files.grep(%r{^(test|spec|features)/})
 
-  spec.add_dependency 'dradis-plugins', '~> 3.8'
+  spec.add_dependency 'dradis-plugins', '~> 4.0.0'
 
   spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'rake', '~> 13.0'

data/lib/dradis/plugins/nipper/engine.rb

@@ -1,13 +1,9 @@
-module Dradis
-  module Plugins
-    module Nipper
-      class Engine < ::Rails::Engine
-        isolate_namespace Dradis::Plugins::Nipper
+module Dradis::Plugins::Nipper
+  class Engine < ::Rails::Engine
+    isolate_namespace Dradis::Plugins::Nipper
 
-        include ::Dradis::Plugins::Base
-        description 'Processes Nipper XML format'
-        provides :upload
-      end
-    end
+    include ::Dradis::Plugins::Base
+    description 'Processes Nipper XML format'
+    provides :upload
   end
 end

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

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

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

@@ -72,6 +72,12 @@ module Dradis::Plugins::Nipper
         label: host_xml.attr('name'),
         type: :host
       )
+
+      # Set device properties
+      @host_node.set_property(:device_name, host_xml.attr('name'))
+      @host_node.set_property(:device_type, host_xml.attr('type'))
+      @host_node.set_property(:os_version, host_xml.attr('osversion'))
+      @host_node.save
     end
   end
 end

data/lib/nipper/issue.rb

@@ -41,7 +41,7 @@ module Nipper
       elsif method.to_s.starts_with?('cvss')
         process_cvss_field(method)
       else
-        @xml.xpath("./#{translations_table[method]}").first.try(:text)
+        collect_text(@xml.xpath("./#{translations_table[method]}"))
       end
     end
 
@@ -55,10 +55,16 @@ module Nipper
       base_method = method.to_s.sub('_vector', '').to_sym
 
       if method.to_s.ends_with?('vector')
-        @xml.xpath("./#{translations_table[base_method]}").first.try(:text)
+        collect_text(@xml.xpath("./#{translations_table[base_method]}"))
       else
         @xml.xpath("./#{translations_table[base_method]}").attr('score')
       end
     end
+
+    private
+
+    def collect_text(xml_field)
+      xml_field.children.map { |xml_text| xml_text.text }.join("\n")
+    end
   end
 end

data/spec/upload_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'Nipper upload plugin' do
   describe 'importer' do
@@ -23,24 +23,35 @@ describe 'Nipper upload plugin' do
         OpenStruct.new(args)
       end.once
 
-      @importer.import(file: 'spec/fixtures/files/invalid.xml')
+      @importer.import(file: File.expand_path('../spec/fixtures/files/invalid.xml', __dir__))
     end
 
     it 'creates nodes, issues, and evidences as needed' do
       expect(@content_service).to receive(:create_node) do |args|
         expect(args[:label]).to eq('PA-200')
         expect(args[:type]).to eq(:host)
-        OpenStruct.new(args)
+        @node = Node.create(label: args[:label])
       end.once
       expect(@content_service).to receive(:create_issue) do |args|
         OpenStruct.new(args)
+        @issue = Issue.create(text: args[:text])
       end.exactly(2).times
       expect(@content_service).to receive(:create_evidence) do |args|
         OpenStruct.new(args)
       end.exactly(2).times
 
       # Run the import
-      @importer.import(file: 'spec/fixtures/files/sample.xml')
+      @importer.import(file: File.expand_path('../spec/fixtures/files/sample.xml', __dir__))
+
+      expect(@node.properties).to eq(
+        {
+          'device_name'=>'PA-200',
+          'device_type'=>'Palo Alto Firewall',
+          'os_version'=>'7.0.0'
+        }
+      )
+
+      expect(@issue.fields['Finding'].lines.count).to eq(2)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-nipper
 version: !ruby/object:Gem::Version
-  version: 3.19.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Dradis Team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dradis-plugins
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -115,11 +115,11 @@ files:
 - templates/issue.fields
 - templates/issue.sample
 - templates/issue.template
-homepage:
+homepage: 
 licenses:
 - Commercial - Dradis Pro
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -134,8 +134,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Nipper upload add-on for Dradis Framework.
 test_files: