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
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,13 @@ private List<Issue> toIssues(String ref, ArrayNode response) {
response.forEach(
data -> {
var issue = new Issue().source(Constants.OSV_NVD_PROVIDER);

String cve = getTextValue(data, "cveId");
issue.id(cve).cves(List.of(cve));
issue.title(getTextValue(data, "summary"));
if (issue.getTitle() == null || issue.getTitle().isEmpty()) {
issue.title(getTextValue(data, "description"));
}
var metrics = data.get("metrics");
if (metrics != null) {
setMetrics(metrics, issue);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ public class ReportTemplate {
@ConfigProperty(name = "report.nvd.issue.regex")
String nvdIssuePathRegex;

@ConfigProperty(name = "report.cve.issue.regex")
String cveIssuePathRegex;

public Map<String, Object> setVariables(
@Body AnalysisReport report,
@ExchangeProperty(Constants.PROVIDER_PRIVATE_DATA_PROPERTY) List<String> providerPrivateData)
Expand All @@ -66,6 +69,7 @@ public Map<String, Object> setVariables(
params.put("nvdIssueTemplate", nvdIssuePathRegex);
params.put("providerPrivateData", providerPrivateData);
params.put("snykSignup", snykSignup);
params.put("cveIssueTemplate", cveIssuePathRegex);

ObjectWriter objectWriter = new ObjectMapper().writer();
String appData = objectWriter.writeValueAsString(params);
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ report.snyk.issue.regex=https://security.snyk.io/vuln/__ISSUE_ID__
report.ossindex.issue.regex=http://ossindex.sonatype.org/vulnerability/__ISSUE_ID__
report.nvd.issue.regex=https://nvd.nist.gov/vuln/detail/__ISSUE_ID__
report.snyk.signup.link=https://app.snyk.io/login?utm_campaign=Code-Ready-Analytics-2020&utm_source=code_ready&code_ready=FF1B53D9-57BE-4613-96D7-1D06066C38C9
report.cve.issue.regex=https://cve.mitre.org/cgi-bin/cvename.cgi?name=__ISSUE_ID__

## Analytics - Segment API
quarkus.rest-client.segment-api.url=https://api.segment.io/
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/freemarker/templates/generated/main.js

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions src/test/resources/__files/reports/report_all_token.json
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@
"issues": [
{
"id": "CVE-2023-2974",
"title": "quarkus-core vulnerable to client driven TLS cipher downgrading",
"source": "osv-nvd",
"cvss": {
"attackVector": "Network",
Expand Down Expand Up @@ -247,6 +248,7 @@
],
"highestVulnerability": {
"id": "CVE-2023-2974",
"title": "quarkus-core vulnerable to client driven TLS cipher downgrading",
"source": "osv-nvd",
"cvss": {
"attackVector": "Network",
Expand Down Expand Up @@ -282,6 +284,7 @@
"issues": [
{
"id": "CVE-2022-42003",
"title": "Uncontrolled Resource Consumption in Jackson-databind",
"source": "osv-nvd",
"cvss": {
"attackVector": "Network",
Expand Down Expand Up @@ -309,6 +312,7 @@
},
{
"id": "CVE-2022-42004",
"title": "Uncontrolled Resource Consumption in FasterXML jackson-databind",
"source": "osv-nvd",
"cvss": {
"attackVector": "Network",
Expand Down Expand Up @@ -336,6 +340,7 @@
},
{
"id": "CVE-2020-36518",
"title": "Deeply nested json in jackson-databind",
"source": "osv-nvd",
"cvss": {
"attackVector": "Network",
Expand Down Expand Up @@ -367,6 +372,7 @@
],
"highestVulnerability": {
"id": "CVE-2022-42003",
"title": "Uncontrolled Resource Consumption in Jackson-databind",
"source": "osv-nvd",
"cvss": {
"attackVector": "Network",
Expand Down Expand Up @@ -397,6 +403,7 @@
"recommendation": "pkg:maven/io.quarkus/[email protected]?repository_url=https%3A%2F%2Fmaven.repository.redhat.com%2Fga%2F&type=jar",
"highestVulnerability": {
"id": "CVE-2023-2974",
"title": "quarkus-core vulnerable to client driven TLS cipher downgrading",
"source": "osv-nvd",
"cvss": {
"attackVector": "Network",
Expand Down Expand Up @@ -435,6 +442,7 @@
"issues": [
{
"id": "CVE-2022-41946",
"title": "TemporaryFolder on unix-like systems does not limit access to created files",
"source": "osv-nvd",
"cvss": {
"attackVector": "Local",
Expand Down Expand Up @@ -465,6 +473,7 @@
],
"highestVulnerability": {
"id": "CVE-2022-41946",
"title": "TemporaryFolder on unix-like systems does not limit access to created files",
"source": "osv-nvd",
"cvss": {
"attackVector": "Local",
Expand Down Expand Up @@ -497,6 +506,7 @@
"recommendation": "pkg:maven/io.quarkus/[email protected]?repository_url=https%3A%2F%2Fmaven.repository.redhat.com%2Fga%2F&type=jar",
"highestVulnerability": {
"id": "CVE-2022-41946",
"title": "TemporaryFolder on unix-like systems does not limit access to created files",
"source": "osv-nvd",
"cvss": {
"attackVector": "Local",
Expand Down
10 changes: 10 additions & 0 deletions src/test/resources/__files/reports/v3/report_all_token.json
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@
"issues": [
{
"id": "CVE-2023-2974",
"title": "quarkus-core vulnerable to client driven TLS cipher downgrading",
"source": "osv-nvd",
"cvss": {
"attackVector": "Network",
Expand Down Expand Up @@ -209,6 +210,7 @@
},
"highestVulnerability": {
"id": "CVE-2023-2974",
"title": "quarkus-core vulnerable to client driven TLS cipher downgrading",
"source": "osv-nvd",
"cvss": {
"attackVector": "Network",
Expand All @@ -234,6 +236,7 @@
"issues": [
{
"id": "CVE-2022-42003",
"title": "Uncontrolled Resource Consumption in Jackson-databind",
"source": "osv-nvd",
"cvss": {
"attackVector": "Network",
Expand All @@ -255,6 +258,7 @@
},
{
"id": "CVE-2022-42004",
"title": "Uncontrolled Resource Consumption in FasterXML jackson-databind",
"source": "osv-nvd",
"cvss": {
"attackVector": "Network",
Expand All @@ -276,6 +280,7 @@
},
{
"id": "CVE-2020-36518",
"title": "Deeply nested json in jackson-databind",
"source": "osv-nvd",
"cvss": {
"attackVector": "Network",
Expand Down Expand Up @@ -303,6 +308,7 @@
},
"highestVulnerability": {
"id": "CVE-2022-42003",
"title": "Uncontrolled Resource Consumption in Jackson-databind",
"source": "osv-nvd",
"cvss": {
"attackVector": "Network",
Expand All @@ -327,6 +333,7 @@
"recommendation": "pkg:maven/io.quarkus/[email protected]?repository_url=https%3A%2F%2Fmaven.repository.redhat.com%2Fga%2F&type=jar",
"highestVulnerability": {
"id": "CVE-2023-2974",
"title": "quarkus-core vulnerable to client driven TLS cipher downgrading",
"source": "osv-nvd",
"cvss": {
"attackVector": "Network",
Expand Down Expand Up @@ -355,6 +362,7 @@
"issues": [
{
"id": "CVE-2022-41946",
"title": "TemporaryFolder on unix-like systems does not limit access to created files",
"source": "osv-nvd",
"cvss": {
"attackVector": "Local",
Expand All @@ -377,6 +385,7 @@
],
"highestVulnerability": {
"id": "CVE-2022-41946",
"title": "TemporaryFolder on unix-like systems does not limit access to created files",
"source": "osv-nvd",
"cvss": {
"attackVector": "Local",
Expand All @@ -401,6 +410,7 @@
"recommendation": "pkg:maven/io.quarkus/[email protected]?repository_url=https%3A%2F%2Fmaven.repository.redhat.com%2Fga%2F&type=jar",
"highestVulnerability": {
"id": "CVE-2022-41946",
"title": "TemporaryFolder on unix-like systems does not limit access to created files",
"source": "osv-nvd",
"cvss": {
"attackVector": "Local",
Expand Down
1 change: 1 addition & 0 deletions ui/src/api/report.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export interface AppData {
ossIssueTemplate: string;
snykIssueTemplate: string;
nvdIssueTemplate: string;
cveIssueTemplate: string;
snykSignup: string;
}

Expand Down
12 changes: 12 additions & 0 deletions ui/src/components/VulnerabilityIdLink.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { Vulnerability } from '../api/report';
import { cveLink } from '../utils/utils';
import { useAppContext } from '../App';

export const VulnerabilityIdLink = ({ vulnerability }: { vulnerability: Vulnerability }) => {
const appContext = useAppContext();
return (
<a href={cveLink(vulnerability.id, appContext)} target="_blank" rel="noreferrer">
{vulnerability.id}
</a>
);
};
21 changes: 11 additions & 10 deletions ui/src/components/VulnerabilityRow.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import {Td, Tr} from '@patternfly/react-table';
import {DependencyLink} from './DependencyLink';
import {RemediationLink} from './RemediationLink';
import {VulnerabilityLink} from './VulnerabilityLink';
import {VulnerabilityScore} from './VulnerabilityScore';
import {VulnerabilitySeverityLabel} from './VulnerabilitySeverityLabel';
import {usePrivateIssueHelper} from "../hooks/usePrivateDataHelper";
import {hasRemediations, VulnerabilityItem} from "../api/report";
import {useAppContext} from '../App';
import { Td, Tr } from '@patternfly/react-table';
import { DependencyLink } from './DependencyLink';
import { RemediationLink } from './RemediationLink';
import { VulnerabilityLink } from './VulnerabilityLink';
import { VulnerabilityScore } from './VulnerabilityScore';
import { VulnerabilitySeverityLabel } from './VulnerabilitySeverityLabel';
import { usePrivateIssueHelper } from "../hooks/usePrivateDataHelper";
import { hasRemediations, VulnerabilityItem } from "../api/report";
import { useAppContext } from '../App';
import { VulnerabilityIdLink } from './VulnerabilityIdLink';

interface VulnerabilityRowProps {
item: VulnerabilityItem;
Expand Down Expand Up @@ -38,7 +39,7 @@ export const VulnerabilityRow: React.FC<VulnerabilityRowProps> = ({item, provide
<>
<Td>
{ids.map((id, index) => (
<p key={index}>{id}</p>
<p key={index}><VulnerabilityIdLink vulnerability={item.vulnerability}/></p>
))}
</Td>
<Td>{item.vulnerability.title}</Td>
Expand Down
1 change: 1 addition & 0 deletions ui/src/mocks/reportMixed.mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4711,4 +4711,5 @@ export const reportMixed: AppData = {
snykIssueTemplate: 'https://security.snyk.io/vuln/__ISSUE_ID__',
nvdIssueTemplate: 'https://nvd.nist.gov/vuln/detail/__ISSUE_ID__',
snykSignup: 'https://app.snyk.io/login',
cveIssueTemplate: 'https://cve.mitre.org/cgi-bin/cvename.cgi?name=__ISSUE_ID__'
};
1 change: 1 addition & 0 deletions ui/src/mocks/reportWithError.mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@ export const errorReport: AppData = {
snykIssueTemplate: 'https://security.snyk.io/vuln/__ISSUE_ID__',
nvdIssueTemplate: 'https://nvd.nist.gov/vuln/detail/__ISSUE_ID__',
snykSignup: 'https://app.snyk.io/login',
cveIssueTemplate: 'https://cve.mitre.org/cgi-bin/cvename.cgi?name=__ISSUE_ID__'
};
1 change: 1 addition & 0 deletions ui/src/mocks/reportWithForbidden.mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@ export const forbiddenReport: AppData = {
snykIssueTemplate: 'https://security.snyk.io/vuln/__ISSUE_ID__',
nvdIssueTemplate: 'https://nvd.nist.gov/vuln/detail/__ISSUE_ID__',
snykSignup: 'https://app.snyk.io/login',
cveIssueTemplate: 'https://cve.mitre.org/cgi-bin/cvename.cgi?name=__ISSUE_ID__'
};
1 change: 1 addition & 0 deletions ui/src/mocks/reportWithToken.mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -438,4 +438,5 @@ export const withTokenReport: AppData = {
snykIssueTemplate: 'https://security.snyk.io/vuln/__ISSUE_ID__',
nvdIssueTemplate: 'https://nvd.nist.gov/vuln/detail/__ISSUE_ID__',
snykSignup: 'https://app.snyk.io/login',
cveIssueTemplate: 'https://cve.mitre.org/cgi-bin/cvename.cgi?name=__ISSUE_ID__'
};
1 change: 1 addition & 0 deletions ui/src/mocks/reportWithUnauthenticated.mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -300,4 +300,5 @@ export const unauthenticatedReport: AppData = {
snykIssueTemplate: 'https://security.snyk.io/vuln/__ISSUE_ID__',
nvdIssueTemplate: 'https://nvd.nist.gov/vuln/detail/__ISSUE_ID__',
snykSignup: 'https://app.snyk.io/login',
cveIssueTemplate: 'https://cve.mitre.org/cgi-bin/cvename.cgi?name=__ISSUE_ID__'
};
1 change: 1 addition & 0 deletions ui/src/mocks/reportWithUnauthorized.mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@ export const unauthorizedReport: AppData = {
snykIssueTemplate: 'https://security.snyk.io/vuln/__ISSUE_ID__',
nvdIssueTemplate: 'https://nvd.nist.gov/vuln/detail/__ISSUE_ID__',
snykSignup: 'https://app.snyk.io/login',
cveIssueTemplate: 'https://cve.mitre.org/cgi-bin/cvename.cgi?name=__ISSUE_ID__'
};
1 change: 1 addition & 0 deletions ui/src/mocks/reportWithoutToken.mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -386,4 +386,5 @@ export const withoutTokenReport: AppData = {
snykIssueTemplate: 'https://security.snyk.io/vuln/__ISSUE_ID__',
nvdIssueTemplate: 'https://nvd.nist.gov/vuln/detail/__ISSUE_ID__',
snykSignup: 'https://app.snyk.io/login',
cveIssueTemplate: 'https://cve.mitre.org/cgi-bin/cvename.cgi?name=__ISSUE_ID__'
};
4 changes: 4 additions & 0 deletions ui/src/utils/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ export const issueLink = (provider: string, issueId: string, appData: AppData) =
}
};

export const cveLink = (issueId: string, appData: AppData) => {
return appData.cveIssueTemplate.replace(ISSUE_PLACEHOLDER, issueId);
}

export const uppercaseFirstLetter = (val: string) => {
return val.toLowerCase().replace(/./, (c) => c.toUpperCase());
};
Expand Down