scanoss 0.15.3 → 0.15.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/main/cli/bin/cli-bin.js +3 -1
- package/build/main/cli/commands/helpers.d.ts +4 -0
- package/build/main/cli/commands/helpers.js +48 -2
- package/build/main/cli/commands/scan.js +20 -6
- package/build/main/index.d.ts +1 -0
- package/build/main/index.js +2 -1
- package/build/main/sdk/scanner/Scanner.d.ts +1 -0
- package/build/main/sdk/scanner/Scanner.js +26 -6
- package/build/main/sdk/scanner/ScannerTypes.d.ts +2 -0
- package/build/main/sdk/scanner/ScannerTypes.js +1 -1
- package/build/main/sdk/scanner/ScannnerResultPostProcessor/interfaces/types.d.ts +15 -0
- package/build/main/sdk/scanner/ScannnerResultPostProcessor/interfaces/types.js +3 -0
- package/build/main/sdk/scanner/ScannnerResultPostProcessor/rules/remove-rule.d.ts +7 -0
- package/build/main/sdk/scanner/ScannnerResultPostProcessor/rules/remove-rule.js +24 -0
- package/build/main/sdk/scanner/ScannnerResultPostProcessor/rules/replace-rule.d.ts +11 -0
- package/build/main/sdk/scanner/ScannnerResultPostProcessor/rules/replace-rule.js +85 -0
- package/build/main/sdk/scanner/ScannnerResultPostProcessor/rules/rule-factory.d.ts +5 -0
- package/build/main/sdk/scanner/ScannnerResultPostProcessor/rules/rule-factory.js +19 -0
- package/build/main/sdk/scanner/ScannnerResultPostProcessor/rules/rule.d.ts +10 -0
- package/build/main/sdk/scanner/ScannnerResultPostProcessor/rules/rule.js +39 -0
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/module/cli/bin/cli-bin.js +3 -1
- package/build/module/cli/commands/helpers.d.ts +4 -0
- package/build/module/cli/commands/helpers.js +45 -1
- package/build/module/cli/commands/scan.js +21 -7
- package/build/module/index.d.ts +1 -0
- package/build/module/index.js +2 -1
- package/build/module/sdk/scanner/Scanner.d.ts +1 -0
- package/build/module/sdk/scanner/Scanner.js +24 -3
- package/build/module/sdk/scanner/ScannerTypes.d.ts +2 -0
- package/build/module/sdk/scanner/ScannerTypes.js +1 -1
- package/build/module/sdk/scanner/ScannnerResultPostProcessor/interfaces/types.d.ts +15 -0
- package/build/module/sdk/scanner/ScannnerResultPostProcessor/interfaces/types.js +2 -0
- package/build/module/sdk/scanner/ScannnerResultPostProcessor/rules/remove-rule.d.ts +7 -0
- package/build/module/sdk/scanner/ScannnerResultPostProcessor/rules/remove-rule.js +21 -0
- package/build/module/sdk/scanner/ScannnerResultPostProcessor/rules/replace-rule.d.ts +11 -0
- package/build/module/sdk/scanner/ScannnerResultPostProcessor/rules/replace-rule.js +82 -0
- package/build/module/sdk/scanner/ScannnerResultPostProcessor/rules/rule-factory.d.ts +5 -0
- package/build/module/sdk/scanner/ScannnerResultPostProcessor/rules/rule-factory.js +15 -0
- package/build/module/sdk/scanner/ScannnerResultPostProcessor/rules/rule.d.ts +10 -0
- package/build/module/sdk/scanner/ScannnerResultPostProcessor/rules/rule.js +36 -0
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -41,6 +41,8 @@ async function main() {
|
|
|
41
41
|
scan.addOption(new commander_1.Option(" --proxy <proxy>", "Proxy URL to use for connections (optional). Can also use the environment variable \"HTTPS_PROXY=[ip]:[port]\" and \"grcp_proxy=[ip]:[port]\" for gRPC"));
|
|
42
42
|
scan.addOption(new commander_1.Option(" --grpc_proxy <grpc_proxy>", "GRPC Proxy URL to use for connections (optional)."));
|
|
43
43
|
scan.addOption(new commander_1.Option("-v, --verbose", "Makes scan operation verbose"));
|
|
44
|
+
scan.addOption(new commander_1.Option("-st, --settings <filename>", "Settings file to use for scanning (optional - default scanoss.json)"));
|
|
45
|
+
scan.addOption(new commander_1.Option("-stf, --skip-settings-file", "Skips settings file"));
|
|
44
46
|
scan.action((source, options) => {
|
|
45
47
|
(0, scan_1.scanHandler)(source, options).catch((e) => {
|
|
46
48
|
CLIErrorHandler(e);
|
|
@@ -96,4 +98,4 @@ catch (e) {
|
|
|
96
98
|
console.error(e);
|
|
97
99
|
process.exit(1);
|
|
98
100
|
}
|
|
99
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpLWJpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9jbGkvYmluL2NsaS1iaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EseUNBQXNEO0FBRXRELGlEQUE4QztBQUM5Qyx5Q0FBNkM7QUFDN0MsMkNBQStDO0FBQy9DLHlDQUE2QztBQUM3QywrQ0FBbUQ7QUFFbkQsU0FBUyxlQUFlLENBQUMsQ0FBUTtJQUMvQixPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ25CLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDakIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNsQixDQUFDO0FBRUQsS0FBSyxVQUFVLElBQUk7SUFFakIsTUFBTSxJQUFJLEdBQUcsSUFBSSxtQkFBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ2pDLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxvQkFBUSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7SUFDM0MsSUFBSSxDQUFDLFdBQVcsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO0lBQ3ZDLElBQUksQ0FBQyxXQUFXLENBQUMsT0FBTyxFQUFFLGlFQUFpRSxDQUFDLENBQUM7SUFFN0YsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLGtCQUFNLENBQUMsV0FBVyxFQUFFLHNDQUFzQyxDQUFDLENBQUMsQ0FBQztJQUNoRixJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksa0JBQU0sQ0FBQyxZQUFZLEVBQUUsOENBQThDLENBQUMsQ0FBQyxDQUFDO0lBQ3pGLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxrQkFBTSxDQUFDLGVBQWUsRUFBRSw2RUFBNkUsQ0FBQyxDQUFDLENBQUM7SUFDM0gsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLGtCQUFNLENBQUMsd0JBQXdCLEVBQUUsK0NBQStDLENBQUMsQ0FBQyxDQUFDO0lBQ3RHLElBQUks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
|
|
@@ -1,2 +1,6 @@
|
|
|
1
|
+
import { Settings } from "../../sdk/scanner/ScannnerResultPostProcessor/interfaces/types";
|
|
2
|
+
export declare const DEFAULT_SETTINGS_FILE = "scanoss.json";
|
|
1
3
|
export declare const isFolder: (path: string) => Promise<boolean>;
|
|
2
4
|
export declare function getProjectNameFromPath(path: string): string;
|
|
5
|
+
export declare function getSettingsFilePath(settingsFilePath: string | null, scanPath: string): Promise<string>;
|
|
6
|
+
export declare function validateSettingsFile(settings: Settings): true | Error;
|
|
@@ -3,10 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.isFolder = void 0;
|
|
6
|
+
exports.isFolder = exports.DEFAULT_SETTINGS_FILE = void 0;
|
|
7
7
|
exports.getProjectNameFromPath = getProjectNameFromPath;
|
|
8
|
+
exports.getSettingsFilePath = getSettingsFilePath;
|
|
9
|
+
exports.validateSettingsFile = validateSettingsFile;
|
|
8
10
|
const path_1 = __importDefault(require("path"));
|
|
9
11
|
const fs_1 = __importDefault(require("fs"));
|
|
12
|
+
const path_2 = __importDefault(require("path"));
|
|
13
|
+
exports.DEFAULT_SETTINGS_FILE = 'scanoss.json';
|
|
10
14
|
// Async function that verify if a path is a folder. If the path is not valid the promise will be rejected
|
|
11
15
|
const isFolder = (path) => {
|
|
12
16
|
return new Promise((resolve, reject) => {
|
|
@@ -24,4 +28,46 @@ exports.isFolder = isFolder;
|
|
|
24
28
|
function getProjectNameFromPath(path) {
|
|
25
29
|
return path_1.default.basename(path, path_1.default.extname(path));
|
|
26
30
|
}
|
|
27
|
-
|
|
31
|
+
async function getSettingsFilePath(settingsFilePath, scanPath) {
|
|
32
|
+
if (settingsFilePath) {
|
|
33
|
+
return settingsFilePath;
|
|
34
|
+
}
|
|
35
|
+
const files = await fs_1.default.promises.readdir(scanPath);
|
|
36
|
+
if (files.some((f) => f === exports.DEFAULT_SETTINGS_FILE)) {
|
|
37
|
+
return path_2.default.join(scanPath, exports.DEFAULT_SETTINGS_FILE);
|
|
38
|
+
}
|
|
39
|
+
return null;
|
|
40
|
+
}
|
|
41
|
+
function validateSettingsFile(settings) {
|
|
42
|
+
if (!settings.bom) {
|
|
43
|
+
throw new Error("[ SETTINGS FILE ]: Missing required 'bom' key");
|
|
44
|
+
}
|
|
45
|
+
const { bom } = settings;
|
|
46
|
+
if (bom.include) {
|
|
47
|
+
if (!Array.isArray(bom.include)) {
|
|
48
|
+
return new Error("[ SETTINGS FILE ]: 'include' must be an array");
|
|
49
|
+
}
|
|
50
|
+
bom.include.forEach((item, index) => {
|
|
51
|
+
if (!item.purl) {
|
|
52
|
+
throw new Error(`[ SETTINGS FILE ]: Missing required 'purl' in include item.\n ${JSON.stringify(item, null, 2)}`);
|
|
53
|
+
}
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
if (bom.remove) {
|
|
57
|
+
if (!Array.isArray(bom.remove)) {
|
|
58
|
+
throw new Error("[ SETTINGS FILE ]: 'remove' must be an array");
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
if (bom.replace) {
|
|
62
|
+
if (!Array.isArray(bom.replace)) {
|
|
63
|
+
throw new Error("[ SETTINGS FILE ]: 'replace' must be an array");
|
|
64
|
+
}
|
|
65
|
+
bom.replace.forEach((item, index) => {
|
|
66
|
+
if (!item.replace_with) {
|
|
67
|
+
throw new Error(`[ SETTINGS FILE ]: Missing required 'replace_with' in replace item.\n ${JSON.stringify(item, null, 2)}`);
|
|
68
|
+
}
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
return true;
|
|
72
|
+
}
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9jbGkvY29tbWFuZHMvaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUF1QkEsd0RBRUM7QUFFRCxrREFVQztBQUVELG9EQXNDQztBQTdFRCxnREFBMkI7QUFDM0IsNENBQW9CO0FBQ3BCLGdEQUF3QjtBQU1YLFFBQUEscUJBQXFCLEdBQUcsY0FBYyxDQUFDO0FBRXBELDBHQUEwRztBQUNuRyxNQUFNLFFBQVEsR0FBRyxDQUFDLElBQVksRUFBb0IsRUFBRTtJQUN6RCxPQUFPLElBQUksT0FBTyxDQUFDLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFO1FBQ3JDLFlBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUMsR0FBRyxFQUFFLEtBQUssRUFBRSxFQUFFO1lBQzNCLElBQUksR0FBRyxFQUFFLENBQUM7Z0JBQ1IsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ2QsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLE9BQU8sQ0FBQyxLQUFLLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQztZQUMvQixDQUFDO1FBQ0gsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDLENBQUMsQ0FBQztBQUNMLENBQUMsQ0FBQTtBQVZZLFFBQUEsUUFBUSxZQVVwQjtBQUVELFNBQWdCLHNCQUFzQixDQUFDLElBQVk7SUFDakQsT0FBTyxjQUFPLENBQUMsUUFBUSxDQUFDLElBQUksRUFBQyxjQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUE7QUFDckQsQ0FBQztBQUVNLEtBQUssVUFBVSxtQkFBbUIsQ0FBQyxnQkFBK0IsRUFBRSxRQUFlO0lBRXhGLElBQUksZ0JBQWdCLEVBQUUsQ0FBQztRQUNyQixPQUFPLGdCQUFnQixDQUFDO0lBQzFCLENBQUM7SUFDRCxNQUFNLEtBQUssR0FBRyxNQUFNLFlBQUUsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2xELElBQUksS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBQyxFQUFFLENBQUMsQ0FBQyxLQUFLLDZCQUFxQixDQUFDLEVBQUUsQ0FBQztRQUNsRCxPQUFPLGNBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLDZCQUFxQixDQUFDLENBQUM7SUFDcEQsQ0FBQztJQUNELE9BQU8sSUFBSSxDQUFDO0FBQ2QsQ0FBQztBQUVELFNBQWdCLG9CQUFvQixDQUFDLFFBQWtCO0lBQ3JELElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDbEIsTUFBTSxJQUFJLEtBQUssQ0FBQywrQ0FBK0MsQ0FBQyxDQUFDO0lBQ25FLENBQUM7SUFFRCxNQUFNLEVBQUUsR0FBRyxFQUFFLEdBQUcsUUFBUSxDQUFDO0lBRXpCLElBQUksR0FBRyxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2hCLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1lBQ2hDLE9BQU8sSUFBSSxLQUFLLENBQUMsK0NBQStDLENBQUMsQ0FBQztRQUNwRSxDQUFDO1FBRUQsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUU7WUFDbEMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztnQkFDZixNQUFNLElBQUksS0FBSyxDQUFDLGlFQUFpRSxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksRUFBQyxJQUFJLEVBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQ2xILENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxJQUFJLEdBQUcsQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUNmLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDO1lBQy9CLE1BQU0sSUFBSSxLQUFLLENBQUMsOENBQThDLENBQUMsQ0FBQztRQUNsRSxDQUFDO0lBQ0gsQ0FBQztJQUVELElBQUksR0FBRyxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2hCLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1lBQ2hDLE1BQU0sSUFBSSxLQUFLLENBQUMsK0NBQStDLENBQUMsQ0FBQztRQUNuRSxDQUFDO1FBRUQsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUU7WUFDbEMsSUFBSSxDQUFDLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztnQkFDdkIsTUFBTSxJQUFJLEtBQUssQ0FBQyx5RUFBeUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUMsSUFBSSxFQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUMxSCxDQUFDO1FBQ0gsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsT0FBTyxJQUFJLENBQUM7QUFDZCxDQUFDIn0=
|
|
@@ -66,6 +66,24 @@ async function scanHandler(rootPath, options) {
|
|
|
66
66
|
await scannerCfg.validate();
|
|
67
67
|
const scanner = new Scanner_1.Scanner(scannerCfg);
|
|
68
68
|
let scannerInput = { fileList: [] };
|
|
69
|
+
// SBOM Ingestion
|
|
70
|
+
if (options.ignore) {
|
|
71
|
+
scannerInput.sbom = fs_1.default.readFileSync(options.ignore, 'utf-8');
|
|
72
|
+
scannerInput.sbomMode = ScannerTypes_1.SbomMode.SBOM_IGNORE;
|
|
73
|
+
}
|
|
74
|
+
// Settings Ingestion
|
|
75
|
+
if (!options.skipSettingsFile) {
|
|
76
|
+
const settingsFilePath = await (0, helpers_1.getSettingsFilePath)(options.settings, rootPath);
|
|
77
|
+
if (settingsFilePath) {
|
|
78
|
+
try {
|
|
79
|
+
scannerInput.settings = JSON.parse(fs_1.default.readFileSync(settingsFilePath, "utf-8"));
|
|
80
|
+
scannerInput.sbomMode = ScannerTypes_1.SbomMode.SBOM_IDENTIFY;
|
|
81
|
+
}
|
|
82
|
+
catch (e) {
|
|
83
|
+
throw new Error(`SCANOSS Settings file cannot be found at: ${settingsFilePath}.`);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
}
|
|
69
87
|
scannerInput.folderRoot = rootPath + path_1.default.sep; // This will remove the project root path from the results.
|
|
70
88
|
if (options.flags)
|
|
71
89
|
scannerInput.engineFlags = options.flags;
|
|
@@ -121,10 +139,6 @@ async function scanHandler(rootPath, options) {
|
|
|
121
139
|
else {
|
|
122
140
|
scanner.on(ScannerTypes_1.ScannerEvents.SCANNER_LOG, (logText) => console.error(logText));
|
|
123
141
|
}
|
|
124
|
-
if (options.ignore) {
|
|
125
|
-
scannerInput.sbom = fs_1.default.readFileSync(options.ignore, 'utf-8');
|
|
126
|
-
scannerInput.sbomMode = ScannerTypes_1.SbomMode.SBOM_IGNORE;
|
|
127
|
-
}
|
|
128
142
|
// Dependency scanner
|
|
129
143
|
let pDependencyScanner = Promise.resolve({});
|
|
130
144
|
if (options.dependencies) {
|
|
@@ -136,7 +150,7 @@ async function scanHandler(rootPath, options) {
|
|
|
136
150
|
pScanner,
|
|
137
151
|
pDependencyScanner,
|
|
138
152
|
]);
|
|
139
|
-
|
|
153
|
+
let scannerResults = JSON.parse(await fs_1.default.promises.readFile(scannerResultPath, 'utf-8'));
|
|
140
154
|
//TODO Unify results.json and dependency.json. What happens with result.json that includes dependencies?
|
|
141
155
|
const scannersResults = {
|
|
142
156
|
scanner: scannerResults,
|
|
@@ -159,4 +173,4 @@ async function scanHandler(rootPath, options) {
|
|
|
159
173
|
else
|
|
160
174
|
console.log(scannerResultsString);
|
|
161
175
|
}
|
|
162
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
176
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../../../src/cli/commands/scan.ts"],"names":[],"mappings":"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"}
|
package/build/main/index.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ export * from './sdk/scanner/Scanner';
|
|
|
2
2
|
export * from './sdk/scanner/ScannerTypes';
|
|
3
3
|
export * from './sdk/scanner/ScannerCfg';
|
|
4
4
|
export * from './sdk/scanner/WfpProvider/WfpCalculator/WfpCalculator';
|
|
5
|
+
export * from './sdk/scanner/ScannnerResultPostProcessor/interfaces/types';
|
|
5
6
|
export * from './sdk/scanner/Fingerprint';
|
|
6
7
|
export { IWfpProviderInput } from './sdk/scanner/WfpProvider/WfpProvider';
|
|
7
8
|
export * from './sdk/Dependencies/DependencyTypes';
|
package/build/main/index.js
CHANGED
|
@@ -20,6 +20,7 @@ __exportStar(require("./sdk/scanner/Scanner"), exports);
|
|
|
20
20
|
__exportStar(require("./sdk/scanner/ScannerTypes"), exports);
|
|
21
21
|
__exportStar(require("./sdk/scanner/ScannerCfg"), exports);
|
|
22
22
|
__exportStar(require("./sdk/scanner/WfpProvider/WfpCalculator/WfpCalculator"), exports);
|
|
23
|
+
__exportStar(require("./sdk/scanner/ScannnerResultPostProcessor/interfaces/types"), exports);
|
|
23
24
|
// *** Fingerprint exports *** //
|
|
24
25
|
__exportStar(require("./sdk/scanner/Fingerprint"), exports);
|
|
25
26
|
// *** Dependency scanner exports *** //
|
|
@@ -49,4 +50,4 @@ __exportStar(require("./sdk/Services/Grpc/DependencyService"), exports);
|
|
|
49
50
|
__exportStar(require("./sdk/Services/http/HttpClient"), exports);
|
|
50
51
|
var Logger_1 = require("./sdk/Logger");
|
|
51
52
|
Object.defineProperty(exports, "logger", { enumerable: true, get: function () { return Logger_1.logger; } });
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxrQ0FBa0M7QUFDbEMsd0RBQXNDO0FBQ3RDLDZEQUEyQztBQUMzQywyREFBeUM7QUFDekMsd0ZBQXNFO0FBQ3RFLDZGQUEyRTtBQUUzRSxpQ0FBaUM7QUFDakMsNERBQTBDO0FBRzFDLHdDQUF3QztBQUN4QyxxRUFBbUQ7QUFDbkQsMEVBQXdEO0FBQ3hELHVFQUFxRDtBQUNyRCxxRkFBbUU7QUFFbkUsMENBQTBDO0FBQzFDLHlFQUF1RDtBQUN2RCwrREFBNkM7QUFDN0MsdUVBQXFEO0FBRXJELDJCQUEyQjtBQUMzQixzREFBb0M7QUFDcEMsd0VBQXNEO0FBQ3RELDZFQUEyRDtBQUMzRCwyRkFBeUU7QUFDekUsMkZBQXlFO0FBQ3pFLDhGQUE0RTtBQUM1RSw2RkFBMkU7QUFFM0UsbUJBQW1CO0FBQ25CLHdFQUFzRDtBQUV0RCx1QkFBdUI7QUFDdkIsNERBQTBDO0FBRzFDLDBFQUF3RDtBQUN4RCx3RUFBc0Q7QUFHdEQsaUJBQWlCO0FBQ2pCLGlFQUE4QztBQUU5Qyx1Q0FBc0M7QUFBN0IsZ0dBQUEsTUFBTSxPQUFBIn0=
|
|
@@ -19,6 +19,8 @@ const WfpSplitter_1 = require("./WfpProvider/WfpSplitter/WfpSplitter");
|
|
|
19
19
|
const sort_paths_1 = __importDefault(require("sort-paths"));
|
|
20
20
|
const uuid_1 = require("uuid");
|
|
21
21
|
const path_1 = __importDefault(require("path"));
|
|
22
|
+
const rule_factory_1 = require("./ScannnerResultPostProcessor/rules/rule-factory");
|
|
23
|
+
const helpers_1 = require("../../cli/commands/helpers");
|
|
22
24
|
let finishPromiseResolve;
|
|
23
25
|
let finishPromiseReject;
|
|
24
26
|
class Scanner extends eventemitter3_1.default {
|
|
@@ -84,23 +86,31 @@ class Scanner extends eventemitter3_1.default {
|
|
|
84
86
|
fs_1.default.unlinkSync(this.wfpFilePath);
|
|
85
87
|
}
|
|
86
88
|
async scan(scannerInput) {
|
|
87
|
-
var _a, _b, _c;
|
|
89
|
+
var _a, _b, _c, _d, _e;
|
|
88
90
|
this.init();
|
|
89
91
|
this.createOutputFiles();
|
|
90
92
|
this.scannerInput = scannerInput;
|
|
93
|
+
this.settings = ((_a = scannerInput[0]) === null || _a === void 0 ? void 0 : _a.settings) ? { ...scannerInput[0].settings } : null;
|
|
94
|
+
if ((_b = scannerInput[0]) === null || _b === void 0 ? void 0 : _b.settings) {
|
|
95
|
+
(0, helpers_1.validateSettingsFile)(scannerInput[0].settings);
|
|
96
|
+
const include = scannerInput[0].settings.bom.include.map((i) => i.purl);
|
|
97
|
+
const replace = scannerInput[0].settings.bom.replace.map((r) => r.replace_with);
|
|
98
|
+
const sbom = { components: [...include, ...replace] };
|
|
99
|
+
scannerInput[0].sbom = JSON.stringify(sbom);
|
|
100
|
+
}
|
|
91
101
|
this.reportLog(`[ SCANNER ]: Scanner instance id ${this.getScannerId()}`);
|
|
92
102
|
if (!this.isValidInput(scannerInput)) {
|
|
93
103
|
this.finishScan();
|
|
94
104
|
return this.finishPromise;
|
|
95
105
|
}
|
|
96
|
-
if ((
|
|
106
|
+
if ((_c = scannerInput[0]) === null || _c === void 0 ? void 0 : _c.wfpPath) {
|
|
97
107
|
this.wfpProvider = new WfpSplitter_1.WfpSplitter(this.scannerCfg);
|
|
98
108
|
this.setWinnowerListeners();
|
|
99
109
|
this.wfpProvider.start(scannerInput[0]);
|
|
100
110
|
}
|
|
101
111
|
else {
|
|
102
112
|
const folderRoot = this.scannerInput[0].folderRoot;
|
|
103
|
-
const winnowingMode = (
|
|
113
|
+
const winnowingMode = (_e = (_d = this.scannerInput[0]) === null || _d === void 0 ? void 0 : _d.winnowing) === null || _e === void 0 ? void 0 : _e.mode;
|
|
104
114
|
const obfuscate = this.scannerCfg.WFP_OBFUSCATION;
|
|
105
115
|
const fileList = this.scannerInput[0].fileList;
|
|
106
116
|
this.wfpProvider.start({
|
|
@@ -196,7 +206,6 @@ class Scanner extends eventemitter3_1.default {
|
|
|
196
206
|
this.wfpProvider.resume();
|
|
197
207
|
});
|
|
198
208
|
this.dispatcher.on(ScannerTypes_1.ScannerEvents.DISPATCHER_NEW_DATA, async (response) => {
|
|
199
|
-
console.log("ScannerEvents.DISPATCHER_NEW_DATA");
|
|
200
209
|
this.processedFiles += response.getNumberOfFilesScanned();
|
|
201
210
|
this.reportLog(`[ SCANNER ]: Received results of ${response.getNumberOfFilesScanned()} files`);
|
|
202
211
|
this.emit(ScannerTypes_1.ScannerEvents.DISPATCHER_NEW_DATA, response);
|
|
@@ -274,6 +283,11 @@ class Scanner extends eventemitter3_1.default {
|
|
|
274
283
|
: serverResponse;
|
|
275
284
|
const responses = new DispatcherResponse_1.DispatcherResponse(r, wfpContent);
|
|
276
285
|
this.reportLog(`[ SCANNER ]: Persisted results of ${responses.getNumberOfFilesScanned()} files...`);
|
|
286
|
+
/* if (this.settings) {
|
|
287
|
+
console.log("SERVER RESPONSE: ", responses.serverResponse);
|
|
288
|
+
const removeRule = new RemoveRule(responses.serverResponse, this.settings);
|
|
289
|
+
responses.serverResponse = removeRule.run();
|
|
290
|
+
}*/
|
|
277
291
|
this.emit(ScannerTypes_1.ScannerEvents.RESULTS_APPENDED, responses, this.filesNotScanned);
|
|
278
292
|
return responses;
|
|
279
293
|
}
|
|
@@ -306,7 +320,13 @@ class Scanner extends eventemitter3_1.default {
|
|
|
306
320
|
async finishScan() {
|
|
307
321
|
if (!this.isBufferEmpty())
|
|
308
322
|
this.bufferToFiles();
|
|
309
|
-
|
|
323
|
+
let results = JSON.parse(await fs_1.default.promises.readFile(this.resultFilePath, 'utf8'));
|
|
324
|
+
if (this.settings) {
|
|
325
|
+
const scannerResultsRules = rule_factory_1.ScannerResultsRuleFactory.create(this.settings, results);
|
|
326
|
+
scannerResultsRules.forEach(r => {
|
|
327
|
+
results = r.run();
|
|
328
|
+
});
|
|
329
|
+
}
|
|
310
330
|
if (this.scannerCfg.WFP_OBFUSCATION &&
|
|
311
331
|
this.scannerCfg.RESULTS_DEOBFUSCATION) {
|
|
312
332
|
for (const key of Object.keys(this.obfuscateMap)) {
|
|
@@ -389,4 +409,4 @@ class Scanner extends eventemitter3_1.default {
|
|
|
389
409
|
}
|
|
390
410
|
}
|
|
391
411
|
exports.Scanner = Scanner;
|
|
392
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Scanner.js","sourceRoot":"","sources":["../../../../src/sdk/scanner/Scanner.ts"],"names":[],"mappings":"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"}
|
|
412
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Scanner.js","sourceRoot":"","sources":["../../../../src/sdk/scanner/Scanner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Settings } from "./ScannnerResultPostProcessor/interfaces/types";
|
|
1
2
|
export declare enum ScannerEvents {
|
|
2
3
|
WINNOWING_STARTING = "WINNOWING_STARTING",
|
|
3
4
|
WINNOWING_NEW_CONTENT = "WINNOWING_NEW_CONTENT",
|
|
@@ -34,6 +35,7 @@ export interface BaseScannerInput {
|
|
|
34
35
|
wfpPath?: string;
|
|
35
36
|
sbom?: string;
|
|
36
37
|
sbomMode?: SbomMode;
|
|
38
|
+
settings?: Settings;
|
|
37
39
|
engineFlags?: number;
|
|
38
40
|
winnowing?: {
|
|
39
41
|
mode: WinnowingMode;
|
|
@@ -47,4 +47,4 @@ var ScannerComponentId;
|
|
|
47
47
|
})(ScannerComponentId || (exports.ScannerComponentId = ScannerComponentId = {}));
|
|
48
48
|
;
|
|
49
49
|
/********************** Scanner results types **********************/
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2Nhbm5lclR5cGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3Nkay9zY2FubmVyL1NjYW5uZXJUeXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFHQSxJQUFZLGFBNkJYO0FBN0JELFdBQVksYUFBYTtJQUN2QiwwREFBeUMsQ0FBQTtJQUN6QyxnRUFBK0MsQ0FBQTtJQUMvQyxzREFBcUMsQ0FBQTtJQUNyQywwREFBeUMsQ0FBQTtJQUN6Qyw4Q0FBNkIsQ0FBQTtJQUU3QixnRUFBK0MsQ0FBQTtJQUMvQyw0REFBMkMsQ0FBQTtJQUMzQyw0REFBMkMsQ0FBQTtJQUMzQyxnRkFBK0QsQ0FBQTtJQUMvRCwwRUFBeUQsQ0FBQTtJQUN6RCxvRkFBbUUsQ0FBQTtJQUNuRSxrREFBaUMsQ0FBQTtJQUVqQyxnRUFBK0MsQ0FBQTtJQUUvQyx3REFBdUMsQ0FBQTtJQUN2Qyx3REFBdUMsQ0FBQTtJQUV2Qyx3REFBdUMsQ0FBQTtJQUN2QyxvREFBbUMsQ0FBQTtJQUVuQyx3Q0FBdUIsQ0FBQTtJQUN2QixzREFBcUMsQ0FBQTtJQUVyQyw0Q0FBMkIsQ0FBQTtJQUUzQixnQ0FBZSxDQUFBO0FBQ2pCLENBQUMsRUE3QlcsYUFBYSw2QkFBYixhQUFhLFFBNkJ4QjtBQUFBLENBQUM7QUFFRixJQUFZLGFBSVg7QUFKRCxXQUFZLGFBQWE7SUFDdkIsa0RBQWlDLENBQUE7SUFDakMsNERBQTJDLENBQUE7SUFDM0MsMERBQXlDLENBQUE7QUFDM0MsQ0FBQyxFQUpXLGFBQWEsNkJBQWIsYUFBYSxRQUl4QjtBQUFBLENBQUM7QUFFRixJQUFZLFFBR1g7QUFIRCxXQUFZLFFBQVE7SUFDbEIscUNBQXlCLENBQUE7SUFDekIsc0NBQTBCLENBQUE7QUFDNUIsQ0FBQyxFQUhXLFFBQVEsd0JBQVIsUUFBUSxRQUduQjtBQWdCQSxDQUFDO0FBV0YsSUFBWSxrQkFBdUU7QUFBbkYsV0FBWSxrQkFBa0I7SUFBRSxtQ0FBYSxDQUFBO0lBQUUsbUNBQWEsQ0FBQTtJQUFHLHlDQUFtQixDQUFBO0FBQUEsQ0FBQyxFQUF2RSxrQkFBa0Isa0NBQWxCLGtCQUFrQixRQUFxRDtBQUFBLENBQUM7QUFvRXBGLHFFQUFxRSJ9
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
export interface Settings {
|
|
2
|
+
bom: Bom;
|
|
3
|
+
}
|
|
4
|
+
export interface Bom {
|
|
5
|
+
include: BomItem[];
|
|
6
|
+
remove: BomItem[];
|
|
7
|
+
replace: ReplaceBomItem[];
|
|
8
|
+
}
|
|
9
|
+
export interface BomItem {
|
|
10
|
+
purl: string;
|
|
11
|
+
path?: string;
|
|
12
|
+
}
|
|
13
|
+
export interface ReplaceBomItem extends BomItem {
|
|
14
|
+
replace_with: string;
|
|
15
|
+
}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvc2RrL3NjYW5uZXIvU2Nhbm5uZXJSZXN1bHRQb3N0UHJvY2Vzc29yL2ludGVyZmFjZXMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.RemoveRule = void 0;
|
|
4
|
+
const rule_1 = require("./rule");
|
|
5
|
+
class RemoveRule extends rule_1.Rule {
|
|
6
|
+
constructor(scanResults, settings) {
|
|
7
|
+
super(scanResults);
|
|
8
|
+
this.removeBomItems = settings.bom.remove;
|
|
9
|
+
}
|
|
10
|
+
run() {
|
|
11
|
+
for (const [resultPath, results] of Object.entries(this.scanResults)) {
|
|
12
|
+
for (const bomItem of this.removeBomItems) {
|
|
13
|
+
if (this.applyRule(resultPath, results, bomItem)) {
|
|
14
|
+
const { server } = this.scanResults[resultPath][0];
|
|
15
|
+
this.scanResults[resultPath] = [{ id: 'none', server }];
|
|
16
|
+
break;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
return this.scanResults;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
exports.RemoveRule = RemoveRule;
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVtb3ZlLXJ1bGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvc2RrL3NjYW5uZXIvU2Nhbm5uZXJSZXN1bHRQb3N0UHJvY2Vzc29yL3J1bGVzL3JlbW92ZS1ydWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLGlDQUE0QjtBQUc1QixNQUFhLFVBQVcsU0FBUSxXQUFJO0lBRWhDLFlBQVksV0FBZ0IsRUFBRSxRQUFrQjtRQUM1QyxLQUFLLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDbkIsSUFBSSxDQUFDLGNBQWMsR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQztJQUM5QyxDQUFDO0lBRUQsR0FBRztRQUNDLEtBQUssTUFBTSxDQUFDLFVBQVUsRUFBRSxPQUFPLENBQUMsSUFBSyxNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQWlDLEVBQUUsQ0FBQztZQUNwRyxLQUFJLE1BQU0sT0FBTyxJQUFJLElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQztnQkFDdkMsSUFBRyxJQUFJLENBQUMsU0FBUyxDQUFDLFVBQVUsRUFBQyxPQUFPLEVBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztvQkFDN0MsTUFBTSxFQUFFLE1BQU0sRUFBQyxHQUFJLElBQUksQ0FBQyxXQUFXLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7b0JBQ25ELElBQUksQ0FBQyxXQUFXLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxFQUFDLEVBQUUsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFDLENBQUMsQ0FBQztvQkFDdEQsTUFBTTtnQkFDVCxDQUFDO1lBQ0wsQ0FBQztRQUNMLENBQUM7UUFDRCxPQUFPLElBQUksQ0FBQyxXQUFXLENBQUM7SUFDNUIsQ0FBQztDQUNKO0FBbkJELGdDQW1CQyJ9
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { Rule } from "./rule";
|
|
2
|
+
import { Settings } from "../interfaces/types";
|
|
3
|
+
export declare class ReplaceRule extends Rule {
|
|
4
|
+
private componentData;
|
|
5
|
+
private replaceBomItems;
|
|
6
|
+
constructor(scanResults: any, settings: Settings);
|
|
7
|
+
private generateBaseUrlFromPurl;
|
|
8
|
+
private replace;
|
|
9
|
+
private loadComponentData;
|
|
10
|
+
run(): any;
|
|
11
|
+
}
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ReplaceRule = void 0;
|
|
4
|
+
const rule_1 = require("./rule");
|
|
5
|
+
const packageurl_js_1 = require("packageurl-js");
|
|
6
|
+
class ReplaceRule extends rule_1.Rule {
|
|
7
|
+
constructor(scanResults, settings) {
|
|
8
|
+
super(scanResults);
|
|
9
|
+
this.replaceBomItems = this.orderRules(settings.bom.replace);
|
|
10
|
+
this.componentData = new Map();
|
|
11
|
+
this.loadComponentData();
|
|
12
|
+
}
|
|
13
|
+
generateBaseUrlFromPurl(pkg) {
|
|
14
|
+
switch (pkg.type) {
|
|
15
|
+
case 'github':
|
|
16
|
+
return `https://github.com/${pkg.namespace}/${pkg.name}`;
|
|
17
|
+
case 'npm':
|
|
18
|
+
return `https://registry.npmjs.org/${pkg.name}`;
|
|
19
|
+
case 'maven': {
|
|
20
|
+
const groupPath = (pkg.namespace || '').replace(/\./g, '/');
|
|
21
|
+
const artifactId = pkg.name;
|
|
22
|
+
return `https://repo1.maven.org/maven2/${groupPath}/${artifactId}`;
|
|
23
|
+
}
|
|
24
|
+
case 'pypi':
|
|
25
|
+
return `https://pypi.org/simple/${pkg.name}/`;
|
|
26
|
+
case 'golang':
|
|
27
|
+
if (pkg.namespace && pkg.namespace.includes('github.com')) {
|
|
28
|
+
return `https://${pkg.namespace}/${pkg.name}`;
|
|
29
|
+
}
|
|
30
|
+
return `https://proxy.golang.org/${pkg.namespace}/${pkg.name}`;
|
|
31
|
+
case 'nuget':
|
|
32
|
+
return `https://api.nuget.org/v3-flatcontainer/${pkg.name.toLowerCase()}`;
|
|
33
|
+
default:
|
|
34
|
+
return '';
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
replace(result, bomItem) {
|
|
38
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
39
|
+
result.purl = [bomItem.replace_with];
|
|
40
|
+
const pkg = packageurl_js_1.PackageURL.fromString(bomItem.replace_with);
|
|
41
|
+
const cachedComponent = this.componentData.get(bomItem.replace_with);
|
|
42
|
+
result.vendor = (_a = cachedComponent === null || cachedComponent === void 0 ? void 0 : cachedComponent.vendor) !== null && _a !== void 0 ? _a : pkg.namespace;
|
|
43
|
+
result.licenses = (_b = cachedComponent === null || cachedComponent === void 0 ? void 0 : cachedComponent.licenses) !== null && _b !== void 0 ? _b : [];
|
|
44
|
+
result.component = (_c = cachedComponent === null || cachedComponent === void 0 ? void 0 : cachedComponent.component) !== null && _c !== void 0 ? _c : pkg.name;
|
|
45
|
+
result.url = (_d = cachedComponent === null || cachedComponent === void 0 ? void 0 : cachedComponent.url) !== null && _d !== void 0 ? _d : this.generateBaseUrlFromPurl(pkg);
|
|
46
|
+
result.version = (_e = cachedComponent === null || cachedComponent === void 0 ? void 0 : cachedComponent.version) !== null && _e !== void 0 ? _e : '0.0.0-unknown';
|
|
47
|
+
result.latest = (_f = cachedComponent === null || cachedComponent === void 0 ? void 0 : cachedComponent.latest) !== null && _f !== void 0 ? _f : '0.0.0-unknown';
|
|
48
|
+
result.release_date = (_g = cachedComponent === null || cachedComponent === void 0 ? void 0 : cachedComponent.release_date) !== null && _g !== void 0 ? _g : '-';
|
|
49
|
+
}
|
|
50
|
+
loadComponentData() {
|
|
51
|
+
for (const [path, results] of Object.entries(this.scanResults)) {
|
|
52
|
+
// @ts-ignore
|
|
53
|
+
results.forEach((r) => {
|
|
54
|
+
if (r.id !== 'none') {
|
|
55
|
+
if (r.purl.length > 0) {
|
|
56
|
+
this.componentData.set(r.purl[0], {
|
|
57
|
+
licenses: r.licenses,
|
|
58
|
+
url: r.url,
|
|
59
|
+
component: r.component,
|
|
60
|
+
vendor: r.vendor,
|
|
61
|
+
version: r.version,
|
|
62
|
+
latest: r.latest,
|
|
63
|
+
release_date: r.release_date,
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
run() {
|
|
71
|
+
for (const [resultPath, results] of Object.entries(this.scanResults)) {
|
|
72
|
+
for (const bomItem of this.replaceBomItems) {
|
|
73
|
+
if (this.applyRule(resultPath, results, bomItem)) {
|
|
74
|
+
results.forEach((r) => {
|
|
75
|
+
this.replace(r, bomItem);
|
|
76
|
+
});
|
|
77
|
+
break;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
return this.scanResults;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
exports.ReplaceRule = ReplaceRule;
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwbGFjZS1ydWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3Nkay9zY2FubmVyL1NjYW5ubmVyUmVzdWx0UG9zdFByb2Nlc3Nvci9ydWxlcy9yZXBsYWNlLXJ1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsaUNBQTRCO0FBRTVCLGlEQUEyQztBQVkzQyxNQUFhLFdBQVksU0FBUSxXQUFJO0lBR2pDLFlBQVksV0FBZSxFQUFFLFFBQWtCO1FBQzNDLEtBQUssQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNuQixJQUFJLENBQUMsZUFBZSxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQTBCLENBQUM7UUFDdEYsSUFBSSxDQUFDLGFBQWEsR0FBRyxJQUFJLEdBQUcsRUFBeUIsQ0FBQztRQUN0RCxJQUFJLENBQUMsaUJBQWlCLEVBQUUsQ0FBQztJQUM3QixDQUFDO0lBRU8sdUJBQXVCLENBQUMsR0FBZTtRQUUzQyxRQUFRLEdBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUVqQixLQUFLLFFBQVE7Z0JBQ1gsT0FBTyxzQkFBc0IsR0FBRyxDQUFDLFNBQVMsSUFBSSxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUM7WUFFM0QsS0FBSyxLQUFLO2dCQUNSLE9BQU8sOEJBQThCLEdBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUVsRCxLQUFLLE9BQU8sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsTUFBTSxTQUFTLEdBQUcsQ0FBQyxHQUFHLENBQUMsU0FBUyxJQUFJLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsR0FBRyxDQUFDLENBQUM7Z0JBQzVELE1BQU0sVUFBVSxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUM7Z0JBQzVCLE9BQU8sa0NBQWtDLFNBQVMsSUFBSSxVQUFVLEVBQUUsQ0FBQztZQUNyRSxDQUFDO1lBRUQsS0FBSyxNQUFNO2dCQUNU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
|