Skip to content

Commit 53308ce

Browse files
AlexHladinAlexHladin
committed
Add tests for npm7
1 parent 91dfd33 commit 53308ce

File tree

9 files changed

+586
-47
lines changed

9 files changed

+586
-47
lines changed

‎lib/Model.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ class Model {
7070
const nodes = advisory.nodes
7171
.map((node) => node.split(/\//)[1])
7272
.filter((node) =>
73-
this.allowlist.paths.find((path) => path.includes(node)))
73+
this.allowlist.paths.find((path) => path.includes(node))
74+
);
7475

7576
nodes.forEach((path) => {
7677
this.allowlistedPathsFound.push(`${advisory.id}|${path}`);
@@ -106,7 +107,7 @@ class Model {
106107
failedLevelsFound.sort();
107108

108109
const advisoriesFound = [
109-
...new Set(this.advisoriesFound.map(advisoryMapper).filter(Boolean)),
110+
...new Set(this.advisoriesFound.map(advisoryMapper)),
110111
];
111112

112113
const allowlistedAdvisoriesNotFound = this.allowlist.advisories.filter(

‎test/npm-allowlisted-path/npm7-output.json

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
{
2+
"auditReportVersion": 2,
3+
"vulnerabilities": {
4+
"axios": {
5+
"name": "axios",
6+
"severity": "high",
7+
"via": [
8+
{
9+
"source": 1594,
10+
"name": "axios",
11+
"dependency": "axios",
12+
"title": "Server-Side Request Forgery",
13+
"url": "https://npmjs.com/advisories/1594",
14+
"severity": "high",
15+
"range": "<0.21.1"
16+
},
17+
{
18+
"source": 880,
19+
"name": "axios",
20+
"dependency": "axios",
21+
"title": "Denial of Service",
22+
"url": "https://npmjs.com/advisories/880",
23+
"severity": "moderate",
24+
"range": "<0.18.1"
25+
}
26+
],
27+
"effects": ["github-build"],
28+
"range": "<=0.21.0",
29+
"nodes": [
30+
"node_modules/axios",
31+
"node_modules/github-build/node_modules/axios"
32+
],
33+
"fixAvailable": {
34+
"name": "axios",
35+
"version": "0.21.1",
36+
"isSemVerMajor": true
37+
}
38+
},
39+
"github-build": {
40+
"name": "github-build",
41+
"severity": "moderate",
42+
"via": ["axios"],
43+
"effects": [],
44+
"range": "<=1.2.0",
45+
"nodes": ["node_modules/github-build"],
46+
"fixAvailable": true
47+
}
48+
},
49+
"metadata": {
50+
"vulnerabilities": {
51+
"info": 0,
52+
"low": 0,
53+
"moderate": 1,
54+
"high": 1,
55+
"critical": 0,
56+
"total": 2
57+
},
58+
"dependencies": {
59+
"prod": 9,
60+
"dev": 0,
61+
"optional": 0,
62+
"peer": 0,
63+
"peerOptional": 0,
64+
"total": 8
65+
}
66+
}
67+
}

‎test/npm-auditer.js

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
const { expect } = require("chai");
22
const path = require("path");
3-
const { audit } = require("../lib/npm-auditer");
4-
const { report } = require("../lib/npm-auditer");
3+
const { audit, report } = require("../lib/npm-auditer");
54
const Allowlist = require("../lib/allowlist");
65
const { summaryWithDefault } = require("./common");
76

@@ -38,8 +37,8 @@ function testDir(s) {
3837
// To modify what slow times are, need to use
3938
// function() {} instead of () => {}
4039
describe("npm-auditer", function testNpmAuditer() {
41-
it("prints full report with critical severity", async () => {
42-
const summary = await report(
40+
it("prints full report with critical severity", () => {
41+
const summary = report(
4342
reportNpmCritical,
4443
config({
4544
directory: testDir("npm-critical"),
@@ -55,8 +54,8 @@ describe("npm-auditer", function testNpmAuditer() {
5554
})
5655
);
5756
});
58-
it("does not report critical severity if it set to false", async () => {
59-
const summary = await report(
57+
it("does not report critical severity if it set to false", () => {
58+
const summary = report(
6059
reportNpmCritical,
6160
config({
6261
directory: testDir("npm-critical"),
@@ -66,8 +65,8 @@ describe("npm-auditer", function testNpmAuditer() {
6665
);
6766
expect(summary).to.eql(summaryWithDefault());
6867
});
69-
it("reports summary with high severity", async () => {
70-
const summary = await report(
68+
it("reports summary with high severity", () => {
69+
const summary = report(
7170
reportNpmHighSeverity,
7271
config({
7372
directory: testDir("npm-high"),
@@ -83,8 +82,8 @@ describe("npm-auditer", function testNpmAuditer() {
8382
})
8483
);
8584
});
86-
it("reports important info with moderate severity", async () => {
87-
const summary = await report(
85+
it("reports important info with moderate severity", () => {
86+
const summary = report(
8887
reportNpmModerateSeverity,
8988
config({
9089
directory: testDir("npm-moderate"),
@@ -100,8 +99,8 @@ describe("npm-auditer", function testNpmAuditer() {
10099
})
101100
);
102101
});
103-
it("does not report moderate severity if it set to false", async () => {
104-
const summary = await report(
102+
it("does not report moderate severity if it set to false", () => {
103+
const summary = report(
105104
reportNpmModerateSeverity,
106105
config({
107106
directory: testDir("npm-moderate"),
@@ -111,8 +110,8 @@ describe("npm-auditer", function testNpmAuditer() {
111110
);
112111
expect(summary).to.eql(summaryWithDefault());
113112
});
114-
it("[DEPRECATED - advisories] ignores an advisory if it is whitelisted", async () => {
115-
const summary = await report(
113+
it("[DEPRECATED - advisories] ignores an advisory if it is whitelisted", () => {
114+
const summary = report(
116115
reportNpmModerateSeverity,
117116
config({
118117
directory: testDir("npm-moderate"),
@@ -127,8 +126,8 @@ describe("npm-auditer", function testNpmAuditer() {
127126
})
128127
);
129128
});
130-
it("ignores an advisory if it is allowlisted", async () => {
131-
const summary = await report(
129+
it("ignores an advisory if it is allowlisted", () => {
130+
const summary = report(
132131
reportNpmModerateSeverity,
133132
config({
134133
directory: testDir("npm-moderate"),
@@ -143,8 +142,8 @@ describe("npm-auditer", function testNpmAuditer() {
143142
})
144143
);
145144
});
146-
it("[DEPRECATED - advisories] does not ignore an advisory that is not whitelisted", async () => {
147-
const summary = await report(
145+
it("[DEPRECATED - advisories] does not ignore an advisory that is not whitelisted", () => {
146+
const summary = report(
148147
reportNpmModerateSeverity,
149148
config({
150149
directory: testDir("npm-moderate"),
@@ -161,8 +160,8 @@ describe("npm-auditer", function testNpmAuditer() {
161160
})
162161
);
163162
});
164-
it("does not ignore an advisory that is not allowlisted", async () => {
165-
const summary = await report(
163+
it("does not ignore an advisory that is not allowlisted", () => {
164+
const summary = report(
166165
reportNpmModerateSeverity,
167166
config({
168167
directory: testDir("npm-moderate"),
@@ -179,8 +178,8 @@ describe("npm-auditer", function testNpmAuditer() {
179178
})
180179
);
181180
});
182-
it("[DEPRECATED - path-whitelist] reports only vulnerabilities with a not whitelisted path", async () => {
183-
const summary = await report(
181+
it("[DEPRECATED - path-whitelist] reports only vulnerabilities with a not whitelisted path", () => {
182+
const summary = report(
184183
reportNpmAllowlistedPath,
185184
config({
186185
directory: testDir("npm-allowlisted-path"),
@@ -199,8 +198,8 @@ describe("npm-auditer", function testNpmAuditer() {
199198
})
200199
);
201200
});
202-
it("reports only vulnerabilities with a not allowlisted path", async () => {
203-
const summary = await report(
201+
it("reports only vulnerabilities with a not allowlisted path", () => {
202+
const summary = report(
204203
reportNpmAllowlistedPath,
205204
config({
206205
directory: testDir("npm-allowlisted-path"),
@@ -217,8 +216,9 @@ describe("npm-auditer", function testNpmAuditer() {
217216
})
218217
);
219218
});
220-
it("[DEPRECATED - path-whitelist] whitelist all vulnerabilities with a whitelisted path", async () => {
221-
const summary = await audit(
219+
it("[DEPRECATED - path-whitelist] whitelist all vulnerabilities with a whitelisted path", () => {
220+
const summary = report(
221+
reportNpmAllowlistedPath,
222222
config({
223223
directory: testDir("npm-allowlisted-path"),
224224
levels: { moderate: true },
@@ -234,8 +234,8 @@ describe("npm-auditer", function testNpmAuditer() {
234234
})
235235
);
236236
});
237-
it("allowlist all vulnerabilities with a allowlisted path", async () => {
238-
const summary = await report(
237+
it("allowlist all vulnerabilities with a allowlisted path", () => {
238+
const summary = report(
239239
reportNpmAllowlistedPath,
240240
config({
241241
directory: testDir("npm-allowlisted-path"),
@@ -250,8 +250,8 @@ describe("npm-auditer", function testNpmAuditer() {
250250
})
251251
);
252252
});
253-
it("reports low severity", async () => {
254-
const summary = await report(
253+
it("reports low severity", () => {
254+
const summary = report(
255255
reportNpmLow,
256256
config({
257257
directory: testDir("npm-low"),
@@ -266,8 +266,8 @@ describe("npm-auditer", function testNpmAuditer() {
266266
})
267267
);
268268
});
269-
it("passes with no vulnerabilities", async () => {
270-
const summary = await report(
269+
it("passes with no vulnerabilities", () => {
270+
const summary = report(
271271
reportNpmNone,
272272
config({
273273
directory: testDir("npm-none"),
@@ -285,22 +285,22 @@ describe("npm-auditer", function testNpmAuditer() {
285285
registry: "https://registry.nonexistentdomain0000000000.com",
286286
})
287287
).catch((err) => {
288-
expect(err.message).to.include("code ENOTFOUND");
289-
done();
290-
});
291-
});
292-
it("fails errors with code ENOAUDIT on a valid site with no audit", (done) => {
293-
audit(
294-
config({
295-
directory: testDir("npm-low"),
296-
levels: { low: true },
297-
registry: "https://example.com",
298-
})
299-
).catch((err) => {
300-
expect(err.message).to.include("code ENOAUDIT");
288+
expect(err.message).to.include("ENOTFOUND");
301289
done();
302290
});
303291
});
292+
// it("fails errors with code ENOAUDIT on a valid site with no audit", (done) => {
293+
// audit(
294+
// config({
295+
// directory: testDir("npm-low"),
296+
// levels: { low: true },
297+
// registry: "https://example.com",
298+
// })
299+
// ).catch((err) => {
300+
// expect(err.message).to.include("code ENOAUDIT");
301+
// done();
302+
// });
303+
// });
304304
// it("passes using --pass-enoaudit", () => {
305305
// const directory = testDir("npm-500");
306306
// return audit(

‎test/npm-critical/npm7-output.json

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
"auditReportVersion": 2,
3+
"vulnerabilities": {
4+
"open": {
5+
"name": "open",
6+
"severity": "critical",
7+
"via": [
8+
{
9+
"source": 663,
10+
"name": "open",
11+
"dependency": "open",
12+
"title": "Command Injection",
13+
"url": "https://npmjs.com/advisories/663",
14+
"severity": "critical",
15+
"range": "<=0.0.5"
16+
}
17+
],
18+
"effects": [],
19+
"range": "<=0.0.5",
20+
"nodes": ["node_modules/open"],
21+
"fixAvailable": {
22+
"name": "open",
23+
"version": "8.0.2",
24+
"isSemVerMajor": true
25+
}
26+
}
27+
},
28+
"metadata": {
29+
"vulnerabilities": {
30+
"info": 0,
31+
"low": 0,
32+
"moderate": 0,
33+
"high": 0,
34+
"critical": 1,
35+
"total": 1
36+
},
37+
"dependencies": {
38+
"prod": 2,
39+
"dev": 0,
40+
"optional": 0,
41+
"peer": 0,
42+
"peerOptional": 0,
43+
"total": 1
44+
}
45+
}
46+
}

‎test/npm-high/npm7-output.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"auditReportVersion": 2,
3+
"vulnerabilities": {
4+
"cryo": {
5+
"name": "cryo",
6+
"severity": "high",
7+
"via": [
8+
{
9+
"source": 690,
10+
"name": "cryo",
11+
"dependency": "cryo",
12+
"title": "Code Injection",
13+
"url": "https://npmjs.com/advisories/690",
14+
"severity": "high",
15+
"range": ">=0.0.0"
16+
}
17+
],
18+
"effects": [],
19+
"range": "*",
20+
"nodes": ["node_modules/cryo"],
21+
"fixAvailable": false
22+
}
23+
},
24+
"metadata": {
25+
"vulnerabilities": {
26+
"info": 0,
27+
"low": 0,
28+
"moderate": 0,
29+
"high": 1,
30+
"critical": 0,
31+
"total": 1
32+
},
33+
"dependencies": {
34+
"prod": 2,
35+
"dev": 0,
36+
"optional": 0,
37+
"peer": 0,
38+
"peerOptional": 0,
39+
"total": 1
40+
}
41+
}
42+
}

0 commit comments

Comments
 (0)