@contrast/contrast 2.0.2-beta.2 → 2.0.2-beta.4
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 +51 -1
- package/dist/audit/catalogueApplication/catalogueApplication.js +6 -10
- package/dist/audit/catalogueApplication/catalogueApplication.js.map +1 -0
- package/dist/audit/languageAnalysisEngine/commonApi.js +3 -6
- package/dist/audit/languageAnalysisEngine/commonApi.js.map +1 -0
- package/dist/audit/languageAnalysisEngine/filterProjectPath.js +1 -0
- package/dist/audit/languageAnalysisEngine/filterProjectPath.js.map +1 -0
- package/dist/audit/languageAnalysisEngine/getProjectRootFilenames.js +9 -12
- package/dist/audit/languageAnalysisEngine/getProjectRootFilenames.js.map +1 -0
- package/dist/audit/languageAnalysisEngine/sendSnapshot.js +15 -19
- package/dist/audit/languageAnalysisEngine/sendSnapshot.js.map +1 -0
- package/dist/audit/nodeAnalysisEngine/parseYarn2LockFileContents.js +9 -9
- package/dist/audit/nodeAnalysisEngine/parseYarn2LockFileContents.js.map +1 -0
- package/dist/audit/report/commonReportingFunctions.js +33 -48
- package/dist/audit/report/commonReportingFunctions.js.map +1 -0
- package/dist/audit/report/models/reportGuidanceModel.js +2 -5
- package/dist/audit/report/models/reportGuidanceModel.js.map +1 -0
- package/dist/audit/report/models/reportLibraryModel.js +3 -7
- package/dist/audit/report/models/reportLibraryModel.js.map +1 -0
- package/dist/audit/report/models/reportListModel.js +4 -9
- package/dist/audit/report/models/reportListModel.js.map +1 -0
- package/dist/audit/report/models/reportOutputModel.js +4 -9
- package/dist/audit/report/models/reportOutputModel.js.map +1 -0
- package/dist/audit/report/models/reportSeverityModel.js +2 -5
- package/dist/audit/report/models/reportSeverityModel.js.map +1 -0
- package/dist/audit/report/models/severityCountModel.js +3 -5
- package/dist/audit/report/models/severityCountModel.js.map +1 -0
- package/dist/audit/report/reportingFeature.js +27 -55
- package/dist/audit/report/reportingFeature.js.map +1 -0
- package/dist/audit/report/utils/reportUtils.js +28 -59
- package/dist/audit/report/utils/reportUtils.js.map +1 -0
- package/dist/audit/save.js +14 -16
- package/dist/audit/save.js.map +1 -0
- package/dist/cliConstants.js +17 -18
- package/dist/cliConstants.js.map +1 -0
- package/dist/commands/audit/auditConfig.js +7 -10
- package/dist/commands/audit/auditConfig.js.map +1 -0
- package/dist/commands/audit/auditController.js +9 -13
- package/dist/commands/audit/auditController.js.map +1 -0
- package/dist/commands/audit/help.js +23 -25
- package/dist/commands/audit/help.js.map +1 -0
- package/dist/commands/audit/processAudit.js +9 -12
- package/dist/commands/audit/processAudit.js.map +1 -0
- package/dist/commands/audit/saveFile.js +3 -6
- package/dist/commands/audit/saveFile.js.map +1 -0
- package/dist/commands/auth/auth.js +25 -24
- package/dist/commands/auth/auth.js.map +1 -0
- package/dist/commands/config/config.js +12 -13
- package/dist/commands/config/config.js.map +1 -0
- package/dist/commands/github/fingerprintConfig.js +8 -11
- package/dist/commands/github/fingerprintConfig.js.map +1 -0
- package/dist/commands/github/processFingerprint.js +12 -15
- package/dist/commands/github/processFingerprint.js.map +1 -0
- package/dist/commands/github/projectGroup.js +25 -32
- package/dist/commands/github/projectGroup.js.map +1 -0
- package/dist/commands/github/repoServices.js +11 -21
- package/dist/commands/github/repoServices.js.map +1 -0
- package/dist/commands/learn/learn.js +3 -6
- package/dist/commands/learn/learn.js.map +1 -0
- package/dist/commands/learn/processLearn.js +3 -6
- package/dist/commands/learn/processLearn.js.map +1 -0
- package/dist/commands/scan/processScan.js +11 -14
- package/dist/commands/scan/processScan.js.map +1 -0
- package/dist/common/HTTPClient.js +123 -94
- package/dist/common/HTTPClient.js.map +1 -0
- package/dist/common/autoDetection.js +26 -33
- package/dist/common/autoDetection.js.map +1 -0
- package/dist/common/baseRequest.js +14 -18
- package/dist/common/baseRequest.js.map +1 -0
- package/dist/common/commonHelp.js +13 -13
- package/dist/common/commonHelp.js.map +1 -0
- package/dist/common/errorHandling.js +30 -39
- package/dist/common/errorHandling.js.map +1 -0
- package/dist/common/fail.js +6 -12
- package/dist/common/fail.js.map +1 -0
- package/dist/common/versionChecker.js +16 -19
- package/dist/common/versionChecker.js.map +1 -0
- package/dist/constants/constants.js +44 -65
- package/dist/constants/constants.js.map +1 -0
- package/dist/constants/lambda.js +8 -5
- package/dist/constants/lambda.js.map +1 -0
- package/dist/constants/locales.js +6 -9
- package/dist/constants/locales.js.map +1 -0
- package/dist/index.js +36 -39
- package/dist/index.js.map +1 -0
- package/dist/lambda/analytics.js +6 -9
- package/dist/lambda/analytics.js.map +1 -0
- package/dist/lambda/arn.js +6 -9
- package/dist/lambda/arn.js.map +1 -0
- package/dist/lambda/aws.js +29 -34
- package/dist/lambda/aws.js.map +1 -0
- package/dist/lambda/cliError.js +13 -41
- package/dist/lambda/cliError.js.map +1 -0
- package/dist/lambda/constants.js +3 -4
- package/dist/lambda/constants.js.map +1 -0
- package/dist/lambda/help.js +39 -44
- package/dist/lambda/help.js.map +1 -0
- package/dist/lambda/lambda.js +61 -65
- package/dist/lambda/lambda.js.map +1 -0
- package/dist/lambda/lambdaUtils.js +38 -32
- package/dist/lambda/lambdaUtils.js.map +1 -0
- package/dist/lambda/logUtils.js +21 -17
- package/dist/lambda/logUtils.js.map +1 -0
- package/dist/lambda/scanDetailCompletion.js +19 -25
- package/dist/lambda/scanDetailCompletion.js.map +1 -0
- package/dist/lambda/scanRequest.js +34 -41
- package/dist/lambda/scanRequest.js.map +1 -0
- package/dist/lambda/scanResults.js +8 -10
- package/dist/lambda/scanResults.js.map +1 -0
- package/dist/lambda/types.js +5 -7
- package/dist/lambda/types.js.map +1 -0
- package/dist/lambda/utils.js +33 -35
- package/dist/lambda/utils.js.map +1 -0
- package/dist/sbom/generateSbom.js +6 -10
- package/dist/sbom/generateSbom.js.map +1 -0
- package/dist/scaAnalysis/common/auditReport.js +8 -12
- package/dist/scaAnalysis/common/auditReport.js.map +1 -0
- package/dist/scaAnalysis/common/commonReportingFunctionsSca.js +26 -32
- package/dist/scaAnalysis/common/commonReportingFunctionsSca.js.map +1 -0
- package/dist/scaAnalysis/common/formatMessage.js +8 -17
- package/dist/scaAnalysis/common/formatMessage.js.map +1 -0
- package/dist/scaAnalysis/common/models/ScaReportModel.js +4 -9
- package/dist/scaAnalysis/common/models/ScaReportModel.js.map +1 -0
- package/dist/scaAnalysis/common/scaParserForGoAndJava.js +10 -9
- package/dist/scaAnalysis/common/scaParserForGoAndJava.js.map +1 -0
- package/dist/scaAnalysis/common/scaServicesUpload.js +21 -22
- package/dist/scaAnalysis/common/scaServicesUpload.js.map +1 -0
- package/dist/scaAnalysis/common/treeUpload.js +7 -10
- package/dist/scaAnalysis/common/treeUpload.js.map +1 -0
- package/dist/scaAnalysis/common/utils/reportUtilsSca.js +21 -29
- package/dist/scaAnalysis/common/utils/reportUtilsSca.js.map +1 -0
- package/dist/scaAnalysis/dotnet/analysis.js +12 -18
- package/dist/scaAnalysis/dotnet/analysis.js.map +1 -0
- package/dist/scaAnalysis/dotnet/index.js +4 -7
- package/dist/scaAnalysis/dotnet/index.js.map +1 -0
- package/dist/scaAnalysis/go/goAnalysis.js +8 -11
- package/dist/scaAnalysis/go/goAnalysis.js.map +1 -0
- package/dist/scaAnalysis/go/goParseDeps.js +9 -7
- package/dist/scaAnalysis/go/goParseDeps.js.map +1 -0
- package/dist/scaAnalysis/go/goReadDepFile.js +10 -8
- package/dist/scaAnalysis/go/goReadDepFile.js.map +1 -0
- package/dist/scaAnalysis/java/analysis.js +23 -20
- package/dist/scaAnalysis/java/analysis.js.map +1 -0
- package/dist/scaAnalysis/java/index.js +7 -10
- package/dist/scaAnalysis/java/index.js.map +1 -0
- package/dist/scaAnalysis/java/javaBuildDepsParser.js +43 -43
- package/dist/scaAnalysis/java/javaBuildDepsParser.js.map +1 -0
- package/dist/scaAnalysis/javascript/analysis.js +16 -20
- package/dist/scaAnalysis/javascript/analysis.js.map +1 -0
- package/dist/scaAnalysis/javascript/index.js +17 -19
- package/dist/scaAnalysis/javascript/index.js.map +1 -0
- package/dist/scaAnalysis/javascript/scaServiceParser.js +8 -15
- package/dist/scaAnalysis/javascript/scaServiceParser.js.map +1 -0
- package/dist/scaAnalysis/legacy/legacyFlow.js +13 -15
- package/dist/scaAnalysis/legacy/legacyFlow.js.map +1 -0
- package/dist/scaAnalysis/php/analysis.js +15 -16
- package/dist/scaAnalysis/php/analysis.js.map +1 -0
- package/dist/scaAnalysis/php/index.js +5 -8
- package/dist/scaAnalysis/php/index.js.map +1 -0
- package/dist/scaAnalysis/php/phpNewServicesMapper.js +9 -12
- package/dist/scaAnalysis/php/phpNewServicesMapper.js.map +1 -0
- package/dist/scaAnalysis/processServicesFlow.js +50 -25
- package/dist/scaAnalysis/processServicesFlow.js.map +1 -0
- package/dist/scaAnalysis/python/analysis.js +16 -23
- package/dist/scaAnalysis/python/analysis.js.map +1 -0
- package/dist/scaAnalysis/python/index.js +4 -7
- package/dist/scaAnalysis/python/index.js.map +1 -0
- package/dist/scaAnalysis/repoMode/gradleParser.js +7 -13
- package/dist/scaAnalysis/repoMode/gradleParser.js.map +1 -0
- package/dist/scaAnalysis/repoMode/index.js +9 -12
- package/dist/scaAnalysis/repoMode/index.js.map +1 -0
- package/dist/scaAnalysis/repoMode/mavenParser.js +12 -12
- package/dist/scaAnalysis/repoMode/mavenParser.js.map +1 -0
- package/dist/scaAnalysis/ruby/analysis.js +32 -46
- package/dist/scaAnalysis/ruby/analysis.js.map +1 -0
- package/dist/scaAnalysis/ruby/index.js +5 -8
- package/dist/scaAnalysis/ruby/index.js.map +1 -0
- package/dist/scaAnalysis/scaAnalysis.js +49 -51
- package/dist/scaAnalysis/scaAnalysis.js.map +1 -0
- package/dist/scan/fileUtils.js +27 -36
- package/dist/scan/fileUtils.js.map +1 -0
- package/dist/scan/formatScanOutput.js +47 -61
- package/dist/scan/formatScanOutput.js.map +1 -0
- package/dist/scan/help.js +8 -11
- package/dist/scan/help.js.map +1 -0
- package/dist/scan/models/groupedResultsModel.js +2 -5
- package/dist/scan/models/groupedResultsModel.js.map +1 -0
- package/dist/scan/models/resultContentModel.js +2 -2
- package/dist/scan/models/resultContentModel.js.map +1 -0
- package/dist/scan/models/scanResultsModel.js +2 -5
- package/dist/scan/models/scanResultsModel.js.map +1 -0
- package/dist/scan/populateProjectIdAndProjectName.js +9 -12
- package/dist/scan/populateProjectIdAndProjectName.js.map +1 -0
- package/dist/scan/saveResults.js +3 -6
- package/dist/scan/saveResults.js.map +1 -0
- package/dist/scan/scan.js +24 -31
- package/dist/scan/scan.js.map +1 -0
- package/dist/scan/scanConfig.js +14 -12
- package/dist/scan/scanConfig.js.map +1 -0
- package/dist/scan/scanController.js +17 -20
- package/dist/scan/scanController.js.map +1 -0
- package/dist/scan/scanResults.js +27 -34
- package/dist/scan/scanResults.js.map +1 -0
- package/dist/telemetry/telemetry.js +29 -59
- package/dist/telemetry/telemetry.js.map +1 -0
- package/dist/utils/capabilities.js +1 -0
- package/dist/utils/capabilities.js.map +1 -0
- package/dist/utils/commonApi.js +15 -24
- package/dist/utils/commonApi.js.map +1 -0
- package/dist/utils/filterProjectPath.js +1 -0
- package/dist/utils/filterProjectPath.js.map +1 -0
- package/dist/utils/generalAPI.js +11 -17
- package/dist/utils/generalAPI.js.map +1 -0
- package/dist/utils/getConfig.js +7 -13
- package/dist/utils/getConfig.js.map +1 -0
- package/dist/utils/oraWrapper.js +7 -14
- package/dist/utils/oraWrapper.js.map +1 -0
- package/dist/utils/paramsUtil/commandlineParams.js +2 -5
- package/dist/utils/paramsUtil/commandlineParams.js.map +1 -0
- package/dist/utils/paramsUtil/configStoreParams.js +9 -10
- package/dist/utils/paramsUtil/configStoreParams.js.map +1 -0
- package/dist/utils/paramsUtil/envVariableParams.js +2 -3
- package/dist/utils/paramsUtil/envVariableParams.js.map +1 -0
- package/dist/utils/paramsUtil/paramHandler.js +12 -13
- package/dist/utils/paramsUtil/paramHandler.js.map +1 -0
- package/dist/utils/parsedCLIOptions.js +4 -7
- package/dist/utils/parsedCLIOptions.js.map +1 -0
- package/dist/utils/requestUtils.js +7 -13
- package/dist/utils/requestUtils.js.map +1 -0
- package/dist/utils/saveFile.js +8 -11
- package/dist/utils/saveFile.js.map +1 -0
- package/dist/utils/validationCheck.js +5 -11
- package/dist/utils/validationCheck.js.map +1 -0
- package/package.json +32 -41
- package/.prettierignore +0 -1
- package/bin/contrast.js +0 -2
- package/dist/audit/languageAnalysisEngine/util/requestUtils.js +0 -14
- package/dist/lambda/__mocks__/aws.js +0 -21
- package/dist/lambda/__mocks__/lambdaConfig.json +0 -42
- package/src/audit/catalogueApplication/catalogueApplication.js +0 -51
- package/src/audit/languageAnalysisEngine/commonApi.js +0 -20
- package/src/audit/languageAnalysisEngine/filterProjectPath.js +0 -21
- package/src/audit/languageAnalysisEngine/getProjectRootFilenames.js +0 -36
- package/src/audit/languageAnalysisEngine/sendSnapshot.js +0 -57
- package/src/audit/languageAnalysisEngine/util/requestUtils.js +0 -17
- package/src/audit/nodeAnalysisEngine/parseYarn2LockFileContents.js +0 -63
- package/src/audit/report/commonReportingFunctions.js +0 -412
- package/src/audit/report/models/reportGuidanceModel.ts +0 -5
- package/src/audit/report/models/reportLibraryModel.ts +0 -30
- package/src/audit/report/models/reportListModel.ts +0 -49
- package/src/audit/report/models/reportOutputModel.ts +0 -29
- package/src/audit/report/models/reportSeverityModel.ts +0 -18
- package/src/audit/report/models/severityCountModel.ts +0 -22
- package/src/audit/report/reportingFeature.ts +0 -110
- package/src/audit/report/utils/reportUtils.ts +0 -165
- package/src/audit/save.js +0 -67
- package/src/cliConstants.js +0 -523
- package/src/commands/audit/auditConfig.js +0 -18
- package/src/commands/audit/auditController.js +0 -50
- package/src/commands/audit/help.js +0 -72
- package/src/commands/audit/processAudit.js +0 -34
- package/src/commands/audit/saveFile.js +0 -15
- package/src/commands/auth/auth.js +0 -146
- package/src/commands/config/config.js +0 -41
- package/src/commands/github/fingerprintConfig.js +0 -19
- package/src/commands/github/processFingerprint.js +0 -37
- package/src/commands/github/projectGroup.js +0 -298
- package/src/commands/github/repoServices.js +0 -122
- package/src/commands/learn/learn.js +0 -10
- package/src/commands/learn/processLearn.js +0 -13
- package/src/commands/scan/processScan.js +0 -42
- package/src/common/HTTPClient.js +0 -775
- package/src/common/autoDetection.js +0 -209
- package/src/common/baseRequest.ts +0 -83
- package/src/common/commonHelp.js +0 -53
- package/src/common/errorHandling.js +0 -157
- package/src/common/fail.js +0 -79
- package/src/common/versionChecker.js +0 -75
- package/src/constants/constants.js +0 -71
- package/src/constants/lambda.js +0 -85
- package/src/constants/locales.js +0 -365
- package/src/index.ts +0 -142
- package/src/lambda/__mocks__/aws.ts +0 -32
- package/src/lambda/__mocks__/lambdaConfig.json +0 -42
- package/src/lambda/analytics.ts +0 -9
- package/src/lambda/arn.ts +0 -33
- package/src/lambda/aws.ts +0 -248
- package/src/lambda/cliError.ts +0 -72
- package/src/lambda/constants.ts +0 -11
- package/src/lambda/help.ts +0 -92
- package/src/lambda/lambda.ts +0 -230
- package/src/lambda/lambdaUtils.ts +0 -111
- package/src/lambda/logUtils.ts +0 -64
- package/src/lambda/scanDetailCompletion.ts +0 -78
- package/src/lambda/scanRequest.ts +0 -169
- package/src/lambda/scanResults.ts +0 -29
- package/src/lambda/types.ts +0 -36
- package/src/lambda/utils.ts +0 -188
- package/src/sbom/generateSbom.ts +0 -45
- package/src/scaAnalysis/common/auditReport.js +0 -59
- package/src/scaAnalysis/common/commonReportingFunctionsSca.js +0 -276
- package/src/scaAnalysis/common/formatMessage.js +0 -67
- package/src/scaAnalysis/common/models/ScaReportModel.ts +0 -81
- package/src/scaAnalysis/common/scaParserForGoAndJava.js +0 -41
- package/src/scaAnalysis/common/scaServicesUpload.js +0 -159
- package/src/scaAnalysis/common/treeUpload.js +0 -51
- package/src/scaAnalysis/common/utils/reportUtilsSca.ts +0 -123
- package/src/scaAnalysis/dotnet/analysis.js +0 -72
- package/src/scaAnalysis/dotnet/index.js +0 -11
- package/src/scaAnalysis/go/goAnalysis.js +0 -26
- package/src/scaAnalysis/go/goParseDeps.js +0 -203
- package/src/scaAnalysis/go/goReadDepFile.js +0 -34
- package/src/scaAnalysis/java/analysis.js +0 -148
- package/src/scaAnalysis/java/index.js +0 -29
- package/src/scaAnalysis/java/javaBuildDepsParser.js +0 -439
- package/src/scaAnalysis/javascript/analysis.js +0 -111
- package/src/scaAnalysis/javascript/index.js +0 -104
- package/src/scaAnalysis/javascript/scaServiceParser.js +0 -151
- package/src/scaAnalysis/legacy/legacyFlow.js +0 -43
- package/src/scaAnalysis/php/analysis.js +0 -78
- package/src/scaAnalysis/php/index.js +0 -28
- package/src/scaAnalysis/php/phpNewServicesMapper.js +0 -77
- package/src/scaAnalysis/processServicesFlow.js +0 -126
- package/src/scaAnalysis/python/analysis.js +0 -93
- package/src/scaAnalysis/python/index.js +0 -16
- package/src/scaAnalysis/repoMode/gradleParser.js +0 -88
- package/src/scaAnalysis/repoMode/index.js +0 -21
- package/src/scaAnalysis/repoMode/mavenParser.js +0 -138
- package/src/scaAnalysis/ruby/analysis.js +0 -413
- package/src/scaAnalysis/ruby/index.js +0 -16
- package/src/scaAnalysis/scaAnalysis.js +0 -172
- package/src/scan/fileUtils.js +0 -218
- package/src/scan/formatScanOutput.ts +0 -225
- package/src/scan/help.js +0 -56
- package/src/scan/models/groupedResultsModel.ts +0 -20
- package/src/scan/models/resultContentModel.ts +0 -86
- package/src/scan/models/scanResultsModel.ts +0 -55
- package/src/scan/populateProjectIdAndProjectName.js +0 -73
- package/src/scan/saveResults.js +0 -14
- package/src/scan/scan.ts +0 -68
- package/src/scan/scanConfig.js +0 -58
- package/src/scan/scanController.js +0 -98
- package/src/scan/scanResults.js +0 -171
- package/src/telemetry/telemetry.ts +0 -154
- package/src/utils/capabilities.js +0 -12
- package/src/utils/commonApi.js +0 -103
- package/src/utils/filterProjectPath.js +0 -25
- package/src/utils/generalAPI.js +0 -52
- package/src/utils/getConfig.ts +0 -34
- package/src/utils/oraWrapper.js +0 -29
- package/src/utils/paramsUtil/commandlineParams.js +0 -12
- package/src/utils/paramsUtil/configStoreParams.js +0 -19
- package/src/utils/paramsUtil/envVariableParams.js +0 -10
- package/src/utils/paramsUtil/paramHandler.js +0 -38
- package/src/utils/parsedCLIOptions.js +0 -32
- package/src/utils/requestUtils.js +0 -29
- package/src/utils/saveFile.js +0 -20
- package/src/utils/validationCheck.js +0 -39
|
@@ -1,33 +1,26 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const i18n_1 = __importDefault(require("i18n"));
|
|
8
|
-
const requestUtils_1 = require("../utils/requestUtils");
|
|
9
|
-
const commonApi_1 = require("../utils/commonApi");
|
|
10
|
-
const oraWrapper_1 = __importDefault(require("../utils/oraWrapper"));
|
|
11
|
-
const cliError_1 = require("./cliError");
|
|
12
|
-
const constants_1 = require("./constants");
|
|
1
|
+
import i18n from 'i18n';
|
|
2
|
+
import { sleep } from '../utils/requestUtils.js';
|
|
3
|
+
import { getHttpClient } from '../utils/commonApi.js';
|
|
4
|
+
import { CliError } from './cliError.js';
|
|
5
|
+
import { ERRORS } from './constants.js';
|
|
6
|
+
import { failSpinner, returnOra, startSpinner, succeedSpinner } from '../utils/oraWrapper.js';
|
|
13
7
|
const MS_IN_MINUTE = 1000 * 60;
|
|
14
8
|
const getScanResources = async (config, params, scanId, httpClient) => {
|
|
15
|
-
const res = await httpClient.getScanResources(config, params, scanId);
|
|
9
|
+
const res = (await httpClient.getScanResources(config, params, scanId));
|
|
16
10
|
const { statusCode, body } = res;
|
|
17
11
|
if (statusCode === 200) {
|
|
18
12
|
return res;
|
|
19
13
|
}
|
|
20
14
|
const { errorCode } = body || {};
|
|
21
|
-
throw new
|
|
15
|
+
throw new CliError(ERRORS.FAILED_TO_GET_SCAN, { statusCode, errorCode });
|
|
22
16
|
};
|
|
23
|
-
exports.getScanResources = getScanResources;
|
|
24
17
|
const pollScanUntilCompletion = async (config, timeoutInMinutes, params, scanId) => {
|
|
25
|
-
const client =
|
|
18
|
+
const client = getHttpClient(config);
|
|
26
19
|
const activeStatuses = ['PENDING', 'SCANNING', 'QUEUED'];
|
|
27
20
|
const maxEndTime = new Date().getTime() + timeoutInMinutes * MS_IN_MINUTE;
|
|
28
|
-
const startScanSpinner =
|
|
29
|
-
|
|
30
|
-
await
|
|
21
|
+
const startScanSpinner = returnOra(i18n.__('scanStarted'));
|
|
22
|
+
startSpinner(startScanSpinner);
|
|
23
|
+
await sleep(5000); // wait 5 sec before first polling
|
|
31
24
|
let complete = false;
|
|
32
25
|
while (!complete) {
|
|
33
26
|
try {
|
|
@@ -36,21 +29,22 @@ const pollScanUntilCompletion = async (config, timeoutInMinutes, params, scanId)
|
|
|
36
29
|
const staticScans = scans?.filter((s) => s.scanType === 2);
|
|
37
30
|
complete = staticScans.some((s) => !activeStatuses.includes(s.state));
|
|
38
31
|
if (complete) {
|
|
39
|
-
|
|
32
|
+
succeedSpinner(startScanSpinner, 'Scan Finished');
|
|
40
33
|
return scans;
|
|
41
34
|
}
|
|
42
|
-
await
|
|
35
|
+
await sleep(2 * 1000);
|
|
43
36
|
}
|
|
44
37
|
catch (error) {
|
|
45
|
-
|
|
38
|
+
failSpinner(startScanSpinner, i18n.__('scanFailed'));
|
|
46
39
|
throw error;
|
|
47
40
|
}
|
|
48
41
|
if (Date.now() >= maxEndTime) {
|
|
49
|
-
|
|
50
|
-
throw new
|
|
42
|
+
failSpinner(startScanSpinner, i18n.__('scanTimedOut'));
|
|
43
|
+
throw new CliError(ERRORS.FAILED_TO_GET_SCAN, {
|
|
51
44
|
errorCode: 'waitingTimedOut'
|
|
52
45
|
});
|
|
53
46
|
}
|
|
54
47
|
}
|
|
55
48
|
};
|
|
56
|
-
|
|
49
|
+
export { pollScanUntilCompletion, getScanResources };
|
|
50
|
+
//# sourceMappingURL=scanDetailCompletion.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scanDetailCompletion.js","sourceRoot":"","sources":["../../src/lambda/scanDetailCompletion.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,31 +1,25 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
const utils_1 = require("./utils");
|
|
13
|
-
const commonApi_1 = require("../utils/commonApi");
|
|
14
|
-
const logUtils_1 = require("./logUtils");
|
|
15
|
-
const cliError_1 = require("./cliError");
|
|
16
|
-
const constants_1 = require("./constants");
|
|
17
|
-
const requestUtils_1 = require("../utils/requestUtils");
|
|
1
|
+
import i18n from 'i18n';
|
|
2
|
+
import logSymbols from 'log-symbols';
|
|
3
|
+
import chalk from 'chalk';
|
|
4
|
+
import { parseARN } from './arn.js';
|
|
5
|
+
import { getLambdaClient, getLambdaFunctionConfiguration, getLambdaPolicies, getLayersLinks } from './aws.js';
|
|
6
|
+
import { toLowerKeys } from './utils.js';
|
|
7
|
+
import { getHttpClient } from '../utils/commonApi.js';
|
|
8
|
+
import { log, prettyPrintJson } from './logUtils.js';
|
|
9
|
+
import { CliError } from './cliError.js';
|
|
10
|
+
import { ERRORS } from './constants.js';
|
|
11
|
+
import { sleep } from '../utils/requestUtils.js';
|
|
18
12
|
const MAX_RETRIES = 2;
|
|
19
13
|
const sendScanPostRequest = async (config, params, functionsEvent, showProgress = false, retryNumber = 0) => {
|
|
20
|
-
const client =
|
|
14
|
+
const client = getHttpClient(config);
|
|
21
15
|
if (showProgress) {
|
|
22
|
-
|
|
16
|
+
log(i18n.__('sendingScanRequest', { icon: logSymbols.success }));
|
|
23
17
|
}
|
|
24
|
-
const res = await client.postFunctionScan(config, params, functionsEvent);
|
|
18
|
+
const res = (await client.postFunctionScan(config, params, functionsEvent));
|
|
25
19
|
const { statusCode, body } = res;
|
|
26
20
|
if (statusCode === 201) {
|
|
27
21
|
if (showProgress) {
|
|
28
|
-
|
|
22
|
+
log(i18n.__('scanRequestedSuccessfully', { icon: logSymbols.success }));
|
|
29
23
|
}
|
|
30
24
|
return body?.data?.scanId;
|
|
31
25
|
}
|
|
@@ -34,33 +28,32 @@ const sendScanPostRequest = async (config, params, functionsEvent, showProgress
|
|
|
34
28
|
let description = '';
|
|
35
29
|
switch (errorCode) {
|
|
36
30
|
case 'not_supported_runtime':
|
|
37
|
-
description =
|
|
31
|
+
description = i18n.__(errorCode, {
|
|
38
32
|
runtime: data?.runtime,
|
|
39
33
|
supportedRuntimes: data?.supportedRuntimes.sort().join(' | ')
|
|
40
34
|
});
|
|
41
35
|
errorCode = false;
|
|
42
36
|
break;
|
|
43
37
|
case 'not_supported_lambda':
|
|
44
|
-
description =
|
|
38
|
+
description = i18n.__(errorCode);
|
|
45
39
|
errorCode = false;
|
|
46
40
|
break;
|
|
47
41
|
default:
|
|
48
42
|
if (retryNumber < MAX_RETRIES) {
|
|
49
|
-
await
|
|
43
|
+
await sleep(3 * 1000);
|
|
50
44
|
return sendScanPostRequest(config, params, functionsEvent, showProgress, retryNumber + 1);
|
|
51
45
|
}
|
|
52
46
|
}
|
|
53
|
-
throw new
|
|
47
|
+
throw new CliError(ERRORS.FAILED_TO_START_SCAN, {
|
|
54
48
|
statusCode,
|
|
55
49
|
errorCode,
|
|
56
50
|
data,
|
|
57
51
|
description
|
|
58
52
|
});
|
|
59
53
|
};
|
|
60
|
-
exports.sendScanPostRequest = sendScanPostRequest;
|
|
61
54
|
const createFunctionEvent = (lambdaConfig, layersLinks, lambdaPolicies) => {
|
|
62
55
|
delete lambdaConfig.$metadata;
|
|
63
|
-
const functionEvent =
|
|
56
|
+
const functionEvent = toLowerKeys(lambdaConfig.Configuration);
|
|
64
57
|
functionEvent['code'] = lambdaConfig.Code;
|
|
65
58
|
functionEvent['rolePolicies'] = lambdaPolicies;
|
|
66
59
|
if (layersLinks) {
|
|
@@ -68,43 +61,43 @@ const createFunctionEvent = (lambdaConfig, layersLinks, lambdaPolicies) => {
|
|
|
68
61
|
}
|
|
69
62
|
return { function: functionEvent };
|
|
70
63
|
};
|
|
71
|
-
exports.createFunctionEvent = createFunctionEvent;
|
|
72
64
|
const requestScanFunctionPost = async (config, lambdaOptions) => {
|
|
73
65
|
const { verbose, jsonOutput, functionName } = lambdaOptions;
|
|
74
|
-
const lambdaClient =
|
|
66
|
+
const lambdaClient = getLambdaClient(lambdaOptions);
|
|
75
67
|
if (!jsonOutput) {
|
|
76
|
-
|
|
77
|
-
icon:
|
|
78
|
-
functionName:
|
|
68
|
+
log(i18n.__('fetchingConfiguration', {
|
|
69
|
+
icon: logSymbols.success,
|
|
70
|
+
functionName: chalk.bold(functionName)
|
|
79
71
|
}));
|
|
80
72
|
}
|
|
81
|
-
const lambdaConfig = await
|
|
73
|
+
const lambdaConfig = await getLambdaFunctionConfiguration(lambdaClient, lambdaOptions);
|
|
82
74
|
if (!lambdaConfig?.Configuration) {
|
|
83
|
-
throw new
|
|
75
|
+
throw new CliError(ERRORS.FAILED_TO_START_SCAN, {
|
|
84
76
|
errorCode: 'missingLambdaConfig'
|
|
85
77
|
});
|
|
86
78
|
}
|
|
87
79
|
const { Configuration } = lambdaConfig;
|
|
88
|
-
const layersLinks = await
|
|
89
|
-
const lambdaPolicies = await
|
|
80
|
+
const layersLinks = await getLayersLinks(lambdaClient, Configuration);
|
|
81
|
+
const lambdaPolicies = await getLambdaPolicies(Configuration, lambdaOptions);
|
|
90
82
|
const functionEvent = createFunctionEvent(lambdaConfig, layersLinks, lambdaPolicies);
|
|
91
83
|
const { FunctionArn: functionArn } = Configuration;
|
|
92
84
|
if (!functionArn) {
|
|
93
|
-
throw new
|
|
85
|
+
throw new CliError(ERRORS.FAILED_TO_START_SCAN, {
|
|
94
86
|
errorCode: 'missingLambdaArn'
|
|
95
87
|
});
|
|
96
88
|
}
|
|
97
|
-
const parsedARN =
|
|
89
|
+
const parsedARN = parseARN(functionArn);
|
|
98
90
|
const params = {
|
|
99
91
|
organizationId: config.organizationId,
|
|
100
92
|
provider: 'aws',
|
|
101
93
|
accountId: parsedARN.accountId
|
|
102
94
|
};
|
|
103
95
|
if (verbose) {
|
|
104
|
-
|
|
105
|
-
|
|
96
|
+
log(i18n.__('fetchedConfiguration', { icon: logSymbols.success }));
|
|
97
|
+
prettyPrintJson(functionEvent);
|
|
106
98
|
}
|
|
107
99
|
const scanId = await sendScanPostRequest(config, params, functionEvent, !jsonOutput);
|
|
108
100
|
return { scanId, params, functionArn };
|
|
109
101
|
};
|
|
110
|
-
|
|
102
|
+
export { sendScanPostRequest, requestScanFunctionPost, createFunctionEvent };
|
|
103
|
+
//# sourceMappingURL=scanRequest.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scanRequest.js","sourceRoot":"","sources":["../../src/lambda/scanRequest.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,14 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const commonApi_1 = require("../utils/commonApi");
|
|
5
|
-
const cliError_1 = require("./cliError");
|
|
6
|
-
const constants_1 = require("./constants");
|
|
1
|
+
import { getHttpClient } from '../utils/commonApi.js';
|
|
2
|
+
import { CliError } from './cliError.js';
|
|
3
|
+
import { ERRORS } from './constants.js';
|
|
7
4
|
const getScanResults = async (config, params, scanId, functionArn) => {
|
|
8
|
-
const client =
|
|
9
|
-
const { statusCode, body } = await client.getFunctionScanResults(config, params, scanId, functionArn);
|
|
5
|
+
const client = getHttpClient(config);
|
|
6
|
+
const { statusCode, body } = (await client.getFunctionScanResults(config, params, scanId, functionArn));
|
|
10
7
|
if (statusCode === 200) {
|
|
11
8
|
return body;
|
|
12
9
|
}
|
|
13
10
|
const { errorCode } = body || {};
|
|
14
|
-
throw new
|
|
11
|
+
throw new CliError(ERRORS.FAILED_TO_GET_RESULTS, { statusCode, errorCode });
|
|
15
12
|
};
|
|
16
|
-
|
|
13
|
+
export { getScanResults };
|
|
14
|
+
//# sourceMappingURL=scanResults.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scanResults.js","sourceRoot":"","sources":["../../src/lambda/scanResults.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAGvC,MAAM,cAAc,GAAG,KAAK,EAC1B,MAAW,EACX,MAAiB,EACjB,MAAc,EACd,WAAmB,EACnB,EAAE;IACF,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAA;IAEpC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,MAAM,CAAC,sBAAsB,CAC/D,MAAM,EACN,MAAM,EACN,MAAM,EACN,WAAW,CACZ,CAAQ,CAAA;IAET,IAAI,UAAU,KAAK,GAAG,EAAE;QACtB,OAAO,IAAI,CAAA;KACZ;IAED,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,IAAI,EAAE,CAAA;IAChC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,qBAAqB,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAA;AAC7E,CAAC,CAAA;AAED,OAAO,EAAE,cAAc,EAAE,CAAA"}
|
package/dist/lambda/types.js
CHANGED
|
@@ -1,13 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.EventType = exports.StatusType = void 0;
|
|
4
|
-
var StatusType;
|
|
1
|
+
export var StatusType;
|
|
5
2
|
(function (StatusType) {
|
|
6
3
|
StatusType["FAILED"] = "failed";
|
|
7
4
|
StatusType["SUCCESS"] = "success";
|
|
8
|
-
})(StatusType
|
|
9
|
-
var EventType;
|
|
5
|
+
})(StatusType || (StatusType = {}));
|
|
6
|
+
export var EventType;
|
|
10
7
|
(function (EventType) {
|
|
11
8
|
EventType["START"] = "start_command_session";
|
|
12
9
|
EventType["END"] = "end_command_session";
|
|
13
|
-
})(EventType
|
|
10
|
+
})(EventType || (EventType = {}));
|
|
11
|
+
//# sourceMappingURL=types.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/lambda/types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,+BAAiB,CAAA;IACjB,iCAAmB,CAAA;AACrB,CAAC,EAHW,UAAU,KAAV,UAAU,QAGrB;AAED,MAAM,CAAN,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,4CAA+B,CAAA;IAC/B,wCAA2B,CAAA;AAC7B,CAAC,EAHW,SAAS,KAAT,SAAS,QAGpB"}
|
package/dist/lambda/utils.js
CHANGED
|
@@ -1,14 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
const lodash_1 = require("lodash");
|
|
9
|
-
const i18n_1 = __importDefault(require("i18n"));
|
|
10
|
-
const logUtils_1 = require("./logUtils");
|
|
11
|
-
i18n_1.default.setLocale('en');
|
|
1
|
+
import chalk from 'chalk';
|
|
2
|
+
import { groupBy, sortBy, capitalize, minBy } from 'lodash-es';
|
|
3
|
+
import i18n from 'i18n';
|
|
4
|
+
import { log } from './logUtils.js';
|
|
5
|
+
// fix for using `plural`
|
|
6
|
+
// https://github.com/mashpie/i18n-node/issues/429
|
|
7
|
+
i18n.setLocale('en');
|
|
12
8
|
class PrintVulnerability {
|
|
13
9
|
constructor(index, vulnerability, group) {
|
|
14
10
|
const { severityText, title, description, remediation, categoryText } = vulnerability;
|
|
@@ -16,7 +12,7 @@ class PrintVulnerability {
|
|
|
16
12
|
this.vulnerability = vulnerability;
|
|
17
13
|
this.index = index;
|
|
18
14
|
this.title = title;
|
|
19
|
-
this.severity =
|
|
15
|
+
this.severity = capitalize(severityText);
|
|
20
16
|
this.description = underlineLinks(description);
|
|
21
17
|
this.remediation = remediation?.description;
|
|
22
18
|
this.recommendation = '';
|
|
@@ -52,13 +48,13 @@ class PrintVulnerability {
|
|
|
52
48
|
const [policy, description] = comment.split(':').map(c => c.trim());
|
|
53
49
|
return { policy, description };
|
|
54
50
|
};
|
|
55
|
-
const groupByPolicy =
|
|
51
|
+
const groupByPolicy = groupBy(comment, c => splitComment(c).policy);
|
|
56
52
|
Object.entries(groupByPolicy).forEach(([policy, commentArr]) => {
|
|
57
53
|
const comments = commentArr
|
|
58
54
|
.map(splitComment)
|
|
59
55
|
.map(({ description }) => ` - ${description}`)
|
|
60
56
|
.join('\n');
|
|
61
|
-
this.whatHappened +=
|
|
57
|
+
this.whatHappened += i18n.__('whatHappenedItem', { policy, comments });
|
|
62
58
|
});
|
|
63
59
|
}
|
|
64
60
|
}
|
|
@@ -67,14 +63,14 @@ class PrintVulnerability {
|
|
|
67
63
|
this.recommendation = this.vulnerability?.remediation?.description;
|
|
68
64
|
return;
|
|
69
65
|
}
|
|
70
|
-
const maxSeverity =
|
|
71
|
-
this.title =
|
|
72
|
-
this.severity =
|
|
66
|
+
const maxSeverity = minBy(this.group, 'severity');
|
|
67
|
+
this.title = i18n.__('vulnerableDependency');
|
|
68
|
+
this.severity = capitalize(maxSeverity.severityText);
|
|
73
69
|
this.recommendation = maxSeverity.remediation?.description;
|
|
74
70
|
const library = groupByDependency({ title: this.vulnerability.title });
|
|
75
71
|
const [packageName, version] = library.split(':');
|
|
76
72
|
const allCves = this.group.map(groupByCVE);
|
|
77
|
-
this.description =
|
|
73
|
+
this.description = i18n.__mf('vulnerableDependencyDescriptions', {
|
|
78
74
|
NUM: this.group.length,
|
|
79
75
|
packageName,
|
|
80
76
|
version,
|
|
@@ -82,26 +78,28 @@ class PrintVulnerability {
|
|
|
82
78
|
});
|
|
83
79
|
}
|
|
84
80
|
print() {
|
|
85
|
-
|
|
86
|
-
|
|
81
|
+
log(`${this.index}.`);
|
|
82
|
+
// prettier-ignore
|
|
83
|
+
log(`${chalk.bold(this.severity)} | ${chalk.bold(this.title)} ${this.description}`);
|
|
87
84
|
if (this.whatHappened) {
|
|
88
|
-
|
|
85
|
+
log(`\n${chalk.bold(i18n.__('whatHappenedTitle'))}\n${this.whatHappened}`);
|
|
89
86
|
}
|
|
90
87
|
if (this.recommendation) {
|
|
91
|
-
|
|
88
|
+
log(`${chalk.bold(i18n.__('recommendation'))}\n${this.recommendation}`);
|
|
92
89
|
}
|
|
93
|
-
|
|
90
|
+
log('');
|
|
94
91
|
}
|
|
95
92
|
}
|
|
96
93
|
const groupByCVE = ({ title }) => title.substring(0, title.indexOf('[') - 1);
|
|
97
94
|
const groupByDependency = ({ title }) => title.substring(title.indexOf('[') + 1, title.indexOf(']'));
|
|
98
95
|
const printResults = (results) => {
|
|
96
|
+
//filter out any vulnerabs which is not least privilege or dependencies- cli does not handle other vulnerabs yet
|
|
99
97
|
const vulnerabs = results.filter(r => r.category === 1 || r.category === 4);
|
|
100
|
-
const sortBySeverity =
|
|
98
|
+
const sortBySeverity = sortBy(vulnerabs, ['severity', 'title']);
|
|
101
99
|
const notDependencies = sortBySeverity.filter(r => r.category !== 1);
|
|
102
100
|
const dependencies = sortBySeverity.filter(r => r.category === 1);
|
|
103
|
-
const dependenciesByLibrary =
|
|
104
|
-
|
|
101
|
+
const dependenciesByLibrary = groupBy(dependencies, groupByDependency);
|
|
102
|
+
log('');
|
|
105
103
|
notDependencies.forEach((vulnerability, index) => {
|
|
106
104
|
const printVulnerab = new PrintVulnerability(index + 1, vulnerability);
|
|
107
105
|
printVulnerab.print();
|
|
@@ -113,24 +111,23 @@ const printResults = (results) => {
|
|
|
113
111
|
});
|
|
114
112
|
const dependenciesCount = Object.keys(dependenciesByLibrary).length;
|
|
115
113
|
const resultCount = notDependencies.length + dependenciesCount;
|
|
116
|
-
|
|
114
|
+
log(i18n.__n('foundVulnerabilities', resultCount), { bold: true });
|
|
117
115
|
const counters = getNotDependenciesCounters(notDependencies);
|
|
118
116
|
if (dependenciesCount) {
|
|
119
|
-
counters.push(
|
|
117
|
+
counters.push(i18n.__n('dependenciesCount', dependenciesCount));
|
|
120
118
|
}
|
|
121
|
-
|
|
119
|
+
log(counters.join(' | '), { bold: true });
|
|
122
120
|
};
|
|
123
|
-
exports.printResults = printResults;
|
|
124
121
|
const getNotDependenciesCounters = (notDependencies) => {
|
|
125
|
-
const groupByType =
|
|
126
|
-
return Object.values(groupByType).map(group => `${group.length} ${
|
|
122
|
+
const groupByType = groupBy(notDependencies, ['categoryText']);
|
|
123
|
+
return Object.values(groupByType).map(group => `${group.length} ${capitalize(group[0].categoryText)}`);
|
|
127
124
|
};
|
|
128
125
|
const underlineLinks = (text) => {
|
|
129
126
|
if (!text) {
|
|
130
127
|
return text;
|
|
131
128
|
}
|
|
132
129
|
const urlRegex = /(https?:\/\/[^\s]+)/g;
|
|
133
|
-
return text.replace(urlRegex,
|
|
130
|
+
return text.replace(urlRegex, chalk.underline('$1'));
|
|
134
131
|
};
|
|
135
132
|
function toLowerKeys(obj) {
|
|
136
133
|
return Object.keys(obj).reduce((accumulator, key) => {
|
|
@@ -139,9 +136,10 @@ function toLowerKeys(obj) {
|
|
|
139
136
|
return accumulator;
|
|
140
137
|
}, {});
|
|
141
138
|
}
|
|
142
|
-
|
|
143
|
-
|
|
139
|
+
export { toLowerKeys, printResults };
|
|
140
|
+
export const exportedForTesting = {
|
|
144
141
|
underlineLinks,
|
|
145
142
|
printResults,
|
|
146
143
|
PrintVulnerability
|
|
147
144
|
};
|
|
145
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lambda/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const commonApi_1 = require("../utils/commonApi");
|
|
5
|
-
const generateSbom = (config, type) => {
|
|
6
|
-
const client = (0, commonApi_1.getHttpClient)(config);
|
|
1
|
+
import { getHttpClient } from '../utils/commonApi.js';
|
|
2
|
+
export const generateSbom = (config, type) => {
|
|
3
|
+
const client = getHttpClient(config);
|
|
7
4
|
return client
|
|
8
5
|
.getSbom(config, type)
|
|
9
6
|
.then((res) => {
|
|
@@ -24,9 +21,8 @@ const generateSbom = (config, type) => {
|
|
|
24
21
|
console.log(err);
|
|
25
22
|
});
|
|
26
23
|
};
|
|
27
|
-
|
|
28
|
-
const
|
|
29
|
-
const client = (0, commonApi_1.getHttpClient)(config);
|
|
24
|
+
export const generateSCASbom = (config, type, reportId) => {
|
|
25
|
+
const client = getHttpClient(config);
|
|
30
26
|
return client
|
|
31
27
|
.getSCASbom(config, type, reportId)
|
|
32
28
|
.then((res) => {
|
|
@@ -42,4 +38,4 @@ const generateSCASbom = (config, type, reportId) => {
|
|
|
42
38
|
console.log(err);
|
|
43
39
|
});
|
|
44
40
|
};
|
|
45
|
-
|
|
41
|
+
//# sourceMappingURL=generateSbom.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generateSbom.js","sourceRoot":"","sources":["../../src/sbom/generateSbom.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAErD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,MAAW,EAAE,IAAY,EAAE,EAAE;IACxD,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAA;IACpC,OAAO,MAAM;SACV,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC;SACrB,IAAI,CAAC,CAAC,GAAQ,EAAE,EAAE;QACjB,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,EAAE;YAC1B,OAAO,GAAG,CAAC,IAAI,CAAA;SAChB;aAAM,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,EAAE;YACjC,OAAO,CAAC,GAAG,CAAC,wDAAwD,CAAC,CAAA;YACrE,OAAO,CAAC,GAAG,CACT,+DAA+D,MAAM,CAAC,cAAc,YAAY,MAAM,CAAC,aAAa,EAAE,CACvH,CAAA;YACD,OAAO,SAAS,CAAA;SACjB;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAAA;YACnE,OAAO,SAAS,CAAA;SACjB;IACH,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE;QAClB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAClB,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,MAAW,EACX,IAAY,EACZ,QAAgB,EAChB,EAAE;IACF,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAA;IACpC,OAAO,MAAM;SACV,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC;SAClC,IAAI,CAAC,CAAC,GAAQ,EAAE,EAAE;QACjB,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,EAAE;YAC1B,OAAO,GAAG,CAAC,IAAI,CAAA;SAChB;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAAA;YACnE,OAAO,SAAS,CAAA;SACjB;IACH,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE;QAClB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAClB,CAAC,CAAC,CAAA;AACN,CAAC,CAAA"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const
|
|
6
|
-
const processAuditReport = async (config, reportModelList, reportId) => {
|
|
1
|
+
import { auditSave } from '../../audit/save.js';
|
|
2
|
+
import { processFail } from '../../common/fail.js';
|
|
3
|
+
import { getSeverityCounts, printNoVulnFoundMsg } from '../../audit/report/commonReportingFunctions.js';
|
|
4
|
+
import { printFormattedOutputSca } from './commonReportingFunctionsSca.js';
|
|
5
|
+
export const processAuditReport = async (config, reportModelList, reportId) => {
|
|
7
6
|
let severityCounts = {};
|
|
8
7
|
if (reportModelList !== undefined) {
|
|
9
8
|
severityCounts = formatScaServicesReport(config, reportModelList);
|
|
@@ -15,10 +14,10 @@ const processAuditReport = async (config, reportModelList, reportId) => {
|
|
|
15
14
|
console.log('Use contrast audit --save to generate an SBOM');
|
|
16
15
|
}
|
|
17
16
|
if (config.fail) {
|
|
18
|
-
|
|
17
|
+
processFail(config, severityCounts);
|
|
19
18
|
}
|
|
20
19
|
};
|
|
21
|
-
const formatScaServicesReport = (config, reportModelList) => {
|
|
20
|
+
export const formatScaServicesReport = (config, reportModelList) => {
|
|
22
21
|
const projectOverviewCount = getSeverityCounts(reportModelList);
|
|
23
22
|
if (projectOverviewCount.total === 0) {
|
|
24
23
|
printNoVulnFoundMsg();
|
|
@@ -36,7 +35,4 @@ const formatScaServicesReport = (config, reportModelList) => {
|
|
|
36
35
|
}
|
|
37
36
|
return projectOverviewCount;
|
|
38
37
|
};
|
|
39
|
-
|
|
40
|
-
formatScaServicesReport,
|
|
41
|
-
processAuditReport
|
|
42
|
-
};
|
|
38
|
+
//# sourceMappingURL=auditReport.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auditReport.js","sourceRoot":"","sources":["../../../src/scaAnalysis/common/auditReport.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,gDAAgD,CAAA;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAA;AAE1E,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,EAAE;IAC5E,IAAI,cAAc,GAAG,EAAE,CAAA;IACvB,IAAI,eAAe,KAAK,SAAS,EAAE;QACjC,cAAc,GAAG,uBAAuB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;KAClE;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;KAClC;SAAM;QACL,OAAO,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAA;KAC7D;IAED,IAAI,MAAM,CAAC,IAAI,EAAE;QACf,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;KACpC;AACH,CAAC,CAAA;AACD,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,EAAE;IACjE,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,eAAe,CAAC,CAAA;IAE/D,IAAI,oBAAoB,CAAC,KAAK,KAAK,CAAC,EAAE;QACpC,mBAAmB,EAAE,CAAA;KACtB;SAAM;QACL,MAAM,2BAA2B,GAAG,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAChE,IAAI,KAAK,GAAG,CAAC,CAAA;YAEb,IAAI,OAAO,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtC,KAAK,EAAE,CAAA;aACR;YAED,OAAO,KAAK,CAAA;QACd,CAAC,CAAC,CAAC,MAAM,CAAA;QAET,IAAI,YAAY,GAAG,eAAe,CAAC,MAAM,CACvC,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,KAAK,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,EAC1D,CAAC,CACF,CAAA;QAED,uBAAuB,CACrB,MAAM,EACN,eAAe,EACf,2BAA2B,EAC3B,YAAY,CACb,CAAA;KACF;IAED,OAAO,oBAAoB,CAAA;AAC7B,CAAC,CAAA"}
|