dradis-csv 4.9.0 → 4.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73b72a29b3c7c57b0b65426b584d3a88f7557089b26c0c1da43fc897e7b17d30
-  data.tar.gz: 67eb6934d1b164e7e97925d6c38cfa3149ce580c59453f20c9759bfea94fb089
+  metadata.gz: f2048ab1a638af0a7433589192ed553885f34417c367f06e1ec6a6cb717d5ba8
+  data.tar.gz: 7c93f77f09ecfe99d4a8129b9ebd349adca55aa8105d03c373243ac871b47ac3
 SHA512:
-  metadata.gz: e7a721f5ab932bf17efb2f39debfb42145374504ecfb2b1cd7147197284e3ca943678be2ce49f16b990873a3e40dbb0c5f9956d35fd9967714e5136819841033
-  data.tar.gz: 651af8822ababb6b238d6b31fe30ea6f979b8ed4e89e1401c9ae9afbeb7827f9d61a83cd7f1d0610c283b776f42c281ad519ca018d10e2b601d05f18dfb50834
+  metadata.gz: 509a35b195cadbd852370f3b4c732e9a7aeb57987bd19479f59633b8cec07f7ae23268d4eda7c4808ca58dd8dc4c0e19becbbc070c4c60ba3e61d27291741a04
+  data.tar.gz: ffb2d555a7965fe0aa04e4eb1600cc06db803ed30c84ee557fb643502d042528eb74453da726362aca7541eeb966f37e22626a0ee82b76a2207a9f40869f7d6e

data/.github/pull_request_template.md

@@ -0,0 +1,45 @@
+Please review [CONTRIBUTING.md](https://github.com/dradis/dradis-ce/blob/develop/CONTRIBUTING.md) and remove this line.
+
+### Summary
+
+Provide a general description of the code changes in your pull
+request... were there any bugs you had fixed? If so, mention them. If
+these bugs have open GitHub issues, be sure to tag them here as well,
+to keep the conversation linked together.
+
+
+### Testing Steps
+
+Provide steps to test functionality, described in detail for someone not familiar with this part of the application / code base
+
+
+### Other Information
+
+If there's anything else that's important and relevant to your pull
+request, mention that information here. This could include
+benchmarks, or other information.
+
+Thanks for contributing to Dradis!
+
+
+### Copyright assignment
+
+Collaboration is difficult with commercial closed source but we want
+to keep as much of the OSS ethos as possible available to users
+who want to fix it themselves.
+
+In order to unambiguously own and sell Dradis Framework commercial
+products, we must have the copyright associated with the entire
+codebase. Any code you create which is merged must be owned by us.
+That's not us trying to be a jerks, that's just the way it works.
+
+You can delete this section, but the following sentence needs to
+remain in the PR's description:
+
+> I assign all rights, including copyright, to any future Dradis
+> work by myself to Security Roots.
+
+### Check List
+
+- [ ] Added a CHANGELOG entry
+- [ ] Added specs

data/.gitignore

@@ -1 +1,3 @@
 .DS_Store
+
+pkg/

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+v4.11.0 (January 2024)
+  - Disable Dradis field selects with `N/A` value
+
+v4.10.0 (September 2023)
+  - Update gemspec links
+
 v4.9.0 (June 2023)
   - Fix CSV upload for files with special characters
   - Update views for compatibility with Bootstrap 5

data/README.md

@@ -7,12 +7,12 @@ The add-on requires [Dradis CE](https://dradisframework.org/) > 4.5, or [Dradis
 
 ## More information
 
-See the Dradis Framework's [README.md](https://github.com/dradis/dradisframework/blob/master/README.md)
+See the Dradis Framework's [README.md](https://github.com/dradis/dradis-ce/blob/develop/README.md)
 
 
 ## Contributing
 
-See the Dradis Framework's [CONTRIBUTING.md](https://github.com/dradis/dradisframework/blob/master/CONTRIBUTING.md)
+See the Dradis Framework's [CONTRIBUTING.md](https://github.com/dradis/dradis-ce/blob/develop/CONTRIBUTING.md)
 
 
 ## License

data/app/assets/javascripts/dradis/plugins/csv/upload.js

@@ -1,4 +1,4 @@
-window.addEventListener('job-done', function(){
+window.addEventListener('job-done', function () {
   if ($('body.upload.index').length) {
     var uploader = document.getElementById('uploader');
 
@@ -7,31 +7,41 @@ window.addEventListener('job-done', function(){
       var project_path = path.split('/').slice(0, -1).join('/');
       var attachment = $('#attachment').val();
 
-      var redirectPath  = project_path + '/addons/csv/upload/new?attachment=' + attachment;
+      var redirectPath =
+        project_path + '/addons/csv/upload/new?attachment=' + attachment;
       Turbolinks.visit(redirectPath);
     }
   }
 });
 
-document.addEventListener('turbolinks:load', function() {
+document.addEventListener('turbolinks:load', function () {
   if ($('body.upload.new').length) {
-    $('[data-behavior=type-select]').on('change', function() {
+    $('[data-behavior=type-select]').on('change', function () {
       var $nodeSelect = $('select option[value="node"]:selected').parent();
 
       // Disable Node Label option
       if ($nodeSelect.length) {
-        $('[data-behavior=type-select]').not($nodeSelect).find('option[value="node"]').attr('disabled', 'disabled');
+        $('[data-behavior=type-select]')
+          .not($nodeSelect)
+          .find('option[value="node"]')
+          .attr('disabled', 'disabled');
       } else {
-        $('[data-behavior=type-select]').find('option[value="node"]').removeAttr('disabled');
+        $('[data-behavior=type-select]')
+          .find('option[value="node"]')
+          .removeAttr('disabled');
       }
 
-      $(this).parents('tr').toggleClass('issue-type', $(this).val() == 'issue');
+      $(this)
+        .parents('tr')
+        .toggleClass('issue-type', $(this).val() == 'issue');
 
       // Update fields column labels
-      var $fieldLabel = $(this).closest('tr').find('[data-behavior=field-label]');
+      var $fieldLabel = $(this)
+        .closest('tr')
+        .find('[data-behavior=field-label]');
 
-      switch($(this).val()) {
-        case 'identifier': 
+      switch ($(this).val()) {
+        case 'identifier':
           $fieldLabel.text('plugin_id');
           break;
         case 'node':
@@ -40,7 +50,7 @@ document.addEventListener('turbolinks:load', function() {
         case 'skip':
           $fieldLabel.text('N/A');
           break;
-        default: 
+        default:
           var header = $fieldLabel.data('header');
           $fieldLabel.text(header);
       }
@@ -48,11 +58,14 @@ document.addEventListener('turbolinks:load', function() {
       _setDradisFieldSelect($(this));
     });
 
-    $('[data-behavior~=mapping-form]').submit(function() {
+    $('[data-behavior~=mapping-form]').submit(function () {
       var valid = _validateIdentifierSelected() && _validateNodeSelected();
 
       if (!valid) {
-        $(this).find('input[type="submit"]').attr('disabled', false).val('Import CSV');
+        $(this)
+          .find('input[type="submit"]')
+          .attr('disabled', false)
+          .val('Import CSV');
 
         $('[data-behavior~=view-content]').animate({
           scrollTop: $('[data-behavior~=validation-messages]').scrollTop()
@@ -67,27 +80,43 @@ document.addEventListener('turbolinks:load', function() {
     function _setDradisFieldSelect($select) {
       var $row = $select.closest('tr');
 
-      $row.find('.field-select').attr('disabled', 'disabled').addClass('d-none');
+      $row
+        .find('[data-behavior~=dradis-field-select]')
+        .attr('disabled', 'disabled')
+        .addClass('d-none');
+
       if ($select.val() == 'issue') {
-        $row.find('[data-behavior=issue-field-select]').removeAttr('disabled', 'disabled').removeClass('d-none');
-      }
-      else if ($select.val() == 'evidence') {
-        $row.find('[data-behavior=evidence-field-select]').removeAttr('disabled').removeClass('d-none');
-      }
-      else {
-        $row.find('[data-behavior=empty-field-select]').removeAttr('disabled').removeClass('d-none');
+        $row
+          .find('[data-behavior~=issue-field-select]')
+          .removeAttr('disabled')
+          .removeClass('d-none');
+      } else if ($select.val() == 'evidence') {
+        $row
+          .find('[data-behavior~=evidence-field-select]')
+          .removeAttr('disabled')
+          .removeClass('d-none');
+      } else {
+        $row
+          .find('[data-behavior~=empty-field-select]')
+          .attr('disabled', 'disabled')
+          .removeClass('d-none');
       }
     }
 
     function _validateNodeSelected() {
-      var $validationMessage = $('[data-behavior~=node-type-validation-message]');
+      var $validationMessage = $(
+        '[data-behavior~=node-type-validation-message]'
+      );
       $validationMessage.addClass('d-none');
 
-      var selectedEvidenceCount = $('select option[value="evidence"]:selected').length;
+      var selectedEvidenceCount = $(
+        'select option[value="evidence"]:selected'
+      ).length;
       var selectedNodeCount = $('select option[value="node"]:selected').length;
 
-      var valid =  selectedEvidenceCount == 0 ||
-                   (selectedEvidenceCount > 0 && selectedNodeCount > 0);
+      var valid =
+        selectedEvidenceCount == 0 ||
+        (selectedEvidenceCount > 0 && selectedNodeCount > 0);
 
       if (!valid) {
         $validationMessage.removeClass('d-none');
@@ -97,10 +126,14 @@ document.addEventListener('turbolinks:load', function() {
     }
 
     function _validateIdentifierSelected() {
-      var $validationMessage = $('[data-behavior~=issue-id-validation-message]');
+      var $validationMessage = $(
+        '[data-behavior~=issue-id-validation-message]'
+      );
       $validationMessage.addClass('d-none');
 
-      var selectedIdentifierCount = $('select option[value="identifier"]:selected').length;
+      var selectedIdentifierCount = $(
+        'select option[value="identifier"]:selected'
+      ).length;
 
       var valid = selectedIdentifierCount == 1;
 

data/app/views/dradis/plugins/csv/upload/new.html.erb

@@ -48,12 +48,12 @@
               <% if @rtp_fields %>
                 <div>
                   <% issue_options = @rtp_fields[:issue].any? ? options_for_select(@rtp_fields[:issue]) : options_for_select([[header, header]], disabled: header, selected: header) %>
-                  <%= f.select "mappings[field_attributes][#{index}][field]", issue_options, {}, class: 'form-select w-75 field-select', data: { behavior: 'issue-field-select', header: header } %>
+                  <%= f.select "mappings[field_attributes][#{index}][field]", issue_options, {}, class: 'form-select w-75 field-select', data: { behavior: 'dradis-field-select issue-field-select', header: header } %>
 
                   <% evidence_options = @rtp_fields[:evidence].any? ? options_for_select(@rtp_fields[:evidence]) : options_for_select([[header, header]], disabled: header, selected: header) %>
-                  <%= f.select "mappings[field_attributes][#{index}][field]", evidence_options, {}, disabled: true, class: 'form-select w-75 field-select d-none', data: { behavior: 'evidence-field-select', header: header } %>
+                  <%= f.select "mappings[field_attributes][#{index}][field]", evidence_options, {}, disabled: true, class: 'form-select w-75 field-select d-none', data: { behavior: 'dradis-field-select evidence-field-select', header: header } %>
 
-                  <%= f.select "mappings[field_attributes][#{index}][field]", [['N/A', '']], {}, disabled: true, class: 'form-select w-75 field-select d-none', data: { behavior: 'empty-field-select', header: header } %>
+                  <%= f.select "mappings[field_attributes][#{index}][field]", [['N/A', '']], {}, disabled: true, class: 'form-select w-75 field-select d-none', data: { behavior: 'dradis-field-select empty-field-select', header: header } %>
                 </div>
               <% else %>
                 <span data-behavior="field-label" data-header="<%= header.delete(" \t\r\n") %>" ><%= header.delete(" \t\r\n") %></span>

data/dradis-csv.gemspec

@@ -13,8 +13,7 @@ Gem::Specification.new do |spec|
   spec.license     = 'GPL-2'
 
   spec.authors     = ['Daniel Martin']
-  spec.email       = ['etd@nomejortu.com']
-  spec.homepage    = 'http://dradisframework.org'
+  spec.homepage    = 'http://dradis.com'
 
   spec.files       = `git ls-files`.split("\n")
   spec.executables = spec.files.grep(%r{^bin/}).map { |f| File.basename(f) }

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-csv
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.11.0
 platform: ruby
 authors:
 - Daniel Martin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 2024-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dradis-plugins
@@ -54,11 +54,11 @@ dependencies:
         version: '0'
 description: This add-on allows you to upload and parse CSV output into Dradis.
 email:
-- etd@nomejortu.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/pull_request_template.md"
 - ".gitignore"
 - CHANGELOG.md
 - CHANGELOG.template
@@ -90,11 +90,11 @@ files:
 - spec/fixtures/files/simple_malformed.csv
 - spec/jobs/dradis/plugins/csv/mapping_import_job_spec.rb
 - spec/lib/dradis/plugins/csv/importer_spec.rb
-homepage: http://dradisframework.org
+homepage: http://dradis.com
 licenses:
 - GPL-2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -109,8 +109,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: CSV add-on for the Dradis Framework.
 test_files: