diff options
Diffstat (limited to 'internal/cvss/cvss.go')
-rw-r--r-- | internal/cvss/cvss.go | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/internal/cvss/cvss.go b/internal/cvss/cvss.go index 057a163..41422f7 100644 --- a/internal/cvss/cvss.go +++ b/internal/cvss/cvss.go @@ -2,7 +2,6 @@ package cvss import ( - "fmt" "strings" ) @@ -235,7 +234,7 @@ func getV2MetricFromString(s string) (v2Metric, error) { // get metric m, ok := v2MetricStrLut[s] if !ok { - return v2InvalidMetric, fmt.Errorf("invalid metric: %s", s) + return v2InvalidMetric, newBadMetric(V20, s) } // return success @@ -725,11 +724,11 @@ func (m v3Metric) Key() Key { } // Convert string to CVSS 3.1 metric. -func getV3Metric(s string) (v3Metric, error) { +func getV3Metric(version Version, s string) (v3Metric, error) { // get metric m, ok := v3MetricStrLut[s] if !ok { - return v3InvalidMetric, fmt.Errorf("invalid metric: %s", s) + return v3InvalidMetric, newBadMetric(version, s) } // return success @@ -782,7 +781,7 @@ func newV30Vector(s string) (Vector, error) { // walk metric strings for i, ms := range(strs) { // convert metric string to metric - m, err := getV3Metric(ms) + m, err := getV3Metric(V30, ms) if err != nil { return nil, err } @@ -841,7 +840,7 @@ func newV31Vector(s string) (Vector, error) { // walk metric strings for i, ms := range(strs) { // get metric from string - m, err := getV3Metric(ms) + m, err := getV3Metric(V31, ms) if err != nil { return nil, err } |