dradis-projects 3.16.0 → 3.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8839b1deab4f196cf96c072b583ac661fd761b01e18a2cc66c5d87ac5ee54482
-  data.tar.gz: ee8272cc0e30a4b18efbceef80ef9e8b1922f782e2e3848d4e550e14f9ce7fbd
+  metadata.gz: d19a3cf6f2164c69c08fd2fa151849338f50cd2756c85a004caee2b304a34019
+  data.tar.gz: ae3b507fa0d58612cdd148237e2bf5d3d61430ce83e6e4ae43efa40cc21c64d2
 SHA512:
-  metadata.gz: d96ed218c6ac1dc4493ae8547ee53c775bb4829000aee94d093f4570158c1343c3b9b257f1026fcdceb2e8cb1eb8eb7dc4bd14227a53bfdc83ca66fd2be235ed
-  data.tar.gz: a0ebd0fe5b2ef8681e081cfc63fd22b9f1a044b4aad1929085005dba19012bdacc8e811a9ca25523c3e4d083a7463fa780fb7b4bf83ebbf03e34d8ec95cd4455
+  metadata.gz: ab39dd0a946b71c978443de7f921c30edcba47e4485459247b4cd4565998066fd53b5511747e0723faf4773aebe5ee37e9ec4c5b632aa47d35c04d08e37c8f23
+  data.tar.gz: 4e6527f380b9baaf70d974eb6b54ced56e471d02874a77ca6b23a6c0a5b6f9fa3cb44ac56bbd5b0be00cc24189a279c7601014cf9ec2637fe0a3f6979be7fd09

data/.gitignore

@@ -8,3 +8,5 @@ Gemfile.lock
 
 # Gem artifacts
 /pkg/
+
+.DS_Store

data/.ruby-version

@@ -1 +1 @@
-2.2.2
+2.4.1

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## Dradis Framework 3.21 (February, 2021) ##
+
+*  No changes
+
+## Dradis Framework 3.20 (Jan, 2020) ##
+
+*  Add views for the export view.
+*  Fix exporting projects with comments by deleted users.
+
+## Dradis Framework 3.19 (September, 2020) ##
+
+*  No changes
+
+## Dradis Framework 3.18 (July, 2020) ##
+
+*  No changes
+
+## Dradis Framework 3.17 (May, 2020) ##
+
+*  No changes
+
 ## Dradis Framework 3.16 (February, 2020) ##
 
 *  No changes
@@ -39,19 +60,19 @@
 
 ## Dradis Framework 3.9 (January, 2018) ##
 
-*   Fix nodes upload   
+*   Fix nodes upload
 
 *   Add default user id as fallback for activity user when importing
 
 ## Dradis Framework 3.8 (September, 2017) ##
 
-*   Add version attribute to exported methodologies   
+*   Add version attribute to exported methodologies
 
 *   Add parse_report_content placeholders to import/export.
 
 ## Dradis Framework 3.7 (July, 2017) ##
 
-*   Skip closing the logger in thorfile   
+*   Skip closing the logger in thorfile
 
 ## Dradis Framework 3.6 (March, 2017) ##
 

data/app/views/dradis/plugins/projects/export/_index-content.html.erb

@@ -0,0 +1,19 @@
+<%= content_tag :div, id: 'plugin-projects', class: 'tab-pane fade' do %>
+  <%= form_tag project_export_manager_path(current_project), target: '_blank' do %>
+    <%= hidden_field_tag :plugin, 'projects' %>
+
+    <h4 class="header-underline">Choose an export option</h4>
+
+    <div class="custom-control custom-radio">
+      <%= radio_button_tag :route, :package, true, :class => 'custom-control-input' %>
+      <label class="custom-control-label" for='route_package'>Package</label>
+    </div>
+
+    <div class="custom-control custom-radio">
+      <%= radio_button_tag :route, :template, false, :class => 'custom-control-input' %>
+      <label class="custom-control-label" for='route_template'>Template</label>
+    </div>
+
+    <button id="export-button" class="btn btn-lg btn-primary mt-4">Export</button>
+  <% end %>
+<% end%>

data/app/views/dradis/plugins/projects/export/_index-tabs.html.erb

@@ -0,0 +1,3 @@
+<li class='nav-item'>
+  <a href='#projects' class='nav-link' data-toggle='tab' data-target='#plugin-projects'>Save and restore project information</a>
+</li>

data/lib/dradis/plugins/projects.rb

@@ -1,8 +1,10 @@
 module Dradis
   module Plugins
     module Projects
-      module Export; end
-      module Upload; end
+      module Export
+      end
+      module Upload
+      end
     end
   end
 end
@@ -16,4 +18,4 @@ require 'dradis/plugins/projects/version'
 
 module Dradis::Plugins::Projects
   ActiveSupport.run_load_hooks(:dradis_projects, self)
-end
+end

data/lib/dradis/plugins/projects/export/v2/template.rb

@@ -11,7 +11,7 @@ module Dradis::Plugins::Projects::Export::V2
             comment_builder.content do
               comment_builder.cdata!(comment.content)
             end
-            comment_builder.author(comment.user.email)
+            comment_builder.author(comment.user&.email)
             comment_builder.created_at(comment.created_at.to_i)
           end
         end

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

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

data/lib/dradis/plugins/projects/upload/v1/template.rb

@@ -3,7 +3,7 @@ module Dradis::Plugins::Projects::Upload::V1
 
     class Importer < Dradis::Plugins::Projects::Upload::Template::Importer
 
-      attr_accessor :attachment_notes, :logger, :pending_changes
+      attr_accessor :attachment_notes, :logger, :pending_changes, :users
 
       ATTACHMENT_URL = %r{^!(/[a-z]+)?/(?:projects/\d+/)?nodes/(\d+)/attachments/(.+)!$}
 
@@ -394,15 +394,17 @@ module Dradis::Plugins::Projects::Upload::V1
         end
       end
 
-      # Cache users to cut down on excess SQL requests
       def user_id_for_email(email)
-        return @default_user_id if email.blank?
+        users[email] || @default_user_id
+      end
+
+      # Cache users to cut down on excess SQL requests
+      def users
         @users ||= begin
           User.select([:id, :email]).all.each_with_object({}) do |user, hash|
             hash[user.email] = user.id
           end
         end
-        @users[email] || @default_user_id
       end
 
       def validate_and_save(instance)

data/lib/dradis/plugins/projects/upload/v2/template.rb

@@ -13,16 +13,19 @@ module Dradis::Plugins::Projects::Upload::V2
             commentable_type: commentable.class.to_s,
             content: xml_comment.at_xpath('content').text,
             created_at: Time.at(xml_comment.at_xpath('created_at').text.to_i),
-            user_id: user_id_for_email(author_email)
+            user_id: users[author_email]
           )
 
-          if comment.user.email != author_email
+          if comment.user.nil?
             comment.content = comment.content +
               "\n\nOriginal author not available in this Dradis instance: "\
               "#{author_email}."
           end
 
-          return false unless validate_and_save(comment)
+          unless validate_and_save(comment)
+            logger.info { "comment errors: #{comment.inspect}" }
+            return false
+          end
         end
       end
     end

data/spec/fixtures/files/with_comments.xml

@@ -71,7 +71,7 @@ A
   </nodes>
   <issues>
     <issue>
-      <id>1</id>
+      <id>586</id>
       <author>xavi</author>
       <text><![CDATA[#[Title]#
 Issue 1

data/spec/lib/dradis/plugins/projects/export/v2/template_spec.rb

@@ -13,13 +13,13 @@ describe Dradis::Plugins::Projects::Export::V2::Template do
 
   context 'exporting a project' do
     before do
-      node = create(:node, project: project)
-      issue = create(:issue, text: 'Issue 1', node: project.issue_library)
+      @node = create(:node, project: project)
+      @issue = create(:issue, text: 'Issue 1', node: project.issue_library)
     end
 
     context 'with comments in an issue' do
       before do
-        create(:comment, content: 'A comment on an issue', commentable: issue)
+        create(:comment, content: 'A comment on an issue', commentable: @issue)
       end
 
       it 'exports comments in the issue' do
@@ -29,7 +29,7 @@ describe Dradis::Plugins::Projects::Export::V2::Template do
 
     context 'with comments in a note' do
       before do
-        note = create(:note, text: 'Note 1', node: node)
+        note = create(:note, text: 'Note 1', node: @node)
         create(:comment, content: 'A comment on a note', commentable: note)
       end
 
@@ -40,7 +40,7 @@ describe Dradis::Plugins::Projects::Export::V2::Template do
 
     context 'with comments in an evidence' do
       before do
-        evidence = create(:evidence, text: 'Test evidence', node: node, issue: issue)
+        evidence = create(:evidence, content: 'Test evidence', node: @node, issue: @issue)
         create(:comment, content: 'A comment on an evidence', commentable: evidence)
       end
 
@@ -48,5 +48,17 @@ describe Dradis::Plugins::Projects::Export::V2::Template do
         expect(export).to include('A comment on an evidence')
       end
     end
+
+    context 'with comments with a deleted author' do
+      before do
+        note = create(:note, text: 'Note 1', node: @node)
+        comment = create(:comment, content: 'Deleted user', commentable: note)
+        comment.update_attribute :user, nil
+      end
+
+      it 'exports the comment without errors' do
+        expect(export).to include('Deleted user')
+      end
+    end
   end
 end

data/spec/lib/dradis/plugins/projects/upload/v2/template_spec.rb

@@ -41,5 +41,17 @@ describe Dradis::Plugins::Projects::Upload::V2::Template::Importer do
       evidence = node.evidence.first
       expect(evidence.comments.first.content).to include('A comment on an evidence')
     end
+
+    it 'imports comments without user' do
+      issue = project.issues.first
+      note = node.notes.first
+      evidence = node.evidence.first
+
+      aggregate_failures do
+        expect(issue.comments.first.user).to be_nil
+        expect(note.comments.first.user).to be_nil
+        expect(evidence.comments.first.user).to be_nil
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-projects
 version: !ruby/object:Gem::Version
-  version: 3.16.0
+  version: 3.21.0
 platform: ruby
 authors:
 - Daniel Martin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2021-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,6 +112,8 @@ files:
 - Rakefile
 - app/controllers/dradis/plugins/projects/packages_controller.rb
 - app/controllers/dradis/plugins/projects/templates_controller.rb
+- app/views/dradis/plugins/projects/export/_index-content.html.erb
+- app/views/dradis/plugins/projects/export/_index-tabs.html.erb
 - config/routes.rb
 - dradis-projects.gemspec
 - lib/dradis-projects.rb
@@ -139,7 +141,7 @@ homepage: http://dradisframework.org
 licenses:
 - GPL-2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -154,8 +156,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.2.4
+signing_key:
 specification_version: 4
 summary: Project export/upload for the Dradis Framework.
 test_files: