@contrast/contrast 1.0.16 → 1.0.18
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/dist/audit/catalogueApplication/catalogueApplication.js +1 -1
- package/dist/cliConstants.js +91 -109
- package/dist/commands/audit/auditConfig.js +10 -12
- package/dist/commands/audit/auditController.js +12 -16
- package/dist/commands/audit/help.js +32 -26
- package/dist/commands/audit/processAudit.js +16 -22
- package/dist/commands/audit/saveFile.js +3 -9
- package/dist/commands/scan/processScan.js +5 -7
- package/dist/commands/scan/sca/scaAnalysis.js +105 -88
- package/dist/common/HTTPClient.js +1 -1
- package/dist/common/commonHelp.js +35 -17
- package/dist/common/errorHandling.js +38 -57
- package/dist/common/versionChecker.js +24 -27
- package/dist/constants/constants.js +1 -1
- package/dist/constants/locales.js +20 -91
- package/dist/lambda/help.js +2 -1
- package/dist/lambda/lambda.js +2 -7
- package/dist/scaAnalysis/java/analysis.js +40 -5
- package/dist/scaAnalysis/java/index.js +14 -2
- package/dist/scan/autoDetection.js +26 -3
- package/dist/scan/fileUtils.js +24 -1
- package/dist/scan/help.js +11 -4
- package/dist/scan/saveResults.js +1 -1
- package/dist/utils/commonApi.js +16 -1
- package/dist/utils/generalAPI.js +1 -2
- package/dist/utils/paramsUtil/configStoreParams.js +12 -1
- package/dist/utils/paramsUtil/paramHandler.js +7 -1
- package/dist/utils/saveFile.js +2 -1
- package/package.json +2 -1
- package/src/audit/catalogueApplication/catalogueApplication.js +1 -1
- package/src/cliConstants.js +96 -116
- package/src/commands/audit/auditConfig.js +19 -0
- package/src/commands/audit/{auditController.ts → auditController.js} +17 -12
- package/src/commands/audit/{help.ts → help.js} +19 -7
- package/src/commands/audit/processAudit.js +37 -0
- package/src/commands/audit/{saveFile.ts → saveFile.js} +2 -2
- package/src/commands/scan/processScan.js +4 -10
- package/src/commands/scan/sca/scaAnalysis.js +135 -115
- package/src/common/HTTPClient.js +1 -1
- package/src/common/commonHelp.js +43 -0
- package/src/common/{errorHandling.ts → errorHandling.js} +25 -32
- package/src/common/{versionChecker.ts → versionChecker.js} +15 -10
- package/src/constants/constants.js +1 -1
- package/src/constants/locales.js +23 -129
- package/src/lambda/help.ts +2 -1
- package/src/lambda/lambda.ts +2 -10
- package/src/scaAnalysis/java/analysis.js +43 -10
- package/src/scaAnalysis/java/index.js +19 -2
- package/src/scan/autoDetection.js +34 -3
- package/src/scan/fileUtils.js +29 -1
- package/src/scan/help.js +12 -4
- package/src/scan/saveResults.js +1 -1
- package/src/utils/commonApi.js +19 -1
- package/src/utils/generalAPI.js +1 -2
- package/src/utils/getConfig.ts +1 -0
- package/src/utils/paramsUtil/configStoreParams.js +14 -1
- package/src/utils/paramsUtil/paramHandler.js +9 -1
- package/src/utils/saveFile.js +2 -1
- package/src/commands/audit/auditConfig.ts +0 -21
- package/src/commands/audit/processAudit.ts +0 -40
- package/src/common/commonHelp.ts +0 -13
package/src/utils/getConfig.ts
CHANGED
|
@@ -16,4 +16,17 @@ const getAuth = () => {
|
|
|
16
16
|
return ContrastConfToUse
|
|
17
17
|
}
|
|
18
18
|
|
|
19
|
-
|
|
19
|
+
const getAgreement = () => {
|
|
20
|
+
const ContrastConf = config.localConfig(APP_NAME, APP_VERSION)
|
|
21
|
+
let ContrastConfToUse = {}
|
|
22
|
+
ContrastConfToUse.javaAgreement = ContrastConf.get('javaAgreement')
|
|
23
|
+
return ContrastConfToUse
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
const setAgreement = agreement => {
|
|
27
|
+
const ContrastConf = config.localConfig(APP_NAME, APP_VERSION)
|
|
28
|
+
ContrastConf.set('javaAgreement', agreement)
|
|
29
|
+
return agreement
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
module.exports = { getAuth, getAgreement, setAgreement }
|
|
@@ -21,4 +21,12 @@ const getAuth = params => {
|
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
|
|
24
|
-
|
|
24
|
+
const getAgreement = () => {
|
|
25
|
+
return configStoreParams.getAgreement()
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
const setAgreement = answer => {
|
|
29
|
+
return configStoreParams.setAgreement(answer)
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
module.exports = { getAuth, getAgreement, setAgreement }
|
package/src/utils/saveFile.js
CHANGED
|
@@ -8,7 +8,8 @@ const saveScanFile = async (config, scanResults) => {
|
|
|
8
8
|
const scanId = scanResults.scanDetail.id
|
|
9
9
|
const client = commonApi.getHttpClient(config)
|
|
10
10
|
const rawResults = await client.getSpecificScanResultSarif(config, scanId)
|
|
11
|
-
await saveResults.writeResultsToFile(rawResults?.body)
|
|
11
|
+
const name = await saveResults.writeResultsToFile(rawResults?.body)
|
|
12
|
+
console.log(`Scan Results saved to ${name}`)
|
|
12
13
|
} else {
|
|
13
14
|
console.log(i18n.__('scanNoFiletypeSpecifiedForSave'))
|
|
14
15
|
}
|
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
import paramHandler from '../../utils/paramsUtil/paramHandler'
|
|
2
|
-
import constants from '../../cliConstants'
|
|
3
|
-
import { getCommandLineArgsCustom } from '../../utils/parsedCLIOptions'
|
|
4
|
-
import { ContrastConf } from '../../utils/getConfig'
|
|
5
|
-
|
|
6
|
-
export const getAuditConfig = async (
|
|
7
|
-
contrastConf: ContrastConf,
|
|
8
|
-
command: string,
|
|
9
|
-
argv: string[]
|
|
10
|
-
): Promise<{ [key: string]: string }> => {
|
|
11
|
-
const auditParameters = await getCommandLineArgsCustom(
|
|
12
|
-
contrastConf,
|
|
13
|
-
command,
|
|
14
|
-
argv,
|
|
15
|
-
constants.commandLineDefinitions.auditOptionDefinitions
|
|
16
|
-
)
|
|
17
|
-
const paramsAuth = paramHandler.getAuth(auditParameters)
|
|
18
|
-
|
|
19
|
-
// @ts-ignore
|
|
20
|
-
return { ...paramsAuth, ...auditParameters }
|
|
21
|
-
}
|
|
@@ -1,40 +0,0 @@
|
|
|
1
|
-
import { getAuditConfig } from './auditConfig'
|
|
2
|
-
import { auditUsageGuide } from './help'
|
|
3
|
-
import { processSca } from '../scan/sca/scaAnalysis'
|
|
4
|
-
import { sendTelemetryConfigAsObject } from '../../telemetry/telemetry'
|
|
5
|
-
import { ContrastConf } from '../../utils/getConfig'
|
|
6
|
-
import chalk from 'chalk'
|
|
7
|
-
|
|
8
|
-
export type parameterInput = string[]
|
|
9
|
-
|
|
10
|
-
export const processAudit = async (
|
|
11
|
-
contrastConf: ContrastConf,
|
|
12
|
-
argv: parameterInput
|
|
13
|
-
) => {
|
|
14
|
-
if (argv.indexOf('--help') != -1) {
|
|
15
|
-
printHelpMessage()
|
|
16
|
-
process.exit(0)
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
const config = await getAuditConfig(contrastConf, 'audit', argv)
|
|
20
|
-
await processSca(config)
|
|
21
|
-
postRunMessage()
|
|
22
|
-
await sendTelemetryConfigAsObject(
|
|
23
|
-
config,
|
|
24
|
-
'audit',
|
|
25
|
-
argv,
|
|
26
|
-
'SUCCESS',
|
|
27
|
-
// @ts-ignore
|
|
28
|
-
config.language
|
|
29
|
-
)
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
const printHelpMessage = () => {
|
|
33
|
-
console.log(auditUsageGuide)
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
const postRunMessage = () => {
|
|
37
|
-
console.log('\n' + chalk.underline.bold('Other Codesec Features:'))
|
|
38
|
-
console.log("'contrast scan' to run CodeSec’s industry leading SAST scanner")
|
|
39
|
-
console.log("'contrast lambda' to secure your AWS serverless functions\n")
|
|
40
|
-
}
|
package/src/common/commonHelp.ts
DELETED
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
import i18n from 'i18n'
|
|
2
|
-
|
|
3
|
-
export function commonHelpLinks() {
|
|
4
|
-
return {
|
|
5
|
-
header: i18n.__('commonHelpHeader'),
|
|
6
|
-
content: [
|
|
7
|
-
i18n.__('commonHelpCheckOutHeader') + i18n.__('commonHelpCheckOutText'),
|
|
8
|
-
i18n.__('commonHelpLearnMoreHeader') + i18n.__('commonHelpLearnMoreText'),
|
|
9
|
-
i18n.__('commonHelpJoinDiscussionHeader') +
|
|
10
|
-
i18n.__('commonHelpJoinDiscussionText')
|
|
11
|
-
]
|
|
12
|
-
}
|
|
13
|
-
}
|