dradis-plugins 3.6.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d94fcec6ee192333a702bf277c2f1362d42b388e
-  data.tar.gz: 8a87e09bee59fed75707f5254492f0f39ca9191c
+  metadata.gz: b4465a6abfcfcc1f72c2507db25a1fec1c078539
+  data.tar.gz: 451a8b3b7676968c4f2cd9640ed975b02cb31d77
 SHA512:
-  metadata.gz: 92eadbdcd4e11ebae0dab886c64bae45b49c55bbbc886cc7af4676a7ab57b2ce8c38dc89fbdb4c528a4c36b1da2bb830b75fd18258e0025f3cf28b41e8043e27
-  data.tar.gz: f17974a6a3ab0d402314457282a74f98751dc64d20e2b2f4035ca7bc2d57d79515cb6b47d0a948a420bbffa84c6b24f76a51fe38013de9c486d44b33f1e72ead
+  metadata.gz: 38544da5415a6f1107a641b549e20b088767a58c040e97842a3f314813d2563fb313ceeaeb0dc2e60060760928d6f6cff23a1d2d55109a49674cbd31261e9b34
+  data.tar.gz: 918e42243f03461549f368abf0e2f59ce60a6dcf0428ed56bd3b77645d5c94d41fdbc12e6374c78eb2f38ef44c811e66c3709a888ece8866059b7258c1a992a2

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-## Dradis Framework 3.6 (March XX, 2017) ##
+## Dradis Framework 3.7 (July, 2017) ##
+
+*   Add ContentService#all_properties method to access the current project's
+    document properties.
+
+*   Don't lose :plugin and :plugin_id from ContentService#create_issue due to
+    excessive input length.
+
+## Dradis Framework 3.6 (April 6, 2017) ##
 
 *   Split the ContentService into multiple modules.
 

data/lib/dradis/plugins/content_service/base.rb

@@ -5,6 +5,7 @@ require 'dradis/plugins/content_service/evidence'
 require 'dradis/plugins/content_service/issues'
 require 'dradis/plugins/content_service/nodes'
 require 'dradis/plugins/content_service/notes'
+require 'dradis/plugins/content_service/properties'
 
 module Dradis::Plugins::ContentService
   class Base
@@ -16,6 +17,7 @@ module Dradis::Plugins::ContentService
     include Issues
     include Nodes
     include Notes
+    include Properties if defined?(Dradis::Pro)
 
      ActiveSupport.run_load_hooks(:content_service, self)
   end

data/lib/dradis/plugins/content_service/core.rb

@@ -28,6 +28,7 @@ module Dradis::Plugins::ContentService
       field = args[:field]
       text  = args[:text]
       msg   = args[:msg]
+      tail  = "..." + args[:tail].to_s
 
       logger.error{ "Trying to rescue from a :length error" }
 
@@ -36,11 +37,11 @@ module Dradis::Plugins::ContentService
         msg = "#[Title]#\nTruncation warning!\n\n"
         msg << "#[Error]#\np(alert alert-error). The plugin tried to store content that was too big for the DB. Review the source to ensure no important data was lost.\n\n"
         msg << text
-        model.send("#{field}=", msg.truncate(65300))
+        model.send("#{field}=", msg.truncate(65300, omission: tail))
       else
         # bail
         msg = "#[Title]#\n#{msg}\n\n"
-        msg << "#[Description]#\nbc. #{issue.errors.inspect}\n\n"
+        msg << "#[Description]#\nbc. #{model.errors.inspect}\n\n"
         model.send("#{field}=", msg)
       end
       if model.valid?

data/lib/dradis/plugins/content_service/issues.rb

@@ -19,8 +19,10 @@ module Dradis::Plugins::ContentService
       return issue_cache[cache_key] if issue_cache.key?(cache_key)
 
       # we inject the source Plugin and unique ID into the issue's text
-      text << "\n\n#[plugin]#\n#{uuid[0]}\n"
-      text << "\n\n#[plugin_id]#\n#{uuid[1]}\n"
+      plugin_details =
+        "\n\n#[plugin]#\n#{uuid[0]}\n" \
+        "\n\n#[plugin_id]#\n#{uuid[1]}\n"
+      text << plugin_details
 
       issue = Issue.new(text: text) do |i|
         i.author   = default_author
@@ -35,7 +37,8 @@ module Dradis::Plugins::ContentService
           model: issue,
           field: :text,
           text: text,
-          msg: 'Error in create_issue()'
+          msg: 'Error in create_issue()',
+          tail: plugin_details
         )
       end
 

data/lib/dradis/plugins/content_service/nodes.rb

@@ -2,6 +2,21 @@ module Dradis::Plugins::ContentService
   module Nodes
     extend ActiveSupport::Concern
 
+    def reporting_nodes
+      nodes = []
+
+      nodes |= nodes_from_evidence
+      nodes |= nodes_from_properties
+
+      # Note that the below sorting would the non-IP nodes first, then the IP
+      # nodes, and will sort them by each octet.
+      #
+      # See:
+      #  http://stackoverflow.com/questions/13996033/sorting-an-array-in-ruby-special-case
+      #  http://tech.maynurd.com/archives/124
+      nodes.sort_by! { |node| node.label.split('.').map(&:to_i) }
+    end
+
     def create_node(args={})
       label  = args[:label]  || default_node_label
       parent = args[:parent] || default_node_parent
@@ -35,5 +50,31 @@ module Dradis::Plugins::ContentService
     def default_node_type
       @default_node_type ||= Node::Types::DEFAULT
     end
+
+
+    # Private: this method returns a list of nodes associated with Evidence
+    # instances. When a node is affected by multiple issues, or multiple pieces
+    # of evidence, we just want a single reference to it.
+    #
+    # Returns and Array with a unique collection of Nodes.
+    def nodes_from_evidence
+      all_issues.
+        includes(:evidence, evidence: :node).
+        collect(&:evidence).
+        # Each Issue can have 0, 1 or more Evidence
+        map { |evidence_collection| evidence_collection.collect(&:node) }.
+        flatten.
+        uniq
+    end
+
+    # Private: this method returns a list of nodes in the project that have some
+    # properties associated with them. Typically properties are used for HOST
+    # type nodes, and even if they have no issues / evidence associated, we want
+    # to include them in the report.
+    #
+    # Returns and Array with a unique collection of Nodes.
+    def nodes_from_properties
+      Node.user_nodes.where('properties IS NOT NULL AND properties != \'{}\'')
+    end
   end
 end

data/lib/dradis/plugins/content_service/properties.rb

@@ -0,0 +1,9 @@
+module Dradis::Plugins::ContentService
+  module Properties
+    extend ActiveSupport::Concern
+
+    def all_properties
+      Node.content_library.properties
+    end
+  end
+end

data/lib/dradis/plugins/gem_version.rb

@@ -7,11 +7,11 @@ module Dradis
 
     module VERSION
       MAJOR = 3
-      MINOR = 6
+      MINOR = 7
       TINY  = 0
       PRE   = nil
 
-      STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
+      STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end
   end
 end

data/lib/dradis/plugins/thor_helper.rb

@@ -2,9 +2,28 @@ module Dradis
   module Plugins
     # Helper methods for plugin Thor tasks
     module ThorHelper
+      attr_accessor :task_options, :logger
+
       def detect_and_set_project_scope
         ;
       end
+
+      def task_options
+        @task_options ||= { logger: logger }
+      end
+
+      def logger
+        @logger ||= default_logger
+      end
+
+
+      private
+      def default_logger
+        STDOUT.sync   = true
+        logger        = Logger.new(STDOUT)
+        logger.level  = Logger::DEBUG
+        logger
+      end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-plugins
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,7 @@ files:
 - lib/dradis/plugins/content_service/issues.rb
 - lib/dradis/plugins/content_service/nodes.rb
 - lib/dradis/plugins/content_service/notes.rb
+- lib/dradis/plugins/content_service/properties.rb
 - lib/dradis/plugins/engine.rb
 - lib/dradis/plugins/export.rb
 - lib/dradis/plugins/export/base.rb
@@ -123,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Plugin manager for the Dradis Framework project.