dradis-plugins 3.9.0 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5accaba92677eb861a1305b6726d7c798267e882
-  data.tar.gz: 9d0659edb3d5f647b01c76f63fb810764d6952c9
+  metadata.gz: 7672289735c03361bf9a838ad2983e10bf8cff5d
+  data.tar.gz: 12c9ba751065766757cdff3bc726117c03a3d9a1
 SHA512:
-  metadata.gz: 54c4b1c04760f32268b2bdd41c197ad599b534ed617f57197f2a1fc13c3ac20ad8a84a5bbf5f5a1f039ba19c0cdb46b228d731207c0b83844a6c40169510aa22
-  data.tar.gz: 73d4162512c945913534c30e0864273ef4bd36940dcbe64ae991a1f8327e532120322e07096e5877d7f589ce08dc177ab8a89e15dcbf5dd49152ffd6d7b4fb59
+  metadata.gz: 68399c15408ee09d91244c8b5081703e94154741c091afa637611fbbc1e8bb06b97a9de1470991ed7e01bc52ec90d8ec9ef88c87bcf22645322d82ba805e4f13
+  data.tar.gz: f6bf7cda772d6ebaf879188a641caa2ff7c90cfde1e47b098bae79f9474e54b0a24b073229013fae4fe0d8507e7c63b45e22d1259c628ece56cde5afe6bd1802

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## Dradis Framework 3.10 (August, 2018) ##
+
+*  Add default project to task options
+*  Use AuthenticatedController as export base
+*  Default title sorting for content blocks
+*  Avoid requiring the caller to use `set_project_scope`
+
 ## Dradis Framework 3.9 (January, 2018) ##
 
 *  No changes

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

@@ -3,7 +3,7 @@ module Dradis::Plugins::ContentService
     extend ActiveSupport::Concern
 
     def all_content_blocks
-      ContentBlock.where(project_id: project.id)
+      project.content_blocks
     end
 
     def create_content_block(args={})

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

@@ -3,7 +3,7 @@ module Dradis::Plugins::ContentService
     extend ActiveSupport::Concern
 
     def all_issues
-      Issue.where(category_id: default_issue_category.id)
+      project.issues.where(category_id: default_issue_category.id)
     end
 
     def create_issue(args={})
@@ -26,7 +26,7 @@ module Dradis::Plugins::ContentService
 
       issue = Issue.new(text: text) do |i|
         i.author   = default_author
-        i.node     = issue_library
+        i.node     = project.issue_library
         i.category = default_issue_category
       end
 
@@ -64,7 +64,7 @@ module Dradis::Plugins::ContentService
     # the issue library cache has been initialized.
     def issue_cache
       @issue_cache ||= begin
-        issues_map = Issue.where(category_id: default_issue_category.id).map do |issue|
+        issues_map = all_issues.map do |issue|
           cache_key = [
             issue.fields['plugin'],
             issue.fields['plugin_id']
@@ -90,10 +90,5 @@ module Dradis::Plugins::ContentService
     def default_issue_text
       "create_issue() invoked by #{plugin} without a :text parameter"
     end
-
-    def issue_library
-      @issue_library ||= Node.issue_library
-    end
-
   end
 end

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

@@ -34,7 +34,11 @@ module Dradis::Plugins::ContentService
         end
       end
 
-      parent.children.find_or_create_by(label: label, type_id: type_id)
+      parent.children.find_or_create_by(
+        label: label,
+        type_id: type_id,
+        project_id: parent.project_id
+      )
     end
 
     private
@@ -44,7 +48,7 @@ module Dradis::Plugins::ContentService
     end
 
     def default_node_parent
-      @default_parent_node ||= Node.plugin_parent_node
+      @default_parent_node ||= project.plugin_parent_node
     end
 
     def default_node_type
@@ -74,7 +78,7 @@ module Dradis::Plugins::ContentService
     #
     # Returns and Array with a unique collection of Nodes.
     def nodes_from_properties
-      Node.user_nodes.where('properties IS NOT NULL AND properties != \'{}\'')
+      project.nodes.user_nodes.where('properties IS NOT NULL AND properties != \'{}\'')
     end
   end
 end

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

@@ -3,7 +3,7 @@ module Dradis::Plugins::ContentService
     extend ActiveSupport::Concern
 
     def all_notes
-      Note.where(category: Category.report)
+      project.notes.where(category: Category.report)
     end
 
     def create_note(args={})

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

@@ -3,7 +3,7 @@ module Dradis::Plugins::ContentService
     extend ActiveSupport::Concern
 
     def all_properties
-      Node.content_library.properties
+      project.content_library.properties
     end
   end
 end

data/lib/dradis/plugins/engine.rb

@@ -7,7 +7,7 @@ module Dradis
 
       initializer "dradis-plugins.set_configs" do |app|
         options = app.config.dradis
-        options.base_export_controller_class_name ||= 'ProjectScopedController'
+        options.base_export_controller_class_name ||= 'AuthenticatedController'
         options.thor_helper_module ||= Dradis::Plugins::ThorHelper
       end
     end

data/lib/dradis/plugins/gem_version.rb

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

data/lib/dradis/plugins/thor_helper.rb

@@ -5,7 +5,7 @@ module Dradis
       attr_accessor :task_options, :logger
 
       def detect_and_set_project_scope
-        ;
+        task_options[:project_id] = Project.new.id
       end
 
       def task_options

data/spec/lib/dradis/plugins/content_service_spec.rb

@@ -1,9 +1,21 @@
 require 'rails_helper'
 
 # These specs are coming from engines/dradispro-rules/spec/content_service_spec.rb
+# To run, execute from Dradis main app folder:
+#   bin/rspec [dradis-plugins path]/spec/lib/dradis/plugins/content_service_spec.rb
 
 describe Dradis::Plugins::ContentService::Base do
-  describe "Issues" do
+  let(:plugin)  { Dradis::Plugins::Nessus }
+  let(:project) { create(:project) }
+  let(:service) do
+    Dradis::Plugins::ContentService::Base.new(
+      plugin: plugin,
+      logger: Rails.logger,
+      project: project
+    )
+  end
+
+  describe 'Issues' do
     let(:create_issue) do
       service.create_issue_without_callback(id: plugin_id)
     end
@@ -14,7 +26,7 @@ describe Dradis::Plugins::ContentService::Base do
     # it's being stored within an instance of FindingCache, which
     # automatically wraps Issues in Findings.
 
-    describe "when the issue already exists in the cache" do
+    describe 'when the issue already exists in the cache' do
       let(:existing_issue) { create(:issue, text: cached_issue_text) }
       before { cache.store(existing_issue) }
 
@@ -22,7 +34,7 @@ describe Dradis::Plugins::ContentService::Base do
         expect{create_issue}.not_to change{Issue.count}
       end
 
-      it "returns the cached issue encapsulated in a finding" do
+      it 'returns the cached issue encapsulated in a finding' do
         finding = create_issue
         expect(finding).to be_a(Finding)
         expect(finding).to eq Finding.from_issue(existing_issue)
@@ -37,13 +49,13 @@ describe Dradis::Plugins::ContentService::Base do
         expect(new_issue.body).to match(/#\[plugin_id\]#\n*#{plugin_id}/)
       end
 
-      it "returns the new Issue encapsulated in a Finding" do
+      it 'returns the new Issue encapsulated in a Finding' do
         finding = create_issue
         expect(finding).to be_a(Finding)
         expect(finding).to eq Finding.from_issue(Issue.last)
       end
 
-      it "adds the new Finding to the cache" do
+      it 'adds the new Finding to the cache' do
         finding = create_issue
         expect(cache[cache_key]).to eq finding
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-plugins
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.10.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-08 00:00:00.000000000 Z
+date: 2018-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,7 +125,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.