dradis-projects 3.8.0 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c89adcdc78b9d1cb42caf85a3c5bdfac676f7537
-  data.tar.gz: 802d58668e34660d86f46b550e6544a3f62ed35f
+  metadata.gz: 0b132456fc52c60a49be0e8fcb92b42d05874c1d
+  data.tar.gz: d240988d1166f96509d3c483a6cc2179dad5d86c
 SHA512:
-  metadata.gz: 8dda41635dd76a933bef1b412df282ced535f4f4f4fa31da0080da9337640cc23df02aa38174da8b2b70633faf7d9f67bbacfb50d793bf083a105c716ff68c5a
-  data.tar.gz: 63049c10e2b62045fa0bf6cd235f6c2ad8987c4c2898a37808e893f534e187a555104c7f4725c7c0a60a6960f1220335e17ae2a203bdbae2a8dac6d89678f2a6
+  metadata.gz: 7ac336d9eb5203fd73f23b3ccc2ef60d78c3f401fc4d8401b3e5c4cbd88090893fefea25fced73dcf08dcccd5a57ce43a83ef8e4a7f11cd24c404a4b2be241b4
+  data.tar.gz: b6da1f393598f2cac694b55955c17117b4d7cccb2e2a2de1f8bc6a3c786604119fc8f692c2c64c8a7e2d1c7465f41906b848a025b8bff343b12fd415a9a03ce9

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Dradis Framework 3.9 (January, 2018) ##
+
+*   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   
@@ -8,7 +14,7 @@
 
 *   Skip closing the logger in thorfile   
 
-## Dradis Framework 3.6 (March XX, 2017) ##
+## Dradis Framework 3.6 (March, 2017) ##
 
 *   Include file version in project template export.
 

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

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

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

@@ -58,8 +58,8 @@ module Dradis::Plugins::Projects::Upload::V1
       def finalize(template)
         logger.info { 'Wrapping up...' }
 
-        finalize_evidence()
         finalize_nodes()
+        finalize_evidence()
         finalize_attachments()
 
         logger.info { 'Done.' }
@@ -67,17 +67,18 @@ module Dradis::Plugins::Projects::Upload::V1
 
       def finalize_attachments
         # Adjust attachment URLs for new Node IDs
-        pending_changes[:attachment_notes].each do |note|
+        pending_changes[:attachment_notes].each do |item|
+          text_attr = item.is_a?(ContentBlock) ? :content : :text
 
-          logger.info { "Adjusting screenshot URLs: Note ##{note.id}" }
+          logger.info { "Adjusting screenshot URLs: #{item.class.name} ##{item.id}" }
 
-          new_text = note.text.gsub(%r{^!(.*)/nodes/(\d+)/attachments/(.+)!$}) do |_|
+          new_text = item.send(text_attr).gsub(%r{^!(.*)/nodes/(\d+)/attachments/(.+)!$}) do |_|
             "!%s/nodes/%d/attachments/%s!" % [$1, lookup_table[:nodes][$2], $3]
           end
 
-          note.text = new_text
+          item.send(text_attr.to_s + "=", new_text)
 
-          raise "Couldn't save note attachment URL for Note ##{note.id}" unless validate_and_save(note)
+          raise "Couldn't save note attachment URL for #{item.class.name} ##{item.id}" unless validate_and_save(item)
         end
       end
 
@@ -199,7 +200,7 @@ module Dradis::Plugins::Projects::Upload::V1
         type_id   = element.text.nil? ? nil : element.text.strip
         label     = xml_node.at_xpath('label').text.strip
         element   = xml_node.at_xpath('parent-id')
-        parent_id = element.text.nil? ? nil : element.text.strip
+        parent_id = element.text.blank? ? nil : element.text.strip
 
         # Node positions
         element  = xml_node.at_xpath('position')
@@ -218,28 +219,36 @@ module Dradis::Plugins::Projects::Upload::V1
         # more than one of this nodes, in any given tree:
         # - the Configuration.uploadsNode node (detected by its label)
         # - any nodes with type different from DEFAULT or HOST
-        node =
-          if label == Configuration.plugin_uploads_node
-            Node.create_with(type_id: type_id, parent_id: parent_id)
-                .find_or_create_by!(label: label)
-          elsif [Node::Types::DEFAULT, Node::Types::HOST].exclude?(type_id.to_i)
-            Node.create_with(label: label)
-                .find_or_create_by!(type_id: type_id)
-          else
-            Node.create!(
+        if label == Configuration.plugin_uploads_node
+          node = Node.create_with(type_id: type_id, parent_id: parent_id)
+              .find_or_create_by!(label: label)
+        elsif Node::Types::USER_TYPES.exclude?(type_id.to_i)
+          node = Node.create_with(label: label)
+              .find_or_create_by!(type_id: type_id)
+        else
+          # We don't want to validate child nodes here yet since they always
+          # have invalid parent id's. They'll eventually be validated in the
+          # finalize_nodes method.
+          has_nil_parent = !parent_id
+          node =
+            Node.new(
               type_id:   type_id,
               label:     label,
               parent_id: parent_id,
               position:  position
             )
-          end
+          node.save!(validate: has_nil_parent)
+          pending_changes[:orphan_nodes] << node if parent_id
+        end
 
-        node.raw_properties = properties if properties
+        if properties
+          node.raw_properties = properties
+          node.save!(validate: has_nil_parent)
+        end
 
         node.update_attribute(:created_at, created_at.text.strip) if created_at
         node.update_attribute(:updated_at, updated_at.text.strip) if updated_at
 
-        raise "Couldn't save Node" unless validate_and_save(node)
         raise "Couldn't create activities for Node ##{node.id}" unless create_activities(node, xml_node)
 
         parse_node_notes(node, xml_node)
@@ -258,11 +267,6 @@ module Dradis::Plugins::Projects::Upload::V1
 
           # keep track of reassigned ids
           lookup_table[:nodes][xml_node.at_xpath('id').text.strip] = node.id
-
-          if node.parent_id != nil
-            # keep track of orphaned nodes
-            pending_changes[:orphan_nodes] << node
-          end
         end
 
         logger.info { 'Done.' }
@@ -365,13 +369,13 @@ module Dradis::Plugins::Projects::Upload::V1
 
       # Cache users to cut down on excess SQL requests
       def user_id_for_email(email)
-        return -1 if email.blank?
+        return @default_user_id if email.blank?
         @users ||= begin
           User.select([:id, :email]).all.each_with_object({}) do |user, hash|
             hash[user.email] = user.id
           end
         end
-        @users[email] || -1
+        @users[email] || @default_user_id
       end
 
       def validate_and_save(instance)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-projects
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.9.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2018-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Project export/upload for the Dradis Framework.