Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
142 changes: 85 additions & 57 deletions cmd/osv-scanner/fix/__snapshots__/command_test.snap
Original file line number Diff line number Diff line change
Expand Up @@ -5259,14 +5259,14 @@ unsupported strategy "force" - must be one of: in-place, relax, override
---

[TestCommand/fix_non-interactive_in-place_package-lock.json - 1]
Found 14 vulnerabilities matching the filter
Can fix 7/14 matching vulnerabilities by changing 5 dependencies
Found 15 vulnerabilities matching the filter
Can fix 8/15 matching vulnerabilities by changing 5 dependencies
UPGRADED-PACKAGE: minimatch,3.1.2,3.1.5
UPGRADED-PACKAGE: brace-expansion,1.1.11,1.1.13
UPGRADED-PACKAGE: ajv,6.12.6,6.14.0
UPGRADED-PACKAGE: brace-expansion,1.1.11,1.1.12
UPGRADED-PACKAGE: concat-stream,1.5.0,1.6.1
UPGRADED-PACKAGE: hosted-git-info,2.1.4,2.8.9
FIXED-VULN-IDS: GHSA-23c5-xmqv-rm74,GHSA-2g4f-4pwh-qvx6,GHSA-3ppc-4f35-3m26,GHSA-43f8-2h32-f4cj,GHSA-7r86-cg39-jmmj,GHSA-g74r-ffvr-5q9f,GHSA-v6h2-p8h4-qcjw
FIXED-VULN-IDS: GHSA-23c5-xmqv-rm74,GHSA-2g4f-4pwh-qvx6,GHSA-3ppc-4f35-3m26,GHSA-43f8-2h32-f4cj,GHSA-7r86-cg39-jmmj,GHSA-f886-m6hf-6m8v,GHSA-g74r-ffvr-5q9f,GHSA-v6h2-p8h4-qcjw
REMAINING-VULNS: 7
UNFIXABLE-VULNS: 7

Expand Down Expand Up @@ -5378,9 +5378,9 @@ UNFIXABLE-VULNS: 7
}
},
"node_modules/brace-expansion": {
"version": "1.1.12",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
"integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
"version": "1.1.13",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
"integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
"dependencies": {
"concat-map": "0.0.1",
"balanced-match": "^1.0.0"
Expand Down Expand Up @@ -6298,9 +6298,9 @@ UNFIXABLE-VULNS: 7
}
},
"brace-expansion": {
"version": "1.1.12",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
"integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
"version": "1.1.13",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
"integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
"requires": {
"concat-map": "0.0.1",
"balanced-match": "^1.0.0"
Expand Down Expand Up @@ -7101,6 +7101,15 @@ UNFIXABLE-VULNS: 7
],
"unactionable": true
},
{
"id": "GHSA-f886-m6hf-6m8v",
"packages": [
{
"name": "brace-expansion",
"version": "1.1.11"
}
]
},
{
"id": "GHSA-fjxv-7rqg-78g4",
"packages": [
Expand Down Expand Up @@ -7183,19 +7192,28 @@ UNFIXABLE-VULNS: 7
{
"packageUpdates": [
{
"name": "ajv",
"versionFrom": "6.12.6",
"versionTo": "6.14.0",
"name": "brace-expansion",
"versionFrom": "1.1.11",
"versionTo": "1.1.13",
"transitive": true
}
],
"fixed": [
{
"id": "GHSA-2g4f-4pwh-qvx6",
"id": "GHSA-f886-m6hf-6m8v",
"packages": [
{
"name": "ajv",
"version": "6.12.6"
"name": "brace-expansion",
"version": "1.1.11"
}
]
},
{
"id": "GHSA-v6h2-p8h4-qcjw",
"packages": [
{
"name": "brace-expansion",
"version": "1.1.11"
}
]
}
Expand All @@ -7204,19 +7222,19 @@ UNFIXABLE-VULNS: 7
{
"packageUpdates": [
{
"name": "brace-expansion",
"versionFrom": "1.1.11",
"versionTo": "1.1.12",
"name": "ajv",
"versionFrom": "6.12.6",
"versionTo": "6.14.0",
"transitive": true
}
],
"fixed": [
{
"id": "GHSA-v6h2-p8h4-qcjw",
"id": "GHSA-2g4f-4pwh-qvx6",
"packages": [
{
"name": "brace-expansion",
"version": "1.1.11"
"name": "ajv",
"version": "6.12.6"
}
]
}
Expand Down Expand Up @@ -7375,9 +7393,9 @@ UNFIXABLE-VULNS: 7
}
},
"node_modules/brace-expansion": {
"version": "1.1.12",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
"integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
"version": "1.1.13",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
"integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
"dependencies": {
"concat-map": "0.0.1",
"balanced-match": "^1.0.0"
Expand Down Expand Up @@ -8295,9 +8313,9 @@ UNFIXABLE-VULNS: 7
}
},
"brace-expansion": {
"version": "1.1.12",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
"integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
"version": "1.1.13",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
"integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
"requires": {
"concat-map": "0.0.1",
"balanced-match": "^1.0.0"
Expand Down Expand Up @@ -9012,6 +9030,16 @@ UNFIXABLE-VULNS: 7
}
]
},
{
"id": "GHSA-6fmv-xxpf-w3cw",
"packages": [
{
"name": "org.codehaus.plexus:plexus-utils",
"version": "3.0"
}
],
"unactionable": true
},
{
"id": "GHSA-78wr-2p64-hpwj",
"packages": [
Expand Down Expand Up @@ -9468,15 +9496,15 @@ UNFIXABLE-VULNS: 7
---

[TestCommand/fix_non-interactive_override_pom.xml - 1]
Found 12 vulnerabilities matching the filter
Can fix 12/12 matching vulnerabilities by overriding 4 dependencies
Found 13 vulnerabilities matching the filter
Can fix 12/13 matching vulnerabilities by overriding 4 dependencies
OVERRIDE-PACKAGE: org.apache.httpcomponents:httpclient,4.5.13
OVERRIDE-PACKAGE: org.codehaus.plexus:plexus-utils,3.0.24
OVERRIDE-PACKAGE: commons-io:commons-io,2.14.0
OVERRIDE-PACKAGE: org.jsoup:jsoup,1.15.3
FIXED-VULN-IDS: GHSA-2x83-r56g-cv47,GHSA-78wr-2p64-hpwj,GHSA-7r82-7xv7-xcpj,GHSA-8vhq-qq4p-grq3,GHSA-cfh5-3ghh-wfjx,GHSA-fmj5-wv96-r2ch,GHSA-g6ph-x5wf-g337,GHSA-gp7f-rwcx-9369,GHSA-gw85-4gmf-m7rh,GHSA-gwrp-pvrq-jmwv,GHSA-jcwr-x25h-x5fh,GHSA-m72m-mhq2-9p6c
REMAINING-VULNS: 0
UNFIXABLE-VULNS: 0
REMAINING-VULNS: 1
UNFIXABLE-VULNS: 1

---

Expand Down Expand Up @@ -9565,14 +9593,14 @@ UNFIXABLE-VULNS: 4
---

[TestCommand/fix_non_interactive_in_place_package_lock_json_with_native_data_source - 1]
Found 14 vulnerabilities matching the filter
Can fix 7/14 matching vulnerabilities by changing 5 dependencies
Found 15 vulnerabilities matching the filter
Can fix 8/15 matching vulnerabilities by changing 5 dependencies
UPGRADED-PACKAGE: minimatch,3.1.2,3.1.5
UPGRADED-PACKAGE: brace-expansion,1.1.11,1.1.13
UPGRADED-PACKAGE: ajv,6.12.6,6.14.0
UPGRADED-PACKAGE: brace-expansion,1.1.11,1.1.12
UPGRADED-PACKAGE: concat-stream,1.5.0,1.6.1
UPGRADED-PACKAGE: hosted-git-info,2.1.4,2.8.9
FIXED-VULN-IDS: GHSA-23c5-xmqv-rm74,GHSA-2g4f-4pwh-qvx6,GHSA-3ppc-4f35-3m26,GHSA-43f8-2h32-f4cj,GHSA-7r86-cg39-jmmj,GHSA-g74r-ffvr-5q9f,GHSA-v6h2-p8h4-qcjw
FIXED-VULN-IDS: GHSA-23c5-xmqv-rm74,GHSA-2g4f-4pwh-qvx6,GHSA-3ppc-4f35-3m26,GHSA-43f8-2h32-f4cj,GHSA-7r86-cg39-jmmj,GHSA-f886-m6hf-6m8v,GHSA-g74r-ffvr-5q9f,GHSA-v6h2-p8h4-qcjw
REMAINING-VULNS: 7
UNFIXABLE-VULNS: 7

Expand Down Expand Up @@ -9684,9 +9712,9 @@ UNFIXABLE-VULNS: 7
}
},
"node_modules/brace-expansion": {
"version": "1.1.12",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
"integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
"version": "1.1.13",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
"integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
"dependencies": {
"concat-map": "0.0.1",
"balanced-match": "^1.0.0"
Expand Down Expand Up @@ -10604,9 +10632,9 @@ UNFIXABLE-VULNS: 7
}
},
"brace-expansion": {
"version": "1.1.12",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
"integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
"version": "1.1.13",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
"integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
"requires": {
"concat-map": "0.0.1",
"balanced-match": "^1.0.0"
Expand Down Expand Up @@ -11307,13 +11335,13 @@ UNFIXABLE-VULNS: 7
---

[TestCommand/fix_non_interactive_override_pom_xml_with_native_data_source - 1]
Found 12 vulnerabilities matching the filter
Can fix 12/12 matching vulnerabilities by overriding 4 dependencies
Found 13 vulnerabilities matching the filter
Can fix 13/13 matching vulnerabilities by overriding 4 dependencies
OVERRIDE-PACKAGE: org.apache.httpcomponents:httpclient,4.5.13
OVERRIDE-PACKAGE: org.codehaus.plexus:plexus-utils,3.0.24
OVERRIDE-PACKAGE: org.codehaus.plexus:plexus-utils,4.0.3
OVERRIDE-PACKAGE: commons-io:commons-io,2.14.0
OVERRIDE-PACKAGE: org.jsoup:jsoup,1.15.3
FIXED-VULN-IDS: GHSA-2x83-r56g-cv47,GHSA-78wr-2p64-hpwj,GHSA-7r82-7xv7-xcpj,GHSA-8vhq-qq4p-grq3,GHSA-cfh5-3ghh-wfjx,GHSA-fmj5-wv96-r2ch,GHSA-g6ph-x5wf-g337,GHSA-gp7f-rwcx-9369,GHSA-gw85-4gmf-m7rh,GHSA-gwrp-pvrq-jmwv,GHSA-jcwr-x25h-x5fh,GHSA-m72m-mhq2-9p6c
FIXED-VULN-IDS: GHSA-2x83-r56g-cv47,GHSA-6fmv-xxpf-w3cw,GHSA-78wr-2p64-hpwj,GHSA-7r82-7xv7-xcpj,GHSA-8vhq-qq4p-grq3,GHSA-cfh5-3ghh-wfjx,GHSA-fmj5-wv96-r2ch,GHSA-g6ph-x5wf-g337,GHSA-gp7f-rwcx-9369,GHSA-gw85-4gmf-m7rh,GHSA-gwrp-pvrq-jmwv,GHSA-jcwr-x25h-x5fh,GHSA-m72m-mhq2-9p6c
REMAINING-VULNS: 0
UNFIXABLE-VULNS: 0

Expand Down Expand Up @@ -11364,7 +11392,7 @@ UNFIXABLE-VULNS: 0
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.0.24</version>
<version>4.0.3</version>
</dependency>
</dependencies>
</project>
Expand All @@ -11381,14 +11409,14 @@ manifest or lockfile is required
---

[TestCommand_OfflineDatabase/fix_non_interactive_in_place_package_lock_json_with_offline_vulns - 1]
Found 14 vulnerabilities matching the filter
Can fix 7/14 matching vulnerabilities by changing 5 dependencies
Found 15 vulnerabilities matching the filter
Can fix 8/15 matching vulnerabilities by changing 5 dependencies
UPGRADED-PACKAGE: minimatch,3.1.2,3.1.5
UPGRADED-PACKAGE: brace-expansion,1.1.11,1.1.13
UPGRADED-PACKAGE: ajv,6.12.6,6.14.0
UPGRADED-PACKAGE: brace-expansion,1.1.11,1.1.12
UPGRADED-PACKAGE: concat-stream,1.5.0,1.6.1
UPGRADED-PACKAGE: hosted-git-info,2.1.4,2.8.9
FIXED-VULN-IDS: GHSA-23c5-xmqv-rm74,GHSA-2g4f-4pwh-qvx6,GHSA-3ppc-4f35-3m26,GHSA-43f8-2h32-f4cj,GHSA-7r86-cg39-jmmj,GHSA-g74r-ffvr-5q9f,GHSA-v6h2-p8h4-qcjw
FIXED-VULN-IDS: GHSA-23c5-xmqv-rm74,GHSA-2g4f-4pwh-qvx6,GHSA-3ppc-4f35-3m26,GHSA-43f8-2h32-f4cj,GHSA-7r86-cg39-jmmj,GHSA-f886-m6hf-6m8v,GHSA-g74r-ffvr-5q9f,GHSA-v6h2-p8h4-qcjw
REMAINING-VULNS: 7
UNFIXABLE-VULNS: 7

Expand Down Expand Up @@ -11500,9 +11528,9 @@ UNFIXABLE-VULNS: 7
}
},
"node_modules/brace-expansion": {
"version": "1.1.12",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
"integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
"version": "1.1.13",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
"integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
"dependencies": {
"concat-map": "0.0.1",
"balanced-match": "^1.0.0"
Expand Down Expand Up @@ -12420,9 +12448,9 @@ UNFIXABLE-VULNS: 7
}
},
"brace-expansion": {
"version": "1.1.12",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
"integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
"version": "1.1.13",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
"integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
"requires": {
"concat-map": "0.0.1",
"balanced-match": "^1.0.0"
Expand Down
Loading
Loading