scanoss 0.15.2 → 0.15.4
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 +56 -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/Dependencies/LocalDependency/parsers/nugetParser.js +4 -3
- package/build/main/sdk/Dependencies/LocalDependency/parsers/parser.spec.js +10 -1
- package/build/main/sdk/scanner/Scanner.d.ts +1 -0
- package/build/main/sdk/scanner/Scanner.js +23 -2
- 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 +36 -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 +53 -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/Dependencies/LocalDependency/parsers/nugetParser.js +3 -3
- package/build/module/sdk/Dependencies/LocalDependency/parsers/parser.spec.js +10 -1
- package/build/module/sdk/scanner/Scanner.d.ts +1 -0
- package/build/module/sdk/scanner/Scanner.js +24 -2
- 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 +33 -0
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -4,7 +4,7 @@ import { SbomMode, ScannerEvents, WinnowingMode, } from '../../sdk/scanner/Scann
|
|
|
4
4
|
import { ScannerCfg } from '../../sdk/scanner/ScannerCfg';
|
|
5
5
|
import { Tree } from '../../sdk/tree/Tree';
|
|
6
6
|
import cliProgress from 'cli-progress';
|
|
7
|
-
import { getProjectNameFromPath, isFolder } from
|
|
7
|
+
import { getProjectNameFromPath, getSettingsFilePath, isFolder } from "./helpers";
|
|
8
8
|
import { DependencyScannerCfg } from '../../sdk/Dependencies/DependencyScannerCfg';
|
|
9
9
|
import { DependencyScanner } from '../../sdk/Dependencies/DependencyScanner';
|
|
10
10
|
import { ScanFilter } from '../../sdk/tree/Filters/ScanFilter';
|
|
@@ -60,6 +60,24 @@ export async function scanHandler(rootPath, options) {
|
|
|
60
60
|
await scannerCfg.validate();
|
|
61
61
|
const scanner = new Scanner(scannerCfg);
|
|
62
62
|
let scannerInput = { fileList: [] };
|
|
63
|
+
// SBOM Ingestion
|
|
64
|
+
if (options.ignore) {
|
|
65
|
+
scannerInput.sbom = fs.readFileSync(options.ignore, 'utf-8');
|
|
66
|
+
scannerInput.sbomMode = SbomMode.SBOM_IGNORE;
|
|
67
|
+
}
|
|
68
|
+
// Settings Ingestion
|
|
69
|
+
if (!options.skipSettingsFile) {
|
|
70
|
+
const settingsFilePath = await getSettingsFilePath(options.settings, rootPath);
|
|
71
|
+
if (settingsFilePath) {
|
|
72
|
+
try {
|
|
73
|
+
scannerInput.settings = JSON.parse(fs.readFileSync(settingsFilePath, "utf-8"));
|
|
74
|
+
scannerInput.sbomMode = SbomMode.SBOM_IDENTIFY;
|
|
75
|
+
}
|
|
76
|
+
catch (e) {
|
|
77
|
+
throw new Error(`SCANOSS Settings file cannot be found at: ${settingsFilePath}.`);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
}
|
|
63
81
|
scannerInput.folderRoot = rootPath + path.sep; // This will remove the project root path from the results.
|
|
64
82
|
if (options.flags)
|
|
65
83
|
scannerInput.engineFlags = options.flags;
|
|
@@ -115,10 +133,6 @@ export async function scanHandler(rootPath, options) {
|
|
|
115
133
|
else {
|
|
116
134
|
scanner.on(ScannerEvents.SCANNER_LOG, (logText) => console.error(logText));
|
|
117
135
|
}
|
|
118
|
-
if (options.ignore) {
|
|
119
|
-
scannerInput.sbom = fs.readFileSync(options.ignore, 'utf-8');
|
|
120
|
-
scannerInput.sbomMode = SbomMode.SBOM_IGNORE;
|
|
121
|
-
}
|
|
122
136
|
// Dependency scanner
|
|
123
137
|
let pDependencyScanner = Promise.resolve({});
|
|
124
138
|
if (options.dependencies) {
|
|
@@ -130,7 +144,7 @@ export async function scanHandler(rootPath, options) {
|
|
|
130
144
|
pScanner,
|
|
131
145
|
pDependencyScanner,
|
|
132
146
|
]);
|
|
133
|
-
|
|
147
|
+
let scannerResults = JSON.parse(await fs.promises.readFile(scannerResultPath, 'utf-8'));
|
|
134
148
|
//TODO Unify results.json and dependency.json. What happens with result.json that includes dependencies?
|
|
135
149
|
const scannersResults = {
|
|
136
150
|
scanner: scannerResults,
|
|
@@ -153,4 +167,4 @@ export async function scanHandler(rootPath, options) {
|
|
|
153
167
|
else
|
|
154
168
|
console.log(scannerResultsString);
|
|
155
169
|
}
|
|
156
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
170
|
+
//# 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/module/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/module/index.js
CHANGED
|
@@ -3,6 +3,7 @@ export * from './sdk/scanner/Scanner';
|
|
|
3
3
|
export * from './sdk/scanner/ScannerTypes';
|
|
4
4
|
export * from './sdk/scanner/ScannerCfg';
|
|
5
5
|
export * from './sdk/scanner/WfpProvider/WfpCalculator/WfpCalculator';
|
|
6
|
+
export * from './sdk/scanner/ScannnerResultPostProcessor/interfaces/types';
|
|
6
7
|
// *** Fingerprint exports *** //
|
|
7
8
|
export * from './sdk/scanner/Fingerprint';
|
|
8
9
|
// *** Dependency scanner exports *** //
|
|
@@ -31,4 +32,4 @@ export * from './sdk/Services/Grpc/DependencyService';
|
|
|
31
32
|
// *** Http ***//
|
|
32
33
|
export * from './sdk/Services/http/HttpClient';
|
|
33
34
|
export { logger } from './sdk/Logger';
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsa0NBQWtDO0FBQ2xDLGNBQWMsdUJBQXVCLENBQUM7QUFDdEMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsdURBQXVELENBQUM7QUFDdEUsY0FBYyw0REFBNEQsQ0FBQztBQUUzRSxpQ0FBaUM7QUFDakMsY0FBYywyQkFBMkIsQ0FBQztBQUcxQyx3Q0FBd0M7QUFDeEMsY0FBYyxvQ0FBb0MsQ0FBQztBQUNuRCxjQUFjLHlDQUF5QyxDQUFDO0FBQ3hELGNBQWMsc0NBQXNDLENBQUM7QUFDckQsY0FBYyxvREFBb0QsQ0FBQztBQUVuRSwwQ0FBMEM7QUFDMUMsY0FBYyx3Q0FBd0MsQ0FBQztBQUN2RCxjQUFjLDhCQUE4QixDQUFDO0FBQzdDLGNBQWMsc0NBQXNDLENBQUM7QUFFckQsMkJBQTJCO0FBQzNCLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyx1Q0FBdUMsQ0FBQztBQUN0RCxjQUFjLDRDQUE0QyxDQUFDO0FBQzNELGNBQWMsMERBQTBELENBQUM7QUFDekUsY0FBYywwREFBMEQsQ0FBQztBQUN6RSxjQUFjLDZEQUE2RCxDQUFDO0FBQzVFLGNBQWMsNERBQTRELENBQUM7QUFFM0UsbUJBQW1CO0FBQ25CLGNBQWMsdUNBQXVDLENBQUM7QUFFdEQsdUJBQXVCO0FBQ3ZCLGNBQWMsMkJBQTJCLENBQUM7QUFHMUMsY0FBYyx5Q0FBeUMsQ0FBQztBQUN4RCxjQUFjLHVDQUF1QyxDQUFDO0FBR3RELGlCQUFpQjtBQUNqQixjQUFjLGdDQUFnQyxDQUFBO0FBRTlDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxjQUFjLENBQUMifQ==
|
|
@@ -9,7 +9,7 @@ export function csprojParser(fileContent, filePath) {
|
|
|
9
9
|
const itemGroups = project.elements.filter(item => item.name == 'ItemGroup');
|
|
10
10
|
const packageReference = [];
|
|
11
11
|
itemGroups.forEach(itemGroup => {
|
|
12
|
-
itemGroup.elements
|
|
12
|
+
itemGroup.elements?.forEach(item => {
|
|
13
13
|
if (item.name == "PackageReference")
|
|
14
14
|
packageReference.push(item);
|
|
15
15
|
});
|
|
@@ -25,7 +25,7 @@ export function csprojParser(fileContent, filePath) {
|
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
27
|
catch (e) {
|
|
28
|
-
console.error(e);
|
|
28
|
+
console.error("File path:", filePath, e);
|
|
29
29
|
return Promise.resolve({ file: filePath, purls: [] });
|
|
30
30
|
}
|
|
31
31
|
return Promise.resolve(results);
|
|
@@ -46,4 +46,4 @@ export function packagesConfigParser(fileContent, filePath) {
|
|
|
46
46
|
});
|
|
47
47
|
return Promise.resolve(results);
|
|
48
48
|
}
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnVnZXRQYXJzZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvc2RrL0RlcGVuZGVuY2llcy9Mb2NhbERlcGVuZGVuY3kvcGFyc2Vycy9udWdldFBhcnNlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEdBQWdCLE1BQU0sUUFBUSxDQUFDO0FBQ3RDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFM0MsTUFBTSxTQUFTLEdBQUcsT0FBTyxDQUFDO0FBRTFCLE1BQU0sVUFBVSxZQUFZLENBQUMsV0FBbUIsRUFBRSxRQUFnQjtJQUVoRSxNQUFNLE9BQU8sR0FBcUIsRUFBQyxJQUFJLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUMsQ0FBQztJQUU5RCxJQUFJLENBQUM7UUFDSCxNQUFNLFdBQVcsR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQzVDLE1BQU0sT0FBTyxHQUFHLFdBQVcsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLElBQUksSUFBSSxTQUFTLENBQUMsQ0FBQztRQUMxRSxNQUFNLFVBQVUsR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLElBQUksV0FBVyxDQUFDLENBQUM7UUFFN0UsTUFBTSxnQkFBZ0IsR0FBbUIsRUFBRSxDQUFDO1FBQzVDLFVBQVUsQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUU7WUFDN0IsU0FBUyxDQUFDLFFBQVEsRUFBRSxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUU7Z0JBQ2pDLElBQUksSUFBSSxDQUFDLElBQUksSUFBSSxrQkFBa0I7b0JBQ2pDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNoQyxDQUFDLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO1FBRUgsaUJBQWlCO1FBQ2pCLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsRUFBRTtZQUNyQyxNQUFNLFdBQVcsR0FBRyxXQUFXLENBQUMsVUFBVSxFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUsQ0FBQztZQUNoRSxNQUFNLE9BQU8sR0FBRyxXQUFXLENBQUMsVUFBVSxFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUsQ0FBQztZQUU1RCxPQUFPLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQztnQkFDakIsSUFBSSxFQUFFLElBQUksVUFBVSxDQUFDLFNBQVMsRUFBRSxJQUFJLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUMsSUFBSSxDQUFDLENBQUMsUUFBUSxFQUFFO2dCQUM5RSxXQUFXLEVBQUUsT0FBTzthQUNyQixDQUFDLENBQUE7UUFDSixDQUFDLENBQUMsQ0FBQztJQUVMLENBQUM7SUFBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1FBQ1gsT0FBTyxDQUFDLEtBQUssQ0FBQyxZQUFZLEVBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3hDLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUFDLElBQUksRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBQyxDQUFDLENBQUM7SUFDdEQsQ0FBQztJQUVELE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQTtBQUNqQyxDQUFDO0FBR0QsTUFBTSxVQUFVLG9CQUFvQixDQUFDLFdBQW1CLEVBQUUsUUFBZ0I7SUFFeEUsTUFBTSxPQUFPLEdBQXFCLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLENBQUM7SUFDaEUsTUFBTSxhQUFhLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUU5QyxNQUFNLFFBQVEsR0FBRyxhQUFhLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLElBQUksVUFBVSxDQUFDLENBQUE7SUFFL0UsUUFBUSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRTtRQUNyQixHQUFHLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRTtZQUN6QixNQUFNLE9BQU8sR0FBRyxHQUFHLENBQUMsVUFBVSxFQUFFLEVBQUUsQ0FBQztZQUNuQyxNQUFNLFVBQVUsR0FBRyxHQUFHLENBQUMsVUFBVSxFQUFFLE9BQU8sQ0FBQztZQUUzQyxPQUFPLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQztnQkFDakIsSUFBSSxFQUFFLElBQUksVUFBVSxDQUFDLFNBQVMsRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUMsUUFBUSxFQUFFO2dCQUMzRSxXQUFXLEVBQUUsVUFBVTthQUN4QixDQUFDLENBQUE7UUFDSixDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUMsQ0FBQyxDQUFDO0lBRUgsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0FBQ2xDLENBQUMifQ==
|