@contrast/contrast 2.0.2-beta.3 → 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
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"analysis.js","sourceRoot":"","sources":["../../../src/scaAnalysis/javascript/analysis.js"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const
|
|
6
|
-
const jsAnalysis = async (config, languageFiles) => {
|
|
1
|
+
import { readFile, readYarn, parseNpmLockFile, parseYarnLockFile } from './analysis.js';
|
|
2
|
+
import i18n from 'i18n';
|
|
3
|
+
import { createJavaScriptTSMessage } from '../common/formatMessage.js';
|
|
4
|
+
import { parseJS } from './scaServiceParser.js';
|
|
5
|
+
const { __ } = i18n;
|
|
6
|
+
export const jsAnalysis = async (config, languageFiles) => {
|
|
7
7
|
checkForCorrectFiles(languageFiles);
|
|
8
8
|
if (!config.file.endsWith('/')) {
|
|
9
9
|
config.file = config.file.concat('/');
|
|
@@ -14,19 +14,19 @@ const buildNodeTree = async (config, files) => {
|
|
|
14
14
|
let analysis = await readFiles(config, files);
|
|
15
15
|
const rawNode = await parseFiles(config, files, analysis);
|
|
16
16
|
if (config.legacy === false) {
|
|
17
|
-
return
|
|
17
|
+
return parseJS(rawNode);
|
|
18
18
|
}
|
|
19
|
-
return
|
|
19
|
+
return createJavaScriptTSMessage(rawNode);
|
|
20
20
|
};
|
|
21
21
|
const readFiles = async (config, files) => {
|
|
22
22
|
let js = {};
|
|
23
|
-
js.packageJSON = JSON.parse(await
|
|
23
|
+
js.packageJSON = JSON.parse(await readFile(config, files, 'package.json'));
|
|
24
24
|
if (files.includes('package-lock.json')) {
|
|
25
|
-
js.rawLockFileContents = await
|
|
25
|
+
js.rawLockFileContents = await readFile(config, files, 'package-lock.json');
|
|
26
26
|
}
|
|
27
27
|
if (files.includes('yarn.lock')) {
|
|
28
28
|
js.yarn = {};
|
|
29
|
-
js.yarn = await
|
|
29
|
+
js.yarn = await readYarn(config, files, 'yarn.lock');
|
|
30
30
|
}
|
|
31
31
|
return js;
|
|
32
32
|
};
|
|
@@ -45,26 +45,24 @@ const parseFiles = async (config, files, js) => {
|
|
|
45
45
|
if (currentLockFileVersion === 3 && config.legacy) {
|
|
46
46
|
throw new Error(`NPM lockfileVersion 3 is not support with --legacy`);
|
|
47
47
|
}
|
|
48
|
-
js.npmLockFile = await
|
|
48
|
+
js.npmLockFile = await parseNpmLockFile(npmLockFile);
|
|
49
49
|
}
|
|
50
50
|
if (files.includes('yarn.lock')) {
|
|
51
|
-
js = await
|
|
51
|
+
js = await parseYarnLockFile(js);
|
|
52
52
|
}
|
|
53
53
|
return js;
|
|
54
54
|
};
|
|
55
55
|
const checkForCorrectFiles = languageFiles => {
|
|
56
56
|
if (languageFiles.JAVASCRIPT.includes('package-lock.json') &&
|
|
57
57
|
languageFiles.JAVASCRIPT.includes('yarn.lock')) {
|
|
58
|
-
throw new Error(
|
|
58
|
+
throw new Error(__('languageAnalysisHasMultipleLockFiles', 'javascript'));
|
|
59
59
|
}
|
|
60
60
|
if (!languageFiles.JAVASCRIPT.includes('package-lock.json') &&
|
|
61
61
|
!languageFiles.JAVASCRIPT.includes('yarn.lock')) {
|
|
62
|
-
throw new Error(
|
|
62
|
+
throw new Error(__('languageAnalysisHasNoLockFile', 'javascript'));
|
|
63
63
|
}
|
|
64
64
|
if (!languageFiles.JAVASCRIPT.includes('package.json')) {
|
|
65
|
-
throw new Error(
|
|
65
|
+
throw new Error(__('languageAnalysisHasNoPackageJsonFile'));
|
|
66
66
|
}
|
|
67
67
|
};
|
|
68
|
-
|
|
69
|
-
jsAnalysis
|
|
70
|
-
};
|
|
68
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/scaAnalysis/javascript/index.js"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
const parseJS = rawNode => {
|
|
1
|
+
export const parseJS = rawNode => {
|
|
3
2
|
let dependencyTree = {};
|
|
4
3
|
let combinedPackageJSONDep = {
|
|
5
4
|
...rawNode.packageJSON?.dependencies,
|
|
@@ -42,7 +41,7 @@ const yarnCreateDepTree = (dependencyTree, combinedPackageJSONDep, packageLock,
|
|
|
42
41
|
}
|
|
43
42
|
return dependencyTree;
|
|
44
43
|
};
|
|
45
|
-
const chooseLockFile = rawNode => {
|
|
44
|
+
export const chooseLockFile = rawNode => {
|
|
46
45
|
if (rawNode?.yarn?.yarnLockFile !== undefined) {
|
|
47
46
|
return { lockFile: rawNode?.yarn?.yarnLockFile?.object, type: 'yarn' };
|
|
48
47
|
}
|
|
@@ -56,7 +55,7 @@ const chooseLockFile = rawNode => {
|
|
|
56
55
|
const createKeyName = (dep, version) => {
|
|
57
56
|
return dep + '@' + version;
|
|
58
57
|
};
|
|
59
|
-
const checkIfInPackageJSON = (list, dep) => {
|
|
58
|
+
export const checkIfInPackageJSON = (list, dep) => {
|
|
60
59
|
return Object.keys(list).includes(dep);
|
|
61
60
|
};
|
|
62
61
|
const createChildDependencies = (lockFileDep, currentDep) => {
|
|
@@ -68,7 +67,7 @@ const createChildDependencies = (lockFileDep, currentDep) => {
|
|
|
68
67
|
}
|
|
69
68
|
return depArray;
|
|
70
69
|
};
|
|
71
|
-
const createNPMChildDependencies = (lockFileDep, currentDep) => {
|
|
70
|
+
export const createNPMChildDependencies = (lockFileDep, currentDep) => {
|
|
72
71
|
let depArray = [];
|
|
73
72
|
if (lockFileDep[currentDep]?.dependencies) {
|
|
74
73
|
for (const [key, value] of Object.entries(lockFileDep[currentDep]?.dependencies)) {
|
|
@@ -84,7 +83,7 @@ const getDepNameWithoutVersion = depKey => {
|
|
|
84
83
|
}
|
|
85
84
|
return dependency[0];
|
|
86
85
|
};
|
|
87
|
-
const getNameFromGAV = depKey => {
|
|
86
|
+
export const getNameFromGAV = depKey => {
|
|
88
87
|
let dependency = depKey.split('/');
|
|
89
88
|
if (dependency.length == 2) {
|
|
90
89
|
dependency = getDepNameWithoutVersion(dependency[1]);
|
|
@@ -94,16 +93,10 @@ const getNameFromGAV = depKey => {
|
|
|
94
93
|
dependency = getDepNameWithoutVersion(depKey);
|
|
95
94
|
return dependency;
|
|
96
95
|
}
|
|
96
|
+
//what should we do if there's no version? The service will fall over but do we want to throw error for only one wrong version?
|
|
97
97
|
return depKey;
|
|
98
98
|
};
|
|
99
|
-
const getResolvedVersion = (depKey, packageLock) => {
|
|
99
|
+
export const getResolvedVersion = (depKey, packageLock) => {
|
|
100
100
|
return packageLock[depKey]?.version;
|
|
101
101
|
};
|
|
102
|
-
|
|
103
|
-
parseJS,
|
|
104
|
-
checkIfInPackageJSON,
|
|
105
|
-
getNameFromGAV,
|
|
106
|
-
getResolvedVersion,
|
|
107
|
-
chooseLockFile,
|
|
108
|
-
createNPMChildDependencies
|
|
109
|
-
};
|
|
102
|
+
//# sourceMappingURL=scaServiceParser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scaServiceParser.js","sourceRoot":"","sources":["../../../src/scaAnalysis/javascript/scaServiceParser.js"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,20 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const
|
|
8
|
-
const { auditSave } = require('../../audit/save');
|
|
9
|
-
const legacyFlow = async (config, messageToSend) => {
|
|
1
|
+
import i18n from 'i18n';
|
|
2
|
+
import { commonSendSnapShot } from '../common/treeUpload.js';
|
|
3
|
+
import { pollForSnapshotCompletion } from '../../audit/languageAnalysisEngine/sendSnapshot.js';
|
|
4
|
+
import { vulnerabilityReportV2 } from '../../audit/report/reportingFeature.js';
|
|
5
|
+
import { dealWithNoAppId } from '../../commands/audit/auditController.js';
|
|
6
|
+
import { returnOra, startSpinner, succeedSpinner } from '../../utils/oraWrapper.js';
|
|
7
|
+
export const legacyFlow = async (config, messageToSend) => {
|
|
10
8
|
const startTime = performance.now();
|
|
11
9
|
if (!config.applicationId) {
|
|
12
|
-
config.applicationId = await
|
|
10
|
+
config.applicationId = await dealWithNoAppId(config);
|
|
13
11
|
}
|
|
14
|
-
console.log('');
|
|
12
|
+
console.log(''); //empty log for space before spinner
|
|
13
|
+
//send message to TS
|
|
15
14
|
const reportSpinner = returnOra(i18n.__('auditSCAAnalysisBegins'));
|
|
16
15
|
startSpinner(reportSpinner);
|
|
17
|
-
const snapshotResponse = await
|
|
16
|
+
const snapshotResponse = await commonSendSnapShot(messageToSend, config);
|
|
17
|
+
// poll for completion
|
|
18
18
|
await pollForSnapshotCompletion(config, snapshotResponse.id, reportSpinner);
|
|
19
19
|
succeedSpinner(reportSpinner, i18n.__('auditSCAAnalysisComplete'));
|
|
20
20
|
await vulnerabilityReportV2(config, snapshotResponse.id);
|
|
@@ -22,6 +22,4 @@ const legacyFlow = async (config, messageToSend) => {
|
|
|
22
22
|
const scanDurationMs = endTime - startTime;
|
|
23
23
|
console.log(`----- completed in ${(scanDurationMs / 1000).toFixed(2)}s -----`);
|
|
24
24
|
};
|
|
25
|
-
|
|
26
|
-
legacyFlow
|
|
27
|
-
};
|
|
25
|
+
//# sourceMappingURL=legacyFlow.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"legacyFlow.js","sourceRoot":"","sources":["../../../src/scaAnalysis/legacy/legacyFlow.js"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAC5D,OAAO,EAAE,yBAAyB,EAAE,MAAM,oDAAoD,CAAA;AAC9F,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAA;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAA;AACzE,OAAO,EACL,SAAS,EACT,YAAY,EACZ,cAAc,EACf,MAAM,2BAA2B,CAAA;AAElC,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE;IACxD,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;IACnC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;QACzB,MAAM,CAAC,aAAa,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC,CAAA;KACrD;IAED,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA,CAAC,oCAAoC;IACpD,oBAAoB;IACpB,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,wBAAwB,CAAC,CAAC,CAAA;IAClE,YAAY,CAAC,aAAa,CAAC,CAAA;IAC3B,MAAM,gBAAgB,GAAG,MAAM,kBAAkB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;IAExE,sBAAsB;IACtB,MAAM,yBAAyB,CAAC,MAAM,EAAE,gBAAgB,CAAC,EAAE,EAAE,aAAa,CAAC,CAAA;IAC3E,cAAc,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAC,CAAA;IAElE,MAAM,qBAAqB,CAAC,MAAM,EAAE,gBAAgB,CAAC,EAAE,CAAC,CAAA;IACxD,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,SAAS,CAAA;IAC7C,MAAM,cAAc,GAAG,OAAO,GAAG,SAAS,CAAA;IAE1C,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;AAChF,CAAC,CAAA"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const
|
|
5
|
-
const readFile = (config, nameOfFile) => {
|
|
1
|
+
import { readFileSync } from 'fs';
|
|
2
|
+
import i18n from 'i18n';
|
|
3
|
+
import { keyBy, merge } from 'lodash-es';
|
|
4
|
+
const { __ } = i18n;
|
|
5
|
+
export const readFile = (config, nameOfFile) => {
|
|
6
6
|
if (config.file) {
|
|
7
7
|
try {
|
|
8
|
-
return
|
|
8
|
+
return readFileSync(config.file + '/' + nameOfFile, 'utf8');
|
|
9
9
|
}
|
|
10
10
|
catch (error) {
|
|
11
11
|
console.log('Unable to find file');
|
|
@@ -13,14 +13,16 @@ const readFile = (config, nameOfFile) => {
|
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
15
|
};
|
|
16
|
-
const parseProjectFiles = php => {
|
|
16
|
+
export const parseProjectFiles = php => {
|
|
17
17
|
try {
|
|
18
|
+
// composer.json
|
|
18
19
|
php.composerJSON.dependencies = php.composerJSON.require;
|
|
19
20
|
php.composerJSON.devDependencies = php.composerJSON['require-dev'];
|
|
21
|
+
// composer.lock
|
|
20
22
|
php.lockFile = php.rawLockFileContents;
|
|
21
|
-
let packages =
|
|
22
|
-
let packagesDev =
|
|
23
|
-
php.lockFile.dependencies =
|
|
23
|
+
let packages = keyBy(php.lockFile.packages, 'name');
|
|
24
|
+
let packagesDev = keyBy(php.lockFile['packages-dev'], 'name');
|
|
25
|
+
php.lockFile.dependencies = merge(packages, packagesDev);
|
|
24
26
|
const listOfTopDep = Object.keys(php.lockFile.dependencies);
|
|
25
27
|
Object.entries(php.lockFile.dependencies).forEach(([key, value]) => {
|
|
26
28
|
if (value.require) {
|
|
@@ -45,7 +47,7 @@ const parseProjectFiles = php => {
|
|
|
45
47
|
return php;
|
|
46
48
|
}
|
|
47
49
|
catch (err) {
|
|
48
|
-
return console.log(
|
|
50
|
+
return console.log(__('phpParseComposerLock', php) + `${err.message}`); // not sure on this
|
|
49
51
|
}
|
|
50
52
|
};
|
|
51
53
|
function addChildDepToLockFileAsOwnObj(php, depObj, key) {
|
|
@@ -56,7 +58,7 @@ function formatParentDepToLockFile(php) {
|
|
|
56
58
|
let requires = {};
|
|
57
59
|
for (const [childKey, childValue] of Object.entries(value)) {
|
|
58
60
|
if (childKey === 'require' || childKey === 'require-dev') {
|
|
59
|
-
requires =
|
|
61
|
+
requires = merge(requires, childValue);
|
|
60
62
|
php.lockFile.dependencies[key].requires = requires;
|
|
61
63
|
delete php.lockFile.dependencies[key].require;
|
|
62
64
|
delete php.lockFile.dependencies[key]['require-dev'];
|
|
@@ -64,7 +66,4 @@ function formatParentDepToLockFile(php) {
|
|
|
64
66
|
}
|
|
65
67
|
}
|
|
66
68
|
}
|
|
67
|
-
|
|
68
|
-
parseProjectFiles,
|
|
69
|
-
readFile
|
|
70
|
-
};
|
|
69
|
+
//# sourceMappingURL=analysis.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"analysis.js","sourceRoot":"","sources":["../../../src/scaAnalysis/php/analysis.js"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const
|
|
5
|
-
const phpAnalysis = config => {
|
|
1
|
+
import { parsePHPLockFileForScaServices } from './phpNewServicesMapper.js';
|
|
2
|
+
import { createPhpTSMessage } from '../common/formatMessage.js';
|
|
3
|
+
import { parseProjectFiles, readFile } from './analysis.js';
|
|
4
|
+
export const phpAnalysis = config => {
|
|
6
5
|
let analysis = readFiles(config);
|
|
7
6
|
if (config.legacy === false) {
|
|
8
7
|
return parsePHPLockFileForScaServices(analysis.rawLockFileContents);
|
|
@@ -18,6 +17,4 @@ const readFiles = config => {
|
|
|
18
17
|
php.rawLockFileContents = JSON.parse(readFile(config, 'composer.lock'));
|
|
19
18
|
return php;
|
|
20
19
|
};
|
|
21
|
-
|
|
22
|
-
phpAnalysis: phpAnalysis
|
|
23
|
-
};
|
|
20
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/scaAnalysis/php/index.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAA;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAC/D,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAE3D,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,EAAE;IAClC,IAAI,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;IAEhC,IAAI,MAAM,CAAC,MAAM,KAAK,KAAK,EAAE;QAC3B,OAAO,8BAA8B,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAA;KACpE;SAAM;QACL,MAAM,MAAM,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAA;QAC1C,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAA;KAClC;AACH,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE;IACzB,IAAI,GAAG,GAAG,EAAE,CAAA;IAEZ,GAAG,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAA;IAEhE,GAAG,CAAC,mBAAmB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAA;IAEvE,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
const
|
|
3
|
-
const parsePHPLockFileForScaServices = phpLockFile => {
|
|
1
|
+
import { keyBy, merge } from 'lodash-es';
|
|
2
|
+
export const parsePHPLockFileForScaServices = phpLockFile => {
|
|
4
3
|
const packages = keyBy(phpLockFile.packages, 'name');
|
|
5
4
|
const packagesDev = keyBy(phpLockFile['packages-dev'], 'name');
|
|
6
5
|
return merge(buildDepTree(packages, true), buildDepTree(packagesDev, false));
|
|
7
6
|
};
|
|
8
|
-
const buildDepTree = (packages, productionDependency) => {
|
|
7
|
+
export const buildDepTree = (packages, productionDependency) => {
|
|
8
|
+
//builds deps into flat structure
|
|
9
9
|
const dependencyTree = {};
|
|
10
10
|
for (const packagesKey in packages) {
|
|
11
11
|
const currentObj = packages[packagesKey];
|
|
@@ -28,7 +28,9 @@ const buildDepTree = (packages, productionDependency) => {
|
|
|
28
28
|
}
|
|
29
29
|
return dependencyTree;
|
|
30
30
|
};
|
|
31
|
-
|
|
31
|
+
// currently sub deps will be built into a flat structure
|
|
32
|
+
// but not ingested via the new services as they do not have concrete versions
|
|
33
|
+
export const buildSubDepsIntoFlatStructure = childDeps => {
|
|
32
34
|
const dependencyTree = {};
|
|
33
35
|
for (const dep in childDeps) {
|
|
34
36
|
const version = childDeps[dep];
|
|
@@ -45,7 +47,7 @@ const buildSubDepsIntoFlatStructure = childDeps => {
|
|
|
45
47
|
}
|
|
46
48
|
return dependencyTree;
|
|
47
49
|
};
|
|
48
|
-
const findGroupAndName = groupAndName => {
|
|
50
|
+
export const findGroupAndName = groupAndName => {
|
|
49
51
|
if (groupAndName.includes('/')) {
|
|
50
52
|
const groupName = groupAndName.split('/');
|
|
51
53
|
return { group: groupName[0], name: groupName[1] };
|
|
@@ -54,9 +56,4 @@ const findGroupAndName = groupAndName => {
|
|
|
54
56
|
return { group: groupAndName, name: groupAndName };
|
|
55
57
|
}
|
|
56
58
|
};
|
|
57
|
-
|
|
58
|
-
parsePHPLockFileForScaServices,
|
|
59
|
-
buildDepTree,
|
|
60
|
-
buildSubDepsIntoFlatStructure,
|
|
61
|
-
findGroupAndName
|
|
62
|
-
};
|
|
59
|
+
//# sourceMappingURL=phpNewServicesMapper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"phpNewServicesMapper.js","sourceRoot":"","sources":["../../../src/scaAnalysis/php/phpNewServicesMapper.js"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,15 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const { shortenFilePath } = require('../scan/fileUtils');
|
|
1
|
+
import { noProjectUpload, scaTreeUpload } from './common/scaServicesUpload.js';
|
|
2
|
+
import { getProjectIdByOrg, registerNewProjectGroup, registerProjectIdOnCliServices, registerProjectWithGroupProjectId } from '../commands/github/projectGroup.js';
|
|
3
|
+
import { shortenFilePath } from '../scan/fileUtils.js';
|
|
4
|
+
import { retrieveProjectInfoViaRepoId } from '../commands/github/repoServices.js';
|
|
6
5
|
const dealWithNoProjectId = async (analysis, config, reportSpinner) => {
|
|
7
|
-
await
|
|
8
|
-
let projectId = await
|
|
9
|
-
await
|
|
6
|
+
await registerNewProjectGroup(config);
|
|
7
|
+
let projectId = await getProjectIdByOrg(config);
|
|
8
|
+
await registerProjectIdOnCliServices(config, projectId);
|
|
10
9
|
config.projectId = projectId;
|
|
11
|
-
return await
|
|
10
|
+
return await scaTreeUpload(analysis, config, reportSpinner);
|
|
12
11
|
};
|
|
13
|
-
const repoProcess = async (analysis, config, reportSpinner) => {
|
|
12
|
+
export const repoProcess = async (analysis, config, reportSpinner) => {
|
|
14
13
|
if (config.debug || config.verbose) {
|
|
15
14
|
console.log('in repository process');
|
|
16
15
|
console.log('repository id: ', config.repositoryId);
|
|
@@ -19,33 +18,62 @@ const repoProcess = async (analysis, config, reportSpinner) => {
|
|
|
19
18
|
console.log('Failed to retrieve Repository Id');
|
|
20
19
|
process.exit(1);
|
|
21
20
|
}
|
|
22
|
-
|
|
23
|
-
let repoInfo = await
|
|
21
|
+
config.shortenedFilePath = shortenFilePath(config.fileName);
|
|
22
|
+
let repoInfo = await retrieveProjectInfoViaRepoId(config);
|
|
24
23
|
repoInfo = repoInfo.find(element => config.fileName === element.path &&
|
|
25
|
-
|
|
24
|
+
config.shortenedFilePath === element.name &&
|
|
26
25
|
config.projectGroupId === element.projectGroupId);
|
|
26
|
+
// console.log('repoInfo', repoInfo)
|
|
27
|
+
// if(repoInfo !== undefined) {
|
|
28
|
+
// console.log('re-register / register first time')
|
|
29
|
+
// const language = repoInfo.language === 'JAVASCRIPT' ? 'NODE' : repoInfo.language
|
|
30
|
+
// const additionalData = {
|
|
31
|
+
// projectGroupId: repoInfo.projectGroupId,
|
|
32
|
+
// projectGroupName: repoInfo.name,
|
|
33
|
+
// projectLanguage: language,
|
|
34
|
+
// projectType: 'REPOSITORY'
|
|
35
|
+
// }
|
|
36
|
+
//
|
|
37
|
+
// // check project exists in sca / register (just in case, it failed in the past)
|
|
38
|
+
// await projectConfig.registerProjectIdOnCliServices(
|
|
39
|
+
// config,
|
|
40
|
+
// repoInfo.projectId,
|
|
41
|
+
// additionalData
|
|
42
|
+
// )
|
|
43
|
+
// }
|
|
27
44
|
if (config.projectGroupId &&
|
|
28
45
|
!repoInfo?.projectId &&
|
|
29
46
|
(repoInfo === undefined || repoInfo.length === 0)) {
|
|
30
47
|
console.log('*** has projectGroupId, no projectId and repo has no project found that matches');
|
|
31
|
-
repoInfo = await
|
|
48
|
+
repoInfo = await registerProjectWithGroupProjectId(config, config.shortenedFilePath);
|
|
32
49
|
console.log('new registered group', repoInfo);
|
|
33
50
|
const language = repoInfo.language === 'JAVASCRIPT' ? 'NODE' : repoInfo.language;
|
|
34
|
-
|
|
51
|
+
// const additionalData = {
|
|
52
|
+
// projectGroupId: repoInfo.projectGroupId,
|
|
53
|
+
// projectGroupName: repoInfo.name,
|
|
54
|
+
// projectLanguage: language,
|
|
55
|
+
// projectType: 'REPOSITORY'
|
|
56
|
+
// }
|
|
57
|
+
await registerProjectIdOnCliServices(config, repoInfo.projectId, config.shortenedFilePath);
|
|
35
58
|
}
|
|
36
59
|
config.projectId = repoInfo.projectId;
|
|
37
|
-
return await
|
|
60
|
+
return await scaTreeUpload(analysis, config, reportSpinner);
|
|
38
61
|
};
|
|
39
62
|
const trackProcess = async (analysis, config, reportSpinner) => {
|
|
40
|
-
let projectId = await
|
|
63
|
+
let projectId = await getProjectIdByOrg(config);
|
|
41
64
|
if (projectId === '') {
|
|
42
65
|
return dealWithNoProjectId(analysis, config, reportSpinner);
|
|
43
66
|
}
|
|
44
67
|
config.projectId = projectId;
|
|
45
|
-
|
|
46
|
-
|
|
68
|
+
// we can always register just in case but normally we exit when
|
|
69
|
+
await registerProjectIdOnCliServices(config, projectId);
|
|
70
|
+
return await scaTreeUpload(analysis, config, reportSpinner);
|
|
47
71
|
};
|
|
48
|
-
const processUpload = async (analysis, config, reportSpinner) => {
|
|
72
|
+
export const processUpload = async (analysis, config, reportSpinner) => {
|
|
73
|
+
// if repo but no repoId -> RegisterRepo -> GroupProjectFlow THEN scaTreeUpload
|
|
74
|
+
// if cli tracked but no projectId -> registerNewProjectGroup THEN scaTreeUpload
|
|
75
|
+
// if cli not tracked and no projectID -> noProjectUpload
|
|
76
|
+
// if cli not tracked and projectID -> scaTreeUpload}
|
|
49
77
|
if (config.repositoryId) {
|
|
50
78
|
return repoProcess(analysis, config, reportSpinner);
|
|
51
79
|
}
|
|
@@ -53,10 +81,7 @@ const processUpload = async (analysis, config, reportSpinner) => {
|
|
|
53
81
|
return trackProcess(analysis, config, reportSpinner);
|
|
54
82
|
}
|
|
55
83
|
if (!config.track) {
|
|
56
|
-
return await
|
|
84
|
+
return await noProjectUpload(analysis, config, reportSpinner);
|
|
57
85
|
}
|
|
58
86
|
};
|
|
59
|
-
|
|
60
|
-
processUpload,
|
|
61
|
-
repoProcess
|
|
62
|
-
};
|
|
87
|
+
//# sourceMappingURL=processServicesFlow.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"processServicesFlow.js","sourceRoot":"","sources":["../../src/scaAnalysis/processServicesFlow.js"],"names":[],"mappings":"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"}
|
|
@@ -1,31 +1,31 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const
|
|
5
|
-
const readAndParseProjectFile = file => {
|
|
1
|
+
import multiReplace from 'string-multiple-replace';
|
|
2
|
+
import { readFileSync } from 'fs';
|
|
3
|
+
import i18n from 'i18n';
|
|
4
|
+
const { __ } = i18n;
|
|
5
|
+
export const readAndParseProjectFile = file => {
|
|
6
6
|
const filePath = filePathForWindows(file + '/Pipfile');
|
|
7
|
-
const pipFile =
|
|
7
|
+
const pipFile = readFileSync(filePath, 'utf8');
|
|
8
8
|
const matcherObj = { '"': '' };
|
|
9
9
|
const sequencer = ['"'];
|
|
10
10
|
const parsedPipfile = multiReplace(pipFile, matcherObj, sequencer);
|
|
11
11
|
const pythonArray = parsedPipfile.split('\n');
|
|
12
12
|
return pythonArray.filter(element => element !== '' && !element.includes('#'));
|
|
13
13
|
};
|
|
14
|
-
const readAndParseLockFile = file => {
|
|
14
|
+
export const readAndParseLockFile = file => {
|
|
15
15
|
const filePath = filePathForWindows(file + '/Pipfile.lock');
|
|
16
|
-
const lockFile =
|
|
16
|
+
const lockFile = readFileSync(filePath, 'utf8');
|
|
17
17
|
let parsedPipLock = JSON.parse(lockFile);
|
|
18
18
|
parsedPipLock['defaults'] = parsedPipLock['default'];
|
|
19
19
|
delete parsedPipLock['default'];
|
|
20
20
|
return parsedPipLock;
|
|
21
21
|
};
|
|
22
|
-
const readLockFile = file => {
|
|
22
|
+
export const readLockFile = file => {
|
|
23
23
|
const filePath = filePathForWindows(file + '/Pipfile.lock');
|
|
24
|
-
const lockFile =
|
|
24
|
+
const lockFile = readFileSync(filePath, 'utf8');
|
|
25
25
|
let parsedPipLock = JSON.parse(lockFile);
|
|
26
26
|
return parsedPipLock['default'];
|
|
27
27
|
};
|
|
28
|
-
const scaPythonParser = pythonDependencies => {
|
|
28
|
+
export const scaPythonParser = pythonDependencies => {
|
|
29
29
|
let pythonParsedDeps = {};
|
|
30
30
|
for (let key in pythonDependencies) {
|
|
31
31
|
pythonParsedDeps[key] = {};
|
|
@@ -38,15 +38,15 @@ const scaPythonParser = pythonDependencies => {
|
|
|
38
38
|
}
|
|
39
39
|
return pythonParsedDeps;
|
|
40
40
|
};
|
|
41
|
-
const checkForCorrectFiles = languageFiles => {
|
|
41
|
+
export const checkForCorrectFiles = languageFiles => {
|
|
42
42
|
if (!languageFiles.includes('Pipfile.lock')) {
|
|
43
|
-
throw new Error(
|
|
43
|
+
throw new Error(__('languageAnalysisHasNoLockFile', 'python'));
|
|
44
44
|
}
|
|
45
45
|
if (!languageFiles.includes('Pipfile')) {
|
|
46
|
-
throw new Error(
|
|
46
|
+
throw new Error(__('languageAnalysisProjectFileError', 'python'));
|
|
47
47
|
}
|
|
48
48
|
};
|
|
49
|
-
const getPythonDeps = (config, languageFiles) => {
|
|
49
|
+
export const getPythonDeps = (config, languageFiles) => {
|
|
50
50
|
try {
|
|
51
51
|
if (config.legacy === false) {
|
|
52
52
|
let pythonLockFileContents = readLockFile(config.file);
|
|
@@ -70,11 +70,4 @@ const filePathForWindows = path => {
|
|
|
70
70
|
}
|
|
71
71
|
return path;
|
|
72
72
|
};
|
|
73
|
-
|
|
74
|
-
getPythonDeps,
|
|
75
|
-
scaPythonParser,
|
|
76
|
-
readAndParseLockFile,
|
|
77
|
-
readAndParseProjectFile,
|
|
78
|
-
checkForCorrectFiles,
|
|
79
|
-
readLockFile
|
|
80
|
-
};
|
|
73
|
+
//# sourceMappingURL=analysis.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"analysis.js","sourceRoot":"","sources":["../../../src/scaAnalysis/python/analysis.js"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
const
|
|
4
|
-
const pythonAnalysis = (config, languageFiles) => {
|
|
1
|
+
import { getPythonDeps } from './analysis.js';
|
|
2
|
+
import { createPythonTSMessage } from '../common/formatMessage.js';
|
|
3
|
+
export const pythonAnalysis = (config, languageFiles) => {
|
|
5
4
|
const pythonDeps = getPythonDeps(config, languageFiles.PYTHON);
|
|
6
5
|
if (config.legacy === false) {
|
|
7
6
|
return pythonDeps;
|
|
@@ -10,6 +9,4 @@ const pythonAnalysis = (config, languageFiles) => {
|
|
|
10
9
|
return createPythonTSMessage(pythonDeps);
|
|
11
10
|
}
|
|
12
11
|
};
|
|
13
|
-
|
|
14
|
-
pythonAnalysis
|
|
15
|
-
};
|
|
12
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/scaAnalysis/python/index.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAElE,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,aAAa,EAAE,EAAE;IACtD,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;IAE9D,IAAI,MAAM,CAAC,MAAM,KAAK,KAAK,EAAE;QAC3B,OAAO,UAAU,CAAA;KAClB;SAAM;QACL,OAAO,qBAAqB,CAAC,UAAU,CAAC,CAAA;KACzC;AACH,CAAC,CAAA"}
|