Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show more CBOM information #36

Merged
merged 17 commits into from
Sep 27, 2024
Merged

Show more CBOM information #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f94be34
getNestedProperty
hugoqnc Sep 25, 2024
62418e7
all cryptoProperties in details
hugoqnc Sep 25, 2024
d064eff
updated dictionnary with cyclonedx spec descriptions
hugoqnc Sep 25, 2024
e0b105e
complete asset details UI
hugoqnc Sep 25, 2024
5ecf445
Use the commit number to display the correct code version
hugoqnc Sep 26, 2024
52db201
basic dependencies feature
hugoqnc Sep 26, 2024
166c3e9
DependenciesView UI
hugoqnc Sep 26, 2024
28eea71
add Provide
hugoqnc Sep 26, 2024
2de4f35
fix details
hugoqnc Sep 27, 2024
30829c1
additional dependencies
hugoqnc Sep 27, 2024
8f4d644
fix
hugoqnc Sep 27, 2024
1edd83d
remove duplicated getPropertyValues logic
hugoqnc Sep 27, 2024
9b80e21
cleaning
hugoqnc Sep 27, 2024
6a74e24
opposite dependencies info
hugoqnc Sep 27, 2024
52e718c
UI details
hugoqnc Sep 27, 2024
46a88a1
clean DataTable
hugoqnc Sep 27, 2024
504ea19
asset type column
hugoqnc Sep 27, 2024
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
508 changes: 362 additions & 146 deletions frontend/resources/crypto-dictionary.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions frontend/src/components/home/SearchOrUploadView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ export default {
padding-left: 8px;
}
.large-title {
font-size: x-large;
font-weight: 400;
font-size: large;
font-weight: 500;
padding-left: 8px;
}
.small-header {
Expand Down
126 changes: 70 additions & 56 deletions frontend/src/components/results/DataTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="table">
<cv-modal ref="modalInfo">
<template slot="label"
>{{ this.assetType }}</template
>{{ getTermFullName(this.assetType) ? getTermFullName(this.assetType) : this.assetType }}</template
>
<template slot="title"
><h3>
Expand All @@ -11,19 +11,18 @@
>
<template slot="content">
<CryptoAssetDetails
:url="model.codeOrigin.gitLink"
:branch="model.codeOrigin.gitBranch"
:asset="currentAssetModal"
@open-code="openInCode"
@open-asset="openAsset"
/>
</template>
</cv-modal>

<cv-modal ref="modalPrompt">
<cv-modal ref="modalPrompt" @after-modal-hidden="resetModal">
<template slot="label">{{ modalPromptLabel }}</template>
<template slot="title">{{ modalPromptTitle }}</template>
<template slot="content">
<GitInfoPrompt @confirm-prompt="confirmPrompt" />
<GitInfoPrompt ref="gitInfoPrompt" @confirm-prompt="confirmPrompt"/>
</template>
</cv-modal>

Expand Down Expand Up @@ -120,24 +119,31 @@
<WatsonHealthImageAvailabilityUnavailable24 v-else/>
</cv-tooltip>
</div>
<div style="padding: 6px; min-width: 160px">
<div style="padding: 6px; min-width: 130px">
<div style="font-weight: 600">
{{ asset.name.toUpperCase() }}
</div>
</div>
</div>
</cv-data-table-cell>
<cv-data-table-cell>
<div style="padding: 6px; min-width: 100px">
<div v-if="type(asset) !== ''">
{{ getTermFullName(type(asset)) ? getTermFullName(type(asset)) : type(asset) }}
</div>
<div v-else>
<em>Unspecified</em>
</div>
</div>
</cv-data-table-cell>
<cv-data-table-cell>
<div style="padding: 6px; min-width: 100px">
<div v-if="primitive(asset) !== ''">
<div style="font-weight: 600">
{{ primitive(asset).toUpperCase() }}
</div>
<div style="font-size: 85%">
{{ getTermFullName(primitive(asset), "primitive", false) }}
</div>
{{ getTermFullName(primitive(asset)) ? getTermFullName(primitive(asset)) : primitive(asset) }}
</div>
<div v-else>Unspecified</div>
<div v-else>
<em>Unspecified</em>
</div>
</div>
</cv-data-table-cell>
<cv-data-table-cell style="max-width: 200px; width: 30%">
Expand Down Expand Up @@ -191,7 +197,8 @@ import {
hasValidComplianceResults,
isViewerOnly,
isLoadingCompliance,
getComplianceDescription
getComplianceDescription,
resolvePath
} from "@/helpers";
import {
Maximize24,
Expand Down Expand Up @@ -220,7 +227,7 @@ export default {
currentAssetModal: null,
currentPagination: null,
openInCodeOnConfirm: false, // If true, the user has clicked on the button to get the prompt. If false, the prompt was shown after the user tried to openInCode.
columns: ["Cryptographic asset", "Primitive", "Location"],
columns: ["Cryptographic asset", "Type", "Primitive", "Location"],
downloadIcon: `<svg fill-rule="evenodd" height="16" name="download" role="img" viewBox="0 0 14 16" width="14" aria-label="Download" alt="Download">
<title>Download</title>
<path d="M7.506 11.03l4.137-4.376.727.687-5.363 5.672-5.367-5.67.726-.687 4.14 4.374V0h1v11.03z"></path>
Expand Down Expand Up @@ -278,8 +285,7 @@ export default {
if (!Object.hasOwn(this.currentAssetModal, "cryptoProperties")) {
return "";
}
const assetTypeStr = this.currentAssetModal.cryptoProperties.assetType;
return capitalizeFirstLetter(assetTypeStr);
return this.currentAssetModal.cryptoProperties.assetType;
},
variant() {
if (
Expand Down Expand Up @@ -330,6 +336,7 @@ export default {
getComplianceDescription,
getTermFullName,
capitalizeFirstLetter,
resolvePath,
actionOnPagination: function (content) {
// console.log(content)
this.currentPagination = content;
Expand Down Expand Up @@ -362,6 +369,9 @@ export default {
this.openInCode(this.openInCodeOnConfirm);
}
},
resetModal() {
this.$refs.gitInfoPrompt.resetModal(); // Call the method in GitInfoPrompt
},
openInCodeFor: function (value) {
this.currentAssetModal = this.paginatedDetections[value.index];
this.openInCode(true);
Expand All @@ -374,24 +384,45 @@ export default {
}
openOnline(this.currentAssetModal);
},
openAsset(asset) {
// Close the modal
this.$refs.modalInfo.hide();
// Wait a bit
setTimeout(() => {
// Set the new asset
this.currentAssetModal = asset;
// Show the modal again
this.$refs.modalInfo.show();
}, 300);
},
onSort(sortBy) {
// Sort by sorting a copy of the detections to not create change in the graph views (that depend on ordering)
this.localFinalListOfAssets = getDetections();
if (sortBy) {
this.localFinalListOfAssets.sort((a, b) => {
let itemA, itemB;
if (sortBy.index === "0") {
// Sort by compliance first, then alphabetically
itemA = getComplianceLevel(a).toString()
itemB = getComplianceLevel(b).toString()
itemA += a["name"];
itemB += b["name"];
} else if (sortBy.index === "1") {
itemA = this.primitive(a);
itemB = this.primitive(b);
} else {
itemA = this.fileName(this.occurrences(a));
itemB = this.fileName(this.occurrences(b));
switch (sortBy.index) {
case "0":
// Sort by compliance first, then alphabetically
itemA = getComplianceLevel(a).toString()
itemB = getComplianceLevel(b).toString()
itemA += a["name"];
itemB += b["name"];
break;
case "1":
itemA = getTermFullName(this.type(a)) ? getTermFullName(this.type(a)) : this.type(a)
itemB = getTermFullName(this.type(b)) ? getTermFullName(this.type(b)) : this.type(b)
break;
case "2":
itemA = getTermFullName(this.primitive(a)) ? getTermFullName(this.primitive(a)) : this.primitive(a)
itemB = getTermFullName(this.primitive(b)) ? getTermFullName(this.primitive(b)) : this.primitive(b)
break;
case "3":
itemA = this.fileName(this.occurrences(a));
itemB = this.fileName(this.occurrences(b));
break;
default:
break;
}
if (sortBy.order === "descending") {
return itemB.localeCompare(itemA);
Expand All @@ -404,36 +435,19 @@ export default {
}
},
primitive(cryptoAsset) {
if (cryptoAsset === undefined || cryptoAsset === null) {
return "";
}
if (!Object.hasOwn(cryptoAsset, "cryptoProperties")) {
return "";
}
if (!Object.hasOwn(cryptoAsset.cryptoProperties, "algorithmProperties")) {
return "";
}
if (
!Object.hasOwn(
cryptoAsset.cryptoProperties.algorithmProperties,
"primitive"
)
) {
return "";
}
return cryptoAsset.cryptoProperties.algorithmProperties.primitive;
let res = resolvePath(cryptoAsset, "cryptoProperties.algorithmProperties.primitive");
return res ? res.toString() : "";
},
type(cryptoAsset) {
let res = resolvePath(cryptoAsset, "cryptoProperties.assetType");
return res ? res.toString() : "";
},
occurrences(cryptoAsset) {
if (cryptoAsset === undefined || cryptoAsset === null) {
return null;
}
if (!Object.hasOwn(cryptoAsset, "evidence")) {
return null;
}
if (!Object.hasOwn(cryptoAsset.evidence, "occurrences")) {
return null;
let res = resolvePath(cryptoAsset, "evidence.occurrences");
if (res !== 0 && Array.isArray(res) && res.length > 0) {
return res[0];
}
return cryptoAsset.evidence.occurrences[0];
return null;
},
fileName(detection) {
if (detection === undefined || detection === null) {
Expand Down
6 changes: 1 addition & 5 deletions frontend/src/components/results/ResultTitle.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
{{ dataTableTitle }}
</h3>
<h4 style="padding-bottom: 8px" v-html="dataTableSubtitle"></h4>
<!-- <h4 style="padding-bottom: 8px;">
Scanned {{ numberFormatter(model.scanning.numberOfLines) }} lines of code across {{ numberFormatter(model.scanning.numberOfFiles) }} files.
</h4> -->
<!-- <cv-tag v-if="showLink" :label="model.codeOrigin.gitLink"/> -->
<cv-tag v-if="showBranch" :label="branchLabel" />
<cv-tag v-if="showCommitID" :label="commitIDLabel" />
<cv-tag v-if="showSubfolder" :label="subfolderLabel" />
Expand All @@ -23,7 +19,7 @@
</div>
<div v-if="getDetections().length > 0 || model.scanning.isScanning">
<RegulatorResults style="padding-top: 12px" />
<StatisticsView style="padding: 22px 0px" />
<StatisticsView style="padding: 22px 16px" />
</div>
</cv-tile>
</div>
Expand Down
Loading
Loading