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: 8 additions & 0 deletions apps/ocp-plugin/console-extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,14 @@
"component": { "$codeRef": "CatalogEditFleetWizard" }
}
},
{
"type": "console.page/route",
"properties": {
"exact": true,
"path": ["/edge/security-overview"],
"component": { "$codeRef": "SecurityOverviewPage" }
}
},
{
"type": "console.page/route",
"properties": {
Expand Down
1 change: 1 addition & 0 deletions apps/ocp-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"EnrollmentRequestDetailsPage": "./src/components/EnrollmentRequests/EnrollmentRequestDetailsPage.tsx",
"appContext": "./src/components/AppContext/AppContext.tsx",
"OverviewTab": "./src/components/OverviewTab/OverviewTab.tsx",
"SecurityOverviewPage": "./src/components/SecurityOverview/SecurityOverviewPage.tsx",
"CatalogPage": "./src/components/Catalog/CatalogPage.tsx",
"AddCatalogItemWizard": "./src/components/Catalog/AddCatalogItemWizard.tsx",
"CatalogInstallWizard": "./src/components/Catalog/CatalogInstallWizard.tsx",
Expand Down
1 change: 1 addition & 0 deletions apps/ocp-plugin/src/components/AppContext/AppContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ const appRoutes = {
[ROUTE.CATALOG_INSTALL]: '/edge/catalog/install',
[ROUTE.CATALOG_FLEET_EDIT]: '/edge/fleets/catalog',
[ROUTE.CATALOG_DEVICE_EDIT]: '/edge/devices/catalog',
[ROUTE.SECURITY_OVERVIEW]: '/edge/security-overview',
};

export const useValuesAppContext = (): AppContextProps => {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import * as React from 'react';
import SecurityOverviewPage from '@flightctl/ui-components/src/components/SecurityOverview/SecurityOverviewPage';
import WithPageLayout from '../common/WithPageLayout';

const OcpSecurityOverviewPage = () => {
return (
<WithPageLayout>
<SecurityOverviewPage />
</WithPageLayout>
);
};

export default OcpSecurityOverviewPage;
45 changes: 34 additions & 11 deletions apps/ocp-plugin/src/utils/apiCalls.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ declare global {
}
}

type Api = 'flightctl' | 'imagebuilder' | 'alerts' | 'catalog';
type Api = 'flightctl' | 'imagebuilder' | 'alerts' | 'catalog' | 'vulnerability';

const addRequiredHeaders = (options: RequestInit, api?: Api): RequestInit => {
const token = getCSRFToken();
Expand Down Expand Up @@ -49,6 +49,7 @@ export const apiProxy = `${uiProxy}/api`;
const alertsAPI = `${apiProxy}/alerts`;
const imageBuilderPathRegex = /^image(builds|exports)/;
const catalogPathRegex = /^(catalogs|catalogitems)/;
const vulnerabilityPathRegex = /^vulnerabilities/;

export const wsEndpoint = `${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${apiServer}`;

Expand All @@ -65,13 +66,14 @@ const getFullApiUrl = (path: string): { api: Api; url: string } => {
if (imageBuilderPathRegex.test(path)) {
return { api: 'imagebuilder', url: `${apiProxy}/imagebuilder/api/v1/${path}` };
}

let apiName: Api = 'flightctl';
if (catalogPathRegex.test(path)) {
return {
api: 'catalog',
url: `${apiProxy}/flightctl/api/v1/${path}`,
};
apiName = 'catalog';
} else if (vulnerabilityPathRegex.test(path)) {
apiName = 'vulnerability';
}
return { api: 'flightctl', url: `${apiProxy}/flightctl/api/v1/${path}` };
return { api: apiName, url: `${apiProxy}/flightctl/api/v1/${path}` };
};

const handleAlertsJSONResponse = async <R>(response: Response): Promise<R> => {
Expand All @@ -94,7 +96,28 @@ const handleAlertsJSONResponse = async <R>(response: Response): Promise<R> => {
throw new Error(await getErrorMsgFromAlertsApiResponse(response));
};

export const handleApiJSONResponse = async <R>(response: Response): Promise<R> => {
const handleVulnerabilityJSONResponse = async <R>(response: Response): Promise<R> => {
if (response.ok) {
const data = (await response.json()) as R;
return data;
}

if (response.status === 404) {
throw new Error(`Error ${response.status}: ${response.statusText}`);
}

// API returns 501 for disabled vulnerabilities API.
if (response.status === 501) {
throw new Error(`${response.status}`);
}

throw new Error(await getErrorMsgFromApiResponse(response));
};

export const handleApiJSONResponse = async <R>(api: Api, response: Response): Promise<R> => {
if (api === 'vulnerability') {
return handleVulnerabilityJSONResponse(response);
}
if (response.ok) {
const data = (await response.json()) as R;
return data;
Expand Down Expand Up @@ -125,7 +148,7 @@ const putOrPostData = async <TRequest, TResponse = TRequest>(
const options = addRequiredHeaders(baseOptions, api);
try {
const response = await fetch(url, options);
return handleApiJSONResponse(response);
return handleApiJSONResponse(api, response);
} catch (error) {
console.error(`Error making ${method} request for ${kind}:`, error);
throw error;
Expand All @@ -148,7 +171,7 @@ export const deleteData = async <R>(kind: string, abortSignal?: AbortSignal): Pr
const options = addRequiredHeaders(baseOptions, api);
try {
const response = await fetch(url, options);
return handleApiJSONResponse(response);
return handleApiJSONResponse(api, response);
} catch (error) {
console.error('Error making DELETE request:', error);
throw error;
Expand All @@ -169,7 +192,7 @@ export const patchData = async <R>(kind: string, data: PatchRequest, abortSignal
const options = addRequiredHeaders(baseOptions, api);
try {
const response = await fetch(url, options);
return handleApiJSONResponse(response);
return handleApiJSONResponse(api, response);
} catch (error) {
console.error('Error making PATCH request:', error);
throw error;
Expand All @@ -190,7 +213,7 @@ export const fetchData = async <R>(path: string, abortSignal?: AbortSignal): Pro
if (api === 'alerts') {
return handleAlertsJSONResponse(response);
}
return handleApiJSONResponse(response);
return handleApiJSONResponse(api, response);
} catch (error) {
console.error('Error making GET request:', error);
throw error;
Expand Down
12 changes: 12 additions & 0 deletions apps/standalone/src/app/routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ const FleetDetails = React.lazy(
);

const OverviewPage = React.lazy(() => import('@flightctl/ui-components/src/components/OverviewPage/OverviewPage'));
const SecurityOverviewPage = React.lazy(
() => import('@flightctl/ui-components/src/components/SecurityOverview/SecurityOverviewPage'),
);
const PendingEnrollmentRequestsBadge = React.lazy(
() => import('@flightctl/ui-components/src/components/EnrollmentRequest/PendingEnrollmentRequestsBadge'),
);
Expand Down Expand Up @@ -172,6 +175,15 @@ const getAppRoutes = (t: TFunction): ExtendedRouteObject[] => [
</TitledRoute>
),
},
{
path: '/security-overview',
title: t('Security overview'),
element: (
<TitledRoute title={t('Security overview')}>
<SecurityOverviewPage />
</TitledRoute>
),
},
{
// Route is only exposed for the standalone app
path: '/command-line-tools',
Expand Down
41 changes: 33 additions & 8 deletions apps/standalone/src/app/utils/apiCalls.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export const apiProxy = `${uiProxy}/api`;

const imageBuilderPathRegex = /^image(builds|exports)/;
const catalogPathRegex = /^(catalogs|catalogitems)/;
const vulnerabilityPathRegex = /^vulnerabilities/;

export const wsEndpoint = `${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${apiServer}`;

Expand Down Expand Up @@ -45,20 +46,23 @@ export const fetchUiProxy = async (endpoint: string, requestInit: RequestInit):
return await fetch(`${apiProxy}/${endpoint}`, options);
};

const getFullApiUrl = (path: string): { api: 'flightctl' | 'imagebuilder' | 'alerts' | 'catalog'; url: string } => {
type Api = 'flightctl' | 'imagebuilder' | 'alerts' | 'catalog' | 'vulnerability';

const getFullApiUrl = (path: string): { api: Api; url: string } => {
if (path.startsWith('alerts')) {
return { api: 'alerts', url: `${apiProxy}/alerts/api/v2/${path}` };
}
if (imageBuilderPathRegex.test(path)) {
return { api: 'imagebuilder', url: `${apiProxy}/imagebuilder/api/v1/${path}` };
}

let apiName: Api = 'flightctl';
if (catalogPathRegex.test(path)) {
return {
api: 'catalog',
url: `${apiProxy}/flightctl/api/v1/${path}`,
};
apiName = 'catalog';
} else if (vulnerabilityPathRegex.test(path)) {
apiName = 'vulnerability';
}
return { api: 'flightctl', url: `${apiProxy}/flightctl/api/v1/${path}` };
return { api: apiName, url: `${apiProxy}/flightctl/api/v1/${path}` };
};

export const logout = async () => {
Expand All @@ -78,7 +82,10 @@ export const redirectToLogin = () => {
window.location.href = '/login';
};

const handleApiJSONResponse = async <R>(response: Response): Promise<R> => {
const handleApiJSONResponse = async <R>(api: Api, response: Response): Promise<R> => {
if (api === 'vulnerability') {
return handleVulnerabilityJSONResponse(response);
}
if (response.ok) {
const data = (await response.json()) as R;
return data;
Expand Down Expand Up @@ -116,6 +123,24 @@ const handleAlertsJSONResponse = async <R>(response: Response): Promise<R> => {
throw new Error(await getErrorMsgFromAlertsApiResponse(response));
};

const handleVulnerabilityJSONResponse = async <R>(response: Response): Promise<R> => {
if (response.ok) {
const data = (await response.json()) as R;
return data;
}

if (response.status === 404) {
throw new Error(`Error ${response.status}: ${response.statusText}`);
}

// API returns 501 for disabled vulnerabilities API.
if (response.status === 501) {
throw new Error(`${response.status}`);
}

throw new Error(await getErrorMsgFromApiResponse(response));
};
Comment on lines +126 to +142
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Missing 401 handling for vulnerability responses.

Unlike handleApiJSONResponse (which calls redirectToLogin() on 401) and handleAlertsJSONResponse (which treats 401 as "disabled"), handleVulnerabilityJSONResponse has no explicit 401 handling. This means unauthorized requests to vulnerability endpoints will throw a generic error instead of redirecting users to login.

🔧 Proposed fix to add 401 handling
 const handleVulnerabilityJSONResponse = async <R>(response: Response): Promise<R> => {
   if (response.ok) {
     const data = (await response.json()) as R;
     return data;
   }

   if (response.status === 404) {
     throw new Error(`Error ${response.status}: ${response.statusText}`);
   }

+  if (response.status === 401) {
+    redirectToLogin();
+  }
+
   // API returns 501 for disabled vulnerabilities API.
   if (response.status === 501) {
     throw new Error(`${response.status}`);
   }

   throw new Error(await getErrorMsgFromApiResponse(response));
 };
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
const handleVulnerabilityJSONResponse = async <R>(response: Response): Promise<R> => {
if (response.ok) {
const data = (await response.json()) as R;
return data;
}
if (response.status === 404) {
throw new Error(`Error ${response.status}: ${response.statusText}`);
}
// API returns 501 for disabled vulnerabilities API.
if (response.status === 501) {
throw new Error(`${response.status}`);
}
throw new Error(await getErrorMsgFromApiResponse(response));
};
const handleVulnerabilityJSONResponse = async <R>(response: Response): Promise<R> => {
if (response.ok) {
const data = (await response.json()) as R;
return data;
}
if (response.status === 404) {
throw new Error(`Error ${response.status}: ${response.statusText}`);
}
if (response.status === 401) {
redirectToLogin();
}
// API returns 501 for disabled vulnerabilities API.
if (response.status === 501) {
throw new Error(`${response.status}`);
}
throw new Error(await getErrorMsgFromApiResponse(response));
};
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@apps/standalone/src/app/utils/apiCalls.ts` around lines 126 - 142,
handleVulnerabilityJSONResponse lacks explicit 401 handling; update the function
(handleVulnerabilityJSONResponse) to mirror handleApiJSONResponse by checking if
response.status === 401, call redirectToLogin() and then throw an appropriate
Error (e.g., using getErrorMsgFromApiResponse(response) or a short message) so
unauthorized vulnerability responses redirect to login instead of producing a
generic error.


const fetchWithRetry = async <R>(path: string, init?: RequestInit): Promise<R> => {
const { api, url } = getFullApiUrl(path);

Expand All @@ -136,7 +161,7 @@ const fetchWithRetry = async <R>(path: string, init?: RequestInit): Promise<R> =
if (api === 'alerts') {
return handleAlertsJSONResponse(response);
}
return handleApiJSONResponse(response);
return handleApiJSONResponse(api, response);
};

const putOrPostData = async <TRequest, TResponse = TRequest>(
Expand Down
5 changes: 5 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,11 @@ module.exports = defineConfig([
importNames: ['WizardFooterWrapper', 'WizardFooter'],
message: 'Use FlightCtlWizardFooter wrapper',
},
{
name: '@patternfly/react-core',
importNames: ['Drawer', 'DrawerPanelContent'],
message: 'Use FlightCtlPageDrawer wrapper',
},
{
name: 'react-i18next',
importNames: ['useTranslation'],
Expand Down
58 changes: 55 additions & 3 deletions libs/i18n/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"404 Page Not Found": "404 Page Not Found",
"Error page - details should be displayed here": "Error page - details should be displayed here",
"Overview": "Overview",
"Security overview": "Security overview",
"Command line tools": "Command line tools",
"Enrollment Request Details": "Enrollment Request Details",
"Enrollment Request": "Enrollment Request",
Expand Down Expand Up @@ -289,7 +290,6 @@
"You do not have permission to deploy": "You do not have permission to deploy",
"A channel must be selected": "A channel must be selected",
"A version must be selected": "A version must be selected",
"Resize panel": "Resize panel",
"Restore": "Restore",
"This catalog item is managed by a resource sync and cannot be directly restored. Either remove this catalog's definition from the resource sync configuration, or delete the resource sync first.": "This catalog item is managed by a resource sync and cannot be directly restored. Either remove this catalog's definition from the resource sync configuration, or delete the resource sync first.",
"Deprecate": "Deprecate",
Expand Down Expand Up @@ -520,6 +520,7 @@
"Add label": "Add label",
"Unexpected error occurred": "Unexpected error occurred",
"Please reload the page and try again.": "Please reload the page and try again.",
"Resize panel": "Resize panel",
"Next": "Next",
"Back": "Back",
"Show less": "Show less",
Expand Down Expand Up @@ -632,13 +633,12 @@
"You can add devices and label them to match fleets, or you can <2>start with a fleet</2> and add devices into it.": "You can add devices and label them to match fleets, or you can <2>start with a fleet</2> and add devices into it.",
"You can add devices and label them to match fleets": "You can add devices and label them to match fleets",
"No decommissioning or decommissioned devices here!": "No decommissioning or decommissioned devices here!",
"Name / Alias": "Name / Alias",
"Clear all filters": "Clear all filters",
"Searching...": "Searching...",
"No results": "No results",
"Fleet and label filter toggle": "Fleet and label filter toggle",
"Clear filter text": "Clear filter text",
"Name and alias": "Name and alias",
"Enter a valid CVE ID in the form CVE-YYYY-sequence, with sequence containing at least 4 digits (for example, CVE-2024-12345).": "Enter a valid CVE ID in the form CVE-YYYY-sequence, with sequence containing at least 4 digits (for example, CVE-2024-12345).",
"Labels and fleets": "Labels and fleets",
"Filter by labels and fleets": "Filter by labels and fleets",
"Decommission devices": "Decommission devices",
Expand Down Expand Up @@ -1206,6 +1206,7 @@
"Failed": "Failed",
"Canceling": "Canceling",
"Canceled": "Canceled",
"Scanning for vulnerabilities": "Scanning for vulnerabilities",
"Converting": "Converting",
"Image built successfully": "Image built successfully",
"Export images": "Export images",
Expand Down Expand Up @@ -1392,6 +1393,8 @@
"This area displays current notifications about your monitored devices and fleets.": "This area displays current notifications about your monitored devices and fleets.",
"Alerts will appear here if an issue is detected.": "Alerts will appear here if an issue is detected.",
"View devices": "View devices",
"Security risks across your devices. Resolve critical vulnerabilities immediately to prevent migration failure and protect your infrastructure.": "Security risks across your devices. Resolve critical vulnerabilities immediately to prevent migration failure and protect your infrastructure.",
"View all CVEs": "View all CVEs",
"{{count}} Devices_one": "{{count}} Device",
"{{count}} Devices_other": "{{count}} Devices",
"Review pending devices_one": "Review pending device",
Expand Down Expand Up @@ -1504,6 +1507,48 @@
"Resource sync {{rsId}} could not be found": "Resource sync {{rsId}} could not be found",
"Resource sync {{rsId}}": "Resource sync {{rsId}}",
"Could not find the details for the resource sync <1>{rsId}</1>": "Could not find the details for the resource sync <1>{rsId}</1>",
"Vulnerability reporting is not enabled in this environment.": "Vulnerability reporting is not enabled in this environment.",
"Total active vulnerabilities.": "Total active vulnerabilities.",
"CVEs affecting images deployed across your managed fleet and devices.": "CVEs affecting images deployed across your managed fleet and devices.",
"Vulnerability counts by severity": "Vulnerability counts by severity",
"No CVEs detected": "No CVEs detected",
"All managed devices have been scanned. No CVEs were found affecting images currently deployed across your fleets and devices.": "All managed devices have been scanned. No CVEs were found affecting images currently deployed across your fleets and devices.",
"No vulnerability data to display": "No vulnerability data to display",
"There are currently no deployed devices. Scan results will be available once devices have been added.": "There are currently no deployed devices. Scan results will be available once devices have been added.",
"Severity": "Severity",
"Affected devices": "Affected devices",
"Affected images": "Affected images",
"Published": "Published",
"Filter by severity": "Filter by severity",
"Find by name": "Find by name",
"Vulnerabilities table": "Vulnerabilities table",
"Show more": "Show more",
"Published: {{ date }}": "Published: {{ date }}",
"Scanner name": "Scanner name",
"<0>{deviceCount}</0> devices in this fleet are running images affected by this vulnerability. Update or replace the affected images to remediate._one": "<0>{deviceCount}</0> device in this fleet is running images affected by this vulnerability. Update or replace the affected images to remediate.",
"<0>{deviceCount}</0> devices in this fleet are running images affected by this vulnerability. Update or replace the affected images to remediate._other": "<0>{deviceCount}</0> devices in this fleet are running images affected by this vulnerability. Update or replace the affected images to remediate.",
"<0>{deviceCount}</0> devices are running images affected by this vulnerability. Update or replace the affected images to remediate._one": "<0>{deviceCount}</0> device is running an image affected by this vulnerability. Update or replace the affected image to remediate.",
"<0>{deviceCount}</0> devices are running images affected by this vulnerability. Update or replace the affected images to remediate._other": "<0>{deviceCount}</0> devices are running images affected by this vulnerability. Update or replace the affected images to remediate.",
"<0>{deviceCount}</0> devices in <2>1</2> fleet are running images affected by this vulnerability. Update or replace the affected images to remediate._one": "<0>{deviceCount}</0> device in <2>1</2> fleet is running an image affected by this vulnerability. Update or replace the affected image to remediate.",
"<0>{deviceCount}</0> devices in <2>1</2> fleet are running images affected by this vulnerability. Update or replace the affected images to remediate._other": "<0>{deviceCount}</0> devices in <2>1</2> fleet are running images affected by this vulnerability. Update or replace the affected images to remediate.",
"<0>{deviceCount}</0> devices across <2>{fleetCount}</2> fleets are running images affected by this vulnerability. Update or replace the affected images to remediate._one": "<0>{deviceCount}</0> device is running an image affected by this vulnerability. Update or replace the affected image to remediate.",
"<0>{deviceCount}</0> devices across <2>{fleetCount}</2> fleets are running images affected by this vulnerability. Update or replace the affected images to remediate._other": "<0>{deviceCount}</0> devices across <2>{fleetCount}</2> fleets are running images affected by this vulnerability. Update or replace the affected images to remediate.",
"This device is running an image affected by this vulnerability. Update or replace the affected image to remediate.": "This device is running an image affected by this vulnerability. Update or replace the affected image to remediate.",
"Vulnerability impact table": "Vulnerability impact table",
"Total affected fleets": "Total affected fleets",
"Total {{ count }} fleets_one": "Total {{ count }} fleet",
"Total {{ count }} fleets_other": "Total {{ count }} fleets",
"Total affected devices": "Total affected devices",
"Total {{ count }} devices_one": "Total {{ count }} device",
"Total {{ count }} devices_other": "Total {{ count }} devices",
"Total affected images": "Total affected images",
"Total {{ count }} images_one": "Total {{ count }} image",
"Total {{ count }} images_other": "Total {{ count }} images",
"Unable to load vulnerability impact data": "Unable to load vulnerability impact data",
"Impact data could not be loaded. Try again later.": "Impact data could not be loaded. Try again later.",
"Impact summary": "Impact summary",
"{{ advisoryId }} - Red Hat Security Advisory": "{{ advisoryId }} - Red Hat Security Advisory",
"CVE details - {{ advisoryId }}": "CVE details - {{ advisoryId }}",
"CPU": "CPU",
"Memory": "Memory",
"Disk": "Disk",
Expand Down Expand Up @@ -1590,6 +1635,8 @@
"Online": "Online",
"Pending sync": "Pending sync",
"Suspended": "Suspended",
"Name and alias": "Name and alias",
"CVE ID": "CVE ID",
"Decommissioned": "Decommissioned",
"Decommissioning": "Decommissioning",
"Enrolled": "Enrolled",
Expand Down Expand Up @@ -1632,5 +1679,10 @@
"Reloading": "Reloading",
"Refreshing": "Refreshing",
"Maintenance": "Maintenance",
"Undefined": "Undefined",
"Critical": "Critical",
"Important": "Important",
"Moderate": "Moderate",
"Low": "Low",
"{{ count }} devices matching the labels were selected._zero": "There are no devices matching these labels."
}
Loading
Loading