dradis-projects 3.17.0 → 3.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 3a8be2f5a1ea984d74d0e2c0e1b8aa8234592b92bd580616afa5846f4e2c85f4
-  data.tar.gz: 07a452e34dfa738a6cc206d24af3b89f3208002c1b73f12fc8c1b57c2e404cf2
+SHA1:
+  metadata.gz: '0059854c4be15ee7482f2c8971b2d116448fdac3'
+  data.tar.gz: 274c11a56a4da9dd7aced8ce40d5733cebcd0fc2
 SHA512:
-  metadata.gz: a4d192636cb52fd17926243cf9ed8123adffd15a7fa6653bf8634afef66ea515ab6fd667de20ddc9a55727aef4d7760963978c372a48d71af96d6e41c5d8e255
-  data.tar.gz: 77167bb73e09422b5a016a09342d1f402e8ad7a5903beb03af3c260492a8102ebc38ee678c047d3a342d36890a0b208a5962868aff49c0b2b1ede6a3f8ee30c8
+  metadata.gz: e7f624ad8cedc09de23de97544715f95c44d696b83b685e25d2dede9f9222de99edba495964db7c554f7199b0d6bb2274d13239f9c40cd346703e24be0547721
+  data.tar.gz: 37e188178fad6f45c8e540e6e731c1422f49b4f0b58769f5005ac8be1c8d09ced41e4af9e0c4015e92c1bc74e091efe35924ab9d62dc97fa69d80c0c0b69ab31

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.22 (April, 2021) ##
+
+*  No changes
+
+## 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
@@ -43,19 +64,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/export/v3/template.rb

@@ -13,43 +13,7 @@ module Dradis::Plugins::Projects::Export::V3
           node_id =
             board.node == project.methodology_library ? nil : board.node_id
 
-          methodologies_builder.board(version: VERSION) do |board_builder|
-            board_builder.id(board.id)
-            board_builder.name(board.name)
-            board_builder.node_id(node_id)
-
-            board.ordered_items.each do |list|
-
-              board_builder.list do |list_builder|
-                list_builder.id(list.id)
-                list_builder.name(list.name)
-                list_builder.previous_id(list.previous_id)
-
-                list.ordered_items.each do |card|
-
-                  list_builder.card do |card_builder|
-                    card_builder.id(card.id)
-                    card_builder.name(card.name)
-                    card_builder.description do
-                      card_builder.cdata!(card.description)
-                    end
-                    card_builder.due_date(card.due_date)
-                    card_builder.previous_id(card.previous_id)
-
-                    card_builder.assignees do |assignee_builder|
-                      card.assignees.each do |assignee|
-                        assignee_builder.assignee(assignee.email)
-                      end
-                    end
-
-                    build_activities_for(card_builder, card)
-                    build_comments_for(card_builder, card)
-                  end
-
-                end
-              end
-            end
-          end
+          board.to_xml(methodologies_builder, includes: [:activities, :assignees, :comments], version: VERSION)
         end
       end
     end

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

@@ -8,7 +8,7 @@ module Dradis
 
       module VERSION
         MAJOR = 3
-        MINOR = 17
+        MINOR = 22
         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.17.0
+  version: 3.22.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2021-04-02 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
@@ -154,7 +156,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Project export/upload for the Dradis Framework.