dradis-plugins 3.17.0 → 3.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63c73b9308963a281e182f68ce2eaaa1d1da5c0dab9fb3a042e63ff9f6f4668d
-  data.tar.gz: b7d3cab673e307dc688828d9a1735295e6d1da9e1c4450aab4f4210993163e03
+  metadata.gz: aec930044375d9b49474c44716cd0108e7417168ada398e15fc7de4c996e9eef
+  data.tar.gz: 76dba5b7f11a1482f33e2a5bfbecaa6237cea9411c194a4a890c33a17222ef05
 SHA512:
-  metadata.gz: 0d557b0eb64458639b1ec6df6ddf38977e017eb0a0f4bf14d5b18b1e3265295b5753dd79dfe757bbade80ec46d8786ab8daeeb2373240cf838ddb6bf4e109702
-  data.tar.gz: 0547b4ca3771a9f2aa8db971295292063a5a9ff6afb67dd89cc6a2d92393ae27ca6ba8bb452ef553fe75f04cb783f0ba4900084c80cc47ce2c15cb2fe9427e41
+  metadata.gz: a6ee68cdd5537f7ff4c5d56ff035e93c504d3405c99ed0ed418eb982d72d877876e36f94e59d4c6a973c8396cc42672b8ef0808a09f6c450e050020f62efbf1c
+  data.tar.gz: e79a08c7dadbf644e658ec32a805e5604edc273c9da0819473262ebf9a12e495b35e47be32b93771317cf8ad741dd9c8163ec58b47e99664691898388eec470a

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## Dradis Framework 3.22 (April, 2021) ##
+
+* ContentService#create_evidence: deduplicate Evidence from integrations.
+
+## Dradis Framework 3.21 (February, 2021) ##
+
+*  Rename `parent` methods to `module_parent` as `Module#parent` is deprecated.
+
+## Dradis Framework 3.20 (January, 2021) ##
+
+*  No changes.
+
+## Dradis Framework 3.19 (September, 2020) ##
+
+*  No changes.
+
+## Dradis Framework 3.18 (July, 2020) ##
+
+*  Added PersistentPermissions module to dry up permissions endpoints.
+
 ## Dradis Framework 3.17 (May, 2020) ##
 
 *  No changes.

data/Gemfile

@@ -1,10 +1,6 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
 
-#gem 'dradis_core', path: '/Users/etd/dradis/git/dradis/core'
-#gem 'dradis', :github => 'dradis/dradisframework' # temporarily here until 3.0.0.beta is released
-# git "https://github.com/dradis/dradisframework.git", :branch => 'dradis3.x' do
-#   gem 'dradis_core'
-# end
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in dradis-html_export.gemspec
 gemspec

data/app/controllers/concerns/dradis/plugins/persistent_permissions.rb

@@ -0,0 +1,43 @@
+module Dradis
+  module Plugins
+    module PersistentPermissions
+      extend ActiveSupport::Concern
+
+      def update
+        @user = User.authors.find(params[:id])
+
+        Permission.transaction do
+          Permission.where(component: self.class.component_name, user_id: params[:id]).destroy_all
+
+          permissions_params[:permissions]&.each do |permission|
+            # Validate the permission being created is a valid value
+            next unless self.class.permissions_validation.call(permission) if self.class.permissions_validation
+
+            Permission.create!(
+              component: self.class.component_name,
+              name: permission,
+              user_id: params[:id]
+            )
+          end
+        end
+
+        redirect_to main_app.edit_admin_user_permissions_path(params[:id]), notice: "#{@user.name}'s permissions have been updated."
+      end
+
+      private
+
+      def permissions_params
+        params.require(self.class.component_name).permit(permissions: [])
+      end
+
+      class_methods do
+        attr_accessor :component_name, :permissions_validation
+
+        def permissible_tool(component_name, opts = {})
+          self.component_name = component_name
+          self.permissions_validation = opts[:validation]
+        end
+      end
+    end
+  end
+end

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

@@ -7,10 +7,11 @@ module Dradis::Plugins::ContentService
       node    = args.fetch(:node, default_node_parent)
       issue   = args[:issue] || default_evidence_issue
 
-      evidence = node.evidence.new(issue_id: issue.id, content: content)
+      # Using node.evidence.new would result in some evidence being saved later on.
+      evidence = ::Evidence.new(issue_id: issue.id, content: content, node_id: node.id)
 
       if evidence.valid?
-        evidence.save
+        evidence = ::Evidence.find_or_create_by(issue_id: issue.id, node_id: node.id, content: content)
       else
         try_rescue_from_length_validation(
           model: evidence,

data/lib/dradis/plugins/gem_version.rb

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

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

@@ -22,7 +22,7 @@ module Dradis::Plugins::Upload::Base
   extend ActiveSupport::Concern
 
   included do
-    parent.extend NamespaceClassMethods
+    module_parent.extend NamespaceClassMethods
   end
 
   module ClassMethods
@@ -41,7 +41,7 @@ module Dradis::Plugins::Upload::Base
     #     ]
     #   end
     def uploaders()
-      [parent]
+      [module_parent]
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-plugins
 version: !ruby/object:Gem::Version
-  version: 3.17.0
+  version: 3.22.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2021-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,6 +67,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/concerns/dradis/plugins/persistent_permissions.rb
 - app/controllers/dradis/plugins/export/base_controller.rb
 - dradis-plugins.gemspec
 - lib/dradis-plugins.rb
@@ -125,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Plugin manager for the Dradis Framework project.