scanoss 0.9.1 → 0.9.3
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/README.md +34 -2
- package/build/main/sdk/scanner/Dispatcher/Dispatcher.js +2 -2
- package/build/main/sdk/scanner/Scanner.d.ts +1 -0
- package/build/main/sdk/scanner/Scanner.js +17 -20
- package/build/main/sdk/scanner/ScannerCfg.js +5 -5
- package/build/main/sdk/scanner/WfpProvider/WfpCalculator/WfpCalculator.js +2 -2
- package/build/main/tsconfig.tsbuildinfo +5 -5
- package/build/module/sdk/scanner/Dispatcher/Dispatcher.js +2 -2
- package/build/module/sdk/scanner/Scanner.d.ts +1 -0
- package/build/module/sdk/scanner/Scanner.js +17 -20
- package/build/module/sdk/scanner/ScannerCfg.js +5 -5
- package/build/module/sdk/scanner/WfpProvider/WfpCalculator/WfpCalculator.js +2 -2
- package/build/module/tsconfig.module.tsbuildinfo +5 -5
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -41,9 +41,41 @@ Commands:
|
|
|
41
41
|
help [command] display help for command
|
|
42
42
|
```
|
|
43
43
|
|
|
44
|
-
|
|
44
|
+
### Command `scan`
|
|
45
|
+
|
|
46
|
+
* For a quick and free analysis of your project, simply input: `scanoss-js scan -o results.json <source-folder>`
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
* Using an API Token for Scanning: `scanoss-js scan -o results.json --key <your_token> --apiurl <your_apiurl> <source-folder>`
|
|
50
|
+
|
|
51
|
+
|
|
52
|
+
* Include Dependency detection in scanning: `scanoss-js scan -o results.json --dependencies <source-folder>`
|
|
53
|
+
|
|
54
|
+
### Command `wfp`
|
|
55
|
+
* Generate Hashes without analysis: `scanoss-js wfp -o fingerprints.wfp <source-folder>`
|
|
56
|
+
|
|
57
|
+
|
|
58
|
+
* Subsequent scanning of previously generated Hashes: `scanoss-js scan -w fingerprints.wfp -o results.json`
|
|
59
|
+
|
|
60
|
+
Note: the --dependencies flag is not applicable here, given that manifest files aren't encompassed within the hashes.
|
|
61
|
+
|
|
62
|
+
|
|
63
|
+
|
|
64
|
+
### Command `dep`
|
|
65
|
+
* Focus Exclusively on Dependencies: `scanoss-js dep .`
|
|
66
|
+
|
|
67
|
+
The manifest files acknowledged during the scanning process are:
|
|
68
|
+
|
|
69
|
+
* Python: requirements.txt
|
|
70
|
+
* Java: pom.xml
|
|
71
|
+
* Javascript: package.json, package-lock.json, yarn.lock
|
|
72
|
+
* Ruby: Gemfile, Gemfile.lock
|
|
73
|
+
* Golang: go.mod, go.sum
|
|
74
|
+
* .NET/NuGet: *.csproj, packages.config
|
|
75
|
+
* Gradle: build.gradle
|
|
76
|
+
|
|
77
|
+
|
|
45
78
|
|
|
46
|
-
`scanoss-js scan -o scan-output.json <source-folder>`
|
|
47
79
|
|
|
48
80
|
## SDK Usage
|
|
49
81
|
The SDK provides a simple way to interact with the Scanoss APIs from your JS code. Here are two examples for performing code scanning and dependency scanning
|
|
@@ -85,7 +85,7 @@ class Dispatcher extends eventemitter3_1.default {
|
|
|
85
85
|
errorHandler(error, disptItem, response) {
|
|
86
86
|
if (!this.globalAbortController.isAborting()) {
|
|
87
87
|
if (error.name === 'AbortError') {
|
|
88
|
-
error.message = `
|
|
88
|
+
error.message = `Timeout reached for packet with request ID ${disptItem.uuid}. Enqueuing again.`;
|
|
89
89
|
error.name = 'TIMEOUT';
|
|
90
90
|
}
|
|
91
91
|
if (this.recoverableErrors.has(error.name)) {
|
|
@@ -142,4 +142,4 @@ class Dispatcher extends eventemitter3_1.default {
|
|
|
142
142
|
}
|
|
143
143
|
}
|
|
144
144
|
exports.Dispatcher = Dispatcher;
|
|
145
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
145
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGlzcGF0Y2hlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9zZGsvc2Nhbm5lci9EaXNwYXRjaGVyL0Rpc3BhdGNoZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxpQ0FBaUM7QUFDakMseUNBQXlDO0FBQ3pDLGtFQUF5QztBQUN6Qyw0REFBNkM7QUFDN0Msc0RBQTZCO0FBRTdCLGtEQUFnRDtBQUNoRCw2REFBMEQ7QUFDMUQsOENBQTJDO0FBQzNDLHVFQUFvRTtBQUVwRSx5REFBb0Q7QUFDcEQsdURBQWtEO0FBQ2xELDZDQUEwQztBQUUxQyxNQUFNLHNCQUFzQixHQUFHLEVBQUUsQ0FBQztBQUVsQyxNQUFhLFVBQVcsU0FBUSx1QkFBWTtJQWlCMUMsWUFBWSxVQUFVLEdBQUcsSUFBSSx1QkFBVSxFQUFFO1FBQ3ZDLEtBQUssRUFBRSxDQUFDO1FBQ1IsSUFBSSxDQUFDLFVBQVUsR0FBRyxVQUFVLENBQUM7UUFDN0IsSUFBRyxJQUFJLENBQUMsVUFBVSxDQUFDLGlCQUFpQixHQUFHLHNCQUFzQjtZQUMzRCxJQUFJLENBQUMsVUFBVSxDQUFDLGlCQUFpQixHQUFHLHNCQUFzQixDQUFDO1FBRTdELElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUNkLENBQUM7SUFFRCxJQUFJO1FBRUYsb0ZBQW9GO1FBQ3BGLElBQUksQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDO1FBRW5CLE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxJQUFLLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxJQUFJLElBQUksQ0FBQztRQUMzSixNQUFNLFVBQVUsR0FBRyxJQUFJ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
|
|
@@ -29,6 +29,7 @@ export declare class Scanner extends EventEmitter {
|
|
|
29
29
|
private insertIntoBuffer;
|
|
30
30
|
private isBufferEmpty;
|
|
31
31
|
private bufferReachedLimit;
|
|
32
|
+
private deobfuscationResponses;
|
|
32
33
|
private bufferToFiles;
|
|
33
34
|
setWorkDirectory(workDirectory: string): void;
|
|
34
35
|
getWorkDirectory(): string;
|
|
@@ -33,7 +33,7 @@ class Scanner extends eventemitter3_1.default {
|
|
|
33
33
|
this.responseBuffer = [];
|
|
34
34
|
this.filesToScan = {};
|
|
35
35
|
this.filesNotScanned = {};
|
|
36
|
-
this.obfuscateMap =
|
|
36
|
+
this.obfuscateMap = {};
|
|
37
37
|
this.wfpProvider = new WfpCalculator_1.WfpCalculator(this.scannerCfg);
|
|
38
38
|
this.dispatcher = new Dispatcher_1.Dispatcher(this.scannerCfg);
|
|
39
39
|
this.finishPromise = new Promise((resolve, reject) => {
|
|
@@ -51,7 +51,7 @@ class Scanner extends eventemitter3_1.default {
|
|
|
51
51
|
this.emit(ScannerTypes_1.ScannerEvents.WINNOWING_NEW_CONTENT, fingerprintPackage);
|
|
52
52
|
this.reportLog(`[ SCANNER ]: New WFP content`);
|
|
53
53
|
if (fingerprintPackage.isObfuscated())
|
|
54
|
-
this.obfuscateMap.
|
|
54
|
+
this.obfuscateMap = Object.assign(Object.assign({}, this.obfuscateMap), fingerprintPackage.getObfuscationMap());
|
|
55
55
|
const item = new DispatchableItem_1.DispatchableItem();
|
|
56
56
|
item.setFingerprintPackage(fingerprintPackage);
|
|
57
57
|
item.uuid = uuid_1.v4();
|
|
@@ -104,7 +104,7 @@ class Scanner extends eventemitter3_1.default {
|
|
|
104
104
|
const filesNotScanned = disptItem.getFingerprintPackage().getFilesFingerprinted();
|
|
105
105
|
this.appendFilesToNotScanned(filesNotScanned);
|
|
106
106
|
});
|
|
107
|
-
this.
|
|
107
|
+
this.dispatcher.on(ScannerTypes_1.ScannerEvents.DISPATCHER_LOG, (msg) => {
|
|
108
108
|
this.reportLog(msg);
|
|
109
109
|
});
|
|
110
110
|
this.dispatcher.on(ScannerTypes_1.ScannerEvents.ERROR, (error, disptItem, response) => {
|
|
@@ -140,6 +140,13 @@ class Scanner extends eventemitter3_1.default {
|
|
|
140
140
|
return true;
|
|
141
141
|
return false;
|
|
142
142
|
}
|
|
143
|
+
deobfuscationResponses(responses, obfuscateMap) {
|
|
144
|
+
const deObfuscation = {};
|
|
145
|
+
Object.entries(responses).forEach(([key, value]) => {
|
|
146
|
+
deObfuscation[obfuscateMap[key]] = value;
|
|
147
|
+
});
|
|
148
|
+
return deObfuscation;
|
|
149
|
+
}
|
|
143
150
|
bufferToFiles() {
|
|
144
151
|
let wfpContent = '';
|
|
145
152
|
const serverResponse = {};
|
|
@@ -149,14 +156,11 @@ class Scanner extends eventemitter3_1.default {
|
|
|
149
156
|
const serverResponseToAppend = dispatcherResponse.getServerResponse();
|
|
150
157
|
Object.assign(serverResponse, serverResponseToAppend);
|
|
151
158
|
}
|
|
152
|
-
|
|
153
|
-
for (const obfuscateMapChunk of this.obfuscateMap) {
|
|
154
|
-
Object.assign(obfuscateMap, obfuscateMapChunk);
|
|
155
|
-
}
|
|
156
|
-
this.appendOutputFiles(wfpContent, serverResponse, obfuscateMap);
|
|
159
|
+
this.appendOutputFiles(wfpContent, serverResponse);
|
|
157
160
|
this.responseBuffer = [];
|
|
158
|
-
this.
|
|
159
|
-
|
|
161
|
+
const r = (this.scannerCfg.WFP_OBFUSCATION &&
|
|
162
|
+
this.scannerCfg.RESULTS_DEOBFUSCATION) ? this.deobfuscationResponses(serverResponse, this.obfuscateMap) : serverResponse;
|
|
163
|
+
const responses = new DispatcherResponse_1.DispatcherResponse(r, wfpContent);
|
|
160
164
|
this.reportLog(`[ SCANNER ]: Persisted results of ${responses.getNumberOfFilesScanned()} files...`);
|
|
161
165
|
this.emit(ScannerTypes_1.ScannerEvents.RESULTS_APPENDED, responses, this.filesNotScanned);
|
|
162
166
|
return responses;
|
|
@@ -208,7 +212,6 @@ class Scanner extends eventemitter3_1.default {
|
|
|
208
212
|
this.bufferToFiles();
|
|
209
213
|
const results = JSON.parse(await fs_1.default.promises.readFile(this.resultFilePath, 'utf8'));
|
|
210
214
|
if (this.scannerCfg.WFP_OBFUSCATION && this.scannerCfg.RESULTS_DEOBFUSCATION) {
|
|
211
|
-
this.obfuscateMap = JSON.parse(await fs_1.default.promises.readFile(this.obfuscateMapFilePath, 'utf8'));
|
|
212
215
|
for (const key of Object.keys(this.obfuscateMap)) {
|
|
213
216
|
const component = results[key];
|
|
214
217
|
const originalPath = this.obfuscateMap[key];
|
|
@@ -222,6 +225,7 @@ class Scanner extends eventemitter3_1.default {
|
|
|
222
225
|
for (const key of sortedPaths)
|
|
223
226
|
resultSorted[key] = results[key];
|
|
224
227
|
await fs_1.default.promises.writeFile(this.resultFilePath, JSON.stringify(resultSorted, null, 2));
|
|
228
|
+
await fs_1.default.promises.writeFile(this.obfuscateMapFilePath, JSON.stringify(this.obfuscateMap, null, 2));
|
|
225
229
|
this.reportLog(`[ SCANNER ]: Scan finished (Scanned: ${this.processedFiles}, Not Scanned: ${Object.keys(this.filesNotScanned).length})`);
|
|
226
230
|
this.reportLog(`[ SCANNER ]: Results on: ${this.resultFilePath}`);
|
|
227
231
|
this.running = false;
|
|
@@ -252,20 +256,13 @@ class Scanner extends eventemitter3_1.default {
|
|
|
252
256
|
fs_1.default.writeFileSync(this.obfuscateMapFilePath, JSON.stringify({}));
|
|
253
257
|
}
|
|
254
258
|
}
|
|
255
|
-
appendOutputFiles(wfpContent, serverResponse
|
|
259
|
+
appendOutputFiles(wfpContent, serverResponse) {
|
|
256
260
|
fs_1.default.appendFileSync(this.wfpFilePath, wfpContent);
|
|
257
261
|
const storedResultStr = fs_1.default.readFileSync(this.resultFilePath, 'utf-8');
|
|
258
262
|
const storedResultObj = JSON.parse(storedResultStr);
|
|
259
263
|
Object.assign(storedResultObj, serverResponse);
|
|
260
264
|
const newResultStr = JSON.stringify(storedResultObj);
|
|
261
265
|
fs_1.default.writeFileSync(this.resultFilePath, newResultStr);
|
|
262
|
-
if (this.scannerCfg.WFP_OBFUSCATION) {
|
|
263
|
-
const storedObfuscationMapStr = fs_1.default.readFileSync(this.obfuscateMapFilePath, 'utf-8');
|
|
264
|
-
const storedObfuscationMap = JSON.parse(storedObfuscationMapStr);
|
|
265
|
-
Object.assign(storedObfuscationMap, obfuscationMap);
|
|
266
|
-
const newObfuscationMap = JSON.stringify(storedObfuscationMap);
|
|
267
|
-
fs_1.default.writeFileSync(this.obfuscateMapFilePath, newObfuscationMap);
|
|
268
|
-
}
|
|
269
266
|
}
|
|
270
267
|
scan(scannerInput) {
|
|
271
268
|
var _a, _b, _c;
|
|
@@ -330,4 +327,4 @@ class Scanner extends eventemitter3_1.default {
|
|
|
330
327
|
}
|
|
331
328
|
}
|
|
332
329
|
exports.Scanner = Scanner;
|
|
333
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Scanner.js","sourceRoot":"","sources":["../../../../src/sdk/scanner/Scanner.ts"],"names":[],"mappings":"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"}
|
|
330
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Scanner.js","sourceRoot":"","sources":["../../../../src/sdk/scanner/Scanner.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,9 +13,9 @@ class ScannerCfg extends BaseConfig_1.BaseConfig {
|
|
|
13
13
|
//Set to true to ignore self certificates issues
|
|
14
14
|
this.IGNORE_CERT_ERRORS = false;
|
|
15
15
|
// Level of concurrency
|
|
16
|
-
this.CONCURRENCY_LIMIT =
|
|
16
|
+
this.CONCURRENCY_LIMIT = 10;
|
|
17
17
|
// Timeout for each transaction
|
|
18
|
-
this.TIMEOUT =
|
|
18
|
+
this.TIMEOUT = 180000;
|
|
19
19
|
// The maximum size for each .wfp file
|
|
20
20
|
this.WFP_FILE_MAX_SIZE = 64 * 1000;
|
|
21
21
|
this.WFP_OBFUSCATION = false;
|
|
@@ -27,10 +27,10 @@ class ScannerCfg extends BaseConfig_1.BaseConfig {
|
|
|
27
27
|
this.ABORT_ON_MAX_RETRIES = true;
|
|
28
28
|
// Persist results after [ X ] server responses
|
|
29
29
|
this.MAX_RESPONSES_IN_BUFFER = 300;
|
|
30
|
-
this.DISPATCHER_QUEUE_SIZE_MAX_LIMIT =
|
|
31
|
-
this.DISPATCHER_QUEUE_SIZE_MIN_LIMIT =
|
|
30
|
+
this.DISPATCHER_QUEUE_SIZE_MAX_LIMIT = 2000;
|
|
31
|
+
this.DISPATCHER_QUEUE_SIZE_MIN_LIMIT = 1000;
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
exports.ScannerCfg = ScannerCfg;
|
|
35
35
|
;
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2Nhbm5lckNmZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zZGsvc2Nhbm5lci9TY2FubmVyQ2ZnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsOENBQTJDO0FBRzNDLE1BQWEsVUFBVyxTQUFRLHVCQUFVO0lBQTFDOztRQUNFLDJEQUEyRDtRQUNwRCxxQkFBZ0IsR0FBRyxFQUFFLENBQUE7UUFDNUIsVUFBVTtRQUNILFlBQU8sR0FBRyxtQ0FBbUMsQ0FBQztRQUU5QyxZQUFPLEdBQUcsRUFBRSxDQUFDO1FBRWIsWUFBTyxHQUFHLEVBQUUsQ0FBQztRQUVwQixnREFBZ0Q7UUFDekMsdUJBQWtCLEdBQUcsS0FBSyxDQUFDO1FBRWxDLHVCQUF1QjtRQUNoQixzQkFBaUIsR0FBRyxFQUFFLENBQUM7UUFFOUIsK0JBQStCO1FBQ3hCLFlBQU8sR0FBRyxNQUFNLENBQUM7UUFFeEIsc0NBQXNDO1FBQy9CLHNCQUFpQixHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUM7UUFFOUIsb0JBQWUsR0FBRyxLQUFLLENBQUM7UUFFeEIsMEJBQXFCLEdBQUcsSUFBSSxDQUFDO1FBQ3BDLDBEQUEwRDtRQUMxRCw4RUFBOEU7UUFDdkUsb0NBQStCLEdBQUcsRUFBRSxDQUFDO1FBRXJDLHdDQUFtQyxHQUFHLENBQUMsQ0FBQztRQUV4Qyx5QkFBb0IsR0FBRyxJQUFJLENBQUM7UUFFbkMsK0NBQStDO1FBQ3hDLDRCQUF1QixHQUFHLEdBQUcsQ0FBQztRQUU5QixvQ0FBK0IsR0FBRyxJQUFJLENBQUM7UUFFdkMsb0NBQStCLEdBQUcsSUFBSSxDQUFDO0lBRWhELENBQUM7Q0FBQTtBQXhDRCxnQ0F3Q0M7QUFBQSxDQUFDIn0=
|
|
@@ -411,7 +411,7 @@ class WfpCalculator extends WfpProvider_1.WfpProvider {
|
|
|
411
411
|
// Files: contains all files winnowed but not packed yet
|
|
412
412
|
const files = new FingerprintPackage_1.FingerprintPackage(this.wfp, this.folderRoot).getFilesFingerprinted();
|
|
413
413
|
if (files.length) {
|
|
414
|
-
const lastFileWinnowed = files[files.length - 1];
|
|
414
|
+
const lastFileWinnowed = this.folderRoot + files[files.length - 1];
|
|
415
415
|
let i = 0;
|
|
416
416
|
while (i <= files.length && lastFileWinnowed !== this.fileList[this.fileListIndex - i]) {
|
|
417
417
|
i += 1;
|
|
@@ -496,4 +496,4 @@ class WfpCalculator extends WfpProvider_1.WfpProvider {
|
|
|
496
496
|
}
|
|
497
497
|
}
|
|
498
498
|
exports.WfpCalculator = WfpCalculator;
|
|
499
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
499
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiV2ZwQ2FsY3VsYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9zZGsvc2Nhbm5lci9XZnBQcm92aWRlci9XZnBDYWxjdWxhdG9yL1dmcENhbGN1bGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw0Q0FBb0I7QUFDcEIsbURBQXdDO0FBRXhDLGlFQUE4RDtBQUM5RCxpREFBOEM7QUFDOUMscURBQWdGO0FBRWhGLDhEQUEyRDtBQUMzRCxnREFBZ0U7QUFFaEUsTUFBTSxZQUFZLEdBQUc7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQTBYcEIsQ0FBQztBQUVGLE1BQWEsYUFBYyxTQUFRLHlCQUFXO0lBTzVDLFlBQVksVUFBVSxHQUFHLElBQUksdUJBQVUsRUFBRTtRQUN2QyxLQUFLLEVBQUUsQ0FBQztRQUNSLElBQUksQ0FBQyxVQUFVLEdBQUcsVUFBVSxDQUFDO0lBQy9CLENBQUM7SUFFRCxJQUFJO1FBQ0YsS0FBSyxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ2IsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUM7UUFDckIsSUFBSSxDQUFDLFFBQVEs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
|
|
@@ -552,7 +552,7 @@
|
|
|
552
552
|
"affectsGlobalScope": false
|
|
553
553
|
},
|
|
554
554
|
"../../src/sdk/scanner/ScannerCfg.ts": {
|
|
555
|
-
"version": "
|
|
555
|
+
"version": "0928fdcb9c509257c0dd2090b035349549d2933d16628d70ad613ef57232e5b3",
|
|
556
556
|
"signature": "83bcdff0644f91c60647ee8d7f3ca4872e38d70051a06a03b18101be433cf783",
|
|
557
557
|
"affectsGlobalScope": false
|
|
558
558
|
},
|
|
@@ -592,7 +592,7 @@
|
|
|
592
592
|
"affectsGlobalScope": false
|
|
593
593
|
},
|
|
594
594
|
"../../src/sdk/scanner/Dispatcher/Dispatcher.ts": {
|
|
595
|
-
"version": "
|
|
595
|
+
"version": "5b44123202d08412f9e76de54b8c1d93be36ce8261b5a483cb631ae98973e10e",
|
|
596
596
|
"signature": "db2ed7a11c770ab4e4b4c9c6df418a3932dc5588fbbe3831e2340dc4f5876807",
|
|
597
597
|
"affectsGlobalScope": false
|
|
598
598
|
},
|
|
@@ -607,7 +607,7 @@
|
|
|
607
607
|
"affectsGlobalScope": false
|
|
608
608
|
},
|
|
609
609
|
"../../src/sdk/scanner/WfpProvider/WfpCalculator/WfpCalculator.ts": {
|
|
610
|
-
"version": "
|
|
610
|
+
"version": "829807fd9b45a6dc12348d483f729e30164c3eb4d32f9a462f00183fb5fbfc79",
|
|
611
611
|
"signature": "39ebe6a7fcbdf428382559b1bc3f0feffcae712c46e9e4d7226f466f598c20b7",
|
|
612
612
|
"affectsGlobalScope": false
|
|
613
613
|
},
|
|
@@ -617,8 +617,8 @@
|
|
|
617
617
|
"affectsGlobalScope": false
|
|
618
618
|
},
|
|
619
619
|
"../../src/sdk/scanner/Scanner.ts": {
|
|
620
|
-
"version": "
|
|
621
|
-
"signature": "
|
|
620
|
+
"version": "eab7801773750f8beac7d641172101142e683c57c3695ca35bae157a272da392",
|
|
621
|
+
"signature": "ce8980e804f23b45079ebeb46491fe25d188bcb4dca5b8dd39d26e99f63bea46",
|
|
622
622
|
"affectsGlobalScope": false
|
|
623
623
|
},
|
|
624
624
|
"../../src/sdk/scanner/Fingerprint.ts": {
|
|
@@ -80,7 +80,7 @@ export class Dispatcher extends EventEmitter {
|
|
|
80
80
|
errorHandler(error, disptItem, response) {
|
|
81
81
|
if (!this.globalAbortController.isAborting()) {
|
|
82
82
|
if (error.name === 'AbortError') {
|
|
83
|
-
error.message = `
|
|
83
|
+
error.message = `Timeout reached for packet with request ID ${disptItem.uuid}. Enqueuing again.`;
|
|
84
84
|
error.name = 'TIMEOUT';
|
|
85
85
|
}
|
|
86
86
|
if (this.recoverableErrors.has(error.name)) {
|
|
@@ -136,4 +136,4 @@ export class Dispatcher extends EventEmitter {
|
|
|
136
136
|
}
|
|
137
137
|
}
|
|
138
138
|
}
|
|
139
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
139
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGlzcGF0Y2hlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9zZGsvc2Nhbm5lci9EaXNwYXRjaGVyL0Rpc3BhdGNoZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsaUNBQWlDO0FBQ2pDLHlDQUF5QztBQUN6QyxPQUFPLFlBQVksTUFBTSxlQUFlLENBQUM7QUFDekMsT0FBTyxLQUFtQixNQUFNLFlBQVksQ0FBQztBQUM3QyxPQUFPLE1BQU0sTUFBTSxTQUFTLENBQUM7QUFFN0IsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzFELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDM0MsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFcEUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNsRCxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFMUMsTUFBTSxzQkFBc0IsR0FBRyxFQUFFLENBQUM7QUFFbEMsTUFBTSxPQUFPLFVBQVcsU0FBUSxZQUFZO0lBaUIxQyxZQUFZLFVBQVUsR0FBRyxJQUFJLFVBQVUsRUFBRTtRQUN2QyxLQUFLLEVBQUUsQ0FBQztRQUNSLElBQUksQ0FBQyxVQUFVLEdBQUcsVUFBVSxDQUFDO1FBQzdCLElBQUcsSUFBSSxDQUFDLFVBQVUsQ0FBQyxpQkFBaUIsR0FBRyxzQkFBc0I7WUFDM0QsSUFBSSxDQUFDLFVBQVUsQ0FBQyxpQkFBaUIsR0FBRyxzQkFBc0IsQ0FBQztRQUU3RCxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDZCxDQUFDO0lBRUQsSUFBSTtRQUVGLG9GQUFvRjtRQUNwRixJQUFJLENB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
|
|
@@ -29,6 +29,7 @@ export declare class Scanner extends EventEmitter {
|
|
|
29
29
|
private insertIntoBuffer;
|
|
30
30
|
private isBufferEmpty;
|
|
31
31
|
private bufferReachedLimit;
|
|
32
|
+
private deobfuscationResponses;
|
|
32
33
|
private bufferToFiles;
|
|
33
34
|
setWorkDirectory(workDirectory: string): void;
|
|
34
35
|
getWorkDirectory(): string;
|
|
@@ -28,7 +28,7 @@ export class Scanner extends EventEmitter {
|
|
|
28
28
|
this.responseBuffer = [];
|
|
29
29
|
this.filesToScan = {};
|
|
30
30
|
this.filesNotScanned = {};
|
|
31
|
-
this.obfuscateMap =
|
|
31
|
+
this.obfuscateMap = {};
|
|
32
32
|
this.wfpProvider = new WfpCalculator(this.scannerCfg);
|
|
33
33
|
this.dispatcher = new Dispatcher(this.scannerCfg);
|
|
34
34
|
this.finishPromise = new Promise((resolve, reject) => {
|
|
@@ -45,7 +45,7 @@ export class Scanner extends EventEmitter {
|
|
|
45
45
|
this.emit(ScannerEvents.WINNOWING_NEW_CONTENT, fingerprintPackage);
|
|
46
46
|
this.reportLog(`[ SCANNER ]: New WFP content`);
|
|
47
47
|
if (fingerprintPackage.isObfuscated())
|
|
48
|
-
this.obfuscateMap.
|
|
48
|
+
this.obfuscateMap = { ...this.obfuscateMap, ...fingerprintPackage.getObfuscationMap() };
|
|
49
49
|
const item = new DispatchableItem();
|
|
50
50
|
item.setFingerprintPackage(fingerprintPackage);
|
|
51
51
|
item.uuid = uuidv4();
|
|
@@ -98,7 +98,7 @@ export class Scanner extends EventEmitter {
|
|
|
98
98
|
const filesNotScanned = disptItem.getFingerprintPackage().getFilesFingerprinted();
|
|
99
99
|
this.appendFilesToNotScanned(filesNotScanned);
|
|
100
100
|
});
|
|
101
|
-
this.
|
|
101
|
+
this.dispatcher.on(ScannerEvents.DISPATCHER_LOG, (msg) => {
|
|
102
102
|
this.reportLog(msg);
|
|
103
103
|
});
|
|
104
104
|
this.dispatcher.on(ScannerEvents.ERROR, (error, disptItem, response) => {
|
|
@@ -134,6 +134,13 @@ export class Scanner extends EventEmitter {
|
|
|
134
134
|
return true;
|
|
135
135
|
return false;
|
|
136
136
|
}
|
|
137
|
+
deobfuscationResponses(responses, obfuscateMap) {
|
|
138
|
+
const deObfuscation = {};
|
|
139
|
+
Object.entries(responses).forEach(([key, value]) => {
|
|
140
|
+
deObfuscation[obfuscateMap[key]] = value;
|
|
141
|
+
});
|
|
142
|
+
return deObfuscation;
|
|
143
|
+
}
|
|
137
144
|
bufferToFiles() {
|
|
138
145
|
let wfpContent = '';
|
|
139
146
|
const serverResponse = {};
|
|
@@ -143,14 +150,11 @@ export class Scanner extends EventEmitter {
|
|
|
143
150
|
const serverResponseToAppend = dispatcherResponse.getServerResponse();
|
|
144
151
|
Object.assign(serverResponse, serverResponseToAppend);
|
|
145
152
|
}
|
|
146
|
-
|
|
147
|
-
for (const obfuscateMapChunk of this.obfuscateMap) {
|
|
148
|
-
Object.assign(obfuscateMap, obfuscateMapChunk);
|
|
149
|
-
}
|
|
150
|
-
this.appendOutputFiles(wfpContent, serverResponse, obfuscateMap);
|
|
153
|
+
this.appendOutputFiles(wfpContent, serverResponse);
|
|
151
154
|
this.responseBuffer = [];
|
|
152
|
-
this.
|
|
153
|
-
|
|
155
|
+
const r = (this.scannerCfg.WFP_OBFUSCATION &&
|
|
156
|
+
this.scannerCfg.RESULTS_DEOBFUSCATION) ? this.deobfuscationResponses(serverResponse, this.obfuscateMap) : serverResponse;
|
|
157
|
+
const responses = new DispatcherResponse(r, wfpContent);
|
|
154
158
|
this.reportLog(`[ SCANNER ]: Persisted results of ${responses.getNumberOfFilesScanned()} files...`);
|
|
155
159
|
this.emit(ScannerEvents.RESULTS_APPENDED, responses, this.filesNotScanned);
|
|
156
160
|
return responses;
|
|
@@ -201,7 +205,6 @@ export class Scanner extends EventEmitter {
|
|
|
201
205
|
this.bufferToFiles();
|
|
202
206
|
const results = JSON.parse(await fs.promises.readFile(this.resultFilePath, 'utf8'));
|
|
203
207
|
if (this.scannerCfg.WFP_OBFUSCATION && this.scannerCfg.RESULTS_DEOBFUSCATION) {
|
|
204
|
-
this.obfuscateMap = JSON.parse(await fs.promises.readFile(this.obfuscateMapFilePath, 'utf8'));
|
|
205
208
|
for (const key of Object.keys(this.obfuscateMap)) {
|
|
206
209
|
const component = results[key];
|
|
207
210
|
const originalPath = this.obfuscateMap[key];
|
|
@@ -215,6 +218,7 @@ export class Scanner extends EventEmitter {
|
|
|
215
218
|
for (const key of sortedPaths)
|
|
216
219
|
resultSorted[key] = results[key];
|
|
217
220
|
await fs.promises.writeFile(this.resultFilePath, JSON.stringify(resultSorted, null, 2));
|
|
221
|
+
await fs.promises.writeFile(this.obfuscateMapFilePath, JSON.stringify(this.obfuscateMap, null, 2));
|
|
218
222
|
this.reportLog(`[ SCANNER ]: Scan finished (Scanned: ${this.processedFiles}, Not Scanned: ${Object.keys(this.filesNotScanned).length})`);
|
|
219
223
|
this.reportLog(`[ SCANNER ]: Results on: ${this.resultFilePath}`);
|
|
220
224
|
this.running = false;
|
|
@@ -245,20 +249,13 @@ export class Scanner extends EventEmitter {
|
|
|
245
249
|
fs.writeFileSync(this.obfuscateMapFilePath, JSON.stringify({}));
|
|
246
250
|
}
|
|
247
251
|
}
|
|
248
|
-
appendOutputFiles(wfpContent, serverResponse
|
|
252
|
+
appendOutputFiles(wfpContent, serverResponse) {
|
|
249
253
|
fs.appendFileSync(this.wfpFilePath, wfpContent);
|
|
250
254
|
const storedResultStr = fs.readFileSync(this.resultFilePath, 'utf-8');
|
|
251
255
|
const storedResultObj = JSON.parse(storedResultStr);
|
|
252
256
|
Object.assign(storedResultObj, serverResponse);
|
|
253
257
|
const newResultStr = JSON.stringify(storedResultObj);
|
|
254
258
|
fs.writeFileSync(this.resultFilePath, newResultStr);
|
|
255
|
-
if (this.scannerCfg.WFP_OBFUSCATION) {
|
|
256
|
-
const storedObfuscationMapStr = fs.readFileSync(this.obfuscateMapFilePath, 'utf-8');
|
|
257
|
-
const storedObfuscationMap = JSON.parse(storedObfuscationMapStr);
|
|
258
|
-
Object.assign(storedObfuscationMap, obfuscationMap);
|
|
259
|
-
const newObfuscationMap = JSON.stringify(storedObfuscationMap);
|
|
260
|
-
fs.writeFileSync(this.obfuscateMapFilePath, newObfuscationMap);
|
|
261
|
-
}
|
|
262
259
|
}
|
|
263
260
|
scan(scannerInput) {
|
|
264
261
|
this.init();
|
|
@@ -321,4 +318,4 @@ export class Scanner extends EventEmitter {
|
|
|
321
318
|
return this.running;
|
|
322
319
|
}
|
|
323
320
|
}
|
|
324
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Scanner.js","sourceRoot":"","sources":["../../../../src/sdk/scanner/Scanner.ts"],"names":[],"mappings":"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"}
|
|
321
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Scanner.js","sourceRoot":"","sources":["../../../../src/sdk/scanner/Scanner.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,9 +11,9 @@ export class ScannerCfg extends BaseConfig {
|
|
|
11
11
|
//Set to true to ignore self certificates issues
|
|
12
12
|
this.IGNORE_CERT_ERRORS = false;
|
|
13
13
|
// Level of concurrency
|
|
14
|
-
this.CONCURRENCY_LIMIT =
|
|
14
|
+
this.CONCURRENCY_LIMIT = 10;
|
|
15
15
|
// Timeout for each transaction
|
|
16
|
-
this.TIMEOUT =
|
|
16
|
+
this.TIMEOUT = 180000;
|
|
17
17
|
// The maximum size for each .wfp file
|
|
18
18
|
this.WFP_FILE_MAX_SIZE = 64 * 1000;
|
|
19
19
|
this.WFP_OBFUSCATION = false;
|
|
@@ -25,9 +25,9 @@ export class ScannerCfg extends BaseConfig {
|
|
|
25
25
|
this.ABORT_ON_MAX_RETRIES = true;
|
|
26
26
|
// Persist results after [ X ] server responses
|
|
27
27
|
this.MAX_RESPONSES_IN_BUFFER = 300;
|
|
28
|
-
this.DISPATCHER_QUEUE_SIZE_MAX_LIMIT =
|
|
29
|
-
this.DISPATCHER_QUEUE_SIZE_MIN_LIMIT =
|
|
28
|
+
this.DISPATCHER_QUEUE_SIZE_MAX_LIMIT = 2000;
|
|
29
|
+
this.DISPATCHER_QUEUE_SIZE_MIN_LIMIT = 1000;
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
32
|
;
|
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2Nhbm5lckNmZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zZGsvc2Nhbm5lci9TY2FubmVyQ2ZnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFHM0MsTUFBTSxPQUFPLFVBQVcsU0FBUSxVQUFVO0lBQTFDOztRQUNFLDJEQUEyRDtRQUNwRCxxQkFBZ0IsR0FBRyxFQUFFLENBQUE7UUFDNUIsVUFBVTtRQUNILFlBQU8sR0FBRyxtQ0FBbUMsQ0FBQztRQUU5QyxZQUFPLEdBQUcsRUFBRSxDQUFDO1FBRWIsWUFBTyxHQUFHLEVBQUUsQ0FBQztRQUVwQixnREFBZ0Q7UUFDekMsdUJBQWtCLEdBQUcsS0FBSyxDQUFDO1FBRWxDLHVCQUF1QjtRQUNoQixzQkFBaUIsR0FBRyxFQUFFLENBQUM7UUFFOUIsK0JBQStCO1FBQ3hCLFlBQU8sR0FBRyxNQUFNLENBQUM7UUFFeEIsc0NBQXNDO1FBQy9CLHNCQUFpQixHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUM7UUFFOUIsb0JBQWUsR0FBRyxLQUFLLENBQUM7UUFFeEIsMEJBQXFCLEdBQUcsSUFBSSxDQUFDO1FBQ3BDLDBEQUEwRDtRQUMxRCw4RUFBOEU7UUFDdkUsb0NBQStCLEdBQUcsRUFBRSxDQUFDO1FBRXJDLHdDQUFtQyxHQUFHLENBQUMsQ0FBQztRQUV4Qyx5QkFBb0IsR0FBRyxJQUFJLENBQUM7UUFFbkMsK0NBQStDO1FBQ3hDLDRCQUF1QixHQUFHLEdBQUcsQ0FBQztRQUU5QixvQ0FBK0IsR0FBRyxJQUFJLENBQUM7UUFFdkMsb0NBQStCLEdBQUcsSUFBSSxDQUFDO0lBRWhELENBQUM7Q0FBQTtBQUFBLENBQUMifQ==
|
|
@@ -406,7 +406,7 @@ export class WfpCalculator extends WfpProvider {
|
|
|
406
406
|
// Files: contains all files winnowed but not packed yet
|
|
407
407
|
const files = new FingerprintPackage(this.wfp, this.folderRoot).getFilesFingerprinted();
|
|
408
408
|
if (files.length) {
|
|
409
|
-
const lastFileWinnowed = files[files.length - 1];
|
|
409
|
+
const lastFileWinnowed = this.folderRoot + files[files.length - 1];
|
|
410
410
|
let i = 0;
|
|
411
411
|
while (i <= files.length && lastFileWinnowed !== this.fileList[this.fileListIndex - i]) {
|
|
412
412
|
i += 1;
|
|
@@ -490,4 +490,4 @@ export class WfpCalculator extends WfpProvider {
|
|
|
490
490
|
this.init();
|
|
491
491
|
}
|
|
492
492
|
}
|
|
493
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
493
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiV2ZwQ2FsY3VsYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9zZGsvc2Nhbm5lci9XZnBQcm92aWRlci9XZnBDYWxjdWxhdG9yL1dmcENhbGN1bGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3BCLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUV4QyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDOUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQzlDLE9BQU8sRUFBRSxhQUFhLEVBQStCLE1BQU0sb0JBQW9CLENBQUM7QUFFaEYsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDM0QsT0FBTyxFQUFxQixXQUFXLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUVoRSxNQUFNLFlBQVksR0FBRzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0NBMFhwQixDQUFDO0FBRUYsTUFBTSxPQUFPLGFBQWMsU0FBUSxXQUFX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
|
|
@@ -552,7 +552,7 @@
|
|
|
552
552
|
"affectsGlobalScope": false
|
|
553
553
|
},
|
|
554
554
|
"../../src/sdk/scanner/ScannerCfg.ts": {
|
|
555
|
-
"version": "
|
|
555
|
+
"version": "0928fdcb9c509257c0dd2090b035349549d2933d16628d70ad613ef57232e5b3",
|
|
556
556
|
"signature": "83bcdff0644f91c60647ee8d7f3ca4872e38d70051a06a03b18101be433cf783",
|
|
557
557
|
"affectsGlobalScope": false
|
|
558
558
|
},
|
|
@@ -592,7 +592,7 @@
|
|
|
592
592
|
"affectsGlobalScope": false
|
|
593
593
|
},
|
|
594
594
|
"../../src/sdk/scanner/Dispatcher/Dispatcher.ts": {
|
|
595
|
-
"version": "
|
|
595
|
+
"version": "5b44123202d08412f9e76de54b8c1d93be36ce8261b5a483cb631ae98973e10e",
|
|
596
596
|
"signature": "db2ed7a11c770ab4e4b4c9c6df418a3932dc5588fbbe3831e2340dc4f5876807",
|
|
597
597
|
"affectsGlobalScope": false
|
|
598
598
|
},
|
|
@@ -607,7 +607,7 @@
|
|
|
607
607
|
"affectsGlobalScope": false
|
|
608
608
|
},
|
|
609
609
|
"../../src/sdk/scanner/WfpProvider/WfpCalculator/WfpCalculator.ts": {
|
|
610
|
-
"version": "
|
|
610
|
+
"version": "829807fd9b45a6dc12348d483f729e30164c3eb4d32f9a462f00183fb5fbfc79",
|
|
611
611
|
"signature": "39ebe6a7fcbdf428382559b1bc3f0feffcae712c46e9e4d7226f466f598c20b7",
|
|
612
612
|
"affectsGlobalScope": false
|
|
613
613
|
},
|
|
@@ -617,8 +617,8 @@
|
|
|
617
617
|
"affectsGlobalScope": false
|
|
618
618
|
},
|
|
619
619
|
"../../src/sdk/scanner/Scanner.ts": {
|
|
620
|
-
"version": "
|
|
621
|
-
"signature": "
|
|
620
|
+
"version": "eab7801773750f8beac7d641172101142e683c57c3695ca35bae157a272da392",
|
|
621
|
+
"signature": "ce8980e804f23b45079ebeb46491fe25d188bcb4dca5b8dd39d26e99f63bea46",
|
|
622
622
|
"affectsGlobalScope": false
|
|
623
623
|
},
|
|
624
624
|
"../../src/sdk/scanner/Fingerprint.ts": {
|
package/package.json
CHANGED