scanoss 0.35.0 → 0.37.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 -1
- package/build/main/cli/commands/scan.js +34 -35
- package/build/main/sdk/Dependencies/LocalDependency/LocalDependency.js +3 -1
- package/build/main/sdk/Dependencies/LocalDependency/parsers/parser.spec.js +49 -15
- package/build/main/sdk/Dependencies/LocalDependency/parsers/pyParser.d.ts +1 -0
- package/build/main/sdk/Dependencies/LocalDependency/parsers/pyParser.js +21 -1
- package/build/main/sdk/Dependencies/LocalDependency/parsers/python/PyProjectToml.js +7 -4
- package/build/main/sdk/scanner/Dispatcher/Dispatcher.js +3 -2
- package/build/main/sdk/scanner/ScanSettingsBuilder.d.ts +6 -1
- package/build/main/sdk/scanner/ScanSettingsBuilder.js +51 -3
- package/build/main/sdk/scanner/ScanSettingsBuilder.spec.js +55 -1
- package/build/main/sdk/scanner/Scannable/ScannableItem.d.ts +3 -0
- package/build/main/sdk/scanner/Scannable/ScannableItem.js +8 -1
- package/build/main/sdk/scanner/Scanner.d.ts +1 -0
- package/build/main/sdk/scanner/Scanner.js +31 -18
- package/build/main/sdk/scanner/ScannerCfg.d.ts +2 -0
- package/build/main/sdk/scanner/ScannerCfg.js +1 -1
- package/build/main/sdk/scanner/ScannerTypes.d.ts +3 -0
- package/build/main/sdk/scanner/ScannerTypes.js +1 -1
- package/build/main/sdk/scanner/ScannnerResultPostProcessor/interfaces/types.d.ts +11 -0
- package/build/main/sdk/scanner/ScannnerResultPostProcessor/rules/remove-rule.js +3 -2
- package/build/main/sdk/scanner/WfpProvider/WfpCalculator/HeaderFilter.d.ts +17 -0
- package/build/main/sdk/scanner/WfpProvider/WfpCalculator/HeaderFilter.js +313 -0
- package/build/main/sdk/scanner/WfpProvider/WfpCalculator/WfpCalculator.d.ts +1 -0
- package/build/main/sdk/scanner/WfpProvider/WfpCalculator/WfpCalculator.js +18 -2
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/module/cli/commands/scan.js +32 -33
- package/build/module/sdk/Dependencies/LocalDependency/LocalDependency.js +4 -2
- package/build/module/sdk/Dependencies/LocalDependency/parsers/parser.spec.js +50 -16
- package/build/module/sdk/Dependencies/LocalDependency/parsers/pyParser.d.ts +1 -0
- package/build/module/sdk/Dependencies/LocalDependency/parsers/pyParser.js +19 -1
- package/build/module/sdk/Dependencies/LocalDependency/parsers/python/PyProjectToml.js +7 -4
- package/build/module/sdk/scanner/Dispatcher/Dispatcher.js +3 -2
- package/build/module/sdk/scanner/ScanSettingsBuilder.d.ts +6 -1
- package/build/module/sdk/scanner/ScanSettingsBuilder.js +46 -3
- package/build/module/sdk/scanner/ScanSettingsBuilder.spec.js +55 -1
- package/build/module/sdk/scanner/Scannable/ScannableItem.d.ts +3 -0
- package/build/module/sdk/scanner/Scannable/ScannableItem.js +9 -1
- package/build/module/sdk/scanner/Scanner.d.ts +1 -0
- package/build/module/sdk/scanner/Scanner.js +27 -15
- package/build/module/sdk/scanner/ScannerCfg.d.ts +2 -0
- package/build/module/sdk/scanner/ScannerCfg.js +2 -1
- package/build/module/sdk/scanner/ScannerTypes.d.ts +3 -0
- package/build/module/sdk/scanner/ScannerTypes.js +1 -1
- package/build/module/sdk/scanner/ScannnerResultPostProcessor/interfaces/types.d.ts +11 -0
- package/build/module/sdk/scanner/ScannnerResultPostProcessor/rules/remove-rule.js +2 -2
- package/build/module/sdk/scanner/WfpProvider/WfpCalculator/HeaderFilter.d.ts +17 -0
- package/build/module/sdk/scanner/WfpProvider/WfpCalculator/HeaderFilter.js +306 -0
- package/build/module/sdk/scanner/WfpProvider/WfpCalculator/WfpCalculator.d.ts +1 -0
- package/build/module/sdk/scanner/WfpProvider/WfpCalculator/WfpCalculator.js +18 -2
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,306 @@
|
|
|
1
|
+
// SPDX-License-Identifier: MIT
|
|
2
|
+
// Copyright (c) 2025, SCANOSS
|
|
3
|
+
import path from 'path';
|
|
4
|
+
const COMPLETE_DOCSTRING_QUOTE_COUNT = 2;
|
|
5
|
+
const LICENSE_HEADER_MAX_LINES = 50;
|
|
6
|
+
const COMMENT_PATTERNS = {
|
|
7
|
+
c_style: {
|
|
8
|
+
single_line: String.raw `^\s*//.*$`,
|
|
9
|
+
multi_start: String.raw `^\s*/\*`,
|
|
10
|
+
multi_end: String.raw `\*/\s*$`,
|
|
11
|
+
multi_single: String.raw `^\s*/\*.*\*/\s*$`,
|
|
12
|
+
},
|
|
13
|
+
python_style: {
|
|
14
|
+
single_line: String.raw `^\s*#.*$`,
|
|
15
|
+
doc_string_start: String.raw `^\s*"""`,
|
|
16
|
+
doc_string_end: String.raw `"""\s*$`,
|
|
17
|
+
},
|
|
18
|
+
lua_style: {
|
|
19
|
+
single_line: String.raw `^\s*--.*$`,
|
|
20
|
+
multi_start: String.raw `^\s*--\[\[`,
|
|
21
|
+
multi_end: String.raw `\]\]\s*$`,
|
|
22
|
+
},
|
|
23
|
+
html_style: {
|
|
24
|
+
multi_start: String.raw `^\s*<!--`,
|
|
25
|
+
multi_end: String.raw `-->\s*$`,
|
|
26
|
+
multi_single: String.raw `^\s*<!--.*-->\s*$`,
|
|
27
|
+
},
|
|
28
|
+
};
|
|
29
|
+
const IMPORT_PATTERNS = {
|
|
30
|
+
python: [String.raw `^\s*import\s+`, String.raw `^\s*from\s+.*\s+import\s+`],
|
|
31
|
+
javascript: [
|
|
32
|
+
String.raw `^\s*import\s+.*\s+from\s+`,
|
|
33
|
+
String.raw `^\s*import\s+['"]`,
|
|
34
|
+
String.raw `^\s*import\s+type\s+`,
|
|
35
|
+
String.raw `^\s*export\s+\*\s+from\s+`,
|
|
36
|
+
String.raw `^\s*export\s+\{.*\}\s+from\s+`,
|
|
37
|
+
String.raw `^\s*const\s+.*\s*=\s*require\(`,
|
|
38
|
+
String.raw `^\s*var\s+.*\s*=\s*require\(`,
|
|
39
|
+
String.raw `^\s*let\s+.*\s*=\s*require\(`,
|
|
40
|
+
],
|
|
41
|
+
typescript: [
|
|
42
|
+
String.raw `^\s*import\s+`,
|
|
43
|
+
String.raw `^\s*export\s+.*\s+from\s+`,
|
|
44
|
+
String.raw `^\s*import\s+type\s+`,
|
|
45
|
+
String.raw `^\s*import\s+\{.*\}\s+from\s+`,
|
|
46
|
+
],
|
|
47
|
+
java: [String.raw `^\s*import\s+`, String.raw `^\s*package\s+`],
|
|
48
|
+
kotlin: [String.raw `^\s*import\s+`, String.raw `^\s*package\s+`],
|
|
49
|
+
scala: [String.raw `^\s*import\s+`, String.raw `^\s*package\s+`],
|
|
50
|
+
go: [
|
|
51
|
+
String.raw `^\s*import\s+\(`,
|
|
52
|
+
String.raw `^\s*import\s+"`,
|
|
53
|
+
String.raw `^\s*package\s+`,
|
|
54
|
+
String.raw `^\s*"[^"]*"\s*$`,
|
|
55
|
+
String.raw `^\s*[a-zA-Z_][a-zA-Z0-9_]*\s+"[^"]*"\s*$`,
|
|
56
|
+
String.raw `^\s*_\s+"[^"]*"\s*$`,
|
|
57
|
+
],
|
|
58
|
+
rust: [String.raw `^\s*use\s+`, String.raw `^\s*extern\s+crate\s+`, String.raw `^\s*mod\s+`],
|
|
59
|
+
cpp: [
|
|
60
|
+
String.raw `^\s*#include\s+`,
|
|
61
|
+
String.raw `^\s*#pragma\s+`,
|
|
62
|
+
String.raw `^\s*#ifndef\s+.*_H.*`,
|
|
63
|
+
String.raw `^\s*#define\s+.*_H.*`,
|
|
64
|
+
String.raw `^\s*#endif\s+(//.*)?\s*$`,
|
|
65
|
+
],
|
|
66
|
+
csharp: [String.raw `^\s*using\s+`, String.raw `^\s*namespace\s+`],
|
|
67
|
+
php: [
|
|
68
|
+
String.raw `^\s*use\s+`,
|
|
69
|
+
String.raw `^\s*require\s+`,
|
|
70
|
+
String.raw `^\s*require_once\s+`,
|
|
71
|
+
String.raw `^\s*include\s+`,
|
|
72
|
+
String.raw `^\s*include_once\s+`,
|
|
73
|
+
String.raw `^\s*namespace\s+`,
|
|
74
|
+
],
|
|
75
|
+
swift: [String.raw `^\s*import\s+`],
|
|
76
|
+
ruby: [String.raw `^\s*require\s+`, String.raw `^\s*require_relative\s+`, String.raw `^\s*load\s+`],
|
|
77
|
+
perl: [String.raw `^\s*use\s+`, String.raw `^\s*require\s+`],
|
|
78
|
+
r: [String.raw `^\s*library\(`, String.raw `^\s*require\(`, String.raw `^\s*source\(`],
|
|
79
|
+
lua: [String.raw `^\s*require\s+`, String.raw `^\s*local\s+.*\s*=\s*require\(`],
|
|
80
|
+
dart: [String.raw `^\s*import\s+`, String.raw `^\s*export\s+`, String.raw `^\s*part\s+`],
|
|
81
|
+
haskell: [String.raw `^\s*import\s+`, String.raw `^\s*module\s+`],
|
|
82
|
+
elixir: [
|
|
83
|
+
String.raw `^\s*import\s+`,
|
|
84
|
+
String.raw `^\s*alias\s+`,
|
|
85
|
+
String.raw `^\s*require\s+`,
|
|
86
|
+
String.raw `^\s*use\s+`,
|
|
87
|
+
],
|
|
88
|
+
clojure: [
|
|
89
|
+
String.raw `^\s*\(\s*ns\s+`,
|
|
90
|
+
String.raw `^\s*\(\s*require\s+`,
|
|
91
|
+
String.raw `^\s*\(\s*import\s+`,
|
|
92
|
+
],
|
|
93
|
+
};
|
|
94
|
+
const LICENSE_KEYWORDS = [
|
|
95
|
+
'copyright', 'license', 'licensed', 'all rights reserved',
|
|
96
|
+
'permission', 'redistribution', 'warranty', 'liability',
|
|
97
|
+
'apache', 'mit', 'gpl', 'bsd', 'mozilla', 'author:',
|
|
98
|
+
'spdx-license', 'contributors', 'licensee',
|
|
99
|
+
];
|
|
100
|
+
const EXT_MAP = {
|
|
101
|
+
'.py': 'python', '.js': 'javascript', '.mjs': 'javascript',
|
|
102
|
+
'.cjs': 'javascript', '.ts': 'typescript', '.tsx': 'typescript',
|
|
103
|
+
'.jsx': 'javascript', '.java': 'java', '.kt': 'kotlin',
|
|
104
|
+
'.kts': 'kotlin', '.scala': 'scala', '.sc': 'scala',
|
|
105
|
+
'.go': 'go', '.rs': 'rust', '.cpp': 'cpp', '.cc': 'cpp',
|
|
106
|
+
'.cxx': 'cpp', '.c': 'cpp', '.h': 'cpp', '.hpp': 'cpp',
|
|
107
|
+
'.hxx': 'cpp', '.cs': 'csharp', '.php': 'php', '.swift': 'swift',
|
|
108
|
+
'.rb': 'ruby', '.pl': 'perl', '.pm': 'perl', '.r': 'r', '.R': 'r',
|
|
109
|
+
'.lua': 'lua', '.dart': 'dart', '.hs': 'haskell', '.ex': 'elixir',
|
|
110
|
+
'.exs': 'elixir', '.clj': 'clojure', '.cljs': 'clojure',
|
|
111
|
+
'.m': 'cpp', '.mm': 'cpp', '.sh': 'python', '.bash': 'python',
|
|
112
|
+
'.zsh': 'python', '.fish': 'python',
|
|
113
|
+
};
|
|
114
|
+
function isBlankLine(stripped) {
|
|
115
|
+
return stripped.length === 0;
|
|
116
|
+
}
|
|
117
|
+
function isShebang(stripped) {
|
|
118
|
+
return stripped.startsWith('#!');
|
|
119
|
+
}
|
|
120
|
+
export class HeaderFilter {
|
|
121
|
+
maxLines;
|
|
122
|
+
constructor(skipLimit) {
|
|
123
|
+
this.maxLines = skipLimit != null && skipLimit > 0 ? skipLimit : null;
|
|
124
|
+
}
|
|
125
|
+
filter(file, decodedContents) {
|
|
126
|
+
if (!decodedContents || !file) {
|
|
127
|
+
return 0;
|
|
128
|
+
}
|
|
129
|
+
const language = this.detectLanguage(file);
|
|
130
|
+
if (!language) {
|
|
131
|
+
return 0;
|
|
132
|
+
}
|
|
133
|
+
const lines = decodedContents.split(/\r?\n/);
|
|
134
|
+
if (lines.length === 0) {
|
|
135
|
+
return 0;
|
|
136
|
+
}
|
|
137
|
+
const implementationStart = this.findFirstImplementationLine(lines, language);
|
|
138
|
+
if (implementationStart === null) {
|
|
139
|
+
return 0;
|
|
140
|
+
}
|
|
141
|
+
let lineOffset = implementationStart - 1;
|
|
142
|
+
if (this.maxLines !== null && this.maxLines > 0 && this.maxLines < lineOffset) {
|
|
143
|
+
lineOffset = this.maxLines;
|
|
144
|
+
}
|
|
145
|
+
return lineOffset;
|
|
146
|
+
}
|
|
147
|
+
detectLanguage(filePath) {
|
|
148
|
+
const ext = path.extname(filePath).toLowerCase();
|
|
149
|
+
if (!ext)
|
|
150
|
+
return null;
|
|
151
|
+
return EXT_MAP[ext] || null;
|
|
152
|
+
}
|
|
153
|
+
getCommentStyle(language) {
|
|
154
|
+
const cStyleLanguages = [
|
|
155
|
+
'cpp', 'java', 'kotlin', 'scala', 'javascript', 'typescript',
|
|
156
|
+
'go', 'rust', 'csharp', 'php', 'swift', 'dart',
|
|
157
|
+
];
|
|
158
|
+
const pythonStyleLanguages = ['python', 'ruby', 'perl', 'r'];
|
|
159
|
+
const luaStyleLanguages = ['lua', 'haskell'];
|
|
160
|
+
if (cStyleLanguages.includes(language))
|
|
161
|
+
return 'c_style';
|
|
162
|
+
if (pythonStyleLanguages.includes(language))
|
|
163
|
+
return 'python_style';
|
|
164
|
+
if (luaStyleLanguages.includes(language))
|
|
165
|
+
return 'lua_style';
|
|
166
|
+
return 'c_style';
|
|
167
|
+
}
|
|
168
|
+
isLicenseHeader(line) {
|
|
169
|
+
const lineLower = line.toLowerCase();
|
|
170
|
+
return LICENSE_KEYWORDS.some(keyword => lineLower.includes(keyword));
|
|
171
|
+
}
|
|
172
|
+
isComment(line, inMultiline, patterns) {
|
|
173
|
+
if (!patterns)
|
|
174
|
+
return [false, inMultiline];
|
|
175
|
+
if (inMultiline) {
|
|
176
|
+
if (patterns.multi_end && new RegExp(patterns.multi_end).test(line)) {
|
|
177
|
+
return [true, false];
|
|
178
|
+
}
|
|
179
|
+
if (patterns.doc_string_end && new RegExp(patterns.doc_string_end).test(line)) {
|
|
180
|
+
return [true, false];
|
|
181
|
+
}
|
|
182
|
+
return [true, true];
|
|
183
|
+
}
|
|
184
|
+
if (patterns.single_line && new RegExp(patterns.single_line).test(line)) {
|
|
185
|
+
return [true, false];
|
|
186
|
+
}
|
|
187
|
+
if (patterns.multi_single && new RegExp(patterns.multi_single).test(line)) {
|
|
188
|
+
return [true, false];
|
|
189
|
+
}
|
|
190
|
+
if (patterns.multi_start && new RegExp(patterns.multi_start).test(line)) {
|
|
191
|
+
if (patterns.multi_end && new RegExp(patterns.multi_end).test(line)) {
|
|
192
|
+
return [true, false];
|
|
193
|
+
}
|
|
194
|
+
return [true, true];
|
|
195
|
+
}
|
|
196
|
+
if (patterns.doc_string_start && line.includes('"""')) {
|
|
197
|
+
const count = (line.match(/"""/g) || []).length;
|
|
198
|
+
if (count === COMPLETE_DOCSTRING_QUOTE_COUNT) {
|
|
199
|
+
return [true, false];
|
|
200
|
+
}
|
|
201
|
+
if (count === 1) {
|
|
202
|
+
return [true, true];
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
return [false, inMultiline];
|
|
206
|
+
}
|
|
207
|
+
isImport(line, patterns) {
|
|
208
|
+
if (!patterns)
|
|
209
|
+
return false;
|
|
210
|
+
return patterns.some(pattern => new RegExp(pattern).test(line));
|
|
211
|
+
}
|
|
212
|
+
findFirstImplementationLine(lines, language) {
|
|
213
|
+
if (!lines.length || !language)
|
|
214
|
+
return null;
|
|
215
|
+
let inMultilineComment = false;
|
|
216
|
+
let inLicenseSection = false;
|
|
217
|
+
let inImportBlock = false;
|
|
218
|
+
let consecutiveImportsCount = 0;
|
|
219
|
+
const commentStyle = this.getCommentStyle(language);
|
|
220
|
+
const commentPatterns = COMMENT_PATTERNS[commentStyle];
|
|
221
|
+
const importPatterns = IMPORT_PATTERNS[language];
|
|
222
|
+
for (let i = 0; i < lines.length; i++) {
|
|
223
|
+
const lineNumber = i + 1;
|
|
224
|
+
const stripped = lines[i].trim();
|
|
225
|
+
if ((i === 0 && isShebang(stripped)) || isBlankLine(stripped)) {
|
|
226
|
+
continue;
|
|
227
|
+
}
|
|
228
|
+
const [isAComment, stillInMultiline] = this.isComment(lines[i], inMultilineComment, commentPatterns);
|
|
229
|
+
inMultilineComment = stillInMultiline;
|
|
230
|
+
if (isAComment) {
|
|
231
|
+
if (this.isLicenseHeader(lines[i])) {
|
|
232
|
+
inLicenseSection = true;
|
|
233
|
+
}
|
|
234
|
+
else if (inLicenseSection && lineNumber < LICENSE_HEADER_MAX_LINES) {
|
|
235
|
+
// Continue within license section
|
|
236
|
+
}
|
|
237
|
+
else {
|
|
238
|
+
inLicenseSection = false;
|
|
239
|
+
}
|
|
240
|
+
continue;
|
|
241
|
+
}
|
|
242
|
+
if (!isAComment) {
|
|
243
|
+
inLicenseSection = false;
|
|
244
|
+
}
|
|
245
|
+
// Go import block handling
|
|
246
|
+
if (language === 'go') {
|
|
247
|
+
if (stripped.startsWith('import (')) {
|
|
248
|
+
inImportBlock = true;
|
|
249
|
+
continue;
|
|
250
|
+
}
|
|
251
|
+
if (inImportBlock) {
|
|
252
|
+
if (stripped === ')') {
|
|
253
|
+
inImportBlock = false;
|
|
254
|
+
continue;
|
|
255
|
+
}
|
|
256
|
+
if (stripped.startsWith('"') ||
|
|
257
|
+
stripped.startsWith('_') ||
|
|
258
|
+
/^[a-zA-Z_][a-zA-Z0-9_]*\s+"/.test(stripped)) {
|
|
259
|
+
continue;
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
if (this.isImport(lines[i], importPatterns)) {
|
|
264
|
+
if (consecutiveImportsCount === 0) {
|
|
265
|
+
// First import detected
|
|
266
|
+
}
|
|
267
|
+
consecutiveImportsCount += 1;
|
|
268
|
+
continue;
|
|
269
|
+
}
|
|
270
|
+
return lineNumber;
|
|
271
|
+
}
|
|
272
|
+
return null;
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
/**
|
|
276
|
+
* Strip WFP snippet lines up to and including the line_offset.
|
|
277
|
+
* Inserts a `start_line=<offset>` tag before the first kept snippet line.
|
|
278
|
+
* Preserves non-snippet lines (file=, fh2=, hpsm=, etc.).
|
|
279
|
+
*/
|
|
280
|
+
export function stripLinesUntilOffset(wfp, lineOffset) {
|
|
281
|
+
if (lineOffset <= 0)
|
|
282
|
+
return wfp;
|
|
283
|
+
const lines = wfp.split('\n');
|
|
284
|
+
const filteredLines = [];
|
|
285
|
+
let startLineAdded = false;
|
|
286
|
+
for (const line of lines) {
|
|
287
|
+
const eqIndex = line.indexOf('=');
|
|
288
|
+
if (eqIndex > 0) {
|
|
289
|
+
const prefix = line.substring(0, eqIndex);
|
|
290
|
+
if (/^\d+$/.test(prefix)) {
|
|
291
|
+
const lineNum = parseInt(prefix, 10);
|
|
292
|
+
if (lineNum > lineOffset) {
|
|
293
|
+
if (!startLineAdded) {
|
|
294
|
+
filteredLines.push(`start_line=${lineOffset}`);
|
|
295
|
+
startLineAdded = true;
|
|
296
|
+
}
|
|
297
|
+
filteredLines.push(line);
|
|
298
|
+
}
|
|
299
|
+
continue;
|
|
300
|
+
}
|
|
301
|
+
}
|
|
302
|
+
filteredLines.push(line);
|
|
303
|
+
}
|
|
304
|
+
return filteredLines.join('\n');
|
|
305
|
+
}
|
|
306
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"HeaderFilter.js","sourceRoot":"","sources":["../../../../../../src/sdk/scanner/WfpProvider/WfpCalculator/HeaderFilter.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import { ScannerCfg } from '../../ScannerCfg';
|
|
|
5
5
|
import { ScannerEvents } from '../../ScannerTypes';
|
|
6
6
|
import { FingerprintPackage } from '../FingerprintPackage';
|
|
7
7
|
import { WfpProvider } from '../WfpProvider';
|
|
8
|
+
import { HeaderFilter, stripLinesUntilOffset } from './HeaderFilter';
|
|
8
9
|
const stringWorker = `
|
|
9
10
|
const { parentPort } = require('worker_threads');
|
|
10
11
|
|
|
@@ -500,9 +501,11 @@ export class WfpCalculator extends WfpProvider {
|
|
|
500
501
|
fileList;
|
|
501
502
|
fileListIndex;
|
|
502
503
|
continue;
|
|
504
|
+
headerFilter;
|
|
503
505
|
constructor(scannerCfg = new ScannerCfg()) {
|
|
504
506
|
super();
|
|
505
507
|
this.scannerCfg = scannerCfg;
|
|
508
|
+
this.headerFilter = null;
|
|
506
509
|
}
|
|
507
510
|
init() {
|
|
508
511
|
super.init();
|
|
@@ -513,7 +516,11 @@ export class WfpCalculator extends WfpProvider {
|
|
|
513
516
|
prepareWorker() {
|
|
514
517
|
this.worker = new Worker(stringWorker, { eval: true });
|
|
515
518
|
this.worker.on('message', async (scannableItem) => {
|
|
516
|
-
|
|
519
|
+
let fingerprint = scannableItem.fingerprint;
|
|
520
|
+
if (scannableItem.lineOffset > 0) {
|
|
521
|
+
fingerprint = stripLinesUntilOffset(fingerprint, scannableItem.lineOffset);
|
|
522
|
+
}
|
|
523
|
+
this.fingerprintPacker(fingerprint);
|
|
517
524
|
await this.nextStepMachine();
|
|
518
525
|
});
|
|
519
526
|
}
|
|
@@ -554,6 +561,10 @@ export class WfpCalculator extends WfpProvider {
|
|
|
554
561
|
if (!(this.fileListIndex % this.scannerCfg.WINNOWING_REPORT_STATUS_AFTER_X))
|
|
555
562
|
this.emit(ScannerEvents.WINNOWING_STATUS, this.scannerCfg.WINNOWING_REPORT_STATUS_AFTER_X);
|
|
556
563
|
const scannable = new ScannableItem(content, contentSource, this.winnowingMode, this.scannerCfg.WFP_FILE_MAX_SIZE);
|
|
564
|
+
if (this.headerFilter && content.length > 0) {
|
|
565
|
+
const lineOffset = this.headerFilter.filter(path, content.toString('utf-8'));
|
|
566
|
+
scannable.setLineOffset(lineOffset);
|
|
567
|
+
}
|
|
557
568
|
return scannable;
|
|
558
569
|
}
|
|
559
570
|
async readFile(path) {
|
|
@@ -588,6 +599,11 @@ export class WfpCalculator extends WfpProvider {
|
|
|
588
599
|
this.sendLog('[ SCANNER ]: WFP Calculator starting...');
|
|
589
600
|
this.init();
|
|
590
601
|
this.prepareWorker();
|
|
602
|
+
const fileSnippet = this.scannerCfg?.SCANOSS_SETTINGS?.settings?.file_snippet;
|
|
603
|
+
if (fileSnippet?.skip_headers) {
|
|
604
|
+
this.headerFilter = new HeaderFilter(fileSnippet.skip_headers_limit);
|
|
605
|
+
this.sendLog('[ SCANNER ]: Header filter enabled');
|
|
606
|
+
}
|
|
591
607
|
if (params.winnowingMode)
|
|
592
608
|
this.setWinnowingMode(params.winnowingMode);
|
|
593
609
|
if (params.obfuscate)
|
|
@@ -620,4 +636,4 @@ export class WfpCalculator extends WfpProvider {
|
|
|
620
636
|
this.sendFingerprint(fingerprint);
|
|
621
637
|
}
|
|
622
638
|
}
|
|
623
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
639
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiV2ZwQ2FsY3VsYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9zZGsvc2Nhbm5lci9XZnBQcm92aWRlci9XZnBDYWxjdWxhdG9yL1dmcENhbGN1bGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3BCLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUV4QyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDOUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQzlDLE9BQU8sRUFBRSxhQUFhLEVBQStCLE1BQU0sb0JBQW9CLENBQUM7QUFFaEYsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDM0QsT0FBTyxFQUFxQixXQUFXLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUNoRSxPQUFPLEVBQUUsWUFBWSxFQUFFLHFCQUFxQixFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFckUsTUFBTSxZQUFZLEdBQUc7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7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
|