Skip to content

Final changes 3 #7

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

Merged
merged 1 commit into from
Sep 23, 2025
Merged

Final changes 3 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 40 additions & 11 deletions src/views/assets/AssetView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,11 @@ const AssetDetail = () => {
// Calculate risk level based on vulnerabilities if they exist
riskLevel: hasVulnerabilities && asset.vulnerabilities.cves?.length > 0
? (() => {
const mexRiskLevel = Math.max(...asset.vulnerabilities.cves.map(cve => cve.riskLevel || 0))
if (mexRiskLevel >= 9.0) return 'Critical'
if (mexRiskLevel >= 7.0) return 'High'
if (mexRiskLevel >= 4.0) return 'Medium'
// Fix: Use risk_level instead of riskLevel
const maxRiskLevel = Math.max(...asset.vulnerabilities.cves.map(cve => cve.risk_level || cve.cvss || 0))
if (maxRiskLevel >= 9.0) return 'Critical'
if (maxRiskLevel >= 7.0) return 'High'
if (maxRiskLevel >= 4.0) return 'Medium'
return 'Low'
})()
: 'Secure'
Expand Down Expand Up @@ -333,6 +334,8 @@ const AssetDetail = () => {
<div className="flex-grow-1">
<div className="d-flex align-items-center gap-2 mb-2">
<code className="text-primary fw-bold">{cve.cve_id}</code>

{/* CVSS Score Badge */}
<CBadge
color={
cve.cvss >= 9.0 ? 'danger' :
Expand All @@ -342,15 +345,40 @@ const AssetDetail = () => {
>
CVSS: {cve.cvss || 'N/A'}
</CBadge>
{cve.epss && (

{/* Risk Level Badge - Fix the field name */}
{(cve.risk_level !== undefined && cve.risk_level !== null) && (
<CBadge color="danger" className="text-white">
Risk: {cve.risk_level.toFixed(2)}
</CBadge>
)}

{/* EPSS Badge */}
{(cve.epss !== undefined && cve.epss !== null) && (
<CBadge color="warning">
EPSS: {(cve.epss * 100).toFixed(2)}%
</CBadge>
)}

{/* Impact Score Badge - Fix the field name */}
{(cve.impact_score !== undefined && cve.impact_score !== null) && (
<CBadge color="info">
Impact: {cve.impact_score.toFixed(2)}
</CBadge>
)}

{/* Exploitability Score Badge - Add this missing field */}
{(cve.exploitability_score !== undefined && cve.exploitability_score !== null) && (
<CBadge color="light" className="text-dark">
EPSS: {cve.impactscore}
Exploit: {cve.exploitability_score.toFixed(2)}
</CBadge>
)}

<CButton size="sm" color="link" className="p-0 ms-auto">
{isExpanded ? 'Less' : 'More'}
</CButton>
</div>

<p className="mb-1 small text-muted">
{isExpanded
? cve.description
Expand All @@ -364,16 +392,17 @@ const AssetDetail = () => {
<CCol md={6}>
<strong>CVE ID:</strong> <code>{cve.cve_id}</code><br/>
<strong>CVSS Score:</strong> {cve.cvss || 'N/A'}<br/>
{/* Fix field names to match backend */}
<strong>Risk Level:</strong> {cve.risk_level?.toFixed(2) || 'N/A'}<br/>
<strong>EPSS:</strong> {cve.epss ? `${(cve.epss * 100).toFixed(2)}%` : 'N/A'}<br/>
<strong>Impact Score:</strong> {cve.impact_score?.toFixed(2) || 'N/A'}<br/>
<strong>Exploitability Score:</strong> {cve.exploitability_score?.toFixed(2) || 'N/A'}<br/>

{cve.cvss_vector && (
<>
<strong>CVSS Vector:</strong> <code className="small">{cve.cvss_vector}</code><br/>
</>
)}
{cve.epss && (
<>
<strong>Risk Level:</strong> {(cve.epss).toFixed(2)}%<br/>
</>
)}
</CCol>
<CCol md={6}>
{cve.published_date && (
Expand Down
75 changes: 56 additions & 19 deletions src/views/overview/Overview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { useNavigation } from '../../hooks/useNavigation'

const Overview = () => {
const navigate = useNavigate()
const { assets } = useNavigation()
const { assets, departments } = useNavigation()
const [expandedAssets, setExpandedAssets] = React.useState({})

// Function to determine risk level based on CVSS score
Expand Down Expand Up @@ -61,12 +61,13 @@ const Overview = () => {
const cves = asset.vulnerabilities?.cves || []
const hasCVEs = cves.length > 0

// Calculate highest risk level
// Calculate highest risk level - Fix field names
let highestRisk = 'None'
let maxRiskLevel = 0

if (hasCVEs) {
maxRiskLevel = Math.max(...cves.map(cve => cve.riskLevel || 0))
// Fix: Use risk_level instead of riskLevel, fallback to cvss
maxRiskLevel = Math.max(...cves.map(cve => cve.risk_level || cve.cvss || 0))
highestRisk = getCVSSRiskLevel(maxRiskLevel)
}

Expand All @@ -76,7 +77,8 @@ const Overview = () => {
hasCVEs,
highestRisk,
maxRiskLevel,
cves: cves.sort((a, b) => (b.riskLevel || 0) - (a.riskLevel || 0)) // Sort by Risk Level descending
// Fix: Sort by risk_level instead of riskLevel
cves: cves.sort((a, b) => (b.risk_level || b.cvss || 0) - (a.risk_level || a.cvss || 0))
}
})
}, [assets])
Expand Down Expand Up @@ -216,7 +218,7 @@ const Overview = () => {
<div>
<strong>{asset.name}</strong>
<br />
<small className="text-muted">
<small className="text-dark">
{asset.vendor} {asset.model && `- ${asset.model}`}
</small>
</div>
Expand Down Expand Up @@ -263,7 +265,7 @@ const Overview = () => {
{asset.highestRisk}
</CBadge>
{asset.maxRiskLevel > 0 && (
<small className="text-muted">
<small className="text-dark">
(CVSS: {asset.maxRiskLevel})
</small>
)}
Expand Down Expand Up @@ -293,20 +295,55 @@ const Overview = () => {
<h6>CVE Details for {asset.name}:</h6>
<CListGroup flush>
{asset.cves.slice(0, 10).map((cve, index) => (
<CListGroupItem key={index} className="d-flex justify-content-between align-items-center">
<div>
<code className="text-primary me-2">{cve.cve_id}</code>
<CBadge color={getCVSSBadgeColor(cve.cvss)} className="me-2">
CVSS: {cve.cvss || 'N/A'}
</CBadge>
{cve.riskLevel && (
<CBadge color="secondary" className="me-2">
Risk Level: {cve.riskLevel}
<CListGroupItem key={index} className="d-flex justify-content-between align-items-start">
<div className="flex-grow-1">
<div className="d-flex align-items-center gap-2 mb-2">
<code className="text-primary me-2">{cve.cve_id}</code>

{/* CVSS Badge */}
<CBadge color={getCVSSBadgeColor(cve.cvss)} className="me-2">
CVSS: {cve.cvss || 'N/A'}
</CBadge>
)}
<CBadge color={getRiskBadgeColor(getCVSSRiskLevel(cve.cvss))}>
{getCVSSRiskLevel(cve.cvss)}
</CBadge>

{/* Risk Level Badge - Fix field name */}
{(cve.risk_level !== undefined && cve.risk_level !== null) && (
<CBadge color="danger" className="me-2">
Risk: {cve.risk_level.toFixed(2)}
</CBadge>
)}

{/* EPSS Badge */}
{(cve.epss !== undefined && cve.epss !== null) && (
<CBadge color="warning" className="me-2">
EPSS: {(cve.epss * 100).toFixed(2)}%
</CBadge>
)}

{/* Impact Score Badge */}
{(cve.impact_score !== undefined && cve.impact_score !== null) && (
<CBadge color="info" className="me-2">
Impact: {cve.impact_score.toFixed(2)}
</CBadge>
)}

{/* Exploitability Score Badge - Add this missing field */}
{(cve.exploitability_score !== undefined && cve.exploitability_score !== null) && (
<CBadge color="secondary" className="me-2">
Exploit: {cve.exploitability_score.toFixed(2)}
</CBadge>
)}

{/* Overall Risk Level Badge */}
<CBadge color={getRiskBadgeColor(getCVSSRiskLevel(cve.risk_level || cve.cvss))}>
{getCVSSRiskLevel(cve.risk_level || cve.cvss)}
</CBadge>
</div>

{/* Description */}
<div className="small text-muted mt-1">
{cve.description?.substring(0, 150)}
{cve.description?.length > 150 ? '...' : ''}
</div>
</div>
</CListGroupItem>
))}
Expand Down