scanoss 0.21.0 → 0.22.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/crypto.js +1 -1
- package/build/main/cli/commands/scan.js +9 -4
- package/build/main/index.d.ts +6 -0
- package/build/main/index.js +9 -1
- package/build/main/sdk/BaseConfig.d.ts +8 -4
- package/build/main/sdk/BaseConfig.js +12 -8
- 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 +4 -1
- package/build/main/sdk/Clients/Cryptography/CryptographyHttpClient.d.ts +22 -3
- package/build/main/sdk/Clients/Cryptography/CryptographyHttpClient.js +28 -12
- 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 -12
- 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/Hint/Components/ComponentHintScanner.js +12 -6
- package/build/main/sdk/Dependencies/DependencyScanner.js +13 -4
- package/build/main/sdk/Dependencies/DependencyScannerCfg.d.ts +0 -3
- package/build/main/sdk/Dependencies/DependencyScannerCfg.js +8 -19
- package/build/main/sdk/Vulnerability/VulnerabilityCfg.js +8 -11
- package/build/main/sdk/Vulnerability/VulnerabilityScanner.js +11 -2
- package/build/main/sdk/scanner/ScannerCfg.d.ts +0 -1
- package/build/main/sdk/scanner/ScannerCfg.js +10 -13
- 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/crypto.js +1 -1
- package/build/module/cli/commands/scan.js +9 -4
- package/build/module/index.d.ts +6 -0
- package/build/module/index.js +9 -1
- package/build/module/sdk/BaseConfig.d.ts +8 -4
- package/build/module/sdk/BaseConfig.js +12 -8
- 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 +4 -1
- package/build/module/sdk/Clients/Cryptography/CryptographyHttpClient.d.ts +22 -3
- package/build/module/sdk/Clients/Cryptography/CryptographyHttpClient.js +28 -14
- 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 -14
- 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/Hint/Components/ComponentHintScanner.js +12 -6
- package/build/module/sdk/Dependencies/DependencyScanner.js +13 -4
- package/build/module/sdk/Dependencies/DependencyScannerCfg.d.ts +0 -3
- package/build/module/sdk/Dependencies/DependencyScannerCfg.js +8 -19
- package/build/module/sdk/Vulnerability/VulnerabilityCfg.js +8 -11
- package/build/module/sdk/Vulnerability/VulnerabilityScanner.js +11 -2
- package/build/module/sdk/scanner/ScannerCfg.d.ts +0 -1
- package/build/module/sdk/scanner/ScannerCfg.js +10 -13
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { BaseConfig } from "../BaseConfig";
|
|
2
2
|
const DEFAULT_CHUNK_REQUEST_SIZE = 15;
|
|
3
3
|
export class DependencyScannerCfg extends BaseConfig {
|
|
4
|
-
_IGNORE_CERT_ERRORS = false;
|
|
5
4
|
_API_KEY = '';
|
|
6
5
|
_CHUNK_REQUEST_SIZE = DEFAULT_CHUNK_REQUEST_SIZE;
|
|
7
6
|
constructor(config) {
|
|
@@ -9,7 +8,6 @@ export class DependencyScannerCfg extends BaseConfig {
|
|
|
9
8
|
if (config) {
|
|
10
9
|
this.CHUNK_REQUEST_SIZE = config.CHUNK_REQUEST_SIZE ? config.CHUNK_REQUEST_SIZE : DEFAULT_CHUNK_REQUEST_SIZE;
|
|
11
10
|
this.API_KEY = config.API_KEY ? config.API_KEY : '';
|
|
12
|
-
this.IGNORE_CERT_ERRORS = config.IGNORE_CERT_ERRORS ? config.IGNORE_CERT_ERRORS : false;
|
|
13
11
|
}
|
|
14
12
|
}
|
|
15
13
|
get CHUNK_REQUEST_SIZE() {
|
|
@@ -24,12 +22,6 @@ export class DependencyScannerCfg extends BaseConfig {
|
|
|
24
22
|
set API_KEY(value) {
|
|
25
23
|
this._API_KEY = value;
|
|
26
24
|
}
|
|
27
|
-
get IGNORE_CERT_ERRORS() {
|
|
28
|
-
return this._IGNORE_CERT_ERRORS;
|
|
29
|
-
}
|
|
30
|
-
set IGNORE_CERT_ERRORS(value) {
|
|
31
|
-
this._IGNORE_CERT_ERRORS = value;
|
|
32
|
-
}
|
|
33
25
|
/**
|
|
34
26
|
* Resolves the appropriate scanner URL based on API key presence and current URL.
|
|
35
27
|
* If an API key is provided and the current URL is the default, returns the premium
|
|
@@ -39,19 +31,16 @@ export class DependencyScannerCfg extends BaseConfig {
|
|
|
39
31
|
* @returns The resolved scanner URL
|
|
40
32
|
*/
|
|
41
33
|
resolveApiUrl(apiKey, currentUrl) {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
// Case 2: Has API key and using custom URL -> keep custom URL
|
|
46
|
-
if (apiKey && currentUrl.startsWith(BaseConfig.getPremiumURL()) || currentUrl.startsWith(BaseConfig.getDefaultURL())) {
|
|
47
|
-
// Check if custom URL is not the same as the default one.
|
|
48
|
-
if (currentUrl.startsWith(BaseConfig.getPremiumURL()) || currentUrl.startsWith(BaseConfig.getDefaultURL())) {
|
|
49
|
-
return currentUrl.replace(/\/scan\/direct$/, '');
|
|
34
|
+
if (!apiKey) {
|
|
35
|
+
if (currentUrl !== BaseConfig.getDefaultURL()) {
|
|
36
|
+
return currentUrl;
|
|
50
37
|
}
|
|
51
38
|
return currentUrl;
|
|
52
39
|
}
|
|
53
|
-
|
|
54
|
-
|
|
40
|
+
if (currentUrl !== BaseConfig.getDefaultURL() && currentUrl !== BaseConfig.getPremiumURL()) {
|
|
41
|
+
return currentUrl;
|
|
42
|
+
}
|
|
43
|
+
return BaseConfig.getPremiumURL();
|
|
55
44
|
}
|
|
56
45
|
get API_URL() {
|
|
57
46
|
return this.resolveApiUrl(this.API_KEY, super.API_URL);
|
|
@@ -60,4 +49,4 @@ export class DependencyScannerCfg extends BaseConfig {
|
|
|
60
49
|
super.API_URL = url;
|
|
61
50
|
}
|
|
62
51
|
}
|
|
63
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
52
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVwZW5kZW5jeVNjYW5uZXJDZmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2RrL0RlcGVuZGVuY2llcy9EZXBlbmRlbmN5U2Nhbm5lckNmZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzNDLE1BQU0sMEJBQTBCLEdBQUcsRUFBRSxDQUFDO0FBRXRDLE1BQU0sT0FBTyxvQkFBcUIsU0FBUSxVQUFVO0lBRWxELFFBQVEsR0FBVyxFQUFFLENBQUM7SUFFdEIsbUJBQW1CLEdBQUcsMEJBQTBCLENBQUM7SUFDakQsWUFBWSxNQUE2QjtRQUN2QyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDZCxJQUFHLE1BQU0sRUFBQyxDQUFDO1lBQ1QsSUFBSSxDQUFDLGtCQUFrQixHQUFHLE1BQU0sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQywwQkFBMEIsQ0FBQztZQUM3RyxJQUFJLENBQUMsT0FBTyxHQUFJLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUN2RCxDQUFDO0lBQ0gsQ0FBQztJQUVELElBQUksa0JBQWtCO1FBQ3BCLE9BQU8sSUFBSSxDQUFDLG1CQUFtQixDQUFDO0lBQ2xDLENBQUM7SUFFRCxJQUFJLGtCQUFrQixDQUFDLEtBQWE7UUFDbEMsSUFBSSxDQUFDLG1CQUFtQixHQUFHLEtBQUssQ0FBQztJQUNuQyxDQUFDO0lBRUQsSUFBSSxPQUFPO1FBQ1QsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDO0lBQ3ZCLENBQUM7SUFFRCxJQUFJLE9BQU8sQ0FBQyxLQUFhO1FBQ3ZCLElBQUksQ0FBQyxRQUFRLEdBQUcsS0FBSyxDQUFDO0lBQ3hCLENBQUM7SUFFRDs7Ozs7OztPQU9HO0lBQ08sYUFBYSxDQUFDLE1BQWMsRUFBRSxVQUFrQjtRQUN4RCxJQUFHLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDWCxJQUFJLFVBQVUsS0FBSyxVQUFVLENBQUMsYUFBYSxFQUFFLEVBQUUsQ0FBQztnQkFDOUMsT0FBTyxVQUFVLENBQUM7WUFDcEIsQ0FBQztZQUNELE9BQU8sVUFBVSxDQUFDO1FBQ3BCLENBQUM7UUFDRCxJQUFJLFVBQVUsS0FBSyxVQUFVLENBQUMsYUFBYSxFQUFFLElBQUksVUFBVSxLQUFLLFVBQVUsQ0FBQyxhQUFhLEVBQUUsRUFBRSxDQUFDO1lBQzNGLE9BQU8sVUFBVSxDQUFDO1FBQ3BCLENBQUM7UUFDRCxPQUFPLFVBQVUsQ0FBQyxhQUFhLEVBQUUsQ0FBQztJQUNwQyxDQUFDO0lBRUQsSUFBSSxPQUFPO1FBQ1QsT0FBTyxJQUFJLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3pELENBQUM7SUFFRCxJQUFJLE9BQU8sQ0FBQyxHQUFXO1FBQ3JCLEtBQUssQ0FBQyxPQUFPLEdBQUcsR0FBRyxDQUFDO0lBQ3RCLENBQUM7Q0FFRiJ9
|
|
@@ -28,19 +28,16 @@ export class VulnerabilityCfg extends BaseConfig {
|
|
|
28
28
|
* @returns The resolved API URL
|
|
29
29
|
*/
|
|
30
30
|
resolveApiUrl(apiKey, currentUrl) {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
// Case 2: Has API key and using custom URL -> keep custom URL
|
|
35
|
-
if (apiKey && currentUrl.startsWith(BaseConfig.getPremiumURL()) || currentUrl.startsWith(BaseConfig.getDefaultURL())) {
|
|
36
|
-
// Check if custom URL is not the same as the default one.
|
|
37
|
-
if (currentUrl.startsWith(BaseConfig.getPremiumURL()) || currentUrl.startsWith(BaseConfig.getDefaultURL())) {
|
|
38
|
-
return currentUrl.replace(/\/scan\/direct$/, '');
|
|
31
|
+
if (!apiKey) {
|
|
32
|
+
if (currentUrl !== BaseConfig.getDefaultURL()) {
|
|
33
|
+
return currentUrl;
|
|
39
34
|
}
|
|
40
35
|
return currentUrl;
|
|
41
36
|
}
|
|
42
|
-
|
|
43
|
-
|
|
37
|
+
if (currentUrl !== BaseConfig.getDefaultURL() && currentUrl !== BaseConfig.getPremiumURL()) {
|
|
38
|
+
return currentUrl;
|
|
39
|
+
}
|
|
40
|
+
return BaseConfig.getPremiumURL();
|
|
44
41
|
}
|
|
45
42
|
get API_URL() {
|
|
46
43
|
return this.resolveApiUrl(this.API_KEY, super.API_URL);
|
|
@@ -49,4 +46,4 @@ export class VulnerabilityCfg extends BaseConfig {
|
|
|
49
46
|
super.API_URL = url;
|
|
50
47
|
}
|
|
51
48
|
}
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVnVsbmVyYWJpbGl0eUNmZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zZGsvVnVsbmVyYWJpbGl0eS9WdWxuZXJhYmlsaXR5Q2ZnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFM0M7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLGdCQUFpQixTQUFRLFVBQVU7SUFFOUM7OztPQUdHO0lBQ0gsa0JBQWtCLEdBQUcsRUFBRSxDQUFDO0lBRXhCOzs7T0FHRztJQUNILE9BQU8sR0FBRyxFQUFFLENBQUM7SUFFYixZQUFZLE1BQXlCO1FBQ25DLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNkLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxNQUFNLEVBQUUsa0JBQWtCLElBQUksSUFBSSxDQUFDLGtCQUFrQixDQUFDO1FBQ2hGLElBQUksQ0FBQyxPQUFPLEdBQUcsTUFBTSxFQUFFLE9BQU8sSUFBSSxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQ2pELENBQUM7SUFFRDs7Ozs7OztPQU9HO0lBQ08sYUFBYSxDQUFDLE1BQWMsRUFBRSxVQUFrQjtRQUN4RCxJQUFHLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDWCxJQUFJLFVBQVUsS0FBSyxVQUFVLENBQUMsYUFBYSxFQUFFLEVBQUUsQ0FBQztnQkFDOUMsT0FBTyxVQUFVLENBQUM7WUFDcEIsQ0FBQztZQUNELE9BQU8sVUFBVSxDQUFDO1FBQ3BCLENBQUM7UUFDRCxJQUFJLFVBQVUsS0FBSyxVQUFVLENBQUMsYUFBYSxFQUFFLElBQUksVUFBVSxLQUFLLFVBQVUsQ0FBQyxhQUFhLEVBQUUsRUFBRSxDQUFDO1lBQzNGLE9BQU8sVUFBVSxDQUFDO1FBQ3BCLENBQUM7UUFDRCxPQUFPLFVBQVUsQ0FBQyxhQUFhLEVBQUUsQ0FBQztJQUNwQyxDQUFDO0lBRUQsSUFBVyxPQUFPO1FBQ2hCLE9BQU8sSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUN6RCxDQUFDO0lBRUQsSUFBSSxPQUFPLENBQUMsR0FBVztRQUNyQixLQUFLLENBQUMsT0FBTyxHQUFHLEdBQUcsQ0FBQztJQUN0QixDQUFDO0NBQ0YifQ==
|
|
@@ -10,7 +10,16 @@ export class VulnerabilityScanner {
|
|
|
10
10
|
this.config = config;
|
|
11
11
|
else
|
|
12
12
|
this.config = new VulnerabilityCfg();
|
|
13
|
-
|
|
13
|
+
const clientCfg = {
|
|
14
|
+
API_KEY: this.config.API_KEY,
|
|
15
|
+
HTTP_PROXY: this.config.HTTP_PROXY,
|
|
16
|
+
HTTPS_PROXY: this.config.HTTPS_PROXY,
|
|
17
|
+
NO_PROXY: this.config.NO_PROXY,
|
|
18
|
+
CA_CERT: this.config.CA_CERT,
|
|
19
|
+
IGNORE_CERT_ERRORS: this.config.IGNORE_CERT_ERRORS,
|
|
20
|
+
HOST_URL: this.config.API_URL, // Only map the one that differs. TODO: Migrate to HOST URL on v1 version
|
|
21
|
+
};
|
|
22
|
+
this.vulnerabilityClient = new VulnerabilityHttpClient(clientCfg);
|
|
14
23
|
}
|
|
15
24
|
async getVulnerabilitiesComponents(components) {
|
|
16
25
|
const requests = chunkRequest(components, this.config.REQUEST_CHUNK_SIZE);
|
|
@@ -83,4 +92,4 @@ export class VulnerabilityScanner {
|
|
|
83
92
|
}
|
|
84
93
|
}
|
|
85
94
|
}
|
|
86
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVnVsbmVyYWJpbGl0eVNjYW5uZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2RrL1Z1bG5lcmFiaWxpdHkvVnVsbmVyYWJpbGl0eVNjYW5uZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDdEQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sa0RBQWtELENBQUM7QUFDM0YsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNuQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFTOUQsTUFBTSxPQUFPLG9CQUFvQjtJQUN2QixNQUFNLENBQW1CO0lBRXpCLG1CQUFtQixDQUEwQjtJQUVyRCxZQUFZLE1BQXlCO1FBQ25DLElBQUksTUFBTTtZQUFFLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDOztZQUM1QixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksZ0JBQWdCLEVBQUUsQ0FBQztRQUMxQyxNQUFNLFNBQVMsR0FBaUI7WUFDOUIsT0FBTyxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTztZQUM1QixVQUFVLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVO1lBQ2xDLFdBQVcsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVc7WUFDcEMsUUFBUSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUTtZQUM5QixPQUFPLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPO1lBQzVCLGtCQUFrQixFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsa0JBQWtCO1lBQ2xELFFBQVEsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSx5RUFBeUU7U0FDekcsQ0FBQztRQUNGLElBQUksQ0FBQyxtQkFBbUIsR0FBRyxJQUFJLHVCQUF1QixDQUFDLFNBQVMsQ0FBQyxDQUFD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
|
|
@@ -3,8 +3,6 @@ export class ScannerCfg extends BaseConfig {
|
|
|
3
3
|
// Client Timestamp, default value is scanoss-js/${version}
|
|
4
4
|
CLIENT_TIMESTAMP = '';
|
|
5
5
|
API_KEY = '';
|
|
6
|
-
//Set to true to ignore self certificates issues
|
|
7
|
-
IGNORE_CERT_ERRORS = false;
|
|
8
6
|
// Level of concurrency
|
|
9
7
|
CONCURRENCY_LIMIT = 5;
|
|
10
8
|
// Timeout for each transaction
|
|
@@ -34,17 +32,16 @@ export class ScannerCfg extends BaseConfig {
|
|
|
34
32
|
* @returns The resolved scanner URL
|
|
35
33
|
*/
|
|
36
34
|
resolveApiUrl(apiKey, currentUrl) {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
35
|
+
if (!apiKey) {
|
|
36
|
+
if (currentUrl !== BaseConfig.getDefaultURL()) {
|
|
37
|
+
return currentUrl;
|
|
38
|
+
}
|
|
39
|
+
return currentUrl + "/scan/direct";
|
|
40
|
+
}
|
|
41
|
+
if (currentUrl !== BaseConfig.getDefaultURL() && currentUrl !== BaseConfig.getPremiumURL()) {
|
|
42
42
|
return currentUrl;
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
return currentUrl;
|
|
46
|
-
// Case 4: No API key and default/empty URL -> use default URL with /scan/direct
|
|
47
|
-
return BaseConfig.getDefaultURL() + '/scan/direct';
|
|
43
|
+
}
|
|
44
|
+
return BaseConfig.getPremiumURL() + "/scan/direct";
|
|
48
45
|
}
|
|
49
46
|
get API_URL() {
|
|
50
47
|
return this.resolveApiUrl(this.API_KEY, super.API_URL);
|
|
@@ -53,4 +50,4 @@ export class ScannerCfg extends BaseConfig {
|
|
|
53
50
|
super.API_URL = url;
|
|
54
51
|
}
|
|
55
52
|
}
|
|
56
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2Nhbm5lckNmZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zZGsvc2Nhbm5lci9TY2FubmVyQ2ZnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFM0MsTUFBTSxPQUFPLFVBQVcsU0FBUSxVQUFVO0lBQ3hDLDJEQUEyRDtJQUNwRCxnQkFBZ0IsR0FBRyxFQUFFLENBQUM7SUFFdEIsT0FBTyxHQUFHLEVBQUUsQ0FBQztJQUVwQix1QkFBdUI7SUFDaEIsaUJBQWlCLEdBQUcsQ0FBQyxDQUFDO0lBRTdCLCtCQUErQjtJQUN4QixPQUFPLEdBQUcsTUFBTSxDQUFDO0lBRXhCLCtDQUErQztJQUN4QyxpQkFBaUIsR0FBRyxFQUFFLEdBQUcsSUFBSSxDQUFDO0lBRTlCLGVBQWUsR0FBRyxLQUFLLENBQUM7SUFFeEIscUJBQXFCLEdBQUcsSUFBSSxDQUFDO0lBQ3BDLDBEQUEwRDtJQUMxRCw4RUFBOEU7SUFDdkUsK0JBQStCLEdBQUcsRUFBRSxDQUFDO0lBRXJDLG1DQUFtQyxHQUFHLENBQUMsQ0FBQztJQUV4QyxvQkFBb0IsR0FBRyxJQUFJLENBQUM7SUFFbkMsK0NBQStDO0lBQ3hDLHVCQUF1QixHQUFHLEdBQUcsQ0FBQztJQUU5QiwrQkFBK0IsR0FBRyxJQUFJLENBQUM7SUFFdkMsK0JBQStCLEdBQUcsSUFBSSxDQUFDO0lBRTlDO1FBQ0UsS0FBSyxFQUFFLENBQUM7SUFDVixDQUFDO0lBRUQ7Ozs7Ozs7T0FPRztJQUNPLGFBQWEsQ0FBQyxNQUFjLEVBQUUsVUFBa0I7UUFDeEQsSUFBRyxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ1gsSUFBSSxVQUFVLEtBQUssVUFBVSxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUM7Z0JBQzlDLE9BQU8sVUFBVSxDQUFDO1lBQ3BCLENBQUM7WUFDRCxPQUFPLFVBQVUsR0FBRyxjQUFjLENBQUM7UUFDckMsQ0FBQztRQUNELElBQUksVUFBVSxLQUFLLFVBQVUsQ0FBQyxhQUFhLEVBQUUsSUFBSSxVQUFVLEtBQUssVUFBVSxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUM7WUFDM0YsT0FBTyxVQUFVLENBQUM7UUFDcEIsQ0FBQztRQUNELE9BQU8sVUFBVSxDQUFDLGFBQWEsRUFBRSxHQUFHLGNBQWMsQ0FBQztJQUNyRCxDQUFDO0lBRUQsSUFBSSxPQUFPO1FBQ1QsT0FBTyxJQUFJLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3pELENBQUM7SUFFRCxJQUFJLE9BQU8sQ0FBQyxHQUFXO1FBQ3JCLEtBQUssQ0FBQyxPQUFPLEdBQUcsR0FBRyxDQUFDO0lBQ3RCLENBQUM7Q0FDRiJ9
|