dradis-projects 3.7.0 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25a395a59c0ca4e3b6f93229f6a26e0ba7c8e9c4
-  data.tar.gz: f819ec97349717710edc060fb4cf4f88e7d3ee41
+  metadata.gz: c89adcdc78b9d1cb42caf85a3c5bdfac676f7537
+  data.tar.gz: 802d58668e34660d86f46b550e6544a3f62ed35f
 SHA512:
-  metadata.gz: aa436c78584124948064ca23edf7f6130514391bf2e3bb9b1ee31dd06767bc10c6c4727121d110190da752d5c570f50c259634d43e5eec86fc46c44d8281da38
-  data.tar.gz: a99db48a1e47d88ab6580c24388c221a93bc677b291b13a0136e9d4ae752f714b82a7ef4327753b6d1946fb05971114a148b7847891344b158f3309732feab26
+  metadata.gz: 8dda41635dd76a933bef1b412df282ced535f4f4f4fa31da0080da9337640cc23df02aa38174da8b2b70633faf7d9f67bbacfb50d793bf083a105c716ff68c5a
+  data.tar.gz: 63049c10e2b62045fa0bf6cd235f6c2ad8987c4c2898a37808e893f534e187a555104c7f4725c7c0a60a6960f1220335e17ae2a203bdbae2a8dac6d89678f2a6

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Dradis Framework 3.8 (September, 2017) ##
+
+*   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   

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

@@ -11,17 +11,19 @@ module Dradis::Plugins::Projects::Export
         build_methodologies(template_builder)
         build_categories(template_builder)
         build_tags(template_builder)
+        build_report_content(template_builder)
       end
       return result
     end
 
     private
-    def build_categories(builder);    raise NotImplementedError; end
-    def build_issues(builder);        raise NotImplementedError; end
-    def build_methodologies(builder); raise NotImplementedError; end
-    def build_nodes(builder);         raise NotImplementedError; end
-    def build_tags(builder);          raise NotImplementedError; end
-    def version;                      raise NotImplementedError; end
+    def build_categories(builder);     raise NotImplementedError; end
+    def build_issues(builder);         raise NotImplementedError; end
+    def build_methodologies(builder);  raise NotImplementedError; end
+    def build_nodes(builder);          raise NotImplementedError; end
+    def build_tags(builder);           raise NotImplementedError; end
+    def build_report_content(builder); raise NotImplementedError; end
+    def version;                       raise NotImplementedError; end
   end
 end
 

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

@@ -70,7 +70,7 @@ module Dradis::Plugins::Projects::Export::V1
       methodologies = Node.methodology_library.notes
       builder.methodologies do |methodologies_builder|
         methodologies.each do |methodology|
-          methodologies_builder.methodology do |methodology_builder|
+          methodologies_builder.methodology(version: VERSION) do |methodology_builder|
             methodology_builder.text do
               methodology_builder.cdata!(methodology.text)
             end
@@ -122,6 +122,8 @@ module Dradis::Plugins::Projects::Export::V1
       end
     end
 
+    def build_report_content(builder); end
+
     def build_tags(builder)
       tags = Tag.all
       builder.tags do |tags_builder|

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

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

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

@@ -81,7 +81,7 @@ module Dradis::Plugins::Projects::Upload
       def parse_issues(template);        raise NotImplementedError; end
       def parse_methodologies(template); raise NotImplementedError; end
       def parse_nodes(template);         raise NotImplementedError; end
-      def parse_report_content(template); raise NotImplementedError; end
+      def parse_report_content(template) raise NotImplementedError; end
       def parse_tags(template);          raise NotImplementedError; end
     end
   end

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

@@ -214,27 +214,27 @@ module Dradis::Plugins::Projects::Upload::V1
 
         logger.info { "New node detected: #{label}, parent_id: #{parent_id}, type_id: #{type_id}" }
 
-        # There is one exception to the rule, the Configuration.uploadsNode node,
-        # it does not make sense to have more than one of this nodes, in any
-        # given tree
-        node = nil
-        note = nil
-        evidence = nil
-        if (label == Configuration.plugin_uploads_node)
-          node = Node.create_with(type_id: type_id, parent_id: parent_id).
-                  find_or_create_by!(label: label)
-        else
-          node = Node.create!(
-                   type_id:   type_id,
-                   label:     label,
-                   parent_id: parent_id,
-                   position:  position
-                 )
-        end
+        # There are exceptions to the rule, when it does not make sense to have
+        # 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!(
+              type_id:   type_id,
+              label:     label,
+              parent_id: parent_id,
+              position:  position
+            )
+          end
 
-        if properties
-          node.raw_properties = properties
-        end
+        node.raw_properties = properties if properties
 
         node.update_attribute(:created_at, created_at.text.strip) if created_at
         node.update_attribute(:updated_at, updated_at.text.strip) if updated_at
@@ -328,27 +328,7 @@ module Dradis::Plugins::Projects::Upload::V1
         end
       end
 
-      def parse_report_content(template)
-        logger.info { 'Processing Report Content...' }
-
-        contentlib_type_id =
-          template.at_xpath(
-            "//nodes/node/type-id[text()='#{Node::Types::CONTENTLIB}']"
-          )
-
-        if contentlib_type_id
-          content_library_xml = contentlib_type_id.parent
-          document_properties =
-            JSON.parse(content_library_xml.at_xpath('properties').text)
-
-          content_library = Node.content_library
-          content_library.properties =
-            content_library.properties.merge(document_properties)
-          content_library.save
-        end
-
-        logger.info { 'Done.' }
-      end
+      def parse_report_content(template); end
 
       def parse_tags(template)
         logger.info { 'Processing Tags...' }

data/lib/tasks/thorfile.rb

@@ -79,7 +79,12 @@ class UploadTasks < Thor
 
     detect_and_set_project_scope
 
-    task_options.merge!(plugin: Dradis::Plugins::Projects::Upload::Template)
+    default_user_id = @project.owners.first.id
+
+    task_options.merge!({
+      plugin: Dradis::Plugins::Projects::Upload::Template,
+      default_user_id: default_user_id
+    })
 
     importer = Dradis::Plugins::Projects::Upload::Template::Importer.new(task_options)
     importer.import(file: file_path)
@@ -100,7 +105,12 @@ class UploadTasks < Thor
 
     detect_and_set_project_scope
 
-    task_options.merge!(plugin: Dradis::Plugins::Projects::Upload::Package)
+    default_user_id = @project.owners.first.id
+
+    task_options.merge!({
+      plugin: Dradis::Plugins::Projects::Upload::Package,
+      default_user_id: default_user_id
+    })
 
     importer = Dradis::Plugins::Projects::Upload::Package::Importer.new(task_options)
     importer.import(file: file_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-projects
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.8.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler