scanoss 0.38.1 → 0.40.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 +14 -0
- package/build/main/cli/commands/wfp.js +3 -3
- package/build/main/sdk/Decompress/DecompressionManager.d.ts +8 -4
- package/build/main/sdk/Decompress/DecompressionManager.js +48 -41
- package/build/main/sdk/scanner/Scannable/ScannableItem.d.ts +2 -1
- package/build/main/sdk/scanner/Scannable/ScannableItem.js +3 -2
- package/build/main/sdk/scanner/WfpProvider/WfpCalculator/WfpCalculator.js +30 -15
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/module/cli/commands/wfp.js +3 -3
- package/build/module/sdk/Decompress/DecompressionManager.d.ts +8 -4
- package/build/module/sdk/Decompress/DecompressionManager.js +48 -41
- package/build/module/sdk/scanner/Scannable/ScannableItem.d.ts +2 -1
- package/build/module/sdk/scanner/Scannable/ScannableItem.js +4 -2
- package/build/module/sdk/scanner/WfpProvider/WfpCalculator/WfpCalculator.js +30 -15
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -4,7 +4,7 @@ import { isFolder } from './helpers';
|
|
|
4
4
|
import { ScannerEvents, WinnowingMode } from '../../sdk/scanner/ScannerTypes';
|
|
5
5
|
import { WfpCalculator } from '../../sdk/scanner/WfpProvider/WfpCalculator/WfpCalculator';
|
|
6
6
|
import { Tree } from '../../sdk/tree/Tree';
|
|
7
|
-
import {
|
|
7
|
+
import { ScanFilter } from '../../sdk/tree/Filters/ScanFilter';
|
|
8
8
|
export async function wfpHandler(rootPath, options) {
|
|
9
9
|
rootPath = rootPath.replace(/\/$/, ''); // Remove trailing slash if exists
|
|
10
10
|
rootPath = rootPath.replace(/^\./, process.env.PWD); // Convert relative path to absolute path.
|
|
@@ -14,7 +14,7 @@ export async function wfpHandler(rootPath, options) {
|
|
|
14
14
|
if (pathIsFolder) {
|
|
15
15
|
const tree = new Tree(rootPath);
|
|
16
16
|
tree.build();
|
|
17
|
-
filesToFingerprint = tree.getFileList(new
|
|
17
|
+
filesToFingerprint = tree.getFileList(new ScanFilter(""));
|
|
18
18
|
}
|
|
19
19
|
else {
|
|
20
20
|
filesToFingerprint.push(rootPath);
|
|
@@ -45,4 +45,4 @@ export async function wfpHandler(rootPath, options) {
|
|
|
45
45
|
wfpInput.winnowingMode = WinnowingMode.FULL_WINNOWING_HPSM;
|
|
46
46
|
await wfpCalculator.start(wfpInput);
|
|
47
47
|
}
|
|
48
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
48
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2ZwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2NsaS9jb21tYW5kcy93ZnAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBRXBCLE9BQU8sV0FBVyxNQUFNLGNBQWMsQ0FBQztBQUV2QyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ3JDLE9BQU8sRUFBRSxhQUFhLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFOUUsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLDJEQUEyRCxDQUFDO0FBRTFGLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUMzQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFHL0QsTUFBTSxDQUFDLEtBQUssVUFBVSxVQUFVLENBQUMsUUFBZ0IsRUFBRSxPQUFZO0lBRTdELFFBQVEsR0FBRyxRQUFRLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFFLGtDQUFrQztJQUMzRSxRQUFRLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFFLDBDQUEwQztJQUNoRyxNQUFNLFlBQVksR0FBRyxNQUFNLFFBQVEsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUM5QyxNQUFNLGFBQWEsR0FBRyxJQUFJLGFBQWEsRUFBRSxDQUFDO0lBRTFDLElBQUksa0JBQWtCLEdBQWEsRUFBRSxDQUFDO0lBQ3RDLElBQUksWUFBWSxFQUFFLENBQUM7UUFDakIsTUFBTSxJQUFJLEdBQUcsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDaEMsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ2Isa0JBQWtCLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLFVBQVUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQzVELENBQUM7U0FBTSxDQUFDO1FBQ04sa0JBQWtCLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBQ25DLENBQUM7SUFHRCxNQUFNLE9BQU8sR0FBRyxFQUFFLE1BQU0sRUFBRSx5RkFBeUYsRUFBRSxDQUFDO0lBQ3RILE1BQU0sSUFBSSxHQUFHLElBQUksV0FBVyxDQUFDLFNBQVMsQ0FBQyxPQUFPLEVBQUUsV0FBVyxDQUFDLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FBQztJQUNwRixJQUFJLENBQUMsS0FBSyxDQUFDLGtCQUFrQixDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQztJQUV6QyxJQUFJLFlBQVksR0FBRyxFQUFFLENBQUM7SUFDdEIsYUFBYSxDQUFDLEVBQUUsQ0FBQyxhQUFhLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxrQkFBc0MsRUFBRSxFQUFFO1FBQy9GLElBQUksQ0FBQyxTQUFTLENBQUMsa0JBQWtCLENBQUMsMkJBQTJCLEVBQUUsQ0FBQyxDQUFDO1FBQ2pFLFlBQVksR0FBRyxZQUFZLENBQUMsTUFBTSxDQUFFLGtCQUFrQixDQUFDLFVBQVUsRUFBRSxDQUFFLENBQUM7SUFDeEUsQ0FBQyxDQUFDLENBQUM7SUFFSCxJQUFJLE9BQU8sQ0FBQyxPQUFPO1FBQ2pCLGFBQWEsQ0FBQyxFQUFFLENBQUMsYUFBYSxDQUFDLFlBQVksRUFBRSxDQUFDLEdBQVcsRUFBRSxFQUFFO1lBQzNELE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDckIsQ0FBQyxDQUFDLENBQUM7SUFFTCxhQUFhLENBQUMsRUFBRSxDQUFDLGFBQWEsQ0FBQyxrQkFBa0IsRUFBRSxHQUFHLEVBQUU7UUFDdEQsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ1osSUFBRyxPQUFPLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDbEIsRUFBRSxDQUFDLGFBQWEsQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLFlBQVksQ0FBQyxDQUFDO1FBQ2pELENBQUM7YUFBTSxDQUFDO1lBQ04sT0FBTyxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUM1QixDQUFDO0lBQ0gsQ0FBQyxDQUFDLENBQUM7SUFFSCxNQUFNLFFBQVEsR0FBc0IsRUFBQyxRQUFRLEVBQUUsa0JBQWtCLEVBQUUsVUFBVSxFQUFFLFFBQVEsRUFBRSxTQUFTLEVBQUUsT0FBTyxDQUFDLFNBQVMsRUFBRSxDQUFBO0lBQ3ZILElBQUcsT0FBTyxDQUFDLElBQUk7UUFBRSxRQUFRLENBQUMsYUFBYSxHQUFHLGFBQWEsQ0FBQyxtQkFBbUIsQ0FBQztJQUM1RSxNQUFNLGFBQWEsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUM7QUFHdEMsQ0FBQyJ9
|
|
@@ -13,9 +13,13 @@ export declare class DecompressionManager {
|
|
|
13
13
|
path: string;
|
|
14
14
|
error: string;
|
|
15
15
|
}>;
|
|
16
|
+
skippedByDepth: Array<string>;
|
|
17
|
+
}>;
|
|
18
|
+
decompressRecursive(archivePath: string, level: number): Promise<{
|
|
19
|
+
failedFiles: Array<{
|
|
20
|
+
path: string;
|
|
21
|
+
error: string;
|
|
22
|
+
}>;
|
|
23
|
+
skippedByDepth: Array<string>;
|
|
16
24
|
}>;
|
|
17
|
-
decompressRecursive(archivePath: string, level: number): Promise<Array<{
|
|
18
|
-
path: string;
|
|
19
|
-
error: string;
|
|
20
|
-
}>>;
|
|
21
25
|
}
|
|
@@ -35,58 +35,65 @@ export class DecompressionManager {
|
|
|
35
35
|
}
|
|
36
36
|
async decompress(archivesPaths) {
|
|
37
37
|
const failedFiles = [];
|
|
38
|
+
const skippedByDepth = [];
|
|
38
39
|
for (const archivePath of archivesPaths) {
|
|
39
|
-
const
|
|
40
|
-
failedFiles.push(...
|
|
40
|
+
const result = await this.decompressRecursive(archivePath, 0);
|
|
41
|
+
failedFiles.push(...result.failedFiles);
|
|
42
|
+
skippedByDepth.push(...result.skippedByDepth);
|
|
41
43
|
}
|
|
42
44
|
const parentFolders = archivesPaths.map(archivePath => `${archivePath}${this.suffix}`);
|
|
43
|
-
return { parentFolders, failedFiles };
|
|
45
|
+
return { parentFolders, failedFiles, skippedByDepth };
|
|
44
46
|
}
|
|
45
47
|
async decompressRecursive(archivePath, level) {
|
|
46
48
|
const failedFiles = [];
|
|
47
|
-
|
|
48
|
-
return failedFiles;
|
|
49
|
-
const archiveRootPath = path.dirname(archivePath);
|
|
49
|
+
const skippedByDepth = [];
|
|
50
50
|
const archiveName = path.basename(archivePath);
|
|
51
|
-
let newFolderPath = `${archiveRootPath}${path.sep}${archiveName}${this.suffix}`;
|
|
52
51
|
const isSupported = this.decompressorList.some((d) => d.isSupported(archiveName));
|
|
53
|
-
if (isSupported)
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
52
|
+
if (!isSupported)
|
|
53
|
+
return { failedFiles, skippedByDepth };
|
|
54
|
+
// Supported archive but configured depth exceeded — record and stop
|
|
55
|
+
if (level >= this.decompressionLevel) {
|
|
56
|
+
skippedByDepth.push(archivePath);
|
|
57
|
+
return { failedFiles, skippedByDepth };
|
|
58
|
+
}
|
|
59
|
+
const archiveRootPath = path.dirname(archivePath);
|
|
60
|
+
let newFolderPath = `${archiveRootPath}${path.sep}${archiveName}${this.suffix}`;
|
|
61
|
+
let i = 0;
|
|
62
|
+
const r = new RegExp("(?<=" + this.suffix + ")-\\d+$"); //Selects last -X where X is a number
|
|
63
|
+
while (!this.decompressOverride && fs.existsSync(newFolderPath)) { //Search for a free name
|
|
64
|
+
newFolderPath = newFolderPath.replace(r, "");
|
|
65
|
+
newFolderPath += `-${i}`;
|
|
66
|
+
i++;
|
|
67
|
+
}
|
|
68
|
+
await fs.promises.mkdir(newFolderPath, { recursive: true });
|
|
69
|
+
//Search for decompressor and extract archive
|
|
70
|
+
let extractionFailed = false;
|
|
71
|
+
for (const d of this.decompressorList) {
|
|
72
|
+
if (d.isSupported(archiveName)) {
|
|
73
|
+
try {
|
|
74
|
+
await d.run(archivePath, newFolderPath);
|
|
76
75
|
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
const newFilesPath = tree.getFileList(new DecompressionFilter(""));
|
|
83
|
-
for (const newFilePath of newFilesPath) {
|
|
84
|
-
const nestedFailed = await this.decompressRecursive(newFilePath, level + 1);
|
|
85
|
-
failedFiles.push(...nestedFailed);
|
|
76
|
+
catch (e) {
|
|
77
|
+
await fs.promises.rm(newFolderPath, { recursive: true, force: true });
|
|
78
|
+
const message = e instanceof Error ? e.message : String(e);
|
|
79
|
+
failedFiles.push({ path: archivePath, error: message });
|
|
80
|
+
extractionFailed = true;
|
|
86
81
|
}
|
|
82
|
+
break;
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
//Search for new archives (only if extraction succeeded)
|
|
86
|
+
if (!extractionFailed) {
|
|
87
|
+
const tree = new Tree(newFolderPath);
|
|
88
|
+
tree.build();
|
|
89
|
+
const newFilesPath = tree.getFileList(new DecompressionFilter(""));
|
|
90
|
+
for (const newFilePath of newFilesPath) {
|
|
91
|
+
const nested = await this.decompressRecursive(newFilePath, level + 1);
|
|
92
|
+
failedFiles.push(...nested.failedFiles);
|
|
93
|
+
skippedByDepth.push(...nested.skippedByDepth);
|
|
87
94
|
}
|
|
88
95
|
}
|
|
89
|
-
return failedFiles;
|
|
96
|
+
return { failedFiles, skippedByDepth };
|
|
90
97
|
}
|
|
91
98
|
}
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
99
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVjb21wcmVzc2lvbk1hbmFnZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2RrL0RlY29tcHJlc3MvRGVjb21wcmVzc2lvbk1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQ3hCLE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQztBQUNwQixPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQ3BDLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRTFFLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUM5RCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDN0QsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDM0UsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRTNELE1BQU0sT0FBTyxvQkFBb0I7SUFFdkIsZ0JBQWdCLENBQXFCO0lBRXJDLGtCQUFrQixDQUFTO0lBRTNCLE1BQU0sQ0FBUztJQUVmLGtCQUFrQixDQUFVLENBQUUsa0ZBQWtGO0lBQ2xGLGlIQUFpSDtJQUV2SixZQUFZLHFCQUE2QixDQUFDLEVBQUUsU0FBaUIsV0FBVyxFQUFFLHFCQUE4QixLQUFLO1FBQzNHLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxrQkFBa0IsQ0FBQztRQUM3QyxJQUFJLENBQUMsa0JBQWtCLEdBQUcsa0JBQWtCLENBQUM7UUFDN0MsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7UUFDckIsSUFBSSxDQUFDLGdCQUFnQixHQUFHO1lBQ3RCLElBQUksYUFBYSxFQUFFO1lBQ25CLElBQUksYUFBYSxFQUFFO1lBQ25CLElBQUksb0JBQW9CLEVBQUU7WUFDMUIsSUFBSSxZQUFZLEVBQUU7U0FDbkIsQ0FBQztJQUVKLENBQUM7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
|
|
@@ -6,7 +6,8 @@ export declare class ScannableItem {
|
|
|
6
6
|
private fingerprint;
|
|
7
7
|
private maxSizeWfp;
|
|
8
8
|
private lineOffset;
|
|
9
|
-
|
|
9
|
+
private isBinary;
|
|
10
|
+
constructor(content: Buffer, contentSource: string, winnowingMode: any, maxSizeWfp: number, isBinary?: boolean);
|
|
10
11
|
getContent(): Buffer<ArrayBufferLike>;
|
|
11
12
|
getContentSource(): string;
|
|
12
13
|
getFingerprint(): any;
|
|
@@ -5,12 +5,14 @@ export class ScannableItem {
|
|
|
5
5
|
fingerprint;
|
|
6
6
|
maxSizeWfp;
|
|
7
7
|
lineOffset;
|
|
8
|
-
|
|
8
|
+
isBinary;
|
|
9
|
+
constructor(content, contentSource, winnowingMode, maxSizeWfp, isBinary = false) {
|
|
9
10
|
this.contentSource = contentSource;
|
|
10
11
|
this.content = content;
|
|
11
12
|
this.winnowingMode = winnowingMode;
|
|
12
13
|
this.maxSizeWfp = maxSizeWfp;
|
|
13
14
|
this.lineOffset = 0;
|
|
15
|
+
this.isBinary = isBinary;
|
|
14
16
|
}
|
|
15
17
|
getContent() {
|
|
16
18
|
return this.content;
|
|
@@ -34,4 +36,4 @@ export class ScannableItem {
|
|
|
34
36
|
return this.lineOffset;
|
|
35
37
|
}
|
|
36
38
|
}
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2Nhbm5hYmxlSXRlbS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9zZGsvc2Nhbm5lci9TY2FubmFibGUvU2Nhbm5hYmxlSXRlbS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxNQUFNLE9BQU8sYUFBYTtJQUNoQixhQUFhLENBQVM7SUFFdEIsT0FBTyxDQUFTO0lBRWhCLGFBQWEsQ0FBZ0I7SUFFN0IsV0FBVyxDQUFNO0lBRWpCLFVBQVUsQ0FBTTtJQUVoQixVQUFVLENBQVM7SUFFbkIsUUFBUSxDQUFVO0lBRTFCLFlBQVksT0FBZSxFQUFFLGFBQXFCLEVBQUUsYUFBa0IsRUFBRSxVQUFrQixFQUFFLFFBQVEsR0FBRyxLQUFLO1FBQzFHLElBQUksQ0FBQyxhQUFhLEdBQUcsYUFBYSxDQUFDO1FBQ25DLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxhQUFhLEdBQUcsYUFBYSxDQUFDO1FBQ25DLElBQUksQ0FBQyxVQUFVLEdBQUcsVUFBVSxDQUFDO1FBQzdCLElBQUksQ0FBQyxVQUFVLEdBQUcsQ0FBQyxDQUFDO1FBQ3BCLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFDO0lBQzNCLENBQUM7SUFFTSxVQUFVO1FBQ2YsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQ3RCLENBQUM7SUFFTSxnQkFBZ0I7UUFDckIsT0FBTyxJQUFJLENBQUMsYUFBYSxDQUFDO0lBQzVCLENBQUM7SUFFTSxjQUFjO1FBQ25CLE9BQU8sSUFBSSxDQUFDLFdBQVcsQ0FBQztJQUMxQixDQUFDO0lBRU0sZ0JBQWdCO1FBQ3JCLE9BQU8sSUFBSSxDQUFDLGFBQWEsQ0FBQztJQUM1QixDQUFDO0lBRU0sYUFBYTtRQUNsQixPQUFPLElBQUksQ0FBQyxVQUFVLENBQUM7SUFDekIsQ0FBQztJQUVNLGFBQWEsQ0FBQyxNQUFjO1FBQ2pDLElBQUksQ0FBQyxVQUFVLEdBQUcsTUFBTSxDQUFDO0lBQzNCLENBQUM7SUFFTSxhQUFhO1FBQ2xCLE9BQU8sSUFBSSxDQUFDLFVBQVUsQ0FBQztJQUN6QixDQUFDO0NBQ0YifQ==
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import fs from 'fs';
|
|
2
|
+
import { isBinaryFileSync } from 'isbinaryfile';
|
|
2
3
|
import { Worker } from 'worker_threads';
|
|
3
4
|
import { ScannableItem } from '../../Scannable/ScannableItem';
|
|
4
5
|
import { ScannerCfg } from '../../ScannerCfg';
|
|
@@ -16,18 +17,21 @@ parentPort.on('message', async (scannableItem) => {
|
|
|
16
17
|
fingerprint = wfp_for_content(
|
|
17
18
|
scannableItem.content,
|
|
18
19
|
scannableItem.contentSource,
|
|
19
|
-
scannableItem.maxSizeWfp
|
|
20
|
+
scannableItem.maxSizeWfp,
|
|
21
|
+
scannableItem.isBinary
|
|
20
22
|
);
|
|
21
23
|
} else if (scannableItem.winnowingMode === "FULL_WINNOWING_HPSM") {
|
|
22
24
|
fingerprint = wfp_hpsm_for_content(
|
|
23
25
|
scannableItem.content,
|
|
24
26
|
scannableItem.contentSource,
|
|
25
|
-
scannableItem.maxSizeWfp
|
|
27
|
+
scannableItem.maxSizeWfp,
|
|
28
|
+
scannableItem.isBinary
|
|
26
29
|
);
|
|
27
30
|
} else if (scannableItem.winnowingMode === "WINNOWING_ONLY_MD5") {
|
|
28
31
|
fingerprint = wfp_only_md5(
|
|
29
32
|
scannableItem.content,
|
|
30
|
-
scannableItem.contentSource
|
|
33
|
+
scannableItem.contentSource,
|
|
34
|
+
scannableItem.isBinary
|
|
31
35
|
);
|
|
32
36
|
}
|
|
33
37
|
|
|
@@ -290,18 +294,25 @@ function join_wfp_hpsm(wfp, hpsm) {
|
|
|
290
294
|
* @param {Buffer} content
|
|
291
295
|
* @param {string} contentSource
|
|
292
296
|
* @param {number} maxSize
|
|
297
|
+
* @param {boolean} isBinary When true, HPSM and snippet winnowing are skipped (binary content has no line/code semantics)
|
|
293
298
|
* @returns {string}
|
|
294
299
|
*/
|
|
295
|
-
function wfp_hpsm_for_content(content, contentSource, maxSize) {
|
|
296
|
-
let wfp = wfp_for_content(content, contentSource, maxSize)
|
|
300
|
+
function wfp_hpsm_for_content(content, contentSource, maxSize, isBinary) {
|
|
301
|
+
let wfp = wfp_for_content(content, contentSource, maxSize, isBinary)
|
|
302
|
+
if (isBinary) return truncate_string(wfp, maxSize)
|
|
297
303
|
let hpsm = calc_hpsm(content) //Returns a string
|
|
298
304
|
let wfp_hpsm_joined = join_wfp_hpsm(wfp, hpsm)
|
|
299
305
|
return truncate_string(wfp_hpsm_joined, maxSize)
|
|
300
306
|
}
|
|
301
307
|
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
308
|
+
// Snippet winnowing and HPSM are line/code semantics — meaningless on
|
|
309
|
+
// binary content (random bytes produce noise grams). Binary files emit
|
|
310
|
+
// only the file= MD5 line, matching the behavior of WINNOWING_ONLY_MD5.
|
|
311
|
+
function wfp_for_content(content, contentSource, maxSize, isBinary) {
|
|
312
|
+
let wfp = wfp_only_md5(content, contentSource, isBinary);
|
|
313
|
+
if (!isBinary) {
|
|
314
|
+
wfp += calc_wfp(content, maxSize);
|
|
315
|
+
}
|
|
305
316
|
return wfp;
|
|
306
317
|
}
|
|
307
318
|
|
|
@@ -410,14 +421,17 @@ function calculate_opposite_line_ending_hash(contents) {
|
|
|
410
421
|
return crypto.createHash('md5').update(opposite_contents).digest('hex');
|
|
411
422
|
}
|
|
412
423
|
|
|
413
|
-
function wfp_only_md5(contents, contentSource) {
|
|
424
|
+
function wfp_only_md5(contents, contentSource, isBinary) {
|
|
414
425
|
const file_md5 = crypto.createHash('md5').update(contents).digest('hex');
|
|
415
426
|
let wfp = 'file=' + String(file_md5) + ',' + String(contents.length) + ',' + String(contentSource)+ String.fromCharCode(10);
|
|
416
427
|
|
|
417
|
-
//
|
|
418
|
-
|
|
419
|
-
if (
|
|
420
|
-
|
|
428
|
+
// fh2 has no meaning on binary content (no line endings to flip) and the
|
|
429
|
+
// normalization loop blows past V8 limits on large buffers.
|
|
430
|
+
if (!isBinary) {
|
|
431
|
+
const opposite_hash = calculate_opposite_line_ending_hash(contents);
|
|
432
|
+
if (opposite_hash !== null) {
|
|
433
|
+
wfp += 'fh2=' + String(opposite_hash) + String.fromCharCode(10);
|
|
434
|
+
}
|
|
421
435
|
}
|
|
422
436
|
|
|
423
437
|
return wfp;
|
|
@@ -557,10 +571,11 @@ export class WfpCalculator extends WfpProvider {
|
|
|
557
571
|
const path = this.fileList[this.fileListIndex];
|
|
558
572
|
const contentSource = path.replace(`${this.folderRoot}`, '');
|
|
559
573
|
const content = await this.readFile(path);
|
|
574
|
+
const isBinary = content.length > 0 && isBinaryFileSync(path);
|
|
560
575
|
this.fileListIndex += 1;
|
|
561
576
|
if (!(this.fileListIndex % this.scannerCfg.WINNOWING_REPORT_STATUS_AFTER_X))
|
|
562
577
|
this.emit(ScannerEvents.WINNOWING_STATUS, this.scannerCfg.WINNOWING_REPORT_STATUS_AFTER_X);
|
|
563
|
-
const scannable = new ScannableItem(content, contentSource, this.winnowingMode, this.scannerCfg.WFP_FILE_MAX_SIZE);
|
|
578
|
+
const scannable = new ScannableItem(content, contentSource, this.winnowingMode, this.scannerCfg.WFP_FILE_MAX_SIZE, isBinary);
|
|
564
579
|
if (this.headerFilter && content.length > 0) {
|
|
565
580
|
const lineOffset = this.headerFilter.filter(path, content.toString('utf-8'));
|
|
566
581
|
scannable.setLineOffset(lineOffset);
|
|
@@ -636,4 +651,4 @@ export class WfpCalculator extends WfpProvider {
|
|
|
636
651
|
this.sendFingerprint(fingerprint);
|
|
637
652
|
}
|
|
638
653
|
}
|
|
639
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
654
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"WfpCalculator.js","sourceRoot":"","sources":["../../../../../../src/sdk/scanner/WfpProvider/WfpCalculator/WfpCalculator.ts"],"names":[],"mappings":"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"}
|