scanoss 0.21.1 → 0.23.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 +21 -4
- package/build/main/cli/bin/cli-bin.js +37 -1
- package/build/main/cli/commands/components.d.ts +1 -0
- package/build/main/cli/commands/components.js +98 -0
- package/build/main/cli/commands/scan.js +8 -3
- package/build/main/index.d.ts +6 -0
- package/build/main/index.js +9 -1
- package/build/main/sdk/BaseConfig.d.ts +5 -1
- package/build/main/sdk/BaseConfig.js +6 -2
- package/build/main/sdk/Clients/Components/ComponentsGRPCClient.d.ts +13 -0
- package/build/main/sdk/Clients/Components/ComponentsGRPCClient.js +33 -0
- package/build/main/sdk/Clients/Components/ComponentsHttpClient.d.ts +37 -0
- package/build/main/sdk/Clients/Components/ComponentsHttpClient.js +122 -0
- package/build/main/sdk/Clients/Components/IComponentsClient.d.ts +71 -0
- package/build/main/sdk/Clients/Components/IComponentsClient.js +3 -0
- package/build/main/sdk/Clients/Cryptography/CryptographyGRPCClient.d.ts +3 -0
- package/build/main/sdk/Clients/Cryptography/CryptographyGRPCClient.js +6 -3
- package/build/main/sdk/Clients/Cryptography/CryptographyHttpClient.d.ts +22 -3
- package/build/main/sdk/Clients/Cryptography/CryptographyHttpClient.js +45 -12
- package/build/main/sdk/Clients/Cryptography/ICryptographyClient.d.ts +2 -2
- package/build/main/sdk/Clients/Dependency/DependencyGRPCClient.d.ts +3 -0
- package/build/main/sdk/Clients/Dependency/DependencyGRPCClient.js +4 -1
- package/build/main/sdk/Clients/Dependency/DependencyHttpClient.d.ts +22 -3
- package/build/main/sdk/Clients/Dependency/DependencyHttpClient.js +27 -13
- package/build/main/sdk/Clients/Grpc/scanoss/api/components/v2/scanoss-components_grpc_pb.d.ts +81 -0
- package/build/main/sdk/Clients/Grpc/scanoss/api/components/v2/scanoss-components_grpc_pb.js +160 -0
- package/build/main/sdk/Clients/Grpc/scanoss/api/components/v2/scanoss-components_pb.d.ts +1 -0
- package/build/main/sdk/Clients/Grpc/scanoss/api/components/v2/scanoss-components_pb.js +2313 -0
- package/build/main/sdk/Clients/Transport/Transport.d.ts +4 -4
- package/build/main/sdk/Clients/Vulnerability/VulnerabilityHttpClient.d.ts +2 -3
- package/build/main/sdk/Clients/Vulnerability/VulnerabilityHttpClient.js +7 -13
- package/build/main/sdk/Clients/http/HttpClient.d.ts +8 -16
- package/build/main/sdk/Clients/http/HttpClient.js +4 -1
- package/build/main/sdk/Clients/interfaces/ClientConfig.d.ts +8 -9
- package/build/main/sdk/Clients/interfaces/ClientConfig.js +1 -7
- package/build/main/sdk/Components/ComponentsScanner.d.ts +34 -0
- package/build/main/sdk/Components/ComponentsScanner.js +123 -0
- package/build/main/sdk/Components/ComponentsScannerCfg.d.ts +21 -0
- package/build/main/sdk/Components/ComponentsScannerCfg.js +54 -0
- package/build/main/sdk/Cryptography/Algorithm/Components/ComponentAlgorithmScanner.js +12 -6
- package/build/main/sdk/Cryptography/CryptoCfg.js +8 -11
- package/build/main/sdk/Cryptography/Helper/ResultCollector/Component/ComponentCryptographyResultColletor.js +11 -11
- package/build/main/sdk/Cryptography/Hint/Components/ComponentHintScanner.js +12 -6
- package/build/main/sdk/Dependencies/DependencyScanner.js +13 -4
- package/build/main/sdk/Dependencies/DependencyScannerCfg.js +8 -11
- package/build/main/sdk/Vulnerability/VulnerabilityCfg.js +8 -11
- package/build/main/sdk/Vulnerability/VulnerabilityScanner.js +11 -2
- package/build/main/sdk/scanner/ScannerCfg.js +10 -11
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/module/cli/bin/cli-bin.js +37 -1
- package/build/module/cli/commands/components.d.ts +1 -0
- package/build/module/cli/commands/components.js +92 -0
- package/build/module/cli/commands/scan.js +8 -3
- package/build/module/index.d.ts +6 -0
- package/build/module/index.js +9 -1
- package/build/module/sdk/BaseConfig.d.ts +5 -1
- package/build/module/sdk/BaseConfig.js +6 -2
- package/build/module/sdk/Clients/Components/ComponentsGRPCClient.d.ts +13 -0
- package/build/module/sdk/Clients/Components/ComponentsGRPCClient.js +29 -0
- package/build/module/sdk/Clients/Components/ComponentsHttpClient.d.ts +37 -0
- package/build/module/sdk/Clients/Components/ComponentsHttpClient.js +118 -0
- package/build/module/sdk/Clients/Components/IComponentsClient.d.ts +71 -0
- package/build/module/sdk/Clients/Components/IComponentsClient.js +2 -0
- package/build/module/sdk/Clients/Cryptography/CryptographyGRPCClient.d.ts +3 -0
- package/build/module/sdk/Clients/Cryptography/CryptographyGRPCClient.js +6 -3
- package/build/module/sdk/Clients/Cryptography/CryptographyHttpClient.d.ts +22 -3
- package/build/module/sdk/Clients/Cryptography/CryptographyHttpClient.js +45 -14
- package/build/module/sdk/Clients/Cryptography/ICryptographyClient.d.ts +2 -2
- package/build/module/sdk/Clients/Dependency/DependencyGRPCClient.d.ts +3 -0
- package/build/module/sdk/Clients/Dependency/DependencyGRPCClient.js +4 -1
- package/build/module/sdk/Clients/Dependency/DependencyHttpClient.d.ts +22 -3
- package/build/module/sdk/Clients/Dependency/DependencyHttpClient.js +27 -15
- package/build/module/sdk/Clients/Grpc/scanoss/api/components/v2/scanoss-components_grpc_pb.d.ts +81 -0
- package/build/module/sdk/Clients/Grpc/scanoss/api/components/v2/scanoss-components_grpc_pb.js +160 -0
- package/build/module/sdk/Clients/Grpc/scanoss/api/components/v2/scanoss-components_pb.d.ts +1 -0
- package/build/module/sdk/Clients/Grpc/scanoss/api/components/v2/scanoss-components_pb.js +2313 -0
- package/build/module/sdk/Clients/Transport/Transport.d.ts +4 -4
- package/build/module/sdk/Clients/Vulnerability/VulnerabilityHttpClient.d.ts +2 -3
- package/build/module/sdk/Clients/Vulnerability/VulnerabilityHttpClient.js +7 -15
- package/build/module/sdk/Clients/http/HttpClient.d.ts +8 -16
- package/build/module/sdk/Clients/http/HttpClient.js +4 -1
- package/build/module/sdk/Clients/interfaces/ClientConfig.d.ts +8 -9
- package/build/module/sdk/Clients/interfaces/ClientConfig.js +2 -6
- package/build/module/sdk/Components/ComponentsScanner.d.ts +34 -0
- package/build/module/sdk/Components/ComponentsScanner.js +119 -0
- package/build/module/sdk/Components/ComponentsScannerCfg.d.ts +21 -0
- package/build/module/sdk/Components/ComponentsScannerCfg.js +50 -0
- package/build/module/sdk/Cryptography/Algorithm/Components/ComponentAlgorithmScanner.js +12 -6
- package/build/module/sdk/Cryptography/CryptoCfg.js +8 -11
- package/build/module/sdk/Cryptography/Helper/ResultCollector/Component/ComponentCryptographyResultColletor.js +11 -11
- package/build/module/sdk/Cryptography/Hint/Components/ComponentHintScanner.js +12 -6
- package/build/module/sdk/Dependencies/DependencyScanner.js +13 -4
- package/build/module/sdk/Dependencies/DependencyScannerCfg.js +8 -11
- package/build/module/sdk/Vulnerability/VulnerabilityCfg.js +8 -11
- package/build/module/sdk/Vulnerability/VulnerabilityScanner.js +11 -2
- package/build/module/sdk/scanner/ScannerCfg.js +10 -11
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -18,7 +18,16 @@ class DependencyScanner {
|
|
|
18
18
|
this.config = cfg;
|
|
19
19
|
else
|
|
20
20
|
this.config = new DependencyScannerCfg_1.DependencyScannerCfg();
|
|
21
|
-
|
|
21
|
+
const clientCfg = {
|
|
22
|
+
API_KEY: this.config.API_KEY,
|
|
23
|
+
HTTP_PROXY: this.config.HTTP_PROXY,
|
|
24
|
+
HTTPS_PROXY: this.config.HTTPS_PROXY,
|
|
25
|
+
NO_PROXY: this.config.NO_PROXY,
|
|
26
|
+
CA_CERT: this.config.CA_CERT,
|
|
27
|
+
IGNORE_CERT_ERRORS: this.config.IGNORE_CERT_ERRORS,
|
|
28
|
+
HOST_URL: this.config.API_URL, // Only map the one that differs. TODO: Migrate to HOST URL on v1 version
|
|
29
|
+
};
|
|
30
|
+
this.dependencyClient = new DependencyHttpClient_1.DependencyHttpClient(clientCfg);
|
|
22
31
|
this.localDependency = new LocalDependency_1.LocalDependencies();
|
|
23
32
|
}
|
|
24
33
|
async scanFolder(path) {
|
|
@@ -71,12 +80,12 @@ class DependencyScanner {
|
|
|
71
80
|
}
|
|
72
81
|
catch (e) {
|
|
73
82
|
Logger_1.logger.debug(`Error while scanning dependencies: ${JSON.stringify(request, null, 2)}`);
|
|
74
|
-
err = e
|
|
83
|
+
err = e;
|
|
75
84
|
failedRequests.push(request);
|
|
76
85
|
}
|
|
77
86
|
}
|
|
78
87
|
if (err) {
|
|
79
|
-
Logger_1.logger.error(
|
|
88
|
+
Logger_1.logger.error(err);
|
|
80
89
|
}
|
|
81
90
|
if (failedRequests.length > 0) {
|
|
82
91
|
overallStatus = { status: 'SUCCEEDED WITH WARNINGS', message: 'Warning: some dependencies were not scanned' };
|
|
@@ -169,4 +178,4 @@ class DependencyScanner {
|
|
|
169
178
|
}
|
|
170
179
|
}
|
|
171
180
|
exports.DependencyScanner = DependencyScanner;
|
|
172
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
181
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"DependencyScanner.js","sourceRoot":"","sources":["../../../../src/sdk/Dependencies/DependencyScanner.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,19 +34,16 @@ class DependencyScannerCfg extends BaseConfig_1.BaseConfig {
|
|
|
34
34
|
* @returns The resolved scanner URL
|
|
35
35
|
*/
|
|
36
36
|
resolveApiUrl(apiKey, currentUrl) {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
// Case 2: Has API key and using custom URL -> keep custom URL
|
|
41
|
-
if (apiKey && currentUrl.startsWith(BaseConfig_1.BaseConfig.getPremiumURL()) || currentUrl.startsWith(BaseConfig_1.BaseConfig.getDefaultURL())) {
|
|
42
|
-
// Check if custom URL is not the same as the default one.
|
|
43
|
-
if (currentUrl.startsWith(BaseConfig_1.BaseConfig.getPremiumURL()) || currentUrl.startsWith(BaseConfig_1.BaseConfig.getDefaultURL())) {
|
|
44
|
-
return currentUrl.replace(/\/scan\/direct$/, '');
|
|
37
|
+
if (!apiKey) {
|
|
38
|
+
if (currentUrl !== BaseConfig_1.BaseConfig.getDefaultURL()) {
|
|
39
|
+
return currentUrl;
|
|
45
40
|
}
|
|
46
41
|
return currentUrl;
|
|
47
42
|
}
|
|
48
|
-
|
|
49
|
-
|
|
43
|
+
if (currentUrl !== BaseConfig_1.BaseConfig.getDefaultURL() && currentUrl !== BaseConfig_1.BaseConfig.getPremiumURL()) {
|
|
44
|
+
return currentUrl;
|
|
45
|
+
}
|
|
46
|
+
return BaseConfig_1.BaseConfig.getPremiumURL();
|
|
50
47
|
}
|
|
51
48
|
get API_URL() {
|
|
52
49
|
return this.resolveApiUrl(this.API_KEY, super.API_URL);
|
|
@@ -56,4 +53,4 @@ class DependencyScannerCfg extends BaseConfig_1.BaseConfig {
|
|
|
56
53
|
}
|
|
57
54
|
}
|
|
58
55
|
exports.DependencyScannerCfg = DependencyScannerCfg;
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
56
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVwZW5kZW5jeVNjYW5uZXJDZmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2RrL0RlcGVuZGVuY2llcy9EZXBlbmRlbmN5U2Nhbm5lckNmZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw4Q0FBMkM7QUFDM0MsTUFBTSwwQkFBMEIsR0FBRyxFQUFFLENBQUM7QUFFdEMsTUFBYSxvQkFBcUIsU0FBUSx1QkFBVTtJQUtsRCxZQUFZLE1BQTZCO1FBQ3ZDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUpoQixhQUFRLEdBQVcsRUFBRSxDQUFDO1FBRXRCLHdCQUFtQixHQUFHLDBCQUEwQixDQUFDO1FBRy9DLElBQUcsTUFBTSxFQUFDLENBQUM7WUFDVCxJQUFJLENBQUMsa0JBQWtCLEdBQUcsTUFBTSxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDLDBCQUEwQixDQUFDO1lBQzdHLElBQUksQ0FBQyxPQUFPLEdBQUksTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO1FBQ3ZELENBQUM7SUFDSCxDQUFDO0lBRUQsSUFBSSxrQkFBa0I7UUFDcEIsT0FBTyxJQUFJLENBQUMsbUJBQW1CLENBQUM7SUFDbEMsQ0FBQztJQUVELElBQUksa0JBQWtCLENBQUMsS0FBYTtRQUNsQyxJQUFJLENBQUMsbUJBQW1CLEdBQUcsS0FBSyxDQUFDO0lBQ25DLENBQUM7SUFFRCxJQUFJLE9BQU87UUFDVCxPQUFPLElBQUksQ0FBQyxRQUFRLENBQUM7SUFDdkIsQ0FBQztJQUVELElBQUksT0FBTyxDQUFDLEtBQWE7UUFDdkIsSUFBSSxDQUFDLFFBQVEsR0FBRyxLQUFLLENBQUM7SUFDeEIsQ0FBQztJQUVEOzs7Ozs7O09BT0c7SUFDTyxhQUFhLENBQUMsTUFBYyxFQUFFLFVBQWtCO1FBQ3hELElBQUcsQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUNYLElBQUksVUFBVSxLQUFLLHVCQUFVLENBQUMsYUFBYSxFQUFFLEVBQUUsQ0FBQztnQkFDOUMsT0FBTyxVQUFVLENBQUM7WUFDcEIsQ0FBQztZQUNELE9BQU8sVUFBVSxDQUFDO1FBQ3BCLENBQUM7UUFDRCxJQUFJLFVBQVUsS0FBSyx1QkFBVSxDQUFDLGFBQWEsRUFBRSxJQUFJLFVBQVUsS0FBSyx1QkFBVSxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUM7WUFDM0YsT0FBTyxVQUFVLENBQUM7UUFDcEIsQ0FBQztRQUNELE9BQU8sdUJBQVUsQ0FBQyxhQUFhLEVBQUUsQ0FBQztJQUNwQyxDQUFDO0lBRUQsSUFBSSxPQUFPO1FBQ1QsT0FBTyxJQUFJLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3pELENBQUM7SUFFRCxJQUFJLE9BQU8sQ0FBQyxHQUFXO1FBQ3JCLEtBQUssQ0FBQyxPQUFPLEdBQUcsR0FBRyxDQUFDO0lBQ3RCLENBQUM7Q0FFRjtBQTFERCxvREEwREMifQ==
|
|
@@ -32,19 +32,16 @@ class VulnerabilityCfg extends BaseConfig_1.BaseConfig {
|
|
|
32
32
|
* @returns The resolved API URL
|
|
33
33
|
*/
|
|
34
34
|
resolveApiUrl(apiKey, currentUrl) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
// Case 2: Has API key and using custom URL -> keep custom URL
|
|
39
|
-
if (apiKey && currentUrl.startsWith(BaseConfig_1.BaseConfig.getPremiumURL()) || currentUrl.startsWith(BaseConfig_1.BaseConfig.getDefaultURL())) {
|
|
40
|
-
// Check if custom URL is not the same as the default one.
|
|
41
|
-
if (currentUrl.startsWith(BaseConfig_1.BaseConfig.getPremiumURL()) || currentUrl.startsWith(BaseConfig_1.BaseConfig.getDefaultURL())) {
|
|
42
|
-
return currentUrl.replace(/\/scan\/direct$/, '');
|
|
35
|
+
if (!apiKey) {
|
|
36
|
+
if (currentUrl !== BaseConfig_1.BaseConfig.getDefaultURL()) {
|
|
37
|
+
return currentUrl;
|
|
43
38
|
}
|
|
44
39
|
return currentUrl;
|
|
45
40
|
}
|
|
46
|
-
|
|
47
|
-
|
|
41
|
+
if (currentUrl !== BaseConfig_1.BaseConfig.getDefaultURL() && currentUrl !== BaseConfig_1.BaseConfig.getPremiumURL()) {
|
|
42
|
+
return currentUrl;
|
|
43
|
+
}
|
|
44
|
+
return BaseConfig_1.BaseConfig.getPremiumURL();
|
|
48
45
|
}
|
|
49
46
|
get API_URL() {
|
|
50
47
|
return this.resolveApiUrl(this.API_KEY, super.API_URL);
|
|
@@ -54,4 +51,4 @@ class VulnerabilityCfg extends BaseConfig_1.BaseConfig {
|
|
|
54
51
|
}
|
|
55
52
|
}
|
|
56
53
|
exports.VulnerabilityCfg = VulnerabilityCfg;
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVnVsbmVyYWJpbGl0eUNmZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zZGsvVnVsbmVyYWJpbGl0eS9WdWxuZXJhYmlsaXR5Q2ZnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDhDQUEyQztBQUUzQzs7O0dBR0c7QUFDSCxNQUFhLGdCQUFpQixTQUFRLHVCQUFVO0lBYzlDLFlBQVksTUFBeUI7O1FBQ25DLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQztRQWJoQjs7O1dBR0c7UUFDSCx1QkFBa0IsR0FBRyxFQUFFLENBQUM7UUFFeEI7OztXQUdHO1FBQ0gsWUFBTyxHQUFHLEVBQUUsQ0FBQztRQUlYLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxNQUFBLE1BQU0sYUFBTixNQUFNLHVCQUFOLE1BQU0sQ0FBRSxrQkFBa0IsbUNBQUksSUFBSSxDQUFDLGtCQUFrQixDQUFDO1FBQ2hGLElBQUksQ0FBQyxPQUFPLEdBQUcsTUFBQSxNQUFNLGFBQU4sTUFBTSx1QkFBTixNQUFNLENBQUUsT0FBTyxtQ0FBSSxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQ2pELENBQUM7SUFFRDs7Ozs7OztPQU9HO0lBQ08sYUFBYSxDQUFDLE1BQWMsRUFBRSxVQUFrQjtRQUN4RCxJQUFHLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDWCxJQUFJLFVBQVUsS0FBSyx1QkFBVSxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUM7Z0JBQzlDLE9BQU8sVUFBVSxDQUFDO1lBQ3BCLENBQUM7WUFDRCxPQUFPLFVBQVUsQ0FBQztRQUNwQixDQUFDO1FBQ0QsSUFBSSxVQUFVLEtBQUssdUJBQVUsQ0FBQyxhQUFhLEVBQUUsSUFBSSxVQUFVLEtBQUssdUJBQVUsQ0FBQyxhQUFhLEVBQUUsRUFBRSxDQUFDO1lBQzNGLE9BQU8sVUFBVSxDQUFDO1FBQ3BCLENBQUM7UUFDRCxPQUFPLHVCQUFVLENBQUMsYUFBYSxFQUFFLENBQUM7SUFDcEMsQ0FBQztJQUVELElBQVcsT0FBTztRQUNoQixPQUFPLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDekQsQ0FBQztJQUVELElBQUksT0FBTyxDQUFDLEdBQVc7UUFDckIsS0FBSyxDQUFDLE9BQU8sR0FBRyxHQUFHLENBQUM7SUFDdEIsQ0FBQztDQUNGO0FBaERELDRDQWdEQyJ9
|
|
@@ -11,7 +11,16 @@ class VulnerabilityScanner {
|
|
|
11
11
|
this.config = config;
|
|
12
12
|
else
|
|
13
13
|
this.config = new VulnerabilityCfg_1.VulnerabilityCfg();
|
|
14
|
-
|
|
14
|
+
const clientCfg = {
|
|
15
|
+
API_KEY: this.config.API_KEY,
|
|
16
|
+
HTTP_PROXY: this.config.HTTP_PROXY,
|
|
17
|
+
HTTPS_PROXY: this.config.HTTPS_PROXY,
|
|
18
|
+
NO_PROXY: this.config.NO_PROXY,
|
|
19
|
+
CA_CERT: this.config.CA_CERT,
|
|
20
|
+
IGNORE_CERT_ERRORS: this.config.IGNORE_CERT_ERRORS,
|
|
21
|
+
HOST_URL: this.config.API_URL, // Only map the one that differs. TODO: Migrate to HOST URL on v1 version
|
|
22
|
+
};
|
|
23
|
+
this.vulnerabilityClient = new VulnerabilityHttpClient_1.VulnerabilityHttpClient(clientCfg);
|
|
15
24
|
}
|
|
16
25
|
async getVulnerabilitiesComponents(components) {
|
|
17
26
|
const requests = (0, clientHelper_1.chunkRequest)(components, this.config.REQUEST_CHUNK_SIZE);
|
|
@@ -85,4 +94,4 @@ class VulnerabilityScanner {
|
|
|
85
94
|
}
|
|
86
95
|
}
|
|
87
96
|
exports.VulnerabilityScanner = VulnerabilityScanner;
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVnVsbmVyYWJpbGl0eVNjYW5uZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2RrL1Z1bG5lcmFiaWxpdHkvVnVsbmVyYWJpbGl0eVNjYW5uZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEseURBQXNEO0FBQ3RELDhGQUEyRjtBQUMzRixzQ0FBbUM7QUFDbkMsaUVBQThEO0FBUzlELE1BQWEsb0JBQW9CO0lBSy9CLFlBQVksTUFBeUI7UUFDbkMsSUFBSSxNQUFNO1lBQUUsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7O1lBQzVCLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxtQ0FBZ0IsRUFBRSxDQUFDO1FBQzFDLE1BQU0sU0FBUyxHQUFpQjtZQUM5QixPQUFPLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPO1lBQzVCLFVBQVUsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLFVBQVU7WUFDbEMsV0FBVyxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsV0FBVztZQUNwQyxRQUFRLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRO1lBQzlCLE9BQU8sRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU87WUFDNUIsa0JBQWtCLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxrQkFBa0I7WUFDbEQsUUFBUSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFLHlFQUF5RTtTQUN6RyxDQUFDO1FBQ0YsSUFBSSxDQUFDLG1CQUFtQixHQUFHLElBQUksaURBQXVCLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDcEUsQ0FBQztJQUVNLEtBQUssQ0FBQyw0QkFBNEIsQ0FBQyxVQUE0QjtRQUNwRSxNQUFNLFFBQVEsR0FBRyxJQUFBLDJCQUFZLEVBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsa0JBQWtCLENBQUMsQ0FBQztRQUMxRSxNQUFNLFFBQVEsR0FBc0M7WUFDbEQsVUFB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
|
|
@@ -35,17 +35,16 @@ class ScannerCfg extends BaseConfig_1.BaseConfig {
|
|
|
35
35
|
* @returns The resolved scanner URL
|
|
36
36
|
*/
|
|
37
37
|
resolveApiUrl(apiKey, currentUrl) {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
38
|
+
if (!apiKey) {
|
|
39
|
+
if (currentUrl !== BaseConfig_1.BaseConfig.getDefaultURL()) {
|
|
40
|
+
return currentUrl;
|
|
41
|
+
}
|
|
42
|
+
return currentUrl + "/scan/direct";
|
|
43
|
+
}
|
|
44
|
+
if (currentUrl !== BaseConfig_1.BaseConfig.getDefaultURL() && currentUrl !== BaseConfig_1.BaseConfig.getPremiumURL()) {
|
|
43
45
|
return currentUrl;
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
return currentUrl;
|
|
47
|
-
// Case 4: No API key and default/empty URL -> use default URL with /scan/direct
|
|
48
|
-
return BaseConfig_1.BaseConfig.getDefaultURL() + '/scan/direct';
|
|
46
|
+
}
|
|
47
|
+
return BaseConfig_1.BaseConfig.getPremiumURL() + "/scan/direct";
|
|
49
48
|
}
|
|
50
49
|
get API_URL() {
|
|
51
50
|
return this.resolveApiUrl(this.API_KEY, super.API_URL);
|
|
@@ -55,4 +54,4 @@ class ScannerCfg extends BaseConfig_1.BaseConfig {
|
|
|
55
54
|
}
|
|
56
55
|
}
|
|
57
56
|
exports.ScannerCfg = ScannerCfg;
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2Nhbm5lckNmZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zZGsvc2Nhbm5lci9TY2FubmVyQ2ZnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDhDQUEyQztBQUUzQyxNQUFhLFVBQVcsU0FBUSx1QkFBVTtJQWlDeEM7UUFDRSxLQUFLLEVBQUUsQ0FBQztRQWpDViwyREFBMkQ7UUFDcEQscUJBQWdCLEdBQUcsRUFBRSxDQUFDO1FBRXRCLFlBQU8sR0FBRyxFQUFFLENBQUM7UUFFcEIsdUJBQXVCO1FBQ2hCLHNCQUFpQixHQUFHLENBQUMsQ0FBQztRQUU3QiwrQkFBK0I7UUFDeEIsWUFBTyxHQUFHLE1BQU0sQ0FBQztRQUV4QiwrQ0FBK0M7UUFDeEMsc0JBQWlCLEdBQUcsRUFBRSxHQUFHLElBQUksQ0FBQztRQUU5QixvQkFBZSxHQUFHLEtBQUssQ0FBQztRQUV4QiwwQkFBcUIsR0FBRyxJQUFJLENBQUM7UUFDcEMsMERBQTBEO1FBQzFELDhFQUE4RTtRQUN2RSxvQ0FBK0IsR0FBRyxFQUFFLENBQUM7UUFFckMsd0NBQW1DLEdBQUcsQ0FBQyxDQUFDO1FBRXhDLHlCQUFvQixHQUFHLElBQUksQ0FBQztRQUVuQywrQ0FBK0M7UUFDeEMsNEJBQXVCLEdBQUcsR0FBRyxDQUFDO1FBRTlCLG9DQUErQixHQUFHLElBQUksQ0FBQztRQUV2QyxvQ0FBK0IsR0FBRyxJQUFJLENBQUM7SUFJOUMsQ0FBQztJQUVEOzs7Ozs7O09BT0c7SUFDTyxhQUFhLENBQUMsTUFBYyxFQUFFLFVBQWtCO1FBQ3hELElBQUcsQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUNYLElBQUksVUFBVSxLQUFLLHVCQUFVLENBQUMsYUFBYSxFQUFFLEVBQUUsQ0FBQztnQkFDOUMsT0FBTyxVQUFVLENBQUM7WUFDcEIsQ0FBQztZQUNELE9BQU8sVUFBVSxHQUFHLGNBQWMsQ0FBQztRQUNyQyxDQUFDO1FBQ0QsSUFBSSxVQUFVLEtBQUssdUJBQVUsQ0FBQyxhQUFhLEVBQUUsSUFBSSxVQUFVLEtBQUssdUJBQVUsQ0FBQyxhQUFhLEVBQUUsRUFBRSxDQUFDO1lBQzNGLE9BQU8sVUFBVSxDQUFDO1FBQ3BCLENBQUM7UUFDRCxPQUFPLHVCQUFVLENBQUMsYUFBYSxFQUFFLEdBQUcsY0FBYyxDQUFDO0lBQ3JELENBQUM7SUFFRCxJQUFJLE9BQU87UUFDVCxPQUFPLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDekQsQ0FBQztJQUVELElBQUksT0FBTyxDQUFDLEdBQVc7UUFDckIsS0FBSyxDQUFDLE9BQU8sR0FBRyxHQUFHLENBQUM7SUFDdEIsQ0FBQztDQUNGO0FBakVELGdDQWlFQyJ9
|