dradis-plugins 4.15.0 → 4.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66d3c74ccd3e2bfab6be839c13a701e9c10f40418c33375273f531afa3ef5245
-  data.tar.gz: 41805afdf16f82a1281ba71ea3c15f11f5b7a3731340ce082c119fbc8588eda6
+  metadata.gz: ab80c138e39b3703d4f65fe3406c9aa876f2588b3bdbaa2f44a1f0fd7cae0e4b
+  data.tar.gz: 4a4ce3dc4c10a0ec9fb7d7206bbea7fe68c0775a34242657f578e15804922a77
 SHA512:
-  metadata.gz: 8a694eb4175f310e71a5daabc3e83af7691bfd7b423025322a51bb8be32fae858e4a840b1084bc9d2851b86446f5dca521d4b6e0863e0adea9afb5a848bee289
-  data.tar.gz: d94aef2e5f2383f7f1da9bc04e59c2c77464190c473c1132c17372fd3380d49e32bdb16ed6ba9b8c3aedc36b42887d0d81e5052adbe1ecf0b9ca666c8f3b65a5
+  metadata.gz: c9555248bb5697d70bcda15e6d7bc5e80281c611efe18a29b4dc3d75cf1f1afb09f369014a3eebce0afea2fc7246c02bad48e58bfd2cb01d3527bc508ebebaf5
+  data.tar.gz: 69d1ccd744a4af22b92e98eba0bff5b9a9d0b2bb304aa0b2ab0cdbea077a29354ad63c584cc706eae079fa12ea6e8480078ddaf2db0233779412e39556cdb42b

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+v4.17.0 (July 2025)
+  - Add Exportable concern to house shared report export logic from Export::BaseController
+  - Only track report export when report is created
+
+v4.16.0 (May 2025)
+  - Enable audit tracking for persistent permissions changes
+  - Default to draft state on tool upload
+
 v4.15.0 (December 2024)
   - No changes
 

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

@@ -0,0 +1,50 @@
+module Dradis
+  module Plugins
+    module Exportable
+      extend ActiveSupport::Concern
+
+      included do
+        before_action :set_exporter, only: [:create]
+        before_action :validate_scope, only: [:create]
+        before_action :validate_template, only: [:create]
+      end
+
+      private
+
+      def is_api?
+        controller_path.include?('api')
+      end
+
+      def set_exporter
+        raise NotImplementedError
+      end
+
+      def templates_dir
+        @templates_dir ||= File.join(::Configuration::paths_templates_reports, @exporter)
+      end
+
+      def validate_scope
+        unless Dradis::Plugins::ContentService::Base::VALID_SCOPES.include?(export_params[:scope])
+          if is_api?
+            render_json_error(Exception.new('Something fishy is going on...'), 422)
+          else
+            raise 'Something fishy is going on...'
+          end
+        end
+      end
+
+      def validate_template
+        @template_file =
+          File.expand_path(File.join(templates_dir, export_params[:template]))
+
+        unless @template_file.starts_with?(templates_dir) && File.exists?(@template_file)
+          if is_api?
+            render_json_error(Exception.new('Something fishy is going on...'), 422)
+          else
+            raise 'Something fishy is going on...'
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,13 +3,15 @@ module Dradis
     module PersistentPermissions
       extend ActiveSupport::Concern
 
+      include UsageTracking if defined?(Dradis::Pro)
+
       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|
+          permission_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
 
@@ -21,12 +23,18 @@ module Dradis
           end
         end
 
+        track_usage(event_name, { id: params[:id], params: permission_params })
+
         redirect_to main_app.edit_admin_user_permissions_path(params[:id]), notice: "#{@user.name}'s permissions have been updated."
       end
 
       private
 
-      def permissions_params
+      def event_name
+        "#{self.class.component_name}_permissions.updated"
+      end
+
+      def permission_params
         params.require(self.class.component_name).permit(permissions: [])
       end
 

data/app/controllers/dradis/plugins/export/base_controller.rb

@@ -2,12 +2,11 @@ module Dradis
   module Plugins
     module Export
       class BaseController < Rails.application.config.dradis.base_export_controller_class_name.to_s.constantize
+        include Exportable
         include ProjectScoped
         include UsageTracking if defined?(Dradis::Pro)
 
-        before_action :validate_scope
-        before_action :validate_template
-        after_action :track_export, if: -> { defined?(Dradis::Pro) }
+        after_action :track_export, only: [:create], if: -> { defined?(Dradis::Pro) }
 
         protected
 
@@ -15,35 +14,16 @@ module Dradis
           params.permit(:project_id, :scope, :template)
         end
 
-        def validate_template
-          @template_file =
-            File.expand_path(File.join(templates_dir, export_params[:template]))
-
-          unless @template_file.starts_with?(templates_dir) && File.exists?(@template_file)
-            raise 'Something fishy is going on...'
-          end
-        end
-
-        def validate_scope
-          unless Dradis::Plugins::ContentService::Base::VALID_SCOPES.include?(export_params[:scope])
-            raise 'Something fishy is going on...'
-          end
-        end
-
         private
 
-        def engine_name
-          "#{self.class.to_s.deconstantize}::Engine".constantize.plugin_name.to_s
-        end
-
-        def templates_dir
-          @templates_dir ||= File.join(::Configuration::paths_templates_reports, engine_name)
+        def set_exporter
+          @exporter = "#{self.class.to_s.deconstantize}::Engine".constantize.plugin_name.to_s
         end
 
         def track_export
           project = Project.includes(:evidence, :nodes).find(current_project.id)
           track_usage('report.exported', {
-            exporter: engine_name,
+            exporter: @exporter,
             issue_count: project.issues.size,
             evidence_count: project.evidence.size,
             node_count: project.nodes.in_tree.size

data/lib/dradis/plugins/gem_version.rb

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

data/lib/dradis/plugins/settings/adapters/db.rb

@@ -9,11 +9,11 @@ module Dradis::Plugins::Settings::Adapters
     end
 
     def exists?(key)
-      Configuration.exists?(name: namespaced_key(key))
+      db_ready? && Configuration.exists?(name: namespaced_key(key))
     end
 
     def read(key)
-      Configuration.find_by(name: namespaced_key(key))&.value
+      db_ready? && Configuration.find_by(name: namespaced_key(key))&.value
     end
 
     def write(key, value)
@@ -26,5 +26,9 @@ module Dradis::Plugins::Settings::Adapters
     def namespaced_key(key)
       [@namespace, key.to_s.underscore].join(':')
     end
+
+    def db_ready?
+      (ActiveRecord::Base.connection.verify! rescue false) && Configuration.table_exists?
+    end
   end
 end

data/lib/dradis/plugins/thor_helper.rb

@@ -9,7 +9,7 @@ module Dradis
       end
 
       def task_options
-        @task_options ||= { logger: logger, state: :published }
+        @task_options ||= { logger: logger, state: :draft }
       end
 
       def logger

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

@@ -27,7 +27,7 @@ module Dradis
           @logger = args.fetch(:logger, Rails.logger)
           @plugin = args[:plugin] || default_plugin
           @project = args.key?(:project_id) ? Project.find(args[:project_id]) : nil
-          @state = args.fetch(:state, :published)
+          @state = args.fetch(:state, :draft)
 
           @content_service   = args.fetch(:content_service, default_content_service)
           @mapping_service   = default_mapping_service

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-plugins
 version: !ruby/object:Gem::Version
-  version: 4.15.0
+  version: 4.17.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-20 00:00:00.000000000 Z
+date: 2025-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,6 +68,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/concerns/dradis/plugins/exportable.rb
 - app/controllers/concerns/dradis/plugins/persistent_permissions.rb
 - app/controllers/dradis/plugins/export/base_controller.rb
 - dradis-plugins.gemspec