dradis-plugins 4.16.0 → 4.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 040de0ca94888eed6a46b3369d4cbf43d47ef8ebda7c222b5cda993b137edc3c
-  data.tar.gz: e680cb65ff3828c4a4aa48a8b296137ad77a82f6245b458966ff4769a46720e7
+  metadata.gz: cbaa602efa4365bbb53bf83b1df8bf5f7c94bb6f94f51eb06cad4aa760277a8b
+  data.tar.gz: 6c293688ca05a8e93cb98577da607ecce2ab5d640520247cff5e0d07082ffdad
 SHA512:
-  metadata.gz: ab57dd203b9269ec378d8b8e401c7d282f448668b0552a173355b614b096e666c9373e2e2069ab2c183a6533bad75b174d8725fd60ac16c7280786c347b51f1f
-  data.tar.gz: 452eda00c7a560beac5c5b5e73de684c1ac140ffa6a81ce488f8716ea0c6f23e971dfd892c939704fe13a8cab2e6bdaabf48dc438666a2eaa2f08784625c2114
+  metadata.gz: 24a773a0dc01c78b3634cb53ccbdc81e0b53cdbbd8e2986dd046777bf140b5be65c98a6e4cf5216d65721c58dcec6bc83eeee46c04d793052daee1eb41cb573c
+  data.tar.gz: 9d6a29c5e175ed04e3faaf53304708651a8c0cd4898486d13b9a0c2d17ca8c3ceb9bc0b594c0c9930630efe52631dedab210d798d9d92adb25ca5b738ebf9a0e

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+v4.18.0 (September 2025)
+  - Update File.exists? calls for ruby upgrade
+
+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

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.exist?(@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,7 +3,7 @@ module Dradis
     module PersistentPermissions
       extend ActiveSupport::Concern
 
-      include UsageTracking
+      include UsageTracking if defined?(Dradis::Pro)
 
       def update
         @user = User.authors.find(params[:id])

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 = 16
+      MINOR = 18
       TINY = 0
       PRE   = nil
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dradis-plugins
 version: !ruby/object:Gem::Version
-  version: 4.16.0
+  version: 4.18.0
 platform: ruby
 authors:
 - Daniel Martin
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,7 +52,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Required dependency for Dradis Framework.
-email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -68,6 +66,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
@@ -122,7 +121,6 @@ homepage: http://dradis.com/ce/
 licenses:
 - GPL-2
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -137,8 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Plugin manager for the Dradis Framework project.
 test_files: