scanoss 0.29.0 → 0.30.1
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 +21 -0
- package/assets/ReportHTMLTemplate/index.html +5 -2
- package/build/main/index.js +1 -2
- package/build/main/sdk/Clients/Dependency/IDependencyClient.d.ts +1 -2
- package/build/main/sdk/Clients/http/HttpClient.d.ts +1 -1
- package/build/main/sdk/Clients/http/HttpClient.js +36 -17
- package/build/main/sdk/Cryptography/CryptographyTypes.d.ts +1 -0
- package/build/main/sdk/Decompress/DecompressionManager.js +3 -2
- package/build/main/sdk/Dependencies/DependencyScanner.d.ts +3 -3
- package/build/main/sdk/Dependencies/DependencyScanner.js +1 -1
- package/build/main/sdk/Dependencies/DependencyTypes.d.ts +8 -18
- package/build/main/sdk/Report/DataLayer/DataLayerTypes.d.ts +1 -0
- package/build/main/sdk/Report/DataLayer/DataProviders/ComponentDataProvider.d.ts +7 -2
- package/build/main/sdk/Report/DataLayer/DataProviders/ComponentDataProvider.js +9 -49
- package/build/main/sdk/Report/DataLayer/DataProviders/DependencyDataProvider.js +2 -1
- package/build/main/sdk/Utils/Utils.d.ts +1 -1
- package/build/main/sdk/Utils/Utils.js +3 -19
- package/build/main/sdk/scanner/Dispatcher/Dispatcher.js +36 -11
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/module/index.js +1 -2
- package/build/module/sdk/Clients/Dependency/IDependencyClient.d.ts +1 -2
- package/build/module/sdk/Clients/http/HttpClient.d.ts +1 -1
- package/build/module/sdk/Clients/http/HttpClient.js +35 -16
- package/build/module/sdk/Cryptography/CryptographyTypes.d.ts +1 -0
- package/build/module/sdk/Decompress/DecompressionManager.js +3 -2
- package/build/module/sdk/Dependencies/DependencyScanner.d.ts +3 -3
- package/build/module/sdk/Dependencies/DependencyScanner.js +1 -1
- package/build/module/sdk/Dependencies/DependencyTypes.d.ts +8 -18
- package/build/module/sdk/Report/DataLayer/DataLayerTypes.d.ts +1 -0
- package/build/module/sdk/Report/DataLayer/DataProviders/ComponentDataProvider.d.ts +7 -2
- package/build/module/sdk/Report/DataLayer/DataProviders/ComponentDataProvider.js +9 -49
- package/build/module/sdk/Report/DataLayer/DataProviders/DependencyDataProvider.js +2 -1
- package/build/module/sdk/Utils/Utils.d.ts +1 -1
- package/build/module/sdk/Utils/Utils.js +3 -19
- package/build/module/sdk/scanner/Dispatcher/Dispatcher.js +34 -11
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/package.json +3 -3
|
@@ -3,7 +3,7 @@ import { Transport } from '../Transport/Transport';
|
|
|
3
3
|
import FormData from 'form-data';
|
|
4
4
|
import { ClientConfig } from "../interfaces/ClientConfig";
|
|
5
5
|
export declare class HttpClient extends Transport<Response> {
|
|
6
|
-
private
|
|
6
|
+
private proxyAgent;
|
|
7
7
|
protected cfg: ClientConfig;
|
|
8
8
|
constructor(cfg?: ClientConfig);
|
|
9
9
|
private init;
|
|
@@ -2,6 +2,7 @@ import fetch from 'node-fetch';
|
|
|
2
2
|
import { ProxyAgent } from 'proxy-agent';
|
|
3
3
|
import { Transport } from '../Transport/Transport';
|
|
4
4
|
import { Utils } from '../../Utils/Utils';
|
|
5
|
+
import { logger } from "../../Logger/Logger";
|
|
5
6
|
export class HttpClient extends Transport {
|
|
6
7
|
proxyAgent;
|
|
7
8
|
cfg;
|
|
@@ -9,7 +10,6 @@ export class HttpClient extends Transport {
|
|
|
9
10
|
super();
|
|
10
11
|
this.cfg = cfg;
|
|
11
12
|
this.init();
|
|
12
|
-
this.proxyAgent = new ProxyAgent();
|
|
13
13
|
}
|
|
14
14
|
init() {
|
|
15
15
|
const PAC_URL = this.cfg?.PAC_PROXY ? `pac+${this.cfg.PAC_PROXY.trim()}` : null;
|
|
@@ -17,21 +17,40 @@ export class HttpClient extends Transport {
|
|
|
17
17
|
HTTP_PROXY: PAC_URL || this.cfg?.HTTP_PROXY || '',
|
|
18
18
|
HTTPS_PROXY: PAC_URL || this.cfg?.HTTPS_PROXY || '',
|
|
19
19
|
NO_PROXY: this.cfg?.NO_PROXY ? this.cfg?.NO_PROXY : null,
|
|
20
|
-
CA_CERT: this.cfg?.CA_CERT || null,
|
|
21
|
-
IGNORE_CERT_ERRORS: this.cfg?.IGNORE_CERT_ERRORS
|
|
20
|
+
CA_CERT: this.cfg?.CA_CERT || process.env.NODE_EXTRA_CA_CERTS || null,
|
|
21
|
+
IGNORE_CERT_ERRORS: this.cfg?.IGNORE_CERT_ERRORS ?? process.env.NODE_TLS_REJECT_UNAUTHORIZED === '0'
|
|
22
22
|
};
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
23
|
+
// Build TLS options
|
|
24
|
+
const caCerts = proxyConfig.CA_CERT ? Utils.readCaCertsFromFile(proxyConfig.CA_CERT) : undefined;
|
|
25
|
+
logger.debug(`[${this.constructor.name}] TLS Config:', {
|
|
26
|
+
ignoreCertErrors: ${proxyConfig.IGNORE_CERT_ERRORS},
|
|
27
|
+
rejectUnauthorized: ${!this.cfg.IGNORE_CERT_ERRORS},
|
|
28
|
+
caCertPath: ${this.cfg.CA_CERT || 'not set'},
|
|
29
|
+
hasCaCerts: ${!!caCerts || 'not set'}
|
|
30
|
+
}`);
|
|
31
|
+
logger.debug(`[${this.constructor.name}] Proxy Config:', {
|
|
32
|
+
HTTP_PROXY: ${this.cfg.HTTP_PROXY || 'no set'},
|
|
33
|
+
HTTPS_PROXY: ${this.cfg.HTTPS_PROXY || 'no set'},
|
|
34
|
+
ENV_HTTP_PROXY: ${process.env.HTTP_PROXY || 'no set'},
|
|
35
|
+
ENV_HTTPS_PROXY: ${process.env.HTTPS_PROXY || 'no set'}
|
|
36
|
+
}`);
|
|
37
|
+
// TLS options at root level are passed to proxy agents (http-proxy-agent, https-proxy-agent)
|
|
38
|
+
// httpsAgent is only used when NO proxy is configured
|
|
39
|
+
this.proxyAgent = new ProxyAgent({
|
|
40
|
+
rejectUnauthorized: !proxyConfig.IGNORE_CERT_ERRORS,
|
|
41
|
+
ca: caCerts,
|
|
42
|
+
getProxyForUrl: (url) => {
|
|
43
|
+
const isHttps = url.startsWith('https');
|
|
44
|
+
let proxyUrl = isHttps
|
|
45
|
+
? (proxyConfig.HTTPS_PROXY || process.env.HTTPS_PROXY)
|
|
46
|
+
: (proxyConfig.HTTP_PROXY || process.env.HTTP_PROXY);
|
|
47
|
+
// Add http:// protocol if missing (required for URL parsing)
|
|
48
|
+
if (proxyUrl && !proxyUrl.startsWith('http://') && !proxyUrl.startsWith('https://')) {
|
|
49
|
+
proxyUrl = `http://${proxyUrl}`;
|
|
50
|
+
}
|
|
51
|
+
return proxyUrl || null;
|
|
52
|
+
}
|
|
53
|
+
});
|
|
35
54
|
}
|
|
36
55
|
async get(url) {
|
|
37
56
|
return await fetch(url, {
|
|
@@ -82,4 +101,4 @@ export class HttpClient extends Transport {
|
|
|
82
101
|
return this.cfg.HOST_URL;
|
|
83
102
|
}
|
|
84
103
|
}
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
104
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSHR0cENsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9zZGsvQ2xpZW50cy9odHRwL0h0dHBDbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFtQixNQUFNLFlBQVksQ0FBQztBQUM3QyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNuRCxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFHMUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRzdDLE1BQU0sT0FBTyxVQUFXLFNBQVEsU0FBbUI7SUFFdkMsVUFBVSxDQUFhO0lBQ3JCLEdBQUcsQ0FBZTtJQUU1QixZQUFZLEdBQWtCO1FBQzVCLEtBQUssRUFBRSxDQUFDO1FBQ1IsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDZixJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDZCxDQUFDO0lBRU8sSUFBSTtRQUNWLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxHQUFHLEVBQUUsU0FBUyxDQUFDLENBQUMsQ0FBQyxPQUFPLElBQUksQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztRQUNoRixNQUFNLFdBQVcsR0FBRztZQUNsQixVQUFVLEVBQUUsT0FBTyxJQUFJLElBQUksQ0FBQyxHQUFHLEVBQUUsVUFBVSxJQUFJLEVBQUU7WUFDakQsV0FBVyxFQUFHLE9BQU8sSUFBSSxJQUFJLENBQUMsR0FBRyxFQUFFLFdBQVcsSUFBSSxFQUFFO1lBQ3BELFFBQVEsRUFBRSxJQUFJLENBQUMsR0FBRyxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFD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
|
|
@@ -59,7 +59,8 @@ export class DecompressionManager {
|
|
|
59
59
|
}
|
|
60
60
|
catch (e) {
|
|
61
61
|
await fs.promises.rm(newFolderPath, { recursive: true, force: true });
|
|
62
|
-
|
|
62
|
+
const message = e instanceof Error ? e.message : String(e);
|
|
63
|
+
throw new Error(`${message}\n\nFailed to extract: "${archivePath}"`);
|
|
63
64
|
}
|
|
64
65
|
break;
|
|
65
66
|
}
|
|
@@ -74,4 +75,4 @@ export class DecompressionManager {
|
|
|
74
75
|
}
|
|
75
76
|
}
|
|
76
77
|
}
|
|
77
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVjb21wcmVzc2lvbk1hbmFnZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2RrL0RlY29tcHJlc3MvRGVjb21wcmVzc2lvbk1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQ3hCLE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQztBQUNwQixPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQ3BDLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRTFFLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUM5RCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFFN0QsTUFBTSxPQUFPLG9CQUFvQjtJQUV2QixnQkFBZ0IsQ0FBcUI7SUFFckMsa0JBQWtCLENBQVM7SUFFM0IsTUFBTSxDQUFTO0lBRWYsa0JBQWtCLENBQVUsQ0FBRSxrRkFBa0Y7SUFDbEYsaUhBQWlIO0lBRXZKLFlBQVkscUJBQTZCLENBQUMsRUFBRSxTQUFpQixXQUFXLEVBQUUscUJBQThCLEtBQUs7UUFDM0csSUFBSSxDQUFDLGtCQUFrQixHQUFHLGtCQUFrQixDQUFDO1FBQzdDLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxrQkFBa0IsQ0FBQztRQUM3QyxJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQztRQUNyQixJQUFJLENBQUMsZ0JBQWdCLEdBQUc7WUFDdEIsSUFBSSxhQUFhLEVBQUU7WUFDbkIsSUFBSSxhQUFhLEVBQUU7U0FDcEIsQ0FBQztJQUVKLENBQUM7SUFFTSxlQUFlLENBQUMsQ0FBZTtRQUNwQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2hDLENBQUM7SUFFTSxtQkFBbUI7UUFDeEIsTUFBTSxnQkFBZ0IsR0FBRyxFQUFFLENBQUM7UUFD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
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { DependencyScannerCfg } from './DependencyScannerCfg';
|
|
2
|
-
import {
|
|
2
|
+
import { IDependencyResponse } from "./DependencyTypes";
|
|
3
3
|
export declare class DependencyScanner {
|
|
4
4
|
private localDependency;
|
|
5
5
|
private dependencyClient;
|
|
6
6
|
private config;
|
|
7
7
|
constructor(cfg?: DependencyScannerCfg);
|
|
8
|
-
scanFolder(path: string): Promise<
|
|
9
|
-
scan(files: Array<string>): Promise<
|
|
8
|
+
scanFolder(path: string): Promise<IDependencyResponse>;
|
|
9
|
+
scan(files: Array<string>): Promise<IDependencyResponse>;
|
|
10
10
|
private getDependencies;
|
|
11
11
|
private purlAdapter;
|
|
12
12
|
private chunkPurls;
|
|
@@ -171,4 +171,4 @@ export class DependencyScanner {
|
|
|
171
171
|
}
|
|
172
172
|
}
|
|
173
173
|
}
|
|
174
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
174
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"DependencyScanner.js","sourceRoot":"","sources":["../../../../src/sdk/Dependencies/DependencyScanner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,23 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
spdxId: string;
|
|
4
|
-
isSpdxApproved: boolean;
|
|
1
|
+
import { Dependency, DependencyFile, DependencyResponse, License } from "../Clients/Dependency/IDependencyClient";
|
|
2
|
+
export interface IDependencyLicense extends License {
|
|
5
3
|
}
|
|
6
|
-
export interface
|
|
7
|
-
component: string;
|
|
8
|
-
purl: string;
|
|
9
|
-
version?: string;
|
|
10
|
-
requirement?: string;
|
|
4
|
+
export interface IDependency extends Omit<Dependency, 'licensesList'> {
|
|
11
5
|
scope?: string;
|
|
12
|
-
licensesList:
|
|
6
|
+
licensesList: IDependencyLicense[];
|
|
13
7
|
}
|
|
14
|
-
export interface
|
|
15
|
-
|
|
16
|
-
id: string;
|
|
17
|
-
status: string;
|
|
18
|
-
dependenciesList: DependenciesList[];
|
|
8
|
+
export interface IDependencyFile extends Omit<DependencyFile, 'dependenciesList'> {
|
|
9
|
+
dependenciesList: IDependency[];
|
|
19
10
|
}
|
|
20
|
-
export interface IDependencyResponse {
|
|
21
|
-
filesList:
|
|
22
|
-
status?: string;
|
|
11
|
+
export interface IDependencyResponse extends Omit<DependencyResponse, 'filesList'> {
|
|
12
|
+
filesList: IDependencyFile[];
|
|
23
13
|
}
|
|
@@ -1,13 +1,18 @@
|
|
|
1
1
|
import { DataProvider, IDataLayers } from '../DataLayerTypes';
|
|
2
2
|
import { ScannerResults } from '../../../scanner/ScannerTypes';
|
|
3
3
|
import { DependencyResponse } from "../../../Clients/Dependency/IDependencyClient";
|
|
4
|
+
/**
|
|
5
|
+
* @param scanRawResults - Raw results from scanner
|
|
6
|
+
* @param {DependencyResponse} [dependencies] - Deprecated: This parameter is no longer used
|
|
7
|
+
*/
|
|
4
8
|
export declare class ComponentDataProvider implements DataProvider {
|
|
5
9
|
private scanRawResults;
|
|
6
10
|
private componentList;
|
|
7
11
|
private dependencies;
|
|
8
|
-
constructor(scanRawResults: ScannerResults,
|
|
12
|
+
constructor(scanRawResults: ScannerResults,
|
|
13
|
+
/** @deprecated No longer used */
|
|
14
|
+
dependencies?: DependencyResponse);
|
|
9
15
|
getLayerName(): string;
|
|
10
16
|
getData(): Promise<IDataLayers>;
|
|
11
|
-
private parseComponentsFromDependencies;
|
|
12
17
|
private parseComponentsFromScanner;
|
|
13
18
|
}
|
|
@@ -1,8 +1,14 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @param scanRawResults - Raw results from scanner
|
|
3
|
+
* @param {DependencyResponse} [dependencies] - Deprecated: This parameter is no longer used
|
|
4
|
+
*/
|
|
1
5
|
export class ComponentDataProvider {
|
|
2
6
|
scanRawResults;
|
|
3
7
|
componentList;
|
|
4
8
|
dependencies;
|
|
5
|
-
constructor(scanRawResults,
|
|
9
|
+
constructor(scanRawResults,
|
|
10
|
+
/** @deprecated No longer used */
|
|
11
|
+
dependencies) {
|
|
6
12
|
this.scanRawResults = scanRawResults;
|
|
7
13
|
this.dependencies = dependencies;
|
|
8
14
|
}
|
|
@@ -18,11 +24,7 @@ export class ComponentDataProvider {
|
|
|
18
24
|
this.componentList = Object.values(this.scanRawResults).flat();
|
|
19
25
|
this.componentList = this.componentList.filter((component) => component.id !== 'none');
|
|
20
26
|
const scannerComponentLayer = this.parseComponentsFromScanner(this.componentList);
|
|
21
|
-
|
|
22
|
-
componentLayer.component = [
|
|
23
|
-
...scannerComponentLayer,
|
|
24
|
-
...dependenciesComponentLayer,
|
|
25
|
-
].sort((itemA, itemB) => {
|
|
27
|
+
componentLayer.component = scannerComponentLayer.sort((itemA, itemB) => {
|
|
26
28
|
if (itemA.name < itemB.name)
|
|
27
29
|
return -1;
|
|
28
30
|
else if (itemA.name > itemB.name)
|
|
@@ -33,48 +35,6 @@ export class ComponentDataProvider {
|
|
|
33
35
|
componentLayer.component = null;
|
|
34
36
|
return componentLayer;
|
|
35
37
|
}
|
|
36
|
-
parseComponentsFromDependencies(dependencies) {
|
|
37
|
-
const componentLayer = [];
|
|
38
|
-
if (!dependencies)
|
|
39
|
-
return componentLayer;
|
|
40
|
-
dependencies.filesList.forEach((file) => {
|
|
41
|
-
file.dependenciesList.forEach((dependency) => {
|
|
42
|
-
const newComponent = {};
|
|
43
|
-
newComponent.key = dependency.purl;
|
|
44
|
-
newComponent.purls = [dependency.purl];
|
|
45
|
-
newComponent.name = dependency.component;
|
|
46
|
-
newComponent.url = null;
|
|
47
|
-
newComponent.vendor = null;
|
|
48
|
-
newComponent.health = null;
|
|
49
|
-
newComponent.versions = [
|
|
50
|
-
{
|
|
51
|
-
version: dependency.version,
|
|
52
|
-
licenses: dependency.licensesList.map((license) => license.spdxId),
|
|
53
|
-
copyrights: null,
|
|
54
|
-
cryptography: null,
|
|
55
|
-
quality: null,
|
|
56
|
-
},
|
|
57
|
-
];
|
|
58
|
-
const existingComponent = componentLayer.find((component) => component.key === newComponent.key);
|
|
59
|
-
if (existingComponent) {
|
|
60
|
-
const existingVersion = existingComponent.versions.find((version) => version.version === newComponent.versions[0].version);
|
|
61
|
-
if (!existingVersion)
|
|
62
|
-
existingComponent.versions.push({
|
|
63
|
-
version: newComponent.versions[0].version,
|
|
64
|
-
licenses: newComponent.versions[0].licenses,
|
|
65
|
-
copyrights: newComponent.versions[0].copyrights,
|
|
66
|
-
quality: null,
|
|
67
|
-
cryptography: null,
|
|
68
|
-
});
|
|
69
|
-
}
|
|
70
|
-
else {
|
|
71
|
-
//Component does not exist, insert as it is.
|
|
72
|
-
componentLayer.push(newComponent);
|
|
73
|
-
}
|
|
74
|
-
});
|
|
75
|
-
});
|
|
76
|
-
return componentLayer;
|
|
77
|
-
}
|
|
78
38
|
parseComponentsFromScanner(scanComponents) {
|
|
79
39
|
const componentLayer = [];
|
|
80
40
|
if (!scanComponents)
|
|
@@ -170,4 +130,4 @@ export class ComponentDataProvider {
|
|
|
170
130
|
return componentLayer;
|
|
171
131
|
}
|
|
172
132
|
}
|
|
173
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
133
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29tcG9uZW50RGF0YVByb3ZpZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3Nkay9SZXBvcnQvRGF0YUxheWVyL0RhdGFQcm92aWRlcnMvQ29tcG9uZW50RGF0YVByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQWFBOzs7R0FHRztBQUNILE1BQU0sT0FBTyxxQkFBcUI7SUFDeEIsY0FBYyxDQUFpQjtJQUUvQixhQUFhLENBQTBCO0lBRXZDLFlBQVksQ0FBcUI7SUFFekMsWUFDRSxjQUE4QjtJQUM5QixpQ0FBaUM7SUFDakMsWUFBaUM7UUFFakMsSUFBSSxDQUFDLGNBQWMsR0FBRyxjQUFjLENBQUM7UUFDckMsSUFBSSxDQUFDLFlBQVksR0FBRyxZQUFZLENBQUM7SUFDbkMsQ0FBQztJQUVNLFlBQVk7UUFDakIsT0FBTyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQztJQUMvQixDQUFDO0lBRU0sS0FBSyxDQUFDLE9BQU87UUFDbEIsTUFBTSxjQUFjLEdBQWdCLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDO1FBRXhELElBQUksQ0FBQyxJQUFJLENBQUMsY0FBYyxJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVk7WUFBRSxPQUFPLGNBQWMsQ0FBQztRQUV0RSxxRkFBcUY7UUFDckYsbUNBQW1DO1FBQ25DLElBQUksQ0FBQyxhQUFhLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDL0QsSUFBSSxDQUFDLGFBQWEsR0FBRyxJQUFJLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FDNUMsQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLFNBQVMsQ0FBQyxFQUFFLEtBQUssTUFBTSxDQUN2QyxDQUFDO1FBQ0YsTUFBTSxxQkFBcUIsR0FBRyxJQUFJLENBQUMsMEJBQTBCLENBQzNELElBQUksQ0FBQyxhQUFhLENBQ25CLENB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
|
|
@@ -30,6 +30,7 @@ export class DependencyDataProvider {
|
|
|
30
30
|
licenses: newLicenses,
|
|
31
31
|
version: dependency.version,
|
|
32
32
|
component: dependency.component,
|
|
33
|
+
url: dependency.url
|
|
33
34
|
});
|
|
34
35
|
});
|
|
35
36
|
dependencyLayer.push({ file: file.file, dependencies: newDependencies });
|
|
@@ -37,4 +38,4 @@ export class DependencyDataProvider {
|
|
|
37
38
|
return dependencyLayer;
|
|
38
39
|
}
|
|
39
40
|
}
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVwZW5kZW5jeURhdGFQcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9zZGsvUmVwb3J0L0RhdGFMYXllci9EYXRhUHJvdmlkZXJzL0RlcGVuZGVuY3lEYXRhUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBU0EsTUFBTSxPQUFPLHNCQUFzQjtJQUN6QixZQUFZLENBQXFCO0lBRXpDLFlBQVksWUFBZ0M7UUFDMUMsSUFBSSxDQUFDLFlBQVksR0FBRyxZQUFZLENBQUM7SUFDbkMsQ0FBQztJQUVNLFlBQVk7UUFDakIsT0FBTyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQztJQUMvQixDQUFDO0lBRU0sS0FBSyxDQUFDLE9BQU87UUFDbEIsTUFBTSxlQUFlLEdBQWdCLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxDQUFDO1FBQzVELElBQUksQ0FBQyxJQUFJLENBQUMsWUFBWTtZQUFFLE9BQU8sZUFBZSxDQUFDO1FBQy9DLE1BQU0sY0FBYyxHQUFHLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDbkUsZUFBZSxDQUFDLFlBQVksR0FBRyxjQUFjLENBQUM7UUFDOUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxZQUFZLENBQUMsTUFBTTtZQUN0QyxlQUFlLENBQUMsWUFBWSxHQUFHLElBQUksQ0FBQztRQUV0QyxPQUFPLGVBQWUsQ0FBQztJQUN6QixDQUFDO0lBRU0sbUJBQW1CLENBQ3hCLFlBQWdDO1FBRWhDLE1BQU0sZUFBZSxHQUErQixFQUFFLENBQUM7UUFFdkQsWUFBWSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtZQUN0QyxNQUFNLGVBQWUsR0FBc0IsRUFBRSxDQUFDO1lBQzlDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsQ0FBQyxVQUFVLEVBQUUsRUFBRTtnQkFDM0MsTUFBTSxXQUFXLEdBQW1CLEVBQUUsQ0FBQztnQkFDdkMsVUFBVSxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRTtvQkFDMUMsV0FBVyxDQUFDLElBQUksQ0FBQyxFQUFFLElBQUksRUFBRSxPQUFPLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxPQUFPLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztnQkFDbkUsQ0FBQyxDQUFDLENBQUM7Z0JBQ0gsZUFBZSxDQUFDLElBQUksQ0FBQztvQkFDbkIsSUFBSSxFQUFFLFVBQVUsQ0FBQyxJQUFJO29CQUNyQixRQUFRLEVBQUUsV0FBVztvQkFDckIsT0FBTyxFQUFFLFVBQVUsQ0FBQyxPQUFPO29CQUMzQixTQUFTLEVBQUUsVUFBVSxDQUFDLFNBQVM7b0JBQy9CLEdBQUcsRUFBRSxVQUFVLENBQUMsR0FBRztpQkFDcEIsQ0FBQyxDQUFDO1lBQ0wsQ0FBQyxDQUFDLENBQUM7WUFDSCxlQUFlLENBQUMsSUFBSSxDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLGVBQWUsRUFBRSxDQUFDLENBQUM7UUFDM0UsQ0FBQyxDQUFDLENBQUM7UUFFSCxPQUFPLGVBQWUsQ0FBQztJQUN6QixDQUFDO0NBQ0YifQ==
|
|
@@ -1,32 +1,16 @@
|
|
|
1
1
|
import fs from 'fs';
|
|
2
|
-
import tls from 'tls';
|
|
3
2
|
export class Utils {
|
|
4
3
|
static PackageJSON = null;
|
|
5
4
|
// This function takes inspiration from https://www.npmjs.com/package/syswide-cas
|
|
6
5
|
// Copyright 2016 Capriza. Code released under the MIT license
|
|
7
|
-
static
|
|
8
|
-
const rootCAs = [];
|
|
6
|
+
static readCaCertsFromFile(file) {
|
|
9
7
|
let content = fs.readFileSync(file, { encoding: "utf-8" }).trim();
|
|
10
8
|
content = content.replace(/\r\n/g, "\n"); // Handles certificates that have been created in Windows
|
|
11
9
|
const regex = /-----BEGIN CERTIFICATE-----\n[\s\S]+?\n-----END CERTIFICATE-----/g;
|
|
12
10
|
const results = content.match(regex);
|
|
13
11
|
if (!results)
|
|
14
12
|
throw new Error("Could not parse certificate");
|
|
15
|
-
results.
|
|
16
|
-
const cert = match.trim();
|
|
17
|
-
rootCAs.push(cert);
|
|
18
|
-
});
|
|
19
|
-
const origCreateSecureContext = tls.createSecureContext;
|
|
20
|
-
tls.createSecureContext = function (options) {
|
|
21
|
-
var c = origCreateSecureContext.apply(null, arguments);
|
|
22
|
-
if (!options.ca && rootCAs.length > 0) {
|
|
23
|
-
rootCAs.forEach(function (ca) {
|
|
24
|
-
// add to the created context our own root CAs
|
|
25
|
-
c.context.addCACert(ca);
|
|
26
|
-
});
|
|
27
|
-
}
|
|
28
|
-
return c;
|
|
29
|
-
};
|
|
13
|
+
return results.map(match => match.trim());
|
|
30
14
|
}
|
|
31
15
|
static getPackageVersion() {
|
|
32
16
|
if (!this.PackageJSON) {
|
|
@@ -47,4 +31,4 @@ export class Utils {
|
|
|
47
31
|
return this.PackageJSON?.version ? this.PackageJSON.version : '';
|
|
48
32
|
}
|
|
49
33
|
}
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2RrL1V0aWxzL1V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQztBQUdwQixNQUFNLE9BQU8sS0FBSztJQUNSLE1BQU0sQ0FBQyxXQUFXLEdBQVEsSUFBSSxDQUFDO0lBRXZDLGlGQUFpRjtJQUNqRiw4REFBOEQ7SUFDdkQsTUFBTSxDQUFDLG1CQUFtQixDQUFDLElBQVk7UUFDNUMsSUFBSSxPQUFPLEdBQUcsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLEVBQUUsRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNsRSxPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyx5REFBeUQ7UUFDbkcsTUFBTSxLQUFLLEdBQUcsbUVBQW1FLENBQUM7UUFDbEYsTUFBTSxPQUFPLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNyQyxJQUFJLENBQUMsT0FBTztZQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsNkJBQTZCLENBQUMsQ0FBQztRQUM3RCxPQUFPLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUM1QyxDQUFDO0lBRU0sTUFBTSxDQUFDLGlCQUFpQjtRQUM3QixJQUFJLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQ3RCLE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUM3QixNQUFNLHdCQUF3QixHQUFHO2dCQUMvQixJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSwwQkFBMEIsQ0FBQztnQkFDaEQsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsdUJBQXVCLENBQUM7YUFDOUMsQ0FBQztZQUNGLEtBQUssTUFBTSxlQUFlLElBQUksd0JBQXdCLEVBQUUsQ0FBQztnQkFDdkQsSUFBSSxDQUFDO29CQUNILElBQUksQ0FBQyxXQUFXLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFDO2dCQUM5QyxDQUFDO2dCQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQSxDQUFDO2dCQUNkLElBQUksSUFBSSxDQUFDLFdBQVc7b0JBQUUsTUFBTTtZQUM5QixDQUFDO1FBQ0gsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDLFdBQVcsRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUE7SUFDbEUsQ0FBQyJ9
|
|
@@ -9,6 +9,7 @@ import { ScannerCfg } from '../ScannerCfg';
|
|
|
9
9
|
import { GlobalControllerAborter } from './GlobalControllerAborter';
|
|
10
10
|
import { Utils } from '../../Utils/Utils';
|
|
11
11
|
import { ProxyAgent } from "proxy-agent";
|
|
12
|
+
import { logger } from "../../Logger/Logger";
|
|
12
13
|
const MAX_CONCURRENT_REQUEST = 30;
|
|
13
14
|
var ERRORS;
|
|
14
15
|
(function (ERRORS) {
|
|
@@ -31,17 +32,39 @@ export class Dispatcher extends EventEmitter {
|
|
|
31
32
|
this.init();
|
|
32
33
|
}
|
|
33
34
|
init() {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
process.env.HTTPS_PROXY = process.env.HTTPS_PROXY || this.scannerCfg.HTTPS_PROXY;
|
|
37
|
-
this.proxyAgent = new ProxyAgent();
|
|
35
|
+
// Build TLS options with env fallbacks
|
|
36
|
+
const ignoreCertErrors = this.scannerCfg.IGNORE_CERT_ERRORS ?? process.env.NODE_TLS_REJECT_UNAUTHORIZED === '0';
|
|
38
37
|
const caCertPath = this.scannerCfg.CA_CERT || process.env.NODE_EXTRA_CA_CERTS;
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
38
|
+
const caCerts = caCertPath ? Utils.readCaCertsFromFile(caCertPath) : undefined;
|
|
39
|
+
logger.debug(`[Dispatcher] TLS Config:', {
|
|
40
|
+
${ignoreCertErrors},
|
|
41
|
+
rejectUnauthorized: ${!ignoreCertErrors},
|
|
42
|
+
caCertPath: ${caCertPath || 'not set'},
|
|
43
|
+
hasCaCerts: ${!!caCerts}
|
|
44
|
+
}`);
|
|
45
|
+
logger.debug(`[Dispatcher] Proxy Config:', {
|
|
46
|
+
HTTP_PROXY: ${this.scannerCfg.HTTP_PROXY || 'no set'},
|
|
47
|
+
HTTPS_PROXY: ${this.scannerCfg.HTTPS_PROXY || 'no set'},
|
|
48
|
+
ENV_HTTP_PROXY: ${process.env.HTTP_PROXY || 'no set'},
|
|
49
|
+
ENV_HTTPS_PROXY: ${process.env.HTTPS_PROXY || 'no set'}
|
|
50
|
+
}`);
|
|
51
|
+
// TLS options at root level are passed to proxy agents (http-proxy-agent, https-proxy-agent)
|
|
52
|
+
// httpsAgent is only used when NO proxy is configured
|
|
53
|
+
this.proxyAgent = new ProxyAgent({
|
|
54
|
+
rejectUnauthorized: !ignoreCertErrors,
|
|
55
|
+
ca: caCerts,
|
|
56
|
+
getProxyForUrl: (url) => {
|
|
57
|
+
const isHttps = url.startsWith('https');
|
|
58
|
+
let proxyUrl = isHttps
|
|
59
|
+
? (this.scannerCfg?.HTTPS_PROXY || process.env.HTTPS_PROXY)
|
|
60
|
+
: (this.scannerCfg?.HTTP_PROXY || process.env.HTTP_PROXY);
|
|
61
|
+
// Add http:// protocol if missing (required for URL parsing)
|
|
62
|
+
if (proxyUrl && !proxyUrl.startsWith('http://') && !proxyUrl.startsWith('https://')) {
|
|
63
|
+
proxyUrl = `http://${proxyUrl}`;
|
|
64
|
+
}
|
|
65
|
+
return proxyUrl || null;
|
|
66
|
+
}
|
|
67
|
+
});
|
|
45
68
|
this.pQueue = new PQueue({
|
|
46
69
|
concurrency: this.scannerCfg.CONCURRENCY_LIMIT,
|
|
47
70
|
});
|
|
@@ -155,4 +178,4 @@ export class Dispatcher extends EventEmitter {
|
|
|
155
178
|
}
|
|
156
179
|
}
|
|
157
180
|
}
|
|
158
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
181
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Dispatcher.js","sourceRoot":"","sources":["../../../../../src/sdk/scanner/Dispatcher/Dispatcher.ts"],"names":[],"mappings":"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"}
|