Merge pull request #34 from 0llirocks/33-cvss-prefix-is-missing-in-v310

33 cvss prefix is missing in v310

Author: 0llirocks

CHANGES.md

@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.1.1] - 2023-10-15
+
+### Fixes
+* CVSS prefix is missing in v3.1.0. Fixes [#33](https://github.com/0llirocks/cvss-suite/issues/33)
+
 ## [3.1.0] - 2022-09-27
 
 ### Fixes

lib/cvss_suite/cvss.rb

@@ -1,7 +1,7 @@
 # CVSS-Suite, a Ruby gem to manage the CVSS vector
 #
 # Copyright (c) 2016-2022 Siemens AG
-# Copyright (c) 2022 0llirocks
+# Copyright (c) 2022-2023 0llirocks
 #
 # Authors:
 #   0llirocks <http://0lli.rocks>
@@ -17,10 +17,6 @@ class Cvss
     # Metric of a CVSS vector.
     attr_reader :base, :temporal, :environmental
 
-    ##
-    # Returns the vector itself.
-    attr_reader :vector
-
     ##
     # Creates a new CVSS vector by a +vector+.
     #
@@ -80,6 +76,12 @@ def overall_score
       base_score
     end
 
+    ##
+    # Returns the vector itself.
+    def vector
+      @vector.to_s
+    end
+
     private
 
     def extract_metrics

lib/cvss_suite/cvss3/cvss3.rb

@@ -1,7 +1,7 @@
 # CVSS-Suite, a Ruby gem to manage the CVSS vector
 #
 # Copyright (c) 2016-2022 Siemens AG
-# Copyright (c) 2022 0llirocks
+# Copyright (c) 2022-2023 0llirocks
 #
 # Authors:
 #   0llirocks <http://0lli.rocks>
@@ -45,6 +45,12 @@ def environmental_score
       Cvss3Helper.round_up(@environmental.score(@base, @temporal))
     end
 
+    ##
+    # Returns the vector itself.
+    def vector
+      "#{CvssSuite::CVSS_VECTOR_BEGINNINGS.find { |beginning| beginning[:version] == version }[:string]}#{@vector}"
+    end
+
     private
 
     def init_metrics

lib/cvss_suite/cvss31/cvss31.rb

@@ -1,7 +1,7 @@
 # CVSS-Suite, a Ruby gem to manage the CVSS vector
 #
 # Copyright (c) 2019-2022 Siemens AG
-# Copyright (c) 2022 0llirocks
+# Copyright (c) 2022-2023 0llirocks
 #
 # Authors:
 #   0llirocks <http://0lli.rocks>
@@ -50,6 +50,12 @@ def environmental_score
       Cvss31Helper.round_up(@environmental.score(@base, @temporal))
     end
 
+    ##
+    # Returns the vector itself.
+    def vector
+      "#{CvssSuite::CVSS_VECTOR_BEGINNINGS.find { |beginning| beginning[:version] == version }[:string]}#{@vector}"
+    end
+
     private
 
     def init_metrics

lib/cvss_suite/version.rb

@@ -1,7 +1,7 @@
 # CVSS-Suite, a Ruby gem to manage the CVSS vector
 #
 # Copyright (c) 2016-2022 Siemens AG
-# Copyright (c) 2022 0llirocks
+# Copyright (c) 2022-2023 0llirocks
 #
 # Authors:
 #   0llirocks <http://0lli.rocks>
@@ -10,5 +10,5 @@
 # See the LICENSE.md file in the top-level directory.
 
 module CvssSuite
-  VERSION = '3.1.0'.freeze
+  VERSION = '3.1.1'.freeze
 end

spec/cvss2/cvss2_spec.rb

@@ -1,7 +1,7 @@
 # CVSS-Suite, a Ruby gem to manage the CVSS vector
 #
 # Copyright (c) 2016-2022 Siemens AG
-# Copyright (c) 2022 0llirocks
+# Copyright (c) 2022-2023 0llirocks
 #
 # Authors:
 #   0llirocks <http://0lli.rocks>
@@ -137,4 +137,15 @@
       end
     end
   end
+
+  describe 'correct vector' do
+    [
+      ['AV:N/AC:L/Au:N/C:P/I:P/A:P', 'AV:N/AC:L/Au:N/C:P/I:P/A:P'],
+      ['(AV:N/AC:L/Au:N/C:P/I:P/A:P)', 'AV:N/AC:L/Au:N/C:P/I:P/A:P']
+    ].each do |vector|
+      it "'#{vector[0]}' is expected to return '#{vector[1]}'" do
+        expect(CvssSuite.new(vector[0]).vector).to eq(vector[1])
+      end
+    end
+  end
 end

spec/cvss3/cvss3_spec.rb

@@ -1,7 +1,7 @@
 # CVSS-Suite, a Ruby gem to manage the CVSS vector
 #
 # Copyright (c) 2016-2022 Siemens AG
-# Copyright (c) 2022 0llirocks
+# Copyright (c) 2022-2023 0llirocks
 #
 # Authors:
 #   0llirocks <http://0lli.rocks>
@@ -160,4 +160,19 @@
 
     it_behaves_like 'a invalid cvss vector with version', 3.0
   end
+
+  describe 'correct vector' do
+    [
+      ['CVSS:3.0/AV:L/AC:H/PR:L/UI:R/S:U/C:L/I:L/A:L', 'CVSS:3.0/AV:L/AC:H/PR:L/UI:R/S:U/C:L/I:L/A:L'],
+      ['CVSS:3.0/A:L/AC:H/PR:L/UI:R/S:U/C:L/I:L/AV:L', 'CVSS:3.0/A:L/AC:H/PR:L/UI:R/S:U/C:L/I:L/AV:L'],
+      [
+        'CVSS:3.0/AV:P/AC:L/PR:H/UI:N/S:C/C:N/I:L/A:H/E:X/RL:T/RC:C/CR:M/IR:L/AR:H/MAV:X/MAC:X/MPR:X/MUI:X/MS:X/MC:X/MI:X/MA:X', # rubocop:disable Layout/LineLength
+        'CVSS:3.0/AV:P/AC:L/PR:H/UI:N/S:C/C:N/I:L/A:H/E:X/RL:T/RC:C/CR:M/IR:L/AR:H/MAV:X/MAC:X/MPR:X/MUI:X/MS:X/MC:X/MI:X/MA:X' # rubocop:disable Layout/LineLength
+      ]
+    ].each do |vector|
+      it "'#{vector[0]}' is expected to return '#{vector[1]}'" do
+        expect(CvssSuite.new(vector[0]).vector).to eq(vector[1])
+      end
+    end
+  end
 end

spec/cvss31/cvss31_spec.rb

@@ -1,7 +1,7 @@
 # CVSS-Suite, a Ruby gem to manage the CVSS vector
 #
 # Copyright (c) 2016-2022 Siemens AG
-# Copyright (c) 2022 0llirocks
+# Copyright (c) 2022-2023 0llirocks
 #
 # Authors:
 #   0llirocks <http://0lli.rocks>
@@ -159,4 +159,19 @@
 
     it_behaves_like 'a invalid cvss vector with version', 3.1
   end
+
+  describe 'correct vector' do
+    [
+      ['CVSS:3.1/AV:L/AC:H/PR:L/UI:R/S:U/C:L/I:L/A:L', 'CVSS:3.1/AV:L/AC:H/PR:L/UI:R/S:U/C:L/I:L/A:L'],
+      ['CVSS:3.1/A:L/AC:H/PR:L/UI:R/S:U/C:L/I:L/AV:L', 'CVSS:3.1/A:L/AC:H/PR:L/UI:R/S:U/C:L/I:L/AV:L'],
+      [
+        'CVSS:3.1/AV:P/AC:L/PR:H/UI:N/S:C/C:N/I:L/A:H/E:X/RL:T/RC:C/CR:M/IR:L/AR:H/MAV:X/MAC:X/MPR:X/MUI:X/MS:X/MC:X/MI:X/MA:X', # rubocop:disable Layout/LineLength
+        'CVSS:3.1/AV:P/AC:L/PR:H/UI:N/S:C/C:N/I:L/A:H/E:X/RL:T/RC:C/CR:M/IR:L/AR:H/MAV:X/MAC:X/MPR:X/MUI:X/MS:X/MC:X/MI:X/MA:X' # rubocop:disable Layout/LineLength
+      ]
+    ].each do |vector|
+      it "'#{vector[0]}' is expected to return '#{vector[1]}'" do
+        expect(CvssSuite.new(vector[0]).vector).to eq(vector[1])
+      end
+    end
+  end
 end