From 5ccc1a72dacabe62d1873306abeeb842ddb98033 Mon Sep 17 00:00:00 2001 From: tiagobcx Date: Thu, 24 Nov 2022 10:40:13 +0000 Subject: [PATCH 1/2] adding new direct dependency field --- src/main/results/CxScaPackageData.ts | 4 +++- src/main/wrapper/ExecutionService.ts | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/results/CxScaPackageData.ts b/src/main/results/CxScaPackageData.ts index 806b5d15..bdbbcdf7 100644 --- a/src/main/results/CxScaPackageData.ts +++ b/src/main/results/CxScaPackageData.ts @@ -7,13 +7,15 @@ export default class CxScaPackageData { outdated: boolean; fixLink:string supportsQuickFix:boolean; + isDirectDependency:boolean; - constructor(id: string,locations: string [],dependencyPaths: CxDependencyPaths [],outdated: boolean,fixLink:string,supportsQuickFix:boolean) { + constructor(id: string,locations: string [],dependencyPaths: CxDependencyPaths [],outdated: boolean,fixLink:string,supportsQuickFix:boolean,isDirectDependency:boolean) { this.id = id; this.locations = locations; this.dependencyPaths = dependencyPaths; this.outdated = outdated; this.fixLink = fixLink; this.supportsQuickFix = supportsQuickFix; + this.isDirectDependency = isDirectDependency; } } \ No newline at end of file diff --git a/src/main/wrapper/ExecutionService.ts b/src/main/wrapper/ExecutionService.ts index 0d5c290d..591617d9 100644 --- a/src/main/wrapper/ExecutionService.ts +++ b/src/main/wrapper/ExecutionService.ts @@ -245,7 +245,7 @@ export class ExecutionService { const read_json = JSON.parse(read.replace(/:([0-9]{15,}),/g, ':"$1",')); if (read_json.results){ const r : CxResult[] = read_json.results.map((member:any)=>{ - const cxScaPackageData = new CxScaPackageData(member.data.scaPackageData?.id,member.data.scaPackageData?.locations,member.data.scaPackageData?.dependencyPaths,member.data.scaPackageData?.outdated,member.data.scaPackageData?.fixLink,member.data.scaPackageData?.supportsQuickFix); + const cxScaPackageData = new CxScaPackageData(member.data.scaPackageData?.id,member.data.scaPackageData?.locations,member.data.scaPackageData?.dependencyPaths,member.data.scaPackageData?.outdated,member.data.scaPackageData?.fixLink,member.data.scaPackageData?.supportsQuickFix,member.data.scaPackageData?.isDirectDependency); const cvss = new CxCvss(member.vulnerabilityDetails.cvss.version,member.vulnerabilityDetails.cvss.attackVector,member.vulnerabilityDetails.cvss.availability,member.vulnerabilityDetails.cvss.confidentiality,member.vulnerabilityDetails.cvss.attackComplexity,member.vulnerabilityDetails.cvss.integrityImpact,member.vulnerabilityDetails.cvss.scope,member.vulnerabilityDetails.cvss.privilegesRequired,member.vulnerabilityDetails.cvss.userInteraction); const cxVulnerabilityDetails = new CxVulnerabilityDetails(member.vulnerabilityDetails.cweId,cvss,member.vulnerabilityDetails.compliances,member.vulnerabilityDetails.cvssScore,member.vulnerabilityDetails.cveName); const nodes:CxNode[]=member.data.nodes?.map((node:any)=>{ From 34e89e24818ae5f391dd331ec39b396f024f7ffb Mon Sep 17 00:00:00 2001 From: tiagobcx Date: Mon, 28 Nov 2022 12:28:31 +0000 Subject: [PATCH 2/2] using new cli field --- src/main/results/CxScaPackageData.ts | 6 +++--- src/main/wrapper/ExecutionService.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/results/CxScaPackageData.ts b/src/main/results/CxScaPackageData.ts index bdbbcdf7..4818f200 100644 --- a/src/main/results/CxScaPackageData.ts +++ b/src/main/results/CxScaPackageData.ts @@ -7,15 +7,15 @@ export default class CxScaPackageData { outdated: boolean; fixLink:string supportsQuickFix:boolean; - isDirectDependency:boolean; + typeOfDependency:string; - constructor(id: string,locations: string [],dependencyPaths: CxDependencyPaths [],outdated: boolean,fixLink:string,supportsQuickFix:boolean,isDirectDependency:boolean) { + constructor(id: string,locations: string [],dependencyPaths: CxDependencyPaths [],outdated: boolean,fixLink:string,supportsQuickFix:boolean,typeOfDependency:string) { this.id = id; this.locations = locations; this.dependencyPaths = dependencyPaths; this.outdated = outdated; this.fixLink = fixLink; this.supportsQuickFix = supportsQuickFix; - this.isDirectDependency = isDirectDependency; + this.typeOfDependency = typeOfDependency; } } \ No newline at end of file diff --git a/src/main/wrapper/ExecutionService.ts b/src/main/wrapper/ExecutionService.ts index 591617d9..fd17cde2 100644 --- a/src/main/wrapper/ExecutionService.ts +++ b/src/main/wrapper/ExecutionService.ts @@ -245,7 +245,7 @@ export class ExecutionService { const read_json = JSON.parse(read.replace(/:([0-9]{15,}),/g, ':"$1",')); if (read_json.results){ const r : CxResult[] = read_json.results.map((member:any)=>{ - const cxScaPackageData = new CxScaPackageData(member.data.scaPackageData?.id,member.data.scaPackageData?.locations,member.data.scaPackageData?.dependencyPaths,member.data.scaPackageData?.outdated,member.data.scaPackageData?.fixLink,member.data.scaPackageData?.supportsQuickFix,member.data.scaPackageData?.isDirectDependency); + const cxScaPackageData = new CxScaPackageData(member.data.scaPackageData?.id,member.data.scaPackageData?.locations,member.data.scaPackageData?.dependencyPaths,member.data.scaPackageData?.outdated,member.data.scaPackageData?.fixLink,member.data.scaPackageData?.supportsQuickFix,member.data.scaPackageData?.typeOfDependency); const cvss = new CxCvss(member.vulnerabilityDetails.cvss.version,member.vulnerabilityDetails.cvss.attackVector,member.vulnerabilityDetails.cvss.availability,member.vulnerabilityDetails.cvss.confidentiality,member.vulnerabilityDetails.cvss.attackComplexity,member.vulnerabilityDetails.cvss.integrityImpact,member.vulnerabilityDetails.cvss.scope,member.vulnerabilityDetails.cvss.privilegesRequired,member.vulnerabilityDetails.cvss.userInteraction); const cxVulnerabilityDetails = new CxVulnerabilityDetails(member.vulnerabilityDetails.cweId,cvss,member.vulnerabilityDetails.compliances,member.vulnerabilityDetails.cvssScore,member.vulnerabilityDetails.cveName); const nodes:CxNode[]=member.data.nodes?.map((node:any)=>{