Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/oss/CxOss.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CxManifestStatus } from './CxManifestStatus';
import { CxRealtimeEngineStatus } from './CxRealtimeEngineStatus';

export interface Location {
line: number;
Expand All @@ -12,7 +12,7 @@ export default class CxOssResult {
version: string;
filepath: string;
locations: Location[];
status: CxManifestStatus;
status: CxRealtimeEngineStatus;
vulnerabilities: { cve: string, description: string, severity: string }[];

static parseResult(resultObject: any): CxOssResult[] {
Expand All @@ -32,7 +32,7 @@ export default class CxOssResult {
endIndex: loc.EndIndex
}))
: [];
ossResult.status = member.Status as CxManifestStatus;
ossResult.status = member.Status as CxRealtimeEngineStatus;
ossResult.vulnerabilities = Array.isArray(member.Vulnerabilities)
? member.Vulnerabilities.map((vul: any) => ({
cve: vul.CVE,
Expand All @@ -55,7 +55,7 @@ export default class CxOssResult {
endIndex: loc.EndIndex
}))
: [];
ossResult.status = packages.Status as CxManifestStatus;
ossResult.status = packages.Status as CxRealtimeEngineStatus;
ossResult.vulnerabilities = Array.isArray(packages.Vulnerabilities)
? packages.Vulnerabilities.map((vul: any) => ({
cve: vul.CVE,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export enum CxManifestStatus {
export enum CxRealtimeEngineStatus {
malicious = "Malicious",
ok = "OK",
unknown = "Unknown",
Expand Down
6 changes: 4 additions & 2 deletions src/main/secrets/CxSecrets.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import {CxRealtimeEngineStatus} from "../oss/CxRealtimeEngineStatus";

export default class CxSecretsResult {
title: string;
description: string;
filepath: string;
severity: string;
severity: CxRealtimeEngineStatus;
locations: { line: number, startIndex: number, endIndex: number }[];

static parseResult(resultObject: any): CxSecretsResult[] {
Expand All @@ -13,7 +15,7 @@ export default class CxSecretsResult {
secretsResult.title = member.Title;
secretsResult.description = member.Description;
secretsResult.filepath = member.FilePath;
secretsResult.severity = member.Severity;
secretsResult.severity = member.Severity as CxRealtimeEngineStatus;
secretsResult.locations = Array.isArray(member.Locations)
? member.Locations.map((l: any) => ({
line: l.Line,
Expand Down
2 changes: 1 addition & 1 deletion src/tests/ScanTest.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ describe("ScanCreate cases", () => {

it.skip('ScanSecrets Successful case', async () => {
const wrapper = new CxWrapper(cxScanConfig);
const cxCommandOutput: CxCommandOutput = await wrapper.secretsScanResults("tsc/tests/data/secret-exposed.txt");
const cxCommandOutput: CxCommandOutput = await wrapper.secretsScanResults("src/tests/data/secret-exposed.txt");
console.log("Json object from scanOSS successful case: " + JSON.stringify(cxCommandOutput));
expect(cxCommandOutput.payload).toBeDefined();
expect(cxCommandOutput.exitCode).toBe(0);
Expand Down