dradis-calculator_cvss 4.12.0 → 4.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea68a10e94cb20e0854d84fa245cfbd8cbf26f6dd3ae9c9c30602667a216856f
-  data.tar.gz: 2883a651f2bd078b4c707a78fd5081dd7dde1294c91bd9ac90e1ff3e0af3495e
+  metadata.gz: f82faa99521fce223adbac8573d81816a7220b6e458963ae8ff1584661e6e4c0
+  data.tar.gz: bd1c63c74eb94f08b3435f806226873ec60920b3e3014b5f97fb0944a6acfb73
 SHA512:
-  metadata.gz: 97bdfdfc740b2d81b59e5082a2c89e71d261ce40613ad1692484d643c92326bf28797c3dad3aa68cb6110f25493f1403482ade15fa44c081e00699f3dd13f15a
-  data.tar.gz: 3725740d1aa3c93d36d10931e14cd67b755e2c75c0bb974efc9d3684d591b65dd024e01c8666f2e6e60dd66c423c68779110db876dd8e7f55e39bdc9663aedad
+  metadata.gz: 1c36e17b6b184197c7eccb1261ece3f361d493cc05d937211641a6f6b5081f61d590a3640e9a6a9cbf844f9b712e3050271c52d8af4c0dacb7f851e57423d86e
+  data.tar.gz: d7aa100798815e471e68eefeb33864b8112f0809e95377ae564b76a4ac0ce68dfd1e512ca0bb01b1d17c063fd938b75c835a1b50aeb257ed825ce2b8249d919c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+v4.13.0 (July 2024)
+  - Add ability to enable/disable calculator in the Tools Manager
+
 v4.12.0 (May 2024)
   - Add CVSS v4 support
 

data/README.md

@@ -2,9 +2,9 @@
 
 This simple add-on adds a new page under `/calculators/cvss` for you to perform CVSS score calculations:
 
-![cvss_calculator](https://cloud.githubusercontent.com/assets/53006/12947493/f01cb53a-cffb-11e5-8f48-19072a3bd8c8.png)
+![cvss4_calculator](https://github.com/dradis/dradis-calculator_cvss/assets/111541062/fd957a70-c068-4453-908e-be50beff9325)
 
-The Common Vulnerability Scoring System (CVSS) Version 3.0 & 3.1 Calculator is heavily inspired in the one provided by [FIRST](https://www.first.org/cvss/calculator/3.0).
+The Common Vulnerability Scoring System (CVSS) Version 4.0, 3.1, 3.0 Calculator is heavily inspired in the one provided by [FIRST](https://www.first.org/cvss/calculator/3.0).
 
 
 ## Install

data/app/views/dradis/plugins/calculators/cvss/issues/_show-content.html.erb

@@ -1,4 +1,3 @@
-<% if Dradis::Plugins::Calculators::CVSS::Engine.settings.show.to_i == 1 %>
 <div class="tab-pane" id="cvss-tab">
   <div class="inner">
     <h4 class="header-underline">CVSS Risk Scoring -
@@ -33,4 +32,3 @@
     </div>
   </div>
 </div>
-<% end %>

data/app/views/dradis/plugins/calculators/cvss/issues/_show-tabs.html.erb

@@ -1,5 +1,3 @@
-<% if Dradis::Plugins::Calculators::CVSS::Engine.settings.show.to_i == 1 %>
-  <li class="nav-item">
-    <a href="#cvss-tab" data-bs-toggle="tab" class="nav-link"><i class="fa-solid fa-calculator"></i> CVSS</a>
-  </li>
-<% end %>
+<li class="nav-item">
+  <a href="#cvss-tab" data-bs-toggle="tab" class="nav-link"><i class="fa-solid fa-calculator"></i> CVSS</a>
+</li>

data/dradis-calculator_cvss.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'dradis-plugins', '~> 4.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 10.0'
 end

data/lib/dradis/plugins/calculators/cvss/engine.rb

@@ -6,10 +6,6 @@ module Dradis::Plugins::Calculators::CVSS
     provides :addon
     description 'Risk Calculator: CVSS'
 
-    addon_settings :calculator_cvss do
-      settings.default_show = 1
-    end
-
     initializer 'calculator_cvss.asset_precompile_paths' do |app|
       app.config.assets.precompile += [
         'dradis/plugins/calculators/cvss/manifests/application.css',
@@ -26,10 +22,20 @@ module Dradis::Plugins::Calculators::CVSS
     end
 
     initializer 'calculator_cvss.mount_engine' do
-      Rails.application.routes.append do
-        mount Dradis::Plugins::Calculators::CVSS::Engine => '/', as: :cvss_calculator
+      # By default, this engine is loaded into the main app. So, upon app
+      # initialization, we first check if the DB is loaded and the Configuration
+      # table has been created, before checking if the engine is enabled
+      Rails.application.reloader.to_prepare do
+        if (ActiveRecord::Base.connection rescue false) && ::Configuration.table_exists?
+          Rails.application.routes.append do
+            # Enabling/disabling integrations calls Rails.application.reload_routes! we need the enable
+            # check inside the block to ensure the routes can be re-enabled without a server restart
+            if Engine.enabled?
+              mount Engine => '/', as: :cvss_calculator
+            end
+          end
+        end
       end
     end
-
   end
 end

data/lib/dradis/plugins/calculators/cvss/gem_version.rb

@@ -9,7 +9,7 @@ module Dradis
 
         module VERSION
           MAJOR = 4
-          MINOR = 12
+          MINOR = 13
           TINY = 0
           PRE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-calculator_cvss
 version: !ruby/object:Gem::Version
-  version: 4.12.0
+  version: 4.13.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-07 00:00:00.000000000 Z
+date: 2024-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dradis-plugins
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement