scanoss 0.33.0 → 0.35.0
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/CHANGELOG.md +16 -2
- package/build/main/cli/bin/cli-bin.js +6 -1
- package/build/main/cli/commands/helpers.js +5 -2
- package/build/main/cli/commands/scan.js +25 -4
- package/build/main/index.d.ts +1 -0
- package/build/main/index.js +2 -1
- package/build/main/sdk/Decompress/Decompressor/DecompressZips.js +3 -2
- package/build/main/sdk/Dependencies/LocalDependency/LocalDependency.js +4 -1
- package/build/main/sdk/Dependencies/LocalDependency/parsers/parser.spec.js +54 -1
- package/build/main/sdk/Dependencies/LocalDependency/parsers/pnpmParser.d.ts +2 -0
- package/build/main/sdk/Dependencies/LocalDependency/parsers/pnpmParser.js +257 -0
- package/build/main/sdk/Dependencies/LocalDependency/parsers/pyParser.d.ts +1 -0
- package/build/main/sdk/Dependencies/LocalDependency/parsers/pyParser.js +26 -9
- package/build/main/sdk/scanner/Dispatcher/DispatchableItem.d.ts +4 -0
- package/build/main/sdk/scanner/Dispatcher/DispatchableItem.js +7 -1
- package/build/main/sdk/scanner/Dispatcher/Dispatcher.d.ts +1 -0
- package/build/main/sdk/scanner/Dispatcher/Dispatcher.js +20 -8
- package/build/main/sdk/scanner/ScanSettingsBuilder.d.ts +13 -0
- package/build/main/sdk/scanner/ScanSettingsBuilder.js +95 -0
- package/build/main/sdk/scanner/ScanSettingsBuilder.spec.d.ts +1 -0
- package/build/main/sdk/scanner/ScanSettingsBuilder.spec.js +238 -0
- package/build/main/sdk/scanner/Scanner.js +4 -2
- package/build/main/sdk/scanner/ScannnerResultPostProcessor/interfaces/types.d.ts +13 -1
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/module/cli/bin/cli-bin.js +6 -1
- package/build/module/cli/commands/helpers.js +5 -2
- package/build/module/cli/commands/scan.js +24 -4
- package/build/module/index.d.ts +1 -0
- package/build/module/index.js +2 -1
- package/build/module/sdk/Decompress/Decompressor/DecompressZips.js +3 -2
- package/build/module/sdk/Dependencies/LocalDependency/LocalDependency.js +5 -2
- package/build/module/sdk/Dependencies/LocalDependency/parsers/parser.spec.js +54 -1
- package/build/module/sdk/Dependencies/LocalDependency/parsers/pnpmParser.d.ts +2 -0
- package/build/module/sdk/Dependencies/LocalDependency/parsers/pnpmParser.js +251 -0
- package/build/module/sdk/Dependencies/LocalDependency/parsers/pyParser.d.ts +1 -0
- package/build/module/sdk/Dependencies/LocalDependency/parsers/pyParser.js +25 -9
- package/build/module/sdk/scanner/Dispatcher/DispatchableItem.d.ts +4 -0
- package/build/module/sdk/scanner/Dispatcher/DispatchableItem.js +8 -1
- package/build/module/sdk/scanner/Dispatcher/Dispatcher.d.ts +1 -0
- package/build/module/sdk/scanner/Dispatcher/Dispatcher.js +20 -8
- package/build/module/sdk/scanner/ScanSettingsBuilder.d.ts +13 -0
- package/build/module/sdk/scanner/ScanSettingsBuilder.js +86 -0
- package/build/module/sdk/scanner/ScanSettingsBuilder.spec.d.ts +1 -0
- package/build/module/sdk/scanner/ScanSettingsBuilder.spec.js +236 -0
- package/build/module/sdk/scanner/Scanner.js +4 -2
- package/build/module/sdk/scanner/ScannnerResultPostProcessor/interfaces/types.d.ts +13 -1
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,251 @@
|
|
|
1
|
+
import path from "path";
|
|
2
|
+
import { PackageURL } from "packageurl-js";
|
|
3
|
+
const PURL_TYPE = "npm";
|
|
4
|
+
const MANIFEST_FILE = "pnpm-lock.yaml";
|
|
5
|
+
// Regex for pnpm lockfile v5 format: /package-name/version or /@scope/package-name/version
|
|
6
|
+
// May include peer dep suffixes like /@scope/pkg/1.0.0_peer@2.0.0
|
|
7
|
+
const V5_PACKAGE_REGEX = /^\s{2,4}\/?(?<fullname>(?:@(?<scope>[^/]+)\/)?(?<name>[^/]+))\/(?<version>\d[^_:]*)/;
|
|
8
|
+
// Regex for pnpm lockfile v6+ format: /package-name@version or /@scope/package-name@version
|
|
9
|
+
// May include peer dep suffixes like /@scope/pkg@1.0.0(@peer/pkg@2.0.0)
|
|
10
|
+
const V6_PACKAGE_REGEX = /^\s{2,4}'?\/?(?<fullname>(?:@(?<scope>[^/@]+)\/)?(?<name>[^@']+))@(?<version>\d[^(':\s]*)/;
|
|
11
|
+
function parseLockfileVersion(fileContent) {
|
|
12
|
+
const match = fileContent.match(/^lockfileVersion:\s*'?(\d+)/m);
|
|
13
|
+
if (match)
|
|
14
|
+
return parseInt(match[1], 10);
|
|
15
|
+
return 0;
|
|
16
|
+
}
|
|
17
|
+
// For pnpm v9+: Parse importers section to get direct prod/dev dependency resolved versions.
|
|
18
|
+
// Returns sets of package keys like "express@4.18.2" or "@angular/core@14.2.0".
|
|
19
|
+
function parseImportersDeps(lines) {
|
|
20
|
+
const prodKeys = new Set();
|
|
21
|
+
const devKeys = new Set();
|
|
22
|
+
let inImporters = false;
|
|
23
|
+
let currentTarget = null;
|
|
24
|
+
let pkgName = null;
|
|
25
|
+
for (const line of lines) {
|
|
26
|
+
const trimmed = line.trimEnd();
|
|
27
|
+
if (trimmed === '')
|
|
28
|
+
continue;
|
|
29
|
+
if (/^importers:\s*$/.test(trimmed)) {
|
|
30
|
+
inImporters = true;
|
|
31
|
+
currentTarget = null;
|
|
32
|
+
pkgName = null;
|
|
33
|
+
continue;
|
|
34
|
+
}
|
|
35
|
+
if (!inImporters)
|
|
36
|
+
continue;
|
|
37
|
+
// End of importers section (next top-level key)
|
|
38
|
+
if (/^\S/.test(trimmed) && !trimmed.startsWith('#')) {
|
|
39
|
+
inImporters = false;
|
|
40
|
+
break;
|
|
41
|
+
}
|
|
42
|
+
const indent = line.search(/\S/);
|
|
43
|
+
// Workspace key at indent 2 (e.g., " .:" or " packages/app:")
|
|
44
|
+
if (indent === 2) {
|
|
45
|
+
currentTarget = null;
|
|
46
|
+
pkgName = null;
|
|
47
|
+
continue;
|
|
48
|
+
}
|
|
49
|
+
// Section header at indent 4 (dependencies:, devDependencies:, etc.)
|
|
50
|
+
if (indent === 4) {
|
|
51
|
+
if (/^\s{4}dependencies:\s*$/.test(trimmed) || /^\s{4}optionalDependencies:\s*$/.test(trimmed)) {
|
|
52
|
+
currentTarget = prodKeys;
|
|
53
|
+
}
|
|
54
|
+
else if (/^\s{4}devDependencies:\s*$/.test(trimmed)) {
|
|
55
|
+
currentTarget = devKeys;
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
currentTarget = null;
|
|
59
|
+
}
|
|
60
|
+
pkgName = null;
|
|
61
|
+
continue;
|
|
62
|
+
}
|
|
63
|
+
if (!currentTarget)
|
|
64
|
+
continue;
|
|
65
|
+
// Package name at indent 6 (e.g., " express:" or " '@angular/core':")
|
|
66
|
+
if (indent === 6) {
|
|
67
|
+
const match = trimmed.match(/^\s{6}'?([^':]+)'?:\s*$/);
|
|
68
|
+
if (match) {
|
|
69
|
+
pkgName = match[1];
|
|
70
|
+
}
|
|
71
|
+
continue;
|
|
72
|
+
}
|
|
73
|
+
// Version at indent 8 (e.g., " version: 4.18.2" or " version: 14.2.0(rxjs@7.8.0)")
|
|
74
|
+
if (indent === 8 && pkgName) {
|
|
75
|
+
const match = trimmed.match(/^\s{8}version:\s*'?([^'\s]+)'?\s*$/);
|
|
76
|
+
if (match) {
|
|
77
|
+
// Strip peer dep suffixes in parentheses
|
|
78
|
+
const version = match[1].replace(/\(.*$/, '');
|
|
79
|
+
currentTarget.add(`${pkgName}@${version}`);
|
|
80
|
+
pkgName = null;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
return { prodKeys, devKeys };
|
|
85
|
+
}
|
|
86
|
+
// For pnpm v9+: Build dependency graph from snapshots section.
|
|
87
|
+
// Maps each package key (e.g., "express@4.18.2") to its dependency keys.
|
|
88
|
+
function buildSnapshotGraph(lines) {
|
|
89
|
+
const graph = new Map();
|
|
90
|
+
let inSnapshots = false;
|
|
91
|
+
let currentKey = null;
|
|
92
|
+
let inDeps = false;
|
|
93
|
+
for (const line of lines) {
|
|
94
|
+
const trimmed = line.trimEnd();
|
|
95
|
+
if (trimmed === '')
|
|
96
|
+
continue;
|
|
97
|
+
if (/^snapshots:\s*$/.test(trimmed)) {
|
|
98
|
+
inSnapshots = true;
|
|
99
|
+
currentKey = null;
|
|
100
|
+
inDeps = false;
|
|
101
|
+
continue;
|
|
102
|
+
}
|
|
103
|
+
if (!inSnapshots)
|
|
104
|
+
continue;
|
|
105
|
+
// End of snapshots section (next top-level key)
|
|
106
|
+
if (/^\S/.test(trimmed) && !trimmed.startsWith('#')) {
|
|
107
|
+
inSnapshots = false;
|
|
108
|
+
break;
|
|
109
|
+
}
|
|
110
|
+
const indent = line.search(/\S/);
|
|
111
|
+
// Snapshot entry at indent 2 (e.g., " express@4.18.2:" or " lodash@4.17.21: {}")
|
|
112
|
+
if (indent === 2) {
|
|
113
|
+
const match = trimmed.match(/^\s{2}'?(.+?)(?:\([^)]*\))*'?:\s*(\{\})?\s*$/);
|
|
114
|
+
if (match) {
|
|
115
|
+
// Strip peer dep suffixes from key
|
|
116
|
+
currentKey = match[1].replace(/\(.*$/, '');
|
|
117
|
+
if (!graph.has(currentKey)) {
|
|
118
|
+
graph.set(currentKey, []);
|
|
119
|
+
}
|
|
120
|
+
inDeps = false;
|
|
121
|
+
// Empty entry like " lodash@4.17.21: {}"
|
|
122
|
+
if (match[2] === '{}') {
|
|
123
|
+
currentKey = null;
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
continue;
|
|
127
|
+
}
|
|
128
|
+
if (!currentKey)
|
|
129
|
+
continue;
|
|
130
|
+
// Subsection header at indent 4
|
|
131
|
+
if (indent === 4) {
|
|
132
|
+
inDeps = /^\s{4}(?:dependencies|optionalDependencies):\s*$/.test(trimmed);
|
|
133
|
+
continue;
|
|
134
|
+
}
|
|
135
|
+
// Dependency entry at indent 6 (e.g., " accepts: 1.3.8")
|
|
136
|
+
if (indent === 6 && inDeps) {
|
|
137
|
+
const match = trimmed.match(/^\s{6}'?([^':]+)'?:\s*'?([^'\s]+)'?/);
|
|
138
|
+
if (match) {
|
|
139
|
+
const depVersion = match[2].replace(/\(.*$/, '');
|
|
140
|
+
const depKey = `${match[1]}@${depVersion}`;
|
|
141
|
+
graph.get(currentKey).push(depKey);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
return graph;
|
|
146
|
+
}
|
|
147
|
+
// BFS from prod dependencies through the snapshot graph to find all production-reachable packages.
|
|
148
|
+
function findProductionPackages(prodKeys, graph) {
|
|
149
|
+
const visited = new Set();
|
|
150
|
+
const queue = [...prodKeys];
|
|
151
|
+
while (queue.length > 0) {
|
|
152
|
+
const key = queue.shift();
|
|
153
|
+
if (visited.has(key))
|
|
154
|
+
continue;
|
|
155
|
+
visited.add(key);
|
|
156
|
+
const deps = graph.get(key);
|
|
157
|
+
if (deps) {
|
|
158
|
+
for (const dep of deps) {
|
|
159
|
+
if (!visited.has(dep)) {
|
|
160
|
+
queue.push(dep);
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
return visited;
|
|
166
|
+
}
|
|
167
|
+
function parsePackagesSection(fileContent) {
|
|
168
|
+
const entries = [];
|
|
169
|
+
const lines = fileContent.split('\n');
|
|
170
|
+
const lockfileVersion = parseLockfileVersion(fileContent);
|
|
171
|
+
let inPackagesSection = false;
|
|
172
|
+
let currentEntry = null;
|
|
173
|
+
const packageRegex = lockfileVersion >= 6 ? V6_PACKAGE_REGEX : V5_PACKAGE_REGEX;
|
|
174
|
+
// For v9+, determine dev scope from importers + snapshots instead of dev: flag
|
|
175
|
+
let prodPackages = null;
|
|
176
|
+
if (lockfileVersion >= 9) {
|
|
177
|
+
const { prodKeys, devKeys } = parseImportersDeps(lines);
|
|
178
|
+
// Only use v9 logic if importers section was found; otherwise fall back to defaults
|
|
179
|
+
if (prodKeys.size > 0 || devKeys.size > 0) {
|
|
180
|
+
const graph = buildSnapshotGraph(lines);
|
|
181
|
+
prodPackages = findProductionPackages(prodKeys, graph);
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
for (const line of lines) {
|
|
185
|
+
// Detect start of packages section
|
|
186
|
+
if (/^packages:/.test(line)) {
|
|
187
|
+
inPackagesSection = true;
|
|
188
|
+
continue;
|
|
189
|
+
}
|
|
190
|
+
// Detect end of packages section (next top-level key)
|
|
191
|
+
if (inPackagesSection && /^\S/.test(line) && !line.startsWith('#')) {
|
|
192
|
+
// Save last entry
|
|
193
|
+
if (currentEntry)
|
|
194
|
+
entries.push(currentEntry);
|
|
195
|
+
inPackagesSection = false;
|
|
196
|
+
continue;
|
|
197
|
+
}
|
|
198
|
+
if (!inPackagesSection)
|
|
199
|
+
continue;
|
|
200
|
+
// Try to match a package key line
|
|
201
|
+
const match = line.match(packageRegex);
|
|
202
|
+
if (match && match.groups) {
|
|
203
|
+
// Save previous entry
|
|
204
|
+
if (currentEntry)
|
|
205
|
+
entries.push(currentEntry);
|
|
206
|
+
const pkgScope = match.groups.scope || undefined;
|
|
207
|
+
const pkgName = match.groups.name;
|
|
208
|
+
const pkgVersion = match.groups.version;
|
|
209
|
+
let isDev = false;
|
|
210
|
+
if (lockfileVersion >= 9 && prodPackages) {
|
|
211
|
+
// For v9+, a package is dev if it's NOT reachable from production dependencies
|
|
212
|
+
const key = pkgScope ? `@${pkgScope}/${pkgName}@${pkgVersion}` : `${pkgName}@${pkgVersion}`;
|
|
213
|
+
isDev = !prodPackages.has(key);
|
|
214
|
+
}
|
|
215
|
+
currentEntry = {
|
|
216
|
+
scope: pkgScope,
|
|
217
|
+
name: pkgName,
|
|
218
|
+
version: pkgVersion,
|
|
219
|
+
dev: isDev,
|
|
220
|
+
};
|
|
221
|
+
continue;
|
|
222
|
+
}
|
|
223
|
+
// Check for dev flag within current entry (v5-v8 only)
|
|
224
|
+
if (lockfileVersion < 9 && currentEntry && /^\s+dev:\s*true/.test(line)) {
|
|
225
|
+
currentEntry.dev = true;
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
// Don't forget last entry
|
|
229
|
+
if (currentEntry)
|
|
230
|
+
entries.push(currentEntry);
|
|
231
|
+
return entries;
|
|
232
|
+
}
|
|
233
|
+
export function pnpmLockParser(fileContent, filePath) {
|
|
234
|
+
const results = { file: filePath, purls: [] };
|
|
235
|
+
if (path.basename(filePath) != MANIFEST_FILE)
|
|
236
|
+
return Promise.resolve(results);
|
|
237
|
+
try {
|
|
238
|
+
const packages = parsePackagesSection(fileContent);
|
|
239
|
+
for (const pkg of packages) {
|
|
240
|
+
const namespace = pkg.scope ? `@${pkg.scope}` : undefined;
|
|
241
|
+
const purlString = new PackageURL(PURL_TYPE, namespace, pkg.name, pkg.version, undefined, undefined).toString();
|
|
242
|
+
const scope = pkg.dev ? "devDependencies" : "dependencies";
|
|
243
|
+
results.purls.push({ purl: purlString, requirement: pkg.version, scope: scope });
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
catch (e) {
|
|
247
|
+
console.error(e);
|
|
248
|
+
}
|
|
249
|
+
return Promise.resolve(results);
|
|
250
|
+
}
|
|
251
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pnpmParser.js","sourceRoot":"","sources":["../../../../../../src/sdk/Dependencies/LocalDependency/parsers/pnpmParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
import { ILocalDependency } from "../DependencyTypes";
|
|
2
2
|
export declare function requirementsParser(fileContent: string, filePath: string): Promise<ILocalDependency>;
|
|
3
|
+
export declare function pipRequirementsLockParser(fileContent: string, filePath: string): Promise<ILocalDependency>;
|
|
@@ -10,14 +10,8 @@ function parseDep(str) {
|
|
|
10
10
|
};
|
|
11
11
|
}
|
|
12
12
|
const PURL_TYPE = 'pypi';
|
|
13
|
-
|
|
14
|
-
// See reference on: https://pip.pypa.io/en/stable/reference/requirements-file-format/
|
|
15
|
-
const MANIFEST_FILE = 'requirements.txt';
|
|
16
|
-
export function requirementsParser(fileContent, filePath) {
|
|
17
|
-
// If the file is not a python manifest file, return an empty results
|
|
13
|
+
function parseRequirementsContent(fileContent, filePath) {
|
|
18
14
|
const results = { file: filePath, purls: [] };
|
|
19
|
-
if (path.basename(filePath) != MANIFEST_FILE)
|
|
20
|
-
return Promise.resolve(results);
|
|
21
15
|
const lines = fileContent.split('\n');
|
|
22
16
|
for (let line of lines) {
|
|
23
17
|
line = line.trim();
|
|
@@ -35,6 +29,9 @@ export function requirementsParser(fileContent, filePath) {
|
|
|
35
29
|
else if (line.startsWith('-r')) {
|
|
36
30
|
continue;
|
|
37
31
|
} // Recursive dependencies (NOT SUPPORTED YET)
|
|
32
|
+
else if (line.startsWith('-')) {
|
|
33
|
+
continue;
|
|
34
|
+
} // Skip pip options (e.g. --hash, -i, -e, etc.)
|
|
38
35
|
else {
|
|
39
36
|
const dep = parseDep(line);
|
|
40
37
|
if (!dep.sym) {
|
|
@@ -52,6 +49,25 @@ export function requirementsParser(fileContent, filePath) {
|
|
|
52
49
|
}
|
|
53
50
|
}
|
|
54
51
|
}
|
|
55
|
-
return
|
|
52
|
+
return results;
|
|
53
|
+
}
|
|
54
|
+
// Parse a requirements.txt file from python projects
|
|
55
|
+
// See reference on: https://pip.pypa.io/en/stable/reference/requirements-file-format/
|
|
56
|
+
const MANIFEST_FILE = 'requirements.txt';
|
|
57
|
+
export function requirementsParser(fileContent, filePath) {
|
|
58
|
+
// If the file is not a python manifest file, return an empty results
|
|
59
|
+
const results = { file: filePath, purls: [] };
|
|
60
|
+
if (path.basename(filePath) != MANIFEST_FILE)
|
|
61
|
+
return Promise.resolve(results);
|
|
62
|
+
return Promise.resolve(parseRequirementsContent(fileContent, filePath));
|
|
63
|
+
}
|
|
64
|
+
// Parse a pip_requirements_lock.txt file (pip-compile / pip-tools lock file)
|
|
65
|
+
// Same format as requirements.txt but typically with pinned versions (==)
|
|
66
|
+
const LOCK_MANIFEST_FILE = 'pip_requirements_lock.txt';
|
|
67
|
+
export function pipRequirementsLockParser(fileContent, filePath) {
|
|
68
|
+
const results = { file: filePath, purls: [] };
|
|
69
|
+
if (path.basename(filePath) != LOCK_MANIFEST_FILE)
|
|
70
|
+
return Promise.resolve(results);
|
|
71
|
+
return Promise.resolve(parseRequirementsContent(fileContent, filePath));
|
|
56
72
|
}
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHlQYXJzZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvc2RrL0RlcGVuZGVuY2llcy9Mb2NhbERlcGVuZGVuY3kvcGFyc2Vycy9weVBhcnNlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLElBQUksTUFBTSxNQUFNLENBQUM7QUFDeEIsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUUzQyxPQUFPLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUdsRCxTQUFTLFFBQVEsQ0FBRSxHQUFXO0lBQzVCLE1BQU0sR0FBRyxHQUFHLDBEQUEwRCxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNqRixPQUFPO1FBQ0wsSUFBSSxFQUFFLEdBQUcsRUFBRSxNQUFNLEVBQUUsSUFBSTtRQUN2QixHQUFHLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxHQUFHO1FBQ3JCLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxFQUFFLE9BQU87S0FDOUIsQ0FBQztBQUNKLENBQUM7QUFFRCxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUM7QUFFekIsU0FBUyx3QkFBd0IsQ0FBQyxXQUFtQixFQUFFLFFBQWdCO0lBQ25FLE1BQU0sT0FBTyxHQUFxQixFQUFDLElBQUksRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBQyxDQUFDO0lBQzlELE1BQU0sS0FBSyxHQUFrQixXQUFXLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRXJELEtBQUssSUFBSSxJQUFJLElBQUksS0FBSyxFQUFFLENBQUM7UUFDckIsSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNuQixJQUFHLElBQUksQ0FBQyxNQUFNLElBQUksQ0FBQztZQUFFLFNBQVM7UUFDOUIsSUFBRyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLElBQUks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
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { FingerprintPackage } from '../WfpProvider/FingerprintPackage';
|
|
2
2
|
import FormData from 'form-data';
|
|
3
3
|
import { SbomMode } from '../ScannerTypes';
|
|
4
|
+
import { FileSnippetSettings } from "../ScannnerResultPostProcessor/interfaces/types";
|
|
4
5
|
export declare class DispatchableItem {
|
|
5
6
|
private form;
|
|
6
7
|
private errorCounter;
|
|
@@ -8,15 +9,18 @@ export declare class DispatchableItem {
|
|
|
8
9
|
private engineFlags;
|
|
9
10
|
private sbom;
|
|
10
11
|
private sbomMode;
|
|
12
|
+
private scanSettings;
|
|
11
13
|
constructor();
|
|
12
14
|
private _uuid;
|
|
13
15
|
get uuid(): string;
|
|
14
16
|
set uuid(uuid: string);
|
|
15
17
|
getForm(): FormData;
|
|
18
|
+
getScanSettings(): FileSnippetSettings | undefined;
|
|
16
19
|
increaseErrorCounter(): void;
|
|
17
20
|
getErrorCounter(): number;
|
|
18
21
|
setFingerprintPackage(fingerprintPackage: FingerprintPackage): void;
|
|
19
22
|
getFingerprintPackage(): FingerprintPackage;
|
|
20
23
|
setEngineFlags(engineFlags: number): void;
|
|
21
24
|
setSbom(sbom: string, sbomMode: SbomMode): void;
|
|
25
|
+
setScanSettings(fileSnippetSettings: FileSnippetSettings): void;
|
|
22
26
|
}
|
|
@@ -6,6 +6,7 @@ export class DispatchableItem {
|
|
|
6
6
|
engineFlags;
|
|
7
7
|
sbom;
|
|
8
8
|
sbomMode;
|
|
9
|
+
scanSettings;
|
|
9
10
|
constructor() {
|
|
10
11
|
this.errorCounter = 0;
|
|
11
12
|
this.form = new FormData();
|
|
@@ -28,6 +29,9 @@ export class DispatchableItem {
|
|
|
28
29
|
}
|
|
29
30
|
return this.form;
|
|
30
31
|
}
|
|
32
|
+
getScanSettings() {
|
|
33
|
+
return this.scanSettings;
|
|
34
|
+
}
|
|
31
35
|
increaseErrorCounter() {
|
|
32
36
|
this.errorCounter += 1;
|
|
33
37
|
}
|
|
@@ -47,5 +51,8 @@ export class DispatchableItem {
|
|
|
47
51
|
this.sbom = sbom;
|
|
48
52
|
this.sbomMode = sbomMode;
|
|
49
53
|
}
|
|
54
|
+
setScanSettings(fileSnippetSettings) {
|
|
55
|
+
this.scanSettings = fileSnippetSettings;
|
|
56
|
+
}
|
|
50
57
|
}
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGlzcGF0Y2hhYmxlSXRlbS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9zZGsvc2Nhbm5lci9EaXNwYXRjaGVyL0Rpc3BhdGNoYWJsZUl0ZW0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxRQUFRLE1BQU0sV0FBVyxDQUFDO0FBSWpDLE1BQU0sT0FBTyxnQkFBZ0I7SUFDbkIsSUFBSSxDQUFXO0lBRWYsWUFBWSxDQUFTO0lBRXJCLGtCQUFrQixDQUFxQjtJQUV2QyxXQUFXLENBQVM7SUFFcEIsSUFBSSxDQUFTO0lBRWIsUUFBUSxDQUFXO0lBRW5CLFlBQVksQ0FBc0I7SUFFMUM7UUFDRSxJQUFJLENBQUMsWUFBWSxHQUFHLENBQUMsQ0FBQztRQUN0QixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksUUFBUSxFQUFFLENBQUM7SUFDN0IsQ0FBQztJQUVPLEtBQUssQ0FBUztJQUV0QixJQUFXLElBQUk7UUFDYixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUM7SUFDcEIsQ0FBQztJQUVELElBQVcsSUFBSSxDQUFDLElBQVk7UUFDMUIsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUM7SUFDcEIsQ0FBQztJQUVNLE9BQU87UUFDWixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksUUFBUSxFQUFFLENBQUM7UUFFM0IsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQ2QsTUFBTSxFQUNOLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLGtCQUFrQixDQUFDLFVBQVUsRUFBRSxDQUFDLEVBQ2pELFVBQVUsQ0FDWCxDQUFDO1FBQ0YsSUFBSSxJQUFJLENBQUMsV0FBVztZQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7UUFFbEUsSUFBSSxJQUFJLENBQUMsUUFBUSxJQUFJLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUMvQixJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3RDLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDMUMsQ0FBQztRQUVELE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQztJQUNuQixDQUFDO0lBRU0sZUFBZTtRQUNwQixPQUFPLElBQUksQ0FBQyxZQUFZLENBQUM7SUFDM0IsQ0FBQztJQUVNLG9CQUFvQjtRQUN6QixJQUFJLENBQUMsWUFBWSxJQUFJLENBQUMsQ0FBQztJQUN6QixDQUFDO0lBRU0sZUFBZTtRQUNwQixPQUFPLElBQUksQ0FBQyxZQUFZLENBQUM7SUFDM0IsQ0FBQztJQUVNLHFCQUFxQixDQUFDLGtCQUFzQztRQUNqRSxJQUFJLENBQUMsa0JBQWtCLEdBQUcsa0JBQWtCLENBQUM7SUFDL0MsQ0FBQztJQUVNLHFCQUFxQjtRQUMxQixPQUFPLElBQUksQ0FBQyxrQkFBa0IsQ0FBQztJQUNqQyxDQUFDO0lBRU0sY0FBYyxDQUFDLFdBQW1CO1FBQ3ZDLElBQUksQ0FBQyxXQUFXLEdBQUcsV0FBVyxDQUFDO0lBQ2pDLENBQUM7SUFFTSxPQUFPLENBQUMsSUFBWSxFQUFFLFFBQWtCO1FBQzdDLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO1FBQ2pCLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFDO0lBQzNCLENBQUM7SUFFTSxlQUFlLENBQUMsbUJBQXdDO1FBQzdELElBQUksQ0FBQyxZQUFZLEdBQUcsbUJBQW1CLENBQUM7SUFDMUMsQ0FBQztDQUNGIn0=
|
|
@@ -15,5 +15,6 @@ export declare class Dispatcher extends EventEmitter {
|
|
|
15
15
|
emitUnrecoberableError(error: any, disptItem: any, response: string): void;
|
|
16
16
|
emitNoDispatchedItem(disptItem: any): void;
|
|
17
17
|
errorHandler(error: Error, disptItem: DispatchableItem, response: string): void;
|
|
18
|
+
private buildScanSettingsHeader;
|
|
18
19
|
dispatch(item: DispatchableItem): Promise<void>;
|
|
19
20
|
}
|
|
@@ -136,6 +136,13 @@ export class Dispatcher extends EventEmitter {
|
|
|
136
136
|
return;
|
|
137
137
|
}
|
|
138
138
|
}
|
|
139
|
+
buildScanSettingsHeader(fileSnippetSettings) {
|
|
140
|
+
if (!fileSnippetSettings || Object.keys(fileSnippetSettings).length === 0) {
|
|
141
|
+
return undefined;
|
|
142
|
+
}
|
|
143
|
+
const jsonStr = JSON.stringify(fileSnippetSettings);
|
|
144
|
+
return Buffer.from(jsonStr).toString('base64');
|
|
145
|
+
}
|
|
139
146
|
async dispatch(item) {
|
|
140
147
|
const timeoutController = this.globalAbortController.getAbortController();
|
|
141
148
|
const timeoutId = setTimeout(() => timeoutController.abort(), this.scannerCfg.TIMEOUT);
|
|
@@ -143,17 +150,22 @@ export class Dispatcher extends EventEmitter {
|
|
|
143
150
|
try {
|
|
144
151
|
this.emit(ScannerEvents.DISPATCHER_WFP_SENDED);
|
|
145
152
|
const scanURL = new URL('/scan/direct', this.scannerCfg.API_URL);
|
|
153
|
+
const headers = {
|
|
154
|
+
'User-Agent': this.scannerCfg.CLIENT_TIMESTAMP
|
|
155
|
+
? this.scannerCfg.CLIENT_TIMESTAMP
|
|
156
|
+
: `scanoss-js/v${Utils.getPackageVersion()}`,
|
|
157
|
+
'X-Session': this.scannerCfg.API_KEY,
|
|
158
|
+
'x-request-id': item.uuid,
|
|
159
|
+
};
|
|
160
|
+
const scanSettingsHeader = this.buildScanSettingsHeader(item.getScanSettings());
|
|
161
|
+
if (scanSettingsHeader) {
|
|
162
|
+
headers['scanoss-settings'] = scanSettingsHeader;
|
|
163
|
+
}
|
|
146
164
|
const response = await fetch(scanURL.href, {
|
|
147
165
|
agent: this.proxyAgent,
|
|
148
166
|
method: 'post',
|
|
149
167
|
body: item.getForm(),
|
|
150
|
-
headers
|
|
151
|
-
'User-Agent': this.scannerCfg.CLIENT_TIMESTAMP
|
|
152
|
-
? this.scannerCfg.CLIENT_TIMESTAMP
|
|
153
|
-
: `scanoss-js/v${Utils.getPackageVersion()}`,
|
|
154
|
-
'X-Session': this.scannerCfg.API_KEY,
|
|
155
|
-
'x-request-id': item.uuid,
|
|
156
|
-
},
|
|
168
|
+
headers,
|
|
157
169
|
signal: timeoutController.signal,
|
|
158
170
|
});
|
|
159
171
|
clearTimeout(timeoutId);
|
|
@@ -178,4 +190,4 @@ export class Dispatcher extends EventEmitter {
|
|
|
178
190
|
}
|
|
179
191
|
}
|
|
180
192
|
}
|
|
181
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
193
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Dispatcher.js","sourceRoot":"","sources":["../../../../../src/sdk/scanner/Dispatcher/Dispatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { FileSnippetSettings } from "./ScannnerResultPostProcessor/interfaces/types";
|
|
2
|
+
export declare class ScanSettingsBuilder {
|
|
3
|
+
private readonly settingsFileSnippet;
|
|
4
|
+
private readonly fileSnippetSettings;
|
|
5
|
+
constructor(settingsFileSnippet?: FileSnippetSettings);
|
|
6
|
+
withMinSnippetHits(cliValue?: number | string): this;
|
|
7
|
+
withMinSnippetLines(cliValue?: number | string): this;
|
|
8
|
+
withRanking(cliValue?: boolean | string): this;
|
|
9
|
+
withRankingThreshold(cliValue?: number | string): this;
|
|
10
|
+
withHonourFileExist(cliValue?: boolean | string): this;
|
|
11
|
+
withDependencyAnalysis(cliValue?: boolean | string): this;
|
|
12
|
+
build(): FileSnippetSettings | undefined;
|
|
13
|
+
}
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
function toBoolean(value) {
|
|
2
|
+
if (typeof value === 'string')
|
|
3
|
+
return value === 'true';
|
|
4
|
+
return value;
|
|
5
|
+
}
|
|
6
|
+
export class ScanSettingsBuilder {
|
|
7
|
+
settingsFileSnippet;
|
|
8
|
+
fileSnippetSettings = {};
|
|
9
|
+
constructor(settingsFileSnippet) {
|
|
10
|
+
this.settingsFileSnippet = settingsFileSnippet;
|
|
11
|
+
}
|
|
12
|
+
// Priority: scanoss.json file_snippet settings > CLI arguments
|
|
13
|
+
// 0 means defer to server config
|
|
14
|
+
withMinSnippetHits(cliValue) {
|
|
15
|
+
const cliMinSnippetHits = cliValue != null ? Number(cliValue) : undefined;
|
|
16
|
+
const merged = this.settingsFileSnippet?.min_snippet_hits ?? cliMinSnippetHits;
|
|
17
|
+
if (merged != null && merged !== 0) {
|
|
18
|
+
this.fileSnippetSettings.min_snippet_hits = Math.max(0, merged);
|
|
19
|
+
}
|
|
20
|
+
return this;
|
|
21
|
+
}
|
|
22
|
+
// 0 means defer to server config
|
|
23
|
+
withMinSnippetLines(cliValue) {
|
|
24
|
+
const cliMinSnippetLines = cliValue != null ? Number(cliValue) : undefined;
|
|
25
|
+
const merged = this.settingsFileSnippet?.min_snippet_lines ?? cliMinSnippetLines;
|
|
26
|
+
if (merged != null && merged !== 0) {
|
|
27
|
+
this.fileSnippetSettings.min_snippet_lines = Math.max(0, merged);
|
|
28
|
+
}
|
|
29
|
+
return this;
|
|
30
|
+
}
|
|
31
|
+
// Only send if explicitly set
|
|
32
|
+
withRanking(cliValue) {
|
|
33
|
+
const cliRanking = cliValue != null ? toBoolean(cliValue) : undefined;
|
|
34
|
+
const merged = this.settingsFileSnippet?.ranking_enabled ?? cliRanking;
|
|
35
|
+
if (merged != null) {
|
|
36
|
+
this.fileSnippetSettings.ranking_enabled = merged;
|
|
37
|
+
}
|
|
38
|
+
return this;
|
|
39
|
+
}
|
|
40
|
+
// -1 means defer to server config, valid range -1 to 10
|
|
41
|
+
withRankingThreshold(cliValue) {
|
|
42
|
+
const MAX_RANKING_THRESHOLD = 10;
|
|
43
|
+
const cliRankingThreshold = cliValue != null ? Number(cliValue) : undefined;
|
|
44
|
+
const merged = this.settingsFileSnippet?.ranking_threshold ?? cliRankingThreshold;
|
|
45
|
+
if (merged != null && merged !== -1) {
|
|
46
|
+
let clamped = merged;
|
|
47
|
+
if (clamped > MAX_RANKING_THRESHOLD) {
|
|
48
|
+
console.error(`WARNING: ranking-threshold value ${clamped} exceeds maximum allowed (${MAX_RANKING_THRESHOLD}). Setting to ${MAX_RANKING_THRESHOLD}.`);
|
|
49
|
+
clamped = MAX_RANKING_THRESHOLD;
|
|
50
|
+
}
|
|
51
|
+
else if (clamped < -1) {
|
|
52
|
+
console.error(`WARNING: ranking-threshold value ${clamped} is below minimum allowed (-1). Setting to -1.`);
|
|
53
|
+
clamped = -1;
|
|
54
|
+
}
|
|
55
|
+
if (clamped !== -1) {
|
|
56
|
+
this.fileSnippetSettings.ranking_threshold = clamped;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
return this;
|
|
60
|
+
}
|
|
61
|
+
// Only send if explicitly set
|
|
62
|
+
withHonourFileExist(cliValue) {
|
|
63
|
+
const cliHonourFileExts = cliValue != null ? toBoolean(cliValue) : undefined;
|
|
64
|
+
const merged = this.settingsFileSnippet?.honour_file_exts ?? cliHonourFileExts;
|
|
65
|
+
if (merged != null) {
|
|
66
|
+
this.fileSnippetSettings.honour_file_exts = merged;
|
|
67
|
+
}
|
|
68
|
+
return this;
|
|
69
|
+
}
|
|
70
|
+
// Only send if explicitly set
|
|
71
|
+
withDependencyAnalysis(cliValue) {
|
|
72
|
+
const cliDependencyAnalysis = cliValue != null ? toBoolean(cliValue) : undefined;
|
|
73
|
+
const merged = this.settingsFileSnippet?.dependency_analysis ?? cliDependencyAnalysis;
|
|
74
|
+
if (merged != null) {
|
|
75
|
+
this.fileSnippetSettings.dependency_analysis = merged;
|
|
76
|
+
}
|
|
77
|
+
return this;
|
|
78
|
+
}
|
|
79
|
+
build() {
|
|
80
|
+
if (Object.keys(this.fileSnippetSettings).length > 0) {
|
|
81
|
+
return this.fileSnippetSettings;
|
|
82
|
+
}
|
|
83
|
+
return undefined;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2NhblNldHRpbmdzQnVpbGRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zZGsvc2Nhbm5lci9TY2FuU2V0dGluZ3NCdWlsZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLFNBQVMsU0FBUyxDQUFDLEtBQXVCO0lBQ3hDLElBQUksT0FBTyxLQUFLLEtBQUssUUFBUTtRQUFFLE9BQU8sS0FBSyxLQUFLLE1BQU0sQ0FBQztJQUN2RCxPQUFPLEtBQUssQ0FBQztBQUNmLENBQUM7QUFFRCxNQUFNLE9BQU8sbUJBQW1CO0lBQ2IsbUJBQW1CLENBQWtDO0lBQ3JELG1CQUFtQixHQUF3QixFQUFFLENBQUM7SUFFL0QsWUFBWSxtQkFBeUM7UUFDbkQsSUFBSSxDQUFDLG1CQUFtQixHQUFHLG1CQUFtQixDQUFDO0lBQ2pELENBQUM7SUFFRCwrREFBK0Q7SUFDL0QsaUNBQWlDO0lBQ2pDLGtCQUFrQixDQUFDLFFBQTBCO1FBQzNDLE1BQU0saUJBQWlCLEdBQUcsUUFBUSxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7UUFDMUUsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLG1CQUFtQixFQUFFLGdCQUFnQixJQUFJLGlCQUFpQixDQUFDO1FBQy9FLElBQUksTUFBTSxJQUFJLElBQUksSUFBSSxNQUFNLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDbkMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLGdCQUFnQixHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBQ2xFLENBQUM7UUFDRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCxpQ0FBaUM7SUFDakMsbUJBQW1CLENBQUMsUUFBMEI7UUFDNUMsTUFBTSxrQkFBa0IsR0FBRyxRQUFRLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMs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
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|