dradis-projects 3.19.0 → 3.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15e6f2944b32adc796476388e08a4526d78046d8c899b47c6d68dc7750b973cb
-  data.tar.gz: 63b932c050ca7f3f1b40d9c7fd4d29f2eb8165d728c4314ed21e8bd7cd552919
+  metadata.gz: bfe5bf6cbe31094323147c20e04d6693fdb4c605c258a0b0755c09e366fb82ba
+  data.tar.gz: e9cd0afb9050999a5d08c0da67bb44469a5209707d81563f7851807db07c7e47
 SHA512:
-  metadata.gz: '08cc871995bc3cf8a56b112a3b85729fa6d6561b2addbec65f6a0b0a9c69291825dff38e8458525a6c40a2b814114a9aef7428cf458d35ae4b13f61c07189551'
-  data.tar.gz: 07e6b9fb5d85de664c3e3e91141961a73931a317bab525c0456c6f60f6b857dbf3167539ef112d2b9ff26e8947f36afacb9c2c93518f5b79dcc425c2d565dc39
+  metadata.gz: 856c6e4c02666794683e1fca0f9e70df6e1cf147d91daf510c7a988e189e7b7b73735b90a99586b22ca3b3ad3ecb496628397f8b79785e7c74262ab58a1d9ea7
+  data.tar.gz: 06a7b58d9fc4128240d00cffc9cac88587796717de132704db67b1476f3ec02d6a3f8774d5e72ceeeaa109ed2f7f5fa47fd5027c49bfbade48b941e6fad5757b

data/.gitignore

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

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Dradis Framework 3.20 (Jan, 2020) ##
+
+*  Fix exporting projects with comments by deleted users.
+
 ## Dradis Framework 3.19 (September, 2020) ##
 
 *  No changes

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 = 19
+        MINOR = 20
         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.19.0
+  version: 3.20.0
 platform: ruby
 authors:
 - Daniel Martin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,7 +139,7 @@ homepage: http://dradisframework.org
 licenses:
 - GPL-2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -154,8 +154,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
-signing_key: 
+rubygems_version: 3.2.4
+signing_key:
 specification_version: 4
 summary: Project export/upload for the Dradis Framework.
 test_files: