Skip to content

Commit

Permalink
Review changes
Browse files Browse the repository at this point in the history 
Signed-off-by: Charles Hu <[email protected]>
  • Loading branch information
@charleshu-8
charleshu-8 committed Aug 9, 2024
1 parent 516ef25 commit a9a4007
Showing 1 changed file with 21 additions and 46 deletions.
67 changes: 21 additions & 46 deletions libs/hdf-converters/src/cyclonedx-sbom-mapper.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export class CycloneDXSBOMResults {
// Pull components from raw data
data.components = [
...(_.cloneDeep(data.raw.components) as ComponentRepository)
].map((element) => Object(element));
] as unknown as IntermediaryComponent[];

// Look through every component at the top level of the list
for (const component of data.components) {
Expand Down Expand Up @@ -155,7 +155,7 @@ export class CycloneDXSBOMResults {
// Pull vulnerabilities from raw data
data.vulnerabilities = [
...(_.cloneDeep(data.raw.vulnerabilities) as VulnerabilityRepository)
].map((element) => Object(element));
] as unknown as IntermediaryVulnerability[];

for (const vulnerability of data.vulnerabilities) {
vulnerability.affectedComponents = [];
Expand Down Expand Up @@ -203,18 +203,15 @@ export class CycloneDXSBOMResults {
// Pull vulnerabilities from raw data
data.vulnerabilities = [
...(_.cloneDeep(data.raw.vulnerabilities) as VulnerabilityRepository)
].map((element) => Object(element));
] as unknown as IntermediaryVulnerability[];

for (const vulnerability of data.vulnerabilities) {
vulnerability.affectedComponents = [];
for (const id of vulnerability.affects) {
// Build a dummy component for each bom-ref identified as being affected by the vulnerability
// Add that component to the corresponding vulnerability object
vulnerability.affectedComponents.push({
'bom-ref': `${id.ref}`,
name: `${id.ref}`
});
}
// Build a dummy component for each bom-ref identified as being affected by the vulnerability
// Add that component to the corresponding vulnerability object
vulnerability.affectedComponents = vulnerability.affects.map((id) => ({
'bom-ref': `${id.ref}`,
name: `${id.ref}`
}));
}
}

Expand Down Expand Up @@ -331,30 +328,22 @@ export class CycloneDXSBOMMapper extends BaseConverter {
descriptions: [
{
path: 'detail',
transformer: (
input: Record<string, unknown>
): Record<string, unknown> | undefined =>
transformer: (input: Record<string, unknown>) =>
input ? {data: input, label: 'Detail'} : undefined
} as unknown as ExecJSON.ControlDescription,
{
path: 'recommendation',
transformer: (
input: Record<string, unknown>
): Record<string, unknown> | undefined =>
transformer: (input: string) =>
input ? {data: input, label: 'Recommendation'} : undefined
} as unknown as ExecJSON.ControlDescription,
{
path: 'workaround',
transformer: (
input: Record<string, unknown>
): Record<string, unknown> | undefined =>
transformer: (input: string) =>
input ? {data: input, label: 'Workaround'} : undefined
} as unknown as ExecJSON.ControlDescription,
{
path: 'proofOfConcept',
transformer: (
input: Record<string, unknown>
): Record<string, unknown> | undefined =>
transformer: (input: Record<string, unknown>) =>
input
? {
data: JSON.stringify(input, null, 2),
Expand All @@ -364,55 +353,41 @@ export class CycloneDXSBOMMapper extends BaseConverter {
} as unknown as ExecJSON.ControlDescription,
{
path: 'created',
transformer: (
input: Record<string, unknown>
): Record<string, unknown> | undefined =>
transformer: (input: Record<string, unknown>) =>
input ? {data: input, label: 'Date created'} : undefined
} as unknown as ExecJSON.ControlDescription,
{
path: 'published',
transformer: (
input: Record<string, unknown>
): Record<string, unknown> | undefined =>
transformer: (input: Record<string, unknown>) =>
input ? {data: input, label: 'Date published'} : undefined
} as unknown as ExecJSON.ControlDescription,
{
path: 'updated',
transformer: (
input: Record<string, unknown>
): Record<string, unknown> | undefined =>
transformer: (input: Record<string, unknown>) =>
input ? {data: input, label: 'Date updated'} : undefined
} as unknown as ExecJSON.ControlDescription,
{
path: 'rejected',
transformer: (
input: Record<string, unknown>
): Record<string, unknown> | undefined =>
transformer: (input: Record<string, unknown>) =>
input ? {data: input, label: 'Date rejected'} : undefined
} as unknown as ExecJSON.ControlDescription,
{
path: 'credits',
transformer: (
input: Record<string, unknown>
): Record<string, unknown> | undefined =>
transformer: (input: Record<string, unknown>) =>
input
? {data: JSON.stringify(input, null, 2), label: 'Credits'}
: undefined
} as unknown as ExecJSON.ControlDescription,
{
path: 'tools',
transformer: (
input: Record<string, unknown>
): Record<string, unknown> | undefined =>
transformer: (input: Record<string, unknown>) =>
input
? {data: JSON.stringify(input, null, 2), label: 'Tools'}
: undefined
} as unknown as ExecJSON.ControlDescription,
{
path: 'analysis',
transformer: (
input: Record<string, unknown>
): Record<string, unknown> | undefined =>
transformer: (input: Record<string, unknown>) =>
input
? {data: JSON.stringify(input, null, 2), label: 'Analysis'}
: undefined
Expand Down Expand Up @@ -516,7 +491,7 @@ export class CycloneDXSBOMMapper extends BaseConverter {
}
}
};
constructor(exportJson: Record<string, unknown>, withRaw = false) {
constructor(exportJson: DataStorage, withRaw = false) {
super(exportJson, true);
this.withRaw = withRaw;
}
Expand Down

0 comments on commit a9a4007

Please sign in to comment.