Skip to content

Commit 366f3d0

Browse files
committed
feat(cvss): add CVSS v4.0 support, fix CVSS v2.0 invalid calculator link
Signed-off-by: Lucas TESSON <[email protected]>
1 parent 5833d68 commit 366f3d0

File tree

3 files changed

+42
-19
lines changed

3 files changed

+42
-19
lines changed

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ require (
88
github.com/blang/semver/v4 v4.0.0
99
github.com/cheggaaa/pb/v3 v3.1.5
1010
github.com/go-git/go-git/v5 v5.12.0
11-
github.com/goark/go-cvss v1.6.7
1211
github.com/golang/protobuf v1.5.4
1312
github.com/google/go-containerregistry v0.19.2
1413
github.com/google/go-github/v60 v60.0.0
@@ -21,6 +20,7 @@ require (
2120
github.com/mitchellh/mapstructure v1.5.0
2221
github.com/nozzle/throttler v0.0.0-20180817012639-2ea982251481
2322
github.com/olekukonko/tablewriter v0.0.5
23+
github.com/pandatix/go-cvss v0.6.2
2424
github.com/psampaz/go-mod-outdated v0.9.0
2525
github.com/saschagrunert/go-modiff v1.3.5
2626
github.com/sendgrid/rest v2.6.9+incompatible
@@ -155,7 +155,6 @@ require (
155155
github.com/go-openapi/swag v0.23.0 // indirect
156156
github.com/go-openapi/validate v0.24.0 // indirect
157157
github.com/go-piv/piv-go v1.11.0 // indirect
158-
github.com/goark/errs v1.3.2 // indirect
159158
github.com/gobwas/glob v0.2.3 // indirect
160159
github.com/gogo/protobuf v1.3.2 // indirect
161160
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect

go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -382,10 +382,6 @@ github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEe
382382
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
383383
github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
384384
github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
385-
github.com/goark/errs v1.3.2 h1:ifccNe1aK7Xezt4XVYwHUqalmnfhuphnEvh3FshCReQ=
386-
github.com/goark/errs v1.3.2/go.mod h1:ZsQucxaDFVfSB8I99j4bxkDRfNOrlKINwg72QMuRWKw=
387-
github.com/goark/go-cvss v1.6.7 h1:9R/cx8+lv17uFS1RKYNmEfYqEJwWgF26F4g7hK38jEw=
388-
github.com/goark/go-cvss v1.6.7/go.mod h1:qsmYCGTQnQqW/Lq1Z3lRCEarKD++nx7C+KgsG05MhDA=
389385
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
390386
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
391387
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
@@ -667,6 +663,8 @@ github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+
667663
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
668664
github.com/package-url/packageurl-go v0.1.2 h1:0H2DQt6DHd/NeRlVwW4EZ4oEI6Bn40XlNPRqegcxuo4=
669665
github.com/package-url/packageurl-go v0.1.2/go.mod h1:uQd4a7Rh3ZsVg5j0lNyAfyxIeGde9yrlhjF78GzeW0c=
666+
github.com/pandatix/go-cvss v0.6.2 h1:TFiHlzUkT67s6UkelHmK6s1INKVUG7nlKYiWWDTITGI=
667+
github.com/pandatix/go-cvss v0.6.2/go.mod h1:jDXYlQBZrc8nvrMUVVvTG8PhmuShOnKrxP53nOFkt8Q=
670668
github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw=
671669
github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
672670
github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=

pkg/cve/cve.go

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@ import (
2020
"errors"
2121
"fmt"
2222
"regexp"
23+
"strings"
2324

24-
cvss "github.com/goark/go-cvss/v3/metric"
25+
gocvss20 "github.com/pandatix/go-cvss/20"
26+
gocvss30 "github.com/pandatix/go-cvss/30"
27+
gocvss31 "github.com/pandatix/go-cvss/31"
28+
gocvss40 "github.com/pandatix/go-cvss/40"
2529
)
2630

2731
// CVE Information of a linked CVE vulnerability
@@ -91,19 +95,41 @@ func (cve *CVE) Validate() (err error) {
9195
return errors.New("string CVSS vector missing from CVE data")
9296
}
9397

94-
var bm cvss.Metrics
95-
// Parse the vector string to make sure it is well formed
96-
if len(cve.CVSSVector) == 44 {
97-
bm, err = cvss.NewBase().Decode(cve.CVSSVector)
98-
} else {
99-
bm, err = cvss.NewTemporal().Decode(cve.CVSSVector)
100-
}
101-
if err != nil {
102-
return fmt.Errorf("parsing CVSS vector string: %w", err)
98+
switch {
99+
default: // CVSS v2.0 has no prefix
100+
_, err := gocvss20.ParseVector(cve.CVSSVector)
101+
if err != nil {
102+
return fmt.Errorf("parsing CVSS vector string: %w", err)
103+
}
104+
// FIRST ORG has no calculator for CVSS v2.0
105+
106+
case strings.HasPrefix(cve.CVSSVector, "CVSS:3.0"):
107+
_, err := gocvss30.ParseVector(cve.CVSSVector)
108+
if err != nil {
109+
return fmt.Errorf("parsing CVSS vector string: %w", err)
110+
}
111+
cve.CalcLink = fmt.Sprintf(
112+
"https://www.first.org/cvss/calculator/3.0#%s", cve.CVSSVector,
113+
)
114+
115+
case strings.HasPrefix(cve.CVSSVector, "CVSS:3.1"):
116+
_, err := gocvss31.ParseVector(cve.CVSSVector)
117+
if err != nil {
118+
return fmt.Errorf("parsing CVSS vector string: %w", err)
119+
}
120+
cve.CalcLink = fmt.Sprintf(
121+
"https://www.first.org/cvss/calculator/3.1#%s", cve.CVSSVector,
122+
)
123+
124+
case strings.HasPrefix(cve.CVSSVector, "CVSS:4.0"):
125+
_, err := gocvss40.ParseVector(cve.CVSSVector)
126+
if err != nil {
127+
return fmt.Errorf("parsing CVSS vector string: %w", err)
128+
}
129+
cve.CalcLink = fmt.Sprintf(
130+
"https://www.first.org/cvss/calculator/4.0#%s", cve.CVSSVector,
131+
)
103132
}
104-
cve.CalcLink = fmt.Sprintf(
105-
"https://www.first.org/cvss/calculator/%s#%s", bm.BaseMetrics().Ver.String(), cve.CVSSVector,
106-
)
107133

108134
if cve.CVSSScore == 0 {
109135
return errors.New("missing CVSS score from CVE data")

0 commit comments

Comments
 (0)