-
Notifications
You must be signed in to change notification settings - Fork 329
/
resolve.go
283 lines (252 loc) · 8.26 KB
/
resolve.go
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
package resolution
import (
"cmp"
"context"
"errors"
"fmt"
"slices"
"deps.dev/util/resolve"
"deps.dev/util/resolve/npm"
"github.com/google/osv-scanner/internal/resolution/client"
"github.com/google/osv-scanner/internal/resolution/manifest"
"github.com/google/osv-scanner/pkg/models"
)
type ResolutionVuln struct {
Vulnerability models.Vulnerability
DevOnly bool
// Chains are paths through requirements from direct dependency to vulnerable package.
// A 'Problem' chain constrains the package to a vulnerable version.
// 'NonProblem' chains re-use the vulnerable version, but would not resolve to a vulnerable version in isolation.
ProblemChains []DependencyChain
NonProblemChains []DependencyChain
}
func (rv ResolutionVuln) IsDirect() bool {
fn := func(dc DependencyChain) bool { return len(dc.Edges) == 1 }
return slices.ContainsFunc(rv.ProblemChains, fn) || slices.ContainsFunc(rv.NonProblemChains, fn)
}
type ResolutionResult struct {
Manifest manifest.Manifest
Graph *resolve.Graph
Vulns []ResolutionVuln
UnfilteredVulns []ResolutionVuln
}
type ResolutionError struct {
NodeID resolve.NodeID
Error resolve.NodeError
}
func (res *ResolutionResult) Errors() []ResolutionError {
var errs []ResolutionError
for i, n := range res.Graph.Nodes {
for _, err := range n.Errors {
errs = append(errs, ResolutionError{
NodeID: resolve.NodeID(i),
Error: err,
})
}
}
return errs
}
func getResolver(sys resolve.System, cl resolve.Client) (resolve.Resolver, error) {
switch sys { //nolint:exhaustive
case resolve.NPM:
return npm.NewResolver(cl), nil
default:
return nil, fmt.Errorf("no resolver for ecosystem %v", sys)
}
}
func Resolve(ctx context.Context, cl client.ResolutionClient, m manifest.Manifest) (*ResolutionResult, error) {
c := client.NewOverrideClient(cl.DependencyClient)
c.AddVersion(m.Root, m.Requirements)
for _, loc := range m.LocalManifests {
c.AddVersion(loc.Root, loc.Requirements)
// TODO: may need to do this recursively
}
cl.DependencyClient = c
r, err := getResolver(m.System(), cl.DependencyClient)
if err != nil {
return nil, err
}
graph, err := r.Resolve(ctx, m.Root.VersionKey)
if err != nil {
return nil, err
}
if len(graph.Error) > 0 {
return nil, errors.New(graph.Error)
}
result := &ResolutionResult{
Manifest: m.Clone(),
Graph: graph,
}
if err := result.computeVulns(ctx, cl); err != nil {
return nil, err
}
// Make a copy of the found vulns, as `Vulns` may be filtered according to specified criteria.
result.UnfilteredVulns = slices.Clone(result.Vulns)
return result, nil
}
// computeVulns scans for vulnerabilities in a resolved graph and populates res.Vulns
func (res *ResolutionResult) computeVulns(ctx context.Context, cl client.ResolutionClient) error {
nodeVulns, err := cl.FindVulns(res.Graph)
if err != nil {
return err
}
// Find all dependency paths to the vulnerable dependencies
var vulnerableNodes []resolve.NodeID
vulnInfo := make(map[string]models.Vulnerability)
for i, vulns := range nodeVulns {
if len(vulns) > 0 {
vulnerableNodes = append(vulnerableNodes, resolve.NodeID(i))
}
for _, vuln := range vulns {
vulnInfo[vuln.ID] = vuln
}
}
nodeChains := ComputeChains(res.Graph, vulnerableNodes)
vulnChains := make(map[string][]DependencyChain)
for i, idx := range vulnerableNodes {
for _, vuln := range nodeVulns[idx] {
vulnChains[vuln.ID] = append(vulnChains[vuln.ID], nodeChains[i]...)
}
}
// construct the ResolutionVulns
// TODO: This constructs a single ResolutionVuln per vulnerability ID.
// The scan action treats vulns with the same ID but affecting different versions of a package as distinct.
// TODO: Combine aliased IDs
for id, vuln := range vulnInfo {
rv := ResolutionVuln{Vulnerability: vuln, DevOnly: true}
for _, chain := range vulnChains[id] {
if chainConstrains(ctx, cl, chain, &rv.Vulnerability) {
rv.ProblemChains = append(rv.ProblemChains, chain)
} else {
rv.NonProblemChains = append(rv.NonProblemChains, chain)
}
rv.DevOnly = rv.DevOnly && ChainIsDev(chain, res.Manifest.Groups)
}
if len(rv.ProblemChains) == 0 {
// There has to be at least one problem chain for the vulnerability to appear.
// If our heuristic couldn't determine any, treat them all as problematic.
rv.ProblemChains = rv.NonProblemChains
rv.NonProblemChains = nil
}
res.Vulns = append(res.Vulns, rv)
}
return nil
}
// FilterVulns populates Vulns with the UnfilteredVulns that satisfy matchFn
func (res *ResolutionResult) FilterVulns(matchFn func(ResolutionVuln) bool) {
var matchedVulns []ResolutionVuln
for _, v := range res.UnfilteredVulns {
if matchFn(v) {
matchedVulns = append(matchedVulns, v)
}
}
res.Vulns = matchedVulns
}
type ResolutionDiff struct {
Original *ResolutionResult
New *ResolutionResult
RemovedVulns []ResolutionVuln
AddedVulns []ResolutionVuln
manifest.ManifestPatch
}
func (res *ResolutionResult) CalculateDiff(other *ResolutionResult) ResolutionDiff {
diff := ResolutionDiff{
Original: res,
New: other,
ManifestPatch: manifest.ManifestPatch{Manifest: &res.Manifest},
}
// Find the changed requirements and the versions they resolve to
for i, oldReq := range res.Manifest.Requirements { // assuming these are in the same order and none are added/removed
newReq := other.Manifest.Requirements[i]
if oldReq.Version == newReq.Version {
continue
}
// Find the node in the graph to find which actual version it resolved to
var oldResolved string
for _, e := range res.Graph.Edges {
toNode := res.Graph.Nodes[e.To]
if e.From == 0 && toNode.Version.PackageKey == oldReq.PackageKey {
oldResolved = toNode.Version.Version
break
}
}
var newResolved string
for _, e := range other.Graph.Edges {
toNode := other.Graph.Nodes[e.To]
if e.From == 0 && toNode.Version.PackageKey == newReq.PackageKey {
newResolved = toNode.Version.Version
break
}
}
diff.Deps = append(diff.Deps, manifest.DependencyPatch{
Pkg: oldReq.PackageKey,
Type: oldReq.Type.Clone(),
OrigRequire: oldReq.Version,
OrigResolved: oldResolved,
NewRequire: newReq.Version,
NewResolved: newResolved,
})
}
// Compute differences in present vulnerabilities.
// Currently this relies on vulnerability IDs being unique in the Vulns slice.
oldVulns := make(map[string]int, len(res.Vulns))
for i, v := range res.Vulns {
oldVulns[v.Vulnerability.ID] = i
}
for _, v := range other.Vulns {
if _, ok := oldVulns[v.Vulnerability.ID]; ok {
// The vuln already existed.
delete(oldVulns, v.Vulnerability.ID) // delete so we know what's been removed
} else {
// This vuln was not in the original resolution - it was newly added
diff.AddedVulns = append(diff.AddedVulns, v)
}
}
// Any remaining oldVulns have been removed in the new resolution
for _, idx := range oldVulns {
diff.RemovedVulns = append(diff.RemovedVulns, res.Vulns[idx])
}
return diff
}
// Compare compares ResolutionDiffs based on 'effectiveness' (best first):
//
// Sort order:
// 1. (number of fixed vulns - introduced vulns) / (number of changed direct dependencies) [descending]
// (i.e. more efficient first)
// 2. number of fixed vulns [descending]
// 3. number of changed direct dependencies [ascending]
// 4. changed direct dependency name package names [ascending]
// 5. size of changed direct dependency bump [ascending]
func (a ResolutionDiff) Compare(b ResolutionDiff) int {
// 1. (fixed - introduced) / (changes) [desc]
// Multiply out to avoid float casts
aRatio := (len(a.RemovedVulns) - len(a.AddedVulns)) * (len(b.Deps))
bRatio := (len(b.RemovedVulns) - len(b.AddedVulns)) * (len(a.Deps))
if c := cmp.Compare(aRatio, bRatio); c != 0 {
return -c
}
// 2. number of fixed vulns [desc]
if c := cmp.Compare(len(a.RemovedVulns), len(b.RemovedVulns)); c != 0 {
return -c
}
// 3. number of changed deps [asc]
if c := cmp.Compare(len(a.Deps), len(b.Deps)); c != 0 {
return c
}
// 4. changed names [asc]
for i, aDep := range a.Deps {
bDep := b.Deps[i]
if c := aDep.Pkg.Compare(bDep.Pkg); c != 0 {
return c
}
}
// 5. dependency bump amount [asc]
for i, aDep := range a.Deps {
bDep := b.Deps[i]
sv := aDep.Pkg.Semver()
if c := sv.Compare(aDep.NewResolved, bDep.NewResolved); c != 0 {
return c
}
}
return 0
}