-
-
-
-
-
- Network interfaces - - (0) - -
-
-
+ Network interfaces
+
+ (0)
+
+
+
+
-
+
+
+
+
+
+
+ Export formatted
+
+
+
+
+
-
-
+
-
-
-
-
-
+
-
-
-
-
+
-
+
+
-
- WQL
-
-
-
+
+
+ WQL
+
+
+
+
+
-
-
+
-
-
+
+
+
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+ | + | ++ - - - - + | ++ + | ++ + | ++ + | +
|---|---|---|---|---|
|
+
+
+ No items found
+
+
+ |
+ ||||
|
+
+
+
+
+
+ + Network ports + + (0) + ++
+
+
- |
- - - | -- - | -
+
- |
- - - | -
|---|---|---|---|---|
|
-
-
+
-
- No items found
-
+
+
+
+
+
+
+
+
+ |
- ||||
-
-
-
-
-
-
-
- - Network ports - - (0) - -
-
-
-
-
-
-
-
+
+
-
+
@@ -845,377 +885,397 @@ exports[`Inventory component A Apple agent should be well rendered. 1`] = `
class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow wz-agent-inventory-panel"
>
-
-
-
+
-
+
+
+
+
+
-
-
+ class="euiFlexItem euiFlexItem--flexGrowZero"
+ />
+
+
+
+
+
+
+ | + + + Local port + + + | ++ + + Local IP address + + + | +
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+ |
+ |
|---|---|---|---|
|
+
+
+ No items found
+
+
+ |
+ |||
| - - - Local port - - - | -- - - Local IP address - - - | -- - | -- - | -
|---|---|---|---|
|
-
-
- No items found
-
-
- |
- |||
-
-
- Network settings - - (0) - -
-
-
+ Network settings
+
+ (0)
+
+
+
+
-
+
+
+
+
+
+
+ Export formatted
+
+
+
+
+
-
+
-
-
-
-
-
+
-
-
-
-
+
-
+
+
-
- WQL
-
-
-
+
+
+ WQL
+
+
+
+
+
-
+
-
+
+
+
+
+
-
+
+
+
+
+
-
+
+ | + + | +
+
-
-
-
-
-
-
-
| ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
-
-
-
-
- Packages - - (0) - -
-
-
+ Packages
+
+ (0)
+
+
+
+
-
+
+
+
+
+
+
+ Export formatted
+
+
+
+
+
-
+
-
-
-
-
-
+
-
-
-
-
+
-
+
+
-
- WQL
-
-
-
+
+
+ WQL
+
+
+
+
+
-
@@ -1619,185 +1699,263 @@ exports[`Inventory component A Apple agent should be well rendered. 1`] = `
class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow wz-agent-inventory-panel"
>
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | + | +
+
-
-
-
-
-
-
-
| ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
-
-
- Processes - - (0) - -
-
-
+ Processes
+
+ (0)
+
+
+
+
-
+
+
+
+
+
+
+ Export formatted
+
+
+
+
+
-
+
-
-
-
-
-
+
-
-
-
-
+
-
+
+
-
- WQL
-
-
-
+
+
+ WQL
+
+
+
+
+
-
@@ -2177,360 +2277,396 @@ exports[`Inventory component A Linux agent should be well rendered. 1`] = `
class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow wz-agent-inventory-panel"
>
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | + | +
+
-
-
-
-
-
-
-
| |||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
-
-
- Network interfaces - - (0) - -
-
-
+ Network interfaces
+
+ (0)
+
+
+
+
-
+
+
+
+
+
+
+ Export formatted
+
+
+
+
+
-
+
-
-
-
-
-
+
-
-
-
-
+
-
+
+
-
- WQL
-
-
-
+
+
+ WQL
+
+
+
+
+
-
@@ -2543,1084 +2679,780 @@ exports[`Inventory component A Linux agent should be well rendered. 1`] = `
class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow wz-agent-inventory-panel"
>
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | + | +
+
-
-
-
-
-
-
-
| |||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
-
-
- Network ports - - (0) - -
-
-
+ Network ports
+
+ (0)
+
+
+
+
-
+
+
+
+
+
+
+ Export formatted
+
+
+
+
+
-
-
+
-
-
-
-
-
+
-
-
-
-
+
-
+
+
-
- WQL
-
-
-
+
+
+ WQL
+
+
+
+
+
-
-
-
-
+
-
-
-
+
-
-
+
-
+
+
+
+ | - - - Local port - - - | -- - - Local IP address - - - | -
-
-
+ |
- Process
-
-
- |
-
-
-
+
+ Local port
+
+
+ |
+
- PID
-
-
- |
-
- |
+
- State
+
+ Process
+
-
-
- |
-
- |
- |
-
-
+
- No items found
-
-
- | | |||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
-
-
-
-
-
-
-
-
-
- - Network settings - - (0) - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+ State
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ No items found
+
+
+
+
-
+
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+ Network settings
+
+ (0)
+
+
-
-
- |
+
+
- |
- - - | -- - | -
+
- |
- - - | -
|---|---|---|---|---|
|
-
-
- No items found
-
-
- |
- ||||
-
-
-
-
-
-
-
-
- - Packages - - (0) - -
-
-
-
-
-
-
-
+
+
-
+
-
-
-
-
-
+
-
-
-
-
+
-
+
+
-
- WQL
-
-
-
+
+
+ WQL
+
+
+
+
+
-
@@ -3636,532 +3468,976 @@ exports[`Inventory component A Linux agent should be well rendered. 1`] = `
class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow wz-agent-inventory-panel"
>
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | + | +
+
-
-
-
-
-
-
-
| ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
-
-
- Processes - - (0) - -
-
-
+ Packages
+
+ (0)
+
+
+
+
-
+
+
+
+
+
+
+ Export formatted
+
+
+
+
+
-
+
-
-
-
-
-
+
-
-
-
-
+
-
+
+
-
- WQL
-
-
-
+
+
+ WQL
+
+
+
+
+
-
@@ -4299,185 +4575,262 @@ exports[`Inventory component A Windows agent should be well rendered. 1`] = `
class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow wz-agent-inventory-panel"
>
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
- |
-
+
+
+
+
+
+
- |
-
+
- |
-
+
+
+
+
+
+
+
+
+
- |
- + + | - | +||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
|
+
+
+ No items found
+
+
+ |
+ |||||||||||
-
-
- Network interfaces - - (0) - -
-
-
+ Network interfaces
+
+ (0)
+
+
+
+
-
+
+
+
+
+
+
+ Export formatted
+
+
+
+
+
-
+
-
-
-
-
-
+
-
-
-
-
+
-
+
+
-
- WQL
-
-
-
+
+
+ WQL
+
+
+
+
+
-
@@ -4682,347 +4978,367 @@ exports[`Inventory component A Windows agent should be well rendered. 1`] = `
class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow wz-agent-inventory-panel"
>
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | + | +
+
-
-
-
-
-
-
-
| ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
-
-
- Network ports - - (0) - -
-
-
+ Network ports
+
+ (0)
+
+
+
+
-
+
+
+
+
+
+
+ Export formatted
+
+
+
+
+
-
+
-
-
-
-
-
+
-
-
-
-
+
-
+
+
-
- WQL
-
-
-
+
+
+ WQL
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
+
-
+
+
+
+ | - - - Local port - - - | -- - - Local IP address - - - | -- |
|---|
+
+ No items found
+
+
+
-
-
-
-
- Network settings - - (0) - -
-
-
+ Network settings
+
+ (0)
+
+
+
+
-
+
+
+
+
+
+
+ Export formatted
+
+
+
+
+
-
+
-
-
-
-
-
+
-
-
-
-
+
-
+
+
-
- WQL
-
-
-
+
+
+ WQL
+
+
+
+
+
-
@@ -5422,185 +5758,262 @@ exports[`Inventory component A Windows agent should be well rendered. 1`] = `
class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow wz-agent-inventory-panel"
>
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | + | +
+
-
-
-
-
-
-
-
| ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
-
-
- Windows updates - - (0) - -
-
-
+ Windows updates
+
+ (0)
+
+
+
+
-
+
+
+
+
+
+
+ Export formatted
+
+
+
+
+
-
+
-
-
-
-
-
+
-
-
-
-
+
-
+
+
-
- WQL
-
-
-
+
+
+ WQL
+
+
+
+
+
-
@@ -5712,185 +6068,262 @@ exports[`Inventory component A Windows agent should be well rendered. 1`] = `
class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow wz-agent-inventory-panel"
>
+
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+ | - - - - + | +
|---|
|
+
+
+ No items found
+
+
+ |
+
| - - | -
|---|
|
-
-
- No items found
-
-
- |
-
-
-
- Packages - - (0) - -
-
-
+ Packages
+
+ (0)
+
+
+
+
-
+
+
+
+
+
+
+ Export formatted
+
+
+
+
+
-
+
-
-
-
-
-
+
-
-
-
-
+
-
+
+
-
- WQL
-
-
-
+
+
+ WQL
+
+
+
+
+
-
@@ -6076,185 +6452,263 @@ exports[`Inventory component A Windows agent should be well rendered. 1`] = `
class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow wz-agent-inventory-panel"
>
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | + | +
+
-
-
-
-
-
-
-
| ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
-
-
- Processes - - (0) - -
-
-
+ Processes
+
+ (0)
+
+
+
+
-
+
+
+
+
+
+
+ Export formatted
+
+
+
+
+
-
+
+
+
+
+
+ {typeof flyoutBody === 'function'
+ ? flyoutBody({
+ onClose,
+ onUpdateCanClose: setCanClose,
+ })
+ : flyoutBody}
+
+
+ {canNotCloseIsOpen && (
+
+ setCanNotCloseIsOpen(false)}
+ cancelButtonText="No, don't do it"
+ confirmButtonText='Yes, do it'
+ >
+
+
+ )}
+
+ );
+}
+
+export const WzButtonOpenFlyout: React.FunctionComponent = ({
+ flyoutTitle,
+ flyoutProps = {},
+ flyoutBody = null,
+ buttonProps = {},
+ ...rest
+}) => (
+ (
+ = ({
+ flyoutTitle,
+ flyoutProps = {},
+ flyoutBody = null,
+ buttonProps = {},
+ ...rest
+}) => (
+ (
+
-
-
+
+
+
+
-
-
-
-
-
+
-
-
-
-
+
-
+
+
-
- WQL
-
-
-
+
+
+ WQL
+
+
+
+
+
-
diff --git a/plugins/main/public/components/common/buttons/flyout.tsx b/plugins/main/public/components/common/buttons/flyout.tsx
new file mode 100644
index 0000000000..7e22970bda
--- /dev/null
+++ b/plugins/main/public/components/common/buttons/flyout.tsx
@@ -0,0 +1,111 @@
+import React, { useState } from 'react';
+import {
+ WzButtonOpenOnClick,
+ WzButtonPermissionsOpenOnClick,
+} from './modal-confirm';
+import { WzFlyout } from '../flyouts';
+import {
+ EuiFlyoutHeader,
+ EuiFlyoutBody,
+ EuiTitle,
+ EuiConfirmModal,
+ EuiOverlayMask,
+} from '@elastic/eui';
+
+function RenderFlyout({ flyoutTitle, flyoutProps, flyoutBody, onClose }) {
+ const [canClose, setCanClose] = useState(true);
+ const [canNotCloseIsOpen, setCanNotCloseIsOpen] = useState(false);
+ const onFlyoutClose = function () {
+ if (!canClose) {
+ setCanNotCloseIsOpen(true);
+ return;
+ }
+ onClose();
+ };
+
+ return (
+ <>
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | + | +
+
-
-
-
-
-
-
-
| ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
{flyoutTitle}
++ There are unsaved changes. Are you sure you want to proceed? +
+
- {errorTitle}}
body={errorMessage || error?.message}
/>
- )
+ );
} else if (!data || (Array.isArray(data) && !data.length)) {
visualization = (
{noDataTitle}}
- body={typeof noDataMessage === 'function' ? noDataMessage() : noDataMessage}
+ body={
+ typeof noDataMessage === 'function' ? noDataMessage() : noDataMessage
+ }
/>
- )
+ );
} else {
const Chart = chartTypes[type];
- const chartFlexStyle = {
- alignItems: 'flex-end',
- paddingRight: '1em'
- }
- const legendFlexStyle = {
- height: '100%',
- paddingLeft: '1em'
- }
visualization = (
-
-
+
+
{showLegend && (
-
+
({ ...rest, labelColor: color, color: 'text' }))}
+ data={data.map(({ color, ...rest }) => ({
+ ...rest,
+ labelColor: color,
+ color: 'text',
+ }))}
/>
)}
- )
+ );
}
return (
- WrappedComponent => props => {
- return condition(props) ? ;
-}
-
-// This HOC hides the wrapped component if user has not permissions
-export const withUserRolesRequirements = requiredUserRoles => WrappedComponent => props => {
- const [userRolesRequirements, userRoles] = useUserRolesRequirements(typeof requiredUserRoles === 'function' ? requiredUserRoles(props) : requiredUserRoles);
- return ;
-}
-
-// This HOC redirects to redirectURL if user has not permissions
-export const withUserRolesPrivate = (requiredUserRoles, redirectURL) => WrappedComponent => props => {
- const [userRolesRequirements, userRoles] = useUserRolesPrivate(requiredUserRoles, redirectURL);
- return userRolesRequirements ? : null;
-}
-
diff --git a/plugins/main/public/components/common/hooks/index.ts b/plugins/main/public/components/common/hooks/index.ts
index e3ce7584c7..f8e404da53 100644
--- a/plugins/main/public/components/common/hooks/index.ts
+++ b/plugins/main/public/components/common/hooks/index.ts
@@ -17,7 +17,7 @@ export * from './use-query';
export * from './use-time-filter';
export * from './useWindowSize';
export * from './useUserPermissions';
-export * from './useUserRoles';
+export * from './use-user-is-admin';
export * from './useResfreshAngularDiscover';
export * from './useAllowedAgents';
export * from './useApiRequest';
diff --git a/plugins/main/public/components/common/hooks/use-service.test.tsx b/plugins/main/public/components/common/hooks/use-service.test.tsx
new file mode 100644
index 0000000000..fbfe48570c
--- /dev/null
+++ b/plugins/main/public/components/common/hooks/use-service.test.tsx
@@ -0,0 +1,68 @@
+import { renderHook } from '@testing-library/react-hooks';
+import { useService } from './use-service';
+
+const successfulService = async (_params?: any) => {
+ return Promise.resolve('test data');
+};
+const failingService = async (_params?: any) => {
+ return Promise.reject('Error occurred');
+};
+const successfulRefreshService = async (_params?: any) => {
+ return Promise.resolve(Date.now());
+};
+
+const successfulServiceWithParams = jest.fn().mockResolvedValue('test data');
+
+describe('useService hook', () => {
+ it('should return data and success state when service call is successful', async () => {
+ const { result, waitForNextUpdate } = renderHook(() =>
+ useService(successfulService),
+ );
+
+ await waitForNextUpdate();
+
+ expect(result.current.data).toEqual('test data');
+ expect(result.current.isLoading).toEqual(false);
+ expect(result.current.isSuccess).toEqual(true);
+ expect(result.current.isError).toEqual(false);
+ expect(result.current.error).toBeUndefined();
+ });
+
+ it('should return error state when service call fails', async () => {
+ const { result, waitForNextUpdate } = renderHook(() =>
+ useService(failingService),
+ );
+
+ await waitForNextUpdate();
+
+ expect(result.current.data).toBeUndefined();
+ expect(result.current.isLoading).toEqual(false);
+ expect(result.current.isSuccess).toEqual(false);
+ expect(result.current.isError).toEqual(true);
+ expect(result.current.error).toEqual('Error occurred');
+ });
+
+ it('should fetch data again with new data when refresh value changes', async () => {
+ const { result, rerender, waitForNextUpdate } = renderHook(
+ ({ refresh }) => useService(successfulRefreshService, undefined, refresh),
+ { initialProps: { refresh: 0 } },
+ );
+
+ await waitForNextUpdate();
+
+ const data = result.current.data;
+
+ rerender({ refresh: 1 });
+ await waitForNextUpdate();
+
+ expect(result.current.data).not.toEqual(data);
+ });
+
+ it('should call the service with provided parameters', async () => {
+ const params = { id: 123456 };
+
+ renderHook(() => useService(successfulServiceWithParams, params));
+
+ expect(successfulServiceWithParams).toHaveBeenCalledWith(params);
+ });
+});
diff --git a/plugins/main/public/components/common/hooks/use-service.ts b/plugins/main/public/components/common/hooks/use-service.ts
new file mode 100644
index 0000000000..979b787213
--- /dev/null
+++ b/plugins/main/public/components/common/hooks/use-service.ts
@@ -0,0 +1,40 @@
+import { useState, useEffect } from 'react';
+
+interface useServiceResponse {
+ data: T | undefined;
+ isLoading: boolean;
+ isSuccess: boolean;
+ isError: boolean;
+ error: any;
+}
+
+export function useService(
+ service: (params?: any | undefined) => Promise,
+ params?: any | undefined,
+ refresh?: number | undefined,
+): useServiceResponse {
+ const [data, setData] = useState(undefined);
+ const [isLoading, setIsLoading] = useState(true);
+ const [isSuccess, setIsSuccess] = useState(false);
+ const [isError, setIsError] = useState(false);
+ const [error, setError] = useState(undefined);
+ useEffect(() => {
+ const handleService = async () => {
+ setIsLoading(true);
+ try {
+ const response = await service(params);
+ setData(response);
+ setIsSuccess(true);
+ } catch (error) {
+ setIsError(true);
+ setError(error);
+ } finally {
+ setIsLoading(false);
+ }
+ };
+
+ handleService();
+ }, [refresh]);
+
+ return { data, isLoading, isSuccess, isError, error };
+}
diff --git a/plugins/main/public/components/common/hooks/use-user-is-admin.ts b/plugins/main/public/components/common/hooks/use-user-is-admin.ts
new file mode 100644
index 0000000000..65c8e98102
--- /dev/null
+++ b/plugins/main/public/components/common/hooks/use-user-is-admin.ts
@@ -0,0 +1,7 @@
+import { useSelector } from 'react-redux';
+
+// It retuns user requirements if is is not admin
+export const useUserPermissionsIsAdminRequirements = () => {
+ const account = useSelector(state => state.appStateReducers.userAccount);
+ return [account.administrator_error_message, account];
+};
diff --git a/plugins/main/public/components/common/hooks/useUserRoles.ts b/plugins/main/public/components/common/hooks/useUserRoles.ts
deleted file mode 100644
index f986eee57f..0000000000
--- a/plugins/main/public/components/common/hooks/useUserRoles.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Wazuh app - React hooks to manage user role requirements
- * Copyright (C) 2015-2022 Wazuh, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Find more information about this on the LICENSE file.
- */
-
-import { useSelector } from 'react-redux';
-import { WzUserPermissions } from '../../../react-services/wz-user-permissions';
-
-// It retuns user Roles
-export const useUserRoles = () => {
- const userRoles = useSelector(state => state.appStateReducers.userRoles);
- return userRoles;
-}
-
-// It returns user roles validation and user roles
-export const useUserRolesRequirements = (requiredRoles) => {
- const userRoles = useUserRoles();
- if(requiredRoles === null){
- return [false, userRoles]
- }
- const requiredRolesArray = typeof requiredRoles === 'function' ? requiredRoles() : requiredRoles;
- return [WzUserPermissions.checkMissingUserRoles(requiredRolesArray, userRoles), userRoles];
-}
-
-// It redirects to other URL if user roles are not valid
-export const useUserRolesPrivate = (requiredRoles, redirectURL) => {
- const [userRolesValidation, userRoles] = useUserRolesRequirements(requiredRoles);
- if(userRolesValidation){
- window.location.href = redirectURL;
- }
- return [userRolesValidation, userRoles];
-}
\ No newline at end of file
diff --git a/plugins/main/public/components/common/loading/loading-spinner-data-source.tsx b/plugins/main/public/components/common/loading/loading-spinner-data-source.tsx
new file mode 100644
index 0000000000..36c4b49930
--- /dev/null
+++ b/plugins/main/public/components/common/loading/loading-spinner-data-source.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import {
+ EuiTitle,
+ EuiPanel,
+ EuiEmptyPrompt,
+ EuiLoadingSpinner,
+} from '@elastic/eui';
+import { FormattedMessage } from '@osd/i18n/react';
+import { IntlProvider } from 'react-intl';
+
+export function LoadingSpinnerDataSource() {
+ return (
+
+
+
+
+
+
+ }
+ />
+
+
+ );
+}
diff --git a/plugins/main/public/components/common/modules/events-enhance-discover-fields.ts b/plugins/main/public/components/common/modules/events-enhance-discover-fields.ts
deleted file mode 100644
index e5e5f5fc97..0000000000
--- a/plugins/main/public/components/common/modules/events-enhance-discover-fields.ts
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Wazuh app - Integrity monitoring components
- * Copyright (C) 2015-2022 Wazuh, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Find more information about this on the LICENSE file.
- */
-
-import { FlyoutDetail } from '../../../components/agents/fim/inventory/flyout';
-import { FlyoutTechnique } from '../../overview/mitre/components/techniques/components/flyout-technique';
-import { AppNavigate } from '../../../react-services/app-navigate';
-import { getCore } from '../../../kibana-services';
-
-// Field to add to elements enchanced
-const CUSTOM_ATTRIBUTE_ENHANCED_DISCOVER_FIELD =
- 'data-wazuh-discover-field-enhanced';
-
-type TGetFlyoutProps = (content: string, rowData, options) => any;
-
-// Set attributes (as object) in a HTML element
-const addAttributesToElement = (element, attributes: any, ...options) => {
- Object.keys(attributes).forEach(attribute => {
- const attributeValue:
- | ((...options) => string | undefined)
- | string
- | undefined = attributes[attribute];
- const attributeValueResult =
- typeof attributeValue === 'function'
- ? attributeValue(...options)
- : attributeValue;
- if (attributeValueResult) {
- element.setAttribute(attribute, attributeValueResult);
- }
- });
-};
-
-// Enhance field: create an anchor HTML element that redirect to some URL
-const createElementFieldURLRedirection =
- (attributes?: any) => (content: string, rowData, element, options) => {
- const container = document.createElement('a');
- addAttributesToElement(container, attributes, content, rowData, options);
- container.textContent = content;
- return container.getAttribute('href') ? container : undefined;
- };
-
-// Enhance field: create an anchor HTML element that open a flyout React component
-const createElementFieldOpenFlyout =
- (FlyoutComponent, getFlyoutProps: TGetFlyoutProps) =>
- (content: string, rowData, element, options) => {
- const container = document.createElement('a');
- container.onclick = () => {
- options.setFlyout({
- component: FlyoutComponent,
- props: getFlyoutProps(content, rowData, options),
- });
- };
- container.textContent = content;
- return container;
- };
-
-// Enhance field: create a div HTML element with anchor HTML elements in the same cell to open a flyout React component with different data
-const createElementFieldOpenFlyoutMultiple =
- (FlyoutComponent, getFlyoutProps: TGetFlyoutProps, containerOptions) =>
- (content: string, rowData, element, options) => {
- const container = document.createElement(containerOptions.element || 'div');
- const formattedContent = content.match(containerOptions.contentRegex);
- if (!formattedContent) {
- return;
- }
- const createElementFieldOpenFlyoutCreator = createElementFieldOpenFlyout(
- FlyoutComponent,
- getFlyoutProps,
- );
- formattedContent.forEach((item, itemIndex) => {
- const itemElement = createElementFieldOpenFlyoutCreator(
- item,
- rowData,
- element,
- options,
- );
- container.appendChild(itemElement);
- if (itemIndex < formattedContent.length - 1) {
- const separatorElement = document.createElement(
- containerOptions.separatorElement || 'span',
- );
- separatorElement.textContent = containerOptions.separator || ', ';
- container.appendChild(separatorElement);
- }
- });
- return container;
- };
-
-// Returns the style attribute value as string
-const styleObjectToString = (obj: any) =>
- Object.keys(obj)
- .map(key => `${key}: ${obj[key]}`)
- .join('; ');
-
-// Styles for external links (as object)
-const attributesExternalLink = {
- target: '__blank',
- rel: 'noreferrer',
-};
-
-// Define button styles
-const buttonStyles = attributesExternalLink;
-
-export const EventsEnhanceDiscoverCell = {
- 'rule.id': createElementFieldURLRedirection({
- ...buttonStyles,
- href: content =>
- getCore().application.getUrlForApp('rules', {
- path: `#/manager/rules?tab=rules&redirectRule=${content}`,
- }),
- }),
- 'agent.id': createElementFieldURLRedirection({
- ...buttonStyles,
- href: content =>
- content !== '000'
- ? getCore().application.getUrlForApp('endpoints-summary', {
- path: `#/agents?tab=welcome&agent=${content}`,
- })
- : undefined,
- }),
- 'agent.name': createElementFieldURLRedirection({
- ...buttonStyles,
- href: (content, rowData) => {
- const agentId = (((rowData || {})._source || {}).agent || {}).id;
- return agentId !== '000'
- ? getCore().application.getUrlForApp('endpoints-summary', {
- path: `#/agents?tab=welcome&agent=${agentId}`,
- })
- : undefined;
- },
- }),
- 'syscheck.path': createElementFieldOpenFlyout(
- FlyoutDetail,
- (content, rowData, options) => ({
- fileName: content,
- agentId: (((rowData || {})._source || {}).agent || {}).id,
- type: 'file',
- view: 'events',
- closeFlyout: options.closeFlyout,
- }),
- ),
- 'rule.mitre.id': createElementFieldOpenFlyoutMultiple(
- FlyoutTechnique,
- (content, rowData, options) => ({
- openDiscover(e, techniqueID) {
- AppNavigate.navigateToModule(e, 'overview', {
- tab: 'mitre',
- tabView: 'discover',
- filters: { 'rule.mitre.id': techniqueID },
- });
- },
- openDashboard(e, techniqueID) {
- AppNavigate.navigateToModule(e, 'overview', {
- tab: 'mitre',
- tabView: 'dashboard',
- filters: { 'rule.mitre.id': techniqueID },
- });
- },
- onChangeFlyout(isFlyoutVisible) {
- isFlyoutVisible ? null : options.closeFlyout();
- },
- currentTechnique: content,
- }),
- {
- contentRegex: /(T\d+\.?(\d+)?)/g,
- element: 'span',
- },
- ),
- 'syscheck.value_name': (content, rowData, element, options) => {
- if (content) return;
- const container = document.createElement('span');
- container.insertAdjacentHTML(
- 'beforeend',
- '',
- );
- container.insertAdjacentHTML(
- 'beforeend',
- '
-
- There were some unknown fields for the current index pattern. You need to refresh
- the page to apply the changes.
-
-
- window.location.reload()} size="s">
- Reload page
-
-
-
- ),
- toastLifeTimeMs,
- });
- };
-
- errorToast = (error) => {
- getToasts().add({
- color: 'danger',
- title: 'The index pattern could not be refreshed.',
- text:
- 'There are some unknown fields for the current index pattern. The index pattern fields need to be refreshed.',
- });
- };
-
- render() {
- const { flyout } = this.state;
- const FlyoutComponent = (flyout || {}).component;
- return (
-
- {flyout && (
-
- );
- }
- }
-);
diff --git a/plugins/main/public/components/common/modules/index.ts b/plugins/main/public/components/common/modules/index.ts
index 1c8866e5ba..4809b5207c 100644
--- a/plugins/main/public/components/common/modules/index.ts
+++ b/plugins/main/public/components/common/modules/index.ts
@@ -11,5 +11,4 @@
*/
export * from './dashboard';
-export * from './events';
export * from './modules-helper.js';
diff --git a/plugins/main/public/components/common/modules/modules-defaults.tsx b/plugins/main/public/components/common/modules/modules-defaults.tsx
index b365d7fe74..80de04594c 100644
--- a/plugins/main/public/components/common/modules/modules-defaults.tsx
+++ b/plugins/main/public/components/common/modules/modules-defaults.tsx
@@ -10,7 +10,6 @@
* Find more information about this on the LICENSE file.
*/
import { Dashboard } from './dashboard';
-import { Events } from './events';
import { MainSca } from '../../agents/sca';
import { MainMitre } from './main-mitre';
import { ModuleMitreAttackIntelligence } from '../../overview/mitre_attack_intelligence';
@@ -39,6 +38,14 @@ import { nistColumns } from '../../overview/nist/events/nist-columns';
import { gdprColumns } from '../../overview/gdpr/events/gdpr-columns';
import { tscColumns } from '../../overview/tsc/events/tsc-columns';
import { githubColumns } from '../../overview/github-panel/events/github-columns';
+import { mitreAttackColumns } from '../../overview/mitre/events/mitre-attack-columns';
+import { virustotalColumns } from '../../overview/virustotal/events/virustotal-columns';
+import { malwareDetectionColumns } from '../../overview/malware-detection/events/malware-detection-columns';
+import { WAZUH_VULNERABILITIES_PATTERN } from '../../../../common/constants';
+import { withVulnerabilitiesStateDataSource } from '../../overview/vulnerabilities/common/hocs/validate-vulnerabilities-states-index-pattern';
+
+const ALERTS_INDEX_PATTERN = 'wazuh-alerts-*';
+const DEFAULT_INDEX_PATTERN = ALERTS_INDEX_PATTERN;
const DashboardTab = {
id: 'dashboard',
@@ -58,13 +65,6 @@ const renderDiscoverTab = (columns, indexPattern) => {
};
};
-const EventsTab = {
- id: 'events',
- name: 'Events',
- buttons: [ButtonModuleExploreAgent],
- component: Events,
-};
-
const RegulatoryComplianceTabs = columns => [
DashboardTab,
{
@@ -120,14 +120,13 @@ export const ModulesDefaults = {
],
availableFor: ['manager', 'agent'],
},
+ // This module is Malware Detection. Ref: https://github.com/wazuh/wazuh-dashboard-plugins/issues/5893
pm: {
init: 'dashboard',
- tabs: [DashboardTab, EventsTab],
- availableFor: ['manager', 'agent'],
- },
- audit: {
- init: 'dashboard',
- tabs: [DashboardTab, EventsTab],
+ tabs: [
+ DashboardTab,
+ renderDiscoverTab(DEFAULT_INDEX_PATTERN, malwareDetectionColumns),
+ ],
availableFor: ['manager', 'agent'],
},
sca: {
@@ -190,11 +189,6 @@ export const ModulesDefaults = {
],
availableFor: ['manager', 'agent'],
},
- ciscat: {
- init: 'dashboard',
- tabs: [DashboardTab, EventsTab],
- availableFor: ['manager', 'agent'],
- },
vuls: {
init: 'dashboard',
tabs: [
@@ -202,17 +196,33 @@ export const ModulesDefaults = {
id: 'dashboard',
name: 'Dashboard',
component: DashboardVuls,
- buttons: [ButtonModuleExploreAgent],
+ /* For ButtonModuleExploreAgent to insert correctly according to the module's index pattern, the moduleIndexPatternTitle parameter is added. By default it applies the index patternt wazuh-alerts-* */
+ buttons: [
+ ({ ...props }) => (
+ {
const additionalProps = {
diff --git a/plugins/main/public/components/common/permissions/element.tsx b/plugins/main/public/components/common/permissions/element.tsx
index 216a9f7d44..d957a82482 100644
--- a/plugins/main/public/components/common/permissions/element.tsx
+++ b/plugins/main/public/components/common/permissions/element.tsx
@@ -12,11 +12,9 @@
import React, { Fragment } from 'react';
import { useUserPermissionsRequirements } from '../hooks/useUserPermissions';
-import { useUserRolesRequirements } from '../hooks/useUserRoles';
-
import { EuiToolTip, EuiSpacer } from '@elastic/eui';
-
import { WzPermissionsFormatted } from './format';
+import { useUserPermissionsIsAdminRequirements } from '../hooks/use-user-is-admin';
export interface IUserPermissionsObject {
action: string;
@@ -25,11 +23,12 @@ export interface IUserPermissionsObject {
export type TUserPermissionsFunction = (props: any) => TUserPermissions;
export type TUserPermissions = (string | IUserPermissionsObject)[] | null;
export type TUserRoles = string[] | null;
+export type TUserIsAdministrator = string | null;
export type TUserRolesFunction = (props: any) => TUserRoles;
export interface IWzElementPermissionsProps {
permissions?: TUserPermissions | TUserPermissionsFunction;
- roles?: TUserRoles | TUserRolesFunction;
+ administrator?: boolean;
tooltip?: any;
children: React.ReactElement;
getAdditionalProps?: (disabled: boolean) => {
@@ -40,7 +39,7 @@ export interface IWzElementPermissionsProps {
export const WzElementPermissions = ({
children,
permissions = null,
- roles = null,
+ administrator = false,
getAdditionalProps,
tooltip,
...rest
@@ -48,15 +47,16 @@ export const WzElementPermissions = ({
const [userPermissionRequirements] = useUserPermissionsRequirements(
typeof permissions === 'function' ? permissions(rest) : permissions,
);
- const [userRolesRequirements] = useUserRolesRequirements(
- typeof roles === 'function' ? roles(rest) : roles,
- );
- const isDisabledByRolesOrPermissions =
- userRolesRequirements || userPermissionRequirements;
+ const [userRequireAdministratorRequirements] =
+ useUserPermissionsIsAdminRequirements();
+
+ const isDisabledByPermissions =
+ userPermissionRequirements ||
+ (administrator && userRequireAdministratorRequirements);
const disabled = Boolean(
- isDisabledByRolesOrPermissions || rest?.isDisabled || rest?.disabled,
+ isDisabledByPermissions || rest?.isDisabled || rest?.disabled,
);
const additionalProps = getAdditionalProps
@@ -67,7 +67,7 @@ export const WzElementPermissions = ({
...additionalProps,
});
- const contentTextRequirements = isDisabledByRolesOrPermissions && (
+ const contentTextRequirements = isDisabledByPermissions && (
{userPermissionRequirements && (
);
- return isDisabledByRolesOrPermissions ? (
+ return isDisabledByPermissions ? (
{childrenWithAdditionalProps}
diff --git a/plugins/main/public/components/common/permissions/prompt.tsx b/plugins/main/public/components/common/permissions/prompt.tsx
index ae7817dd5a..962cdcd491 100644
--- a/plugins/main/public/components/common/permissions/prompt.tsx
+++ b/plugins/main/public/components/common/permissions/prompt.tsx
@@ -11,44 +11,38 @@
*/
import React, { Fragment } from 'react';
-import { useUserPermissionsRequirements, useUserRolesRequirements } from '../hooks';
import { EuiEmptyPrompt, EuiSpacer } from '@elastic/eui';
-import {
- TUserPermissions,
- TUserPermissionsFunction,
- TUserRoles,
- TUserRolesFunction,
-} from '../permissions/element';
+import { TUserPermissions, TUserIsAdministrator } from '../permissions/element';
import { WzPermissionsFormatted } from './format';
import { withErrorBoundary } from '../hocs/error-boundary/with-error-boundary';
interface IEmptyPromptNoPermissions {
permissions?: TUserPermissions;
- roles?: TUserRoles;
+ administrator?: TUserIsAdministrator;
actions?: React.ReactNode;
}
export const WzEmptyPromptNoPermissions = withErrorBoundary(
- ({ permissions, roles, actions }: IEmptyPromptNoPermissions) => {
+ ({ permissions, administrator, actions }: IEmptyPromptNoPermissions) => {
return (
You have no permissions}
body={
{permissions && (
@@ -56,34 +50,5 @@ export const WzEmptyPromptNoPermissions = withErrorBoundary(
actions={actions}
/>
);
- }
+ },
);
-interface IPromptNoPermissions {
- permissions?: TUserPermissions | TUserPermissionsFunction;
- roles?: TUserRoles | TUserRolesFunction;
- children?: React.ReactNode;
- rest?: any;
-}
-
-export const WzPromptPermissions = ({
- permissions = null,
- roles = null,
- children,
- ...rest
-}: IPromptNoPermissions) => {
- const [userPermissionRequirements, userPermissions] = useUserPermissionsRequirements(
- typeof permissions === 'function' ? permissions(rest) : permissions
- );
- const [userRolesRequirements, userRoles] = useUserRolesRequirements(
- typeof roles === 'function' ? roles(rest) : roles
- );
-
- return userPermissionRequirements || userRolesRequirements ? (
- & tUseSearchBarCustomInputs;
@@ -36,12 +47,14 @@ type tUserSearchBarResponse = {
* @param props
* @returns
*/
-const useSearchBar = (props?: tUseSearchBarProps): tUserSearchBarResponse => {
+const useSearchBarConfiguration = (
+ props?: tUseSearchBarProps,
+): tUserSearchBarResponse => {
// dependencies
const SESSION_STORAGE_FILTERS_NAME = 'wazuh_persistent_searchbar_filters';
const SESSION_STORAGE_PREV_FILTER_NAME = 'wazuh_persistent_current_filter';
const filterManager = useFilterManager().filterManager as FilterManager;
- const { filters } = useFilterManager();
+ const filters = props?.filters ? props.filters : filterManager.getFilters();
const [query, setQuery] = props?.query
? useState(props?.query)
: useQueryManager();
@@ -52,43 +65,26 @@ const useSearchBar = (props?: tUseSearchBarProps): tUserSearchBarResponse => {
useState();
useEffect(() => {
- const prevPattern =
- AppState.getCurrentPattern() || getSettingDefaultValue('pattern');
- if (filters && filters.length > 0) {
- sessionStorage.setItem(
- SESSION_STORAGE_FILTERS_NAME,
- JSON.stringify(
- updatePrevFilters(filters, props?.defaultIndexPatternID),
- ),
- );
- }
- sessionStorage.setItem(SESSION_STORAGE_PREV_FILTER_NAME, prevPattern);
- AppState.setCurrentPattern(props?.defaultIndexPatternID);
initSearchBar();
-
- /**
- * When the component is unmounted, the original filters that arrived
- * when the component was mounted are added.
- * Both when the component is mounted and unmounted, the index pattern is
- * updated so that the pin action adds the agent with the correct index pattern.
- */
return () => {
+ /* Upon unmount, the previous filters are restored */
const prevStoragePattern = sessionStorage.getItem(
SESSION_STORAGE_PREV_FILTER_NAME,
);
- AppState.setCurrentPattern(prevStoragePattern);
sessionStorage.removeItem(SESSION_STORAGE_PREV_FILTER_NAME);
const storagePreviousFilters = sessionStorage.getItem(
SESSION_STORAGE_FILTERS_NAME,
);
if (storagePreviousFilters) {
const previousFilters = JSON.parse(storagePreviousFilters);
- const cleanedFilters = cleanFilters(
- previousFilters,
- prevStoragePattern ?? prevPattern,
- );
- filterManager.setFilters(cleanedFilters);
- sessionStorage.removeItem(SESSION_STORAGE_FILTERS_NAME);
+ if (props?.onUnMount) {
+ props.onUnMount(
+ previousFilters,
+ prevStoragePattern,
+ filterManager,
+ props?.defaultIndexPatternID,
+ );
+ }
}
};
}, []);
@@ -100,8 +96,11 @@ const useSearchBar = (props?: tUseSearchBarProps): tUserSearchBarResponse => {
setIsLoading(true);
const indexPattern = await getIndexPattern(props?.defaultIndexPatternID);
setIndexPatternSelected(indexPattern);
- const initialFilters = props?.filters ?? filters;
- filterManager.setFilters(initialFilters);
+ if (props?.onMount) {
+ props.onMount(filterManager, props?.defaultIndexPatternID);
+ } else {
+ filterManager.setFilters(filters);
+ }
setIsLoading(false);
};
@@ -126,199 +125,34 @@ const useSearchBar = (props?: tUseSearchBarProps): tUserSearchBarResponse => {
}
};
- const updatePrevFilters = (
- previousFilters: Filter[],
- indexPattern?: string,
- ) => {
- const pinnedAgent = previousFilters.find(
- (filter: Filter) =>
- filter.meta.key === 'agent.id' && !!filter?.$state?.isImplicit,
- );
- if (!pinnedAgent) {
- const url = window.location.href;
- const regex = new RegExp('agentId=' + '[^&]*');
- const match = url.match(regex);
- if (match && match[0]) {
- const agentId = match[0].split('=')[1];
- const agentFilters = previousFilters.filter(x => {
- return x.meta.key !== 'agent.id';
- });
- const insertPinnedAgent = {
- meta: {
- alias: null,
- disabled: false,
- key: 'agent.id',
- negate: false,
- params: { query: agentId },
- type: 'phrase',
- index: indexPattern,
- },
- query: {
- match: {
- 'agent.id': {
- query: agentId,
- type: 'phrase',
- },
- },
- },
- $state: { store: 'appState', isImplicit: true },
- };
- agentFilters.push(insertPinnedAgent);
- return agentFilters;
- }
- }
- if (pinnedAgent) {
- const agentFilters = previousFilters.filter(x => {
- return x.meta.key !== 'agent.id';
- });
- agentFilters.push({
- ...pinnedAgent,
- meta: {
- ...pinnedAgent.meta,
- index: indexPattern,
- },
- $state: { store: FilterStateStore.APP_STATE, isImplicit: true },
- });
- return agentFilters;
- }
- return previousFilters;
- };
-
- /**
- * Return filters from filters manager.
- * Additionally solve the known issue with the auto loaded agent.id filters from the searchbar
- * and filters those filters that are not related to the default index pattern
- * @returns
- */
- const getFilters = () => {
- const originalFilters = filterManager ? filterManager.getFilters() : [];
- const pinnedAgent = originalFilters.find(
- (filter: Filter) =>
- filter.meta.key === 'agent.id' && !!filter?.$state?.isImplicit,
- );
- const mappedFilters = originalFilters.filter(
- (filter: Filter) =>
- filter?.meta?.controlledBy !== AUTHORIZED_AGENTS && // remove auto loaded agent.id filters
- filter?.meta?.index === props?.defaultIndexPatternID,
- );
-
- if (pinnedAgent) {
- const agentFilters = mappedFilters.filter(x => {
- return x.meta.key !== 'agent.id';
- });
- agentFilters.push({
- ...pinnedAgent,
- meta: {
- ...pinnedAgent.meta,
- index: props?.defaultIndexPatternID,
- },
- });
- return agentFilters;
- }
- return mappedFilters;
- };
-
- /**
- * Return cleaned filters.
- * Clean the known issue with the auto loaded agent.id filters from the searchbar
- * and filters those filters that are not related to the default index pattern.
- * This cleanup adjusts the index pattern of a pinned agent, if applicable.
- * @param previousFilters
- * @returns
- */
- const cleanFilters = (previousFilters: Filter[], indexPattern?: string) => {
- /**
- * Verify if a pinned agent exists, identifying it by its meta.isImplicit attribute or by the agentId query param URL.
- * We also compare the agent.id filter with the agentId query param because the OSD filter definition does not include the "isImplicit" attribute that Wazuh adds.
- * There may be cases where the "isImplicit" attribute is lost, since any action regarding filters that is done with the
- * filterManager ( addFilters, setFilters, setGlobalFilters, setAppFilters)
- * does a mapAndFlattenFilters mapping to the filters that removes any attributes that are not part of the filter definition.
- * */
- const mappedFilters = previousFilters.filter(
- (filter: Filter) =>
- filter?.meta?.controlledBy !== AUTHORIZED_AGENTS && // remove auto loaded agent.id filters
- filter?.meta?.index !== props?.defaultIndexPatternID,
- );
- const pinnedAgent = mappedFilters.find(
- (filter: Filter) =>
- filter.meta.key === 'agent.id' && !!filter?.$state?.isImplicit,
- );
-
- if (!pinnedAgent) {
- const url = window.location.href;
- const regex = new RegExp('agentId=' + '[^&]*');
- const match = url.match(regex);
- if (match && match[0]) {
- const agentId = match[0].split('=')[1];
- const agentFilters = mappedFilters.filter(x => {
- return x.meta.key !== 'agent.id';
- });
- const insertPinnedAgent = {
- meta: {
- alias: null,
- disabled: false,
- key: 'agent.id',
- negate: false,
- params: { query: agentId },
- type: 'phrase',
- index: indexPattern,
- },
- query: {
- match: {
- 'agent.id': {
- query: agentId,
- type: 'phrase',
- },
- },
- },
- $state: { store: 'appState', isImplicit: true },
- };
- agentFilters.push(insertPinnedAgent);
- return agentFilters;
- }
- }
- if (pinnedAgent) {
- mappedFilters.push({
- ...pinnedAgent,
- meta: {
- ...pinnedAgent.meta,
- index: indexPattern,
- },
- $state: { store: FilterStateStore.APP_STATE, isImplicit: true },
- });
- }
- return mappedFilters;
- };
-
/**
* Search bar properties necessary to render and initialize the osd search bar component
*/
const searchBarProps: Partial = {
isLoading,
...(indexPatternSelected && { indexPatterns: [indexPatternSelected] }), // indexPattern cannot be empty or empty []
- filters: getFilters(),
+ filters: filters
+ .filter(
+ (filter: Filter) =>
+ ![
+ AUTHORIZED_AGENTS,
+ DATA_SOURCE_FILTER_CONTROLLED_EXCLUDE_SERVER,
+ ].includes(filter?.meta?.controlledBy), // remove auto loaded agent.id filters
+ )
+ .sort((a: Filter, b: Filter) => {
+ return a?.$state?.isImplicit && !(a?.meta?.key === 'agent.id')
+ ? -1
+ : b?.$state?.isImplicit
+ ? 1
+ : -1;
+ }),
query,
timeHistory,
dateRangeFrom: timeFilter.from,
dateRangeTo: timeFilter.to,
onFiltersUpdated: (filters: Filter[]) => {
- const storagePreviousFilters = sessionStorage.getItem(
- SESSION_STORAGE_FILTERS_NAME,
- );
- /**
- * If there are persisted filters, it is necessary to add them when
- * updating the filters in the filterManager
- */
- if (storagePreviousFilters) {
- const previousFilters = JSON.parse(storagePreviousFilters);
- const cleanedFilters = cleanFilters(
- previousFilters,
- props?.defaultIndexPatternID,
- );
- filterManager.setFilters([...cleanedFilters, ...filters]);
-
- props?.onFiltersUpdated &&
- props?.onFiltersUpdated([...cleanedFilters, ...filters]);
+ if (props?.onUpdate) {
+ props.onUpdate(filters, filterManager, props?.onFiltersUpdated);
} else {
filterManager.setFilters(filters);
props?.onFiltersUpdated && props?.onFiltersUpdated(filters);
@@ -343,4 +177,4 @@ const useSearchBar = (props?: tUseSearchBarProps): tUserSearchBarResponse => {
};
};
-export default useSearchBar;
+export default useSearchBarConfiguration;
diff --git a/plugins/main/public/components/common/tables/__snapshots__/table-default.test.tsx.snap b/plugins/main/public/components/common/tables/__snapshots__/table-default.test.tsx.snap
index c5da18140d..fd8283c553 100644
--- a/plugins/main/public/components/common/tables/__snapshots__/table-default.test.tsx.snap
+++ b/plugins/main/public/components/common/tables/__snapshots__/table-default.test.tsx.snap
@@ -226,7 +226,7 @@ exports[`Table Default component renders correctly to match the snapshot 1`] = `
size="s"
type="arrowDown"
>
-
-
-
-
-
-
-
+
- )
+ );
} else if (errorMessage || error?.message) {
visualization = (
+
+
{title && (
-
-
-
option.value === selectedOption))
- : rest.noDataMessage
- }
- : {}
- )}
- onFetchDependencies={[selectedOption, ...(onFetchExtraDependencies || [])]}
+ {...(rest.noDataMessage
+ ? {
+ noDataMessage:
+ typeof rest.noDataMessage === 'function'
+ ? rest.noDataMessage(
+ selectedOption,
+ selectorOptions.find(
+ option => option.value === selectedOption,
+ ),
+ )
+ : rest.noDataMessage,
+ }
+ : {})}
+ onFetchDependencies={[
+ selectedOption,
+ ...(onFetchExtraDependencies || []),
+ ]}
/>
- )
-}
\ No newline at end of file
+ );
+};
diff --git a/plugins/main/public/components/common/charts/visualizations/legend.scss b/plugins/main/public/components/common/charts/visualizations/legend.scss
index 99e97df2f2..a3a9b27787 100644
--- a/plugins/main/public/components/common/charts/visualizations/legend.scss
+++ b/plugins/main/public/components/common/charts/visualizations/legend.scss
@@ -1,7 +1,20 @@
+.chart-legend {
+ width: 60vw;
+ overflow: auto;
+ scrollbar-width: none;
+ @media (min-width: 1024px) {
+ width: 160px;
+ }
+}
+
.chart-legend > li {
- margin-top: 0px;
+ margin-top: 5px !important;
+}
+
+.chart-legend > li svg {
+ margin-right: 6px;
}
.chart-legend > li > * {
- padding: 0px;
+ padding: 0px;
}
diff --git a/plugins/main/public/components/common/charts/visualizations/legend.tsx b/plugins/main/public/components/common/charts/visualizations/legend.tsx
index b36270bdb3..f3a2c6a6e8 100644
--- a/plugins/main/public/components/common/charts/visualizations/legend.tsx
+++ b/plugins/main/public/components/common/charts/visualizations/legend.tsx
@@ -1,32 +1,41 @@
-import React from "react";
-import { EuiIcon } from "@elastic/eui";
-import { EuiListGroup } from "@elastic/eui";
+import React from 'react';
+import { EuiIcon } from '@elastic/eui';
+import { EuiListGroup } from '@elastic/eui';
import './legend.scss';
type ChartLegendProps = {
data: {
- label: string
- value: any
- color: string
- labelColor: string
- }[]
-}
+ label: string;
+ value: any;
+ color: string;
+ labelColor: string;
+ }[];
+};
/**
* Create the legend to use with charts in visualizations.
*/
export function ChartLegend({ data }: ChartLegendProps) {
- const list = data.map(({label, labelColor, value, ...rest}, idx) => ({
- label:
@@ -396,7 +404,11 @@ exports[`[component] InputForm Renders correctly to match the snapshot: Input: s
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
- />
+ >
+
{visualization}
- )
-
-}
+ );
+};
type VisualizationBasicWidgetProps = VisualizationBasicProps & {
- onFetch: (...dependencies) => any[]
- onFetchDependencies?: any[]
-}
+ onFetch: (...dependencies) => any[];
+ onFetchDependencies?: any[];
+};
/**
* Component that fetch the data and renders the visualization using the visualization basic component
*/
-export const VisualizationBasicWidget = ({ onFetch, onFetchDependencies, ...rest }: VisualizationBasicWidgetProps) => {
- const { running, ...restAsyncAction } = useAsyncActionRunOnStart(onFetch, onFetchDependencies);
+export const VisualizationBasicWidget = ({
+ onFetch,
+ onFetchDependencies,
+ ...rest
+}: VisualizationBasicWidgetProps) => {
+ const { running, ...restAsyncAction } = useAsyncActionRunOnStart(
+ onFetch,
+ onFetchDependencies,
+ );
- return
- {title}
+
+ {title}
+
)}
{title}
{title}
+{`${label} (${value})`}
,
- icon: {`${label} (${value})`}
+ ),
+ icon:
@@ -357,7 +361,11 @@ exports[`[component] InputForm Renders correctly to match the snapshot: Input: s
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
- />
+ >
+
+
+ Empty field',
- );
- return container;
- },
-};
-
-// Method to enhance a cell of discover table
-export const enhanceDiscoverEventsCell = (
- field,
- content,
- rowData,
- element,
- options,
-) => {
- if (
- !EventsEnhanceDiscoverCell[field] ||
- !element ||
- element.attributes[CUSTOM_ATTRIBUTE_ENHANCED_DISCOVER_FIELD]
- ) {
- return;
- }
- const elementCellEnhanced = EventsEnhanceDiscoverCell[field](
- content,
- rowData,
- element,
- options,
- );
- if (elementCellEnhanced) {
- elementCellEnhanced.setAttribute(
- CUSTOM_ATTRIBUTE_ENHANCED_DISCOVER_FIELD,
- '',
- ); // Set a custom attribute to indentify that element was enhanced
- element.replaceWith(elementCellEnhanced);
- }
-};
diff --git a/plugins/main/public/components/common/modules/events-selected-fields.js b/plugins/main/public/components/common/modules/events-selected-fields.js
deleted file mode 100644
index ee685c42e7..0000000000
--- a/plugins/main/public/components/common/modules/events-selected-fields.js
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Wazuh app - Simple description for each App tabs
- * Copyright (C) 2015-2022 Wazuh, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Find more information about this on the LICENSE file.
- */
-export const EventsSelectedFiles = {
- fim: [
- 'agent.name',
- 'syscheck.path',
- 'syscheck.event',
- 'rule.description',
- 'rule.level',
- 'rule.id'
- ],
- mitre: [
- 'agent.name',
- 'rule.mitre.id',
- 'rule.mitre.tactic',
- 'rule.description',
- 'rule.level',
- 'rule.id'
- ],
- sca: [
- 'data.sca.check.title',
- 'data.sca.check.file',
- 'data.sca.check.result',
- 'data.sca.policy',
- ],
- general: [
- 'agent.name',
- 'rule.description',
- 'rule.level',
- 'rule.id',
- ],
- aws: [
- 'data.aws.source',
- 'rule.description',
- 'rule.level',
- 'rule.id',
- ],
- gcp: [
- 'agent.name',
- 'data.gcp.jsonPayload.vmInstanceName',
- 'data.gcp.resource.labels.location',
- 'data.gcp.resource.labels.project_id',
- 'data.gcp.resource.type',
- 'data.gcp.severity',
- ],
- pm: [
- 'agent.name',
- 'data.title',
- 'rule.description',
- 'rule.level',
- 'rule.id',
- ],
- audit: [
- 'agent.name',
- 'data.audit.command',
- 'data.audit.pid',
- 'rule.description',
- 'rule.level',
- 'rule.id',
- ],
- oscap: [
- 'agent.name',
- 'data.oscap.check.title',
- 'data.oscap.check.description',
- 'data.oscap.check.result',
- 'data.oscap.check.severity',
- ],
- ciscat: [
- 'agent.name',
- 'data.cis.benchmark',
- 'data.cis.group',
- 'data.cis.pass',
- 'data.cis.fail',
- 'data.cis.unknown',
- 'data.cis.result',
- ],
- vuls: [
- 'agent.name',
- 'data.vulnerability.package.name',
- 'data.vulnerability.cve',
- 'data.vulnerability.severity',
- 'data.vulnerability.status'
- ],
- virustotal: [
- 'agent.name',
- 'data.virustotal.source.file',
- 'data.virustotal.permalink',
- 'data.virustotal.malicious',
- 'data.virustotal.positives',
- 'data.virustotal.total',
- ],
- osquery: [
- 'agent.name',
- 'data.osquery.name',
- 'data.osquery.pack',
- 'data.osquery.action',
- 'data.osquery.subquery',
- ],
- docker: [
- 'agent.name',
- 'data.docker.from',
- 'data.docker.Type',
- 'data.docker.Action',
- 'rule.description',
- 'rule.level',
- ],
- pci: [
- 'agent.name',
- 'rule.pci_dss',
- 'rule.description',
- 'rule.level',
- 'rule.id'
- ],
- gdpr: [
- 'agent.name',
- 'rule.gdpr',
- 'rule.description',
- 'rule.level',
- 'rule.id'
- ],
- hipaa: [
- 'agent.name',
- 'rule.hipaa',
- 'rule.description',
- 'rule.level',
- 'rule.id'
- ],
- nist: [
- 'agent.name',
- 'rule.nist_800_53',
- 'rule.description',
- 'rule.level',
- 'rule.id'
- ],
- tsc: [
- 'agent.name',
- 'rule.tsc',
- 'rule.description',
- 'rule.level',
- 'rule.id'
- ],
- office: [
- 'data.office365.Subscription',
- 'data.office365.Operation',
- 'data.office365.UserId',
- 'data.office365.ClientIP',
- 'rule.level',
- 'rule.id'
- ],
- github: [
- 'agent.id',
- 'data.github.repo',
- 'data.github.actor',
- 'data.github.org',
- 'rule.description',
- 'rule.level',
- 'rule.id'
- ],
-
-};
diff --git a/plugins/main/public/components/common/modules/events.tsx b/plugins/main/public/components/common/modules/events.tsx
deleted file mode 100644
index 0005eeb9d6..0000000000
--- a/plugins/main/public/components/common/modules/events.tsx
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
- * Wazuh app - Integrity monitoring components
- * Copyright (C) 2015-2022 Wazuh, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Find more information about this on the LICENSE file.
- */
-
-import React, { Component, Fragment } from 'react';
-import { getAngularModule, getToasts } from '../../../kibana-services';
-import { EventsSelectedFiles } from './events-selected-fields';
-import { ModulesHelper } from './modules-helper';
-import store from '../../../redux/store';
-import {
- EuiButton,
- EuiFlexGroup,
- EuiFlexItem,
- EuiOverlayMask,
- EuiOutsideClickDetector,
-} from '@elastic/eui';
-import { PatternHandler } from '../../../react-services/pattern-handler';
-import { enhanceDiscoverEventsCell } from './events-enhance-discover-fields';
-import { toMountPoint } from '../../../../../../src/plugins/opensearch_dashboards_react/public';
-import { withAgentSupportModule, withModuleTabLoader } from '../hocs';
-import { compose } from 'redux';
-import { UI_LOGGER_LEVELS } from '../../../../common/constants';
-import { UI_ERROR_SEVERITIES } from '../../../react-services/error-orchestrator/types';
-import { getErrorOrchestrator } from '../../../react-services/common-services';
-
-export const Events = compose(
- withAgentSupportModule,
- withModuleTabLoader
-)(
- class Events extends Component {
- intervalCheckExistsDiscoverTableTime: number = 200;
- isMount: boolean;
- hasRefreshedKnownFields: boolean;
- isRefreshing: boolean;
- state: {
- flyout: false | { component: any; props: any };
- discoverRowsData: any[];
- };
- constructor(props) {
- super(props);
- this.isMount = true;
- this.hasRefreshedKnownFields = false;
- this.isRefreshing = false;
- this.state = {
- flyout: false,
- discoverRowsData: [],
- };
- }
-
- async componentDidMount() {
- document.body.scrollTop = 0; // For Safari
- document.documentElement.scrollTop = 0; // For Chrome, Firefox, IE and Opera
- const app = getAngularModule();
- this.$rootScope = app.$injector.get('$rootScope');
- this.$rootScope.showModuleEvents = this.props.section;
- const scope = await ModulesHelper.getDiscoverScope();
- if (this.isMount) {
- this.$rootScope.moduleDiscoverReady = true;
- this.$rootScope.$applyAsync();
- const fields = [...EventsSelectedFiles[this.props.section]];
- const index = fields.indexOf('agent.name');
- if (index > -1 && store.getState().appStateReducers.currentAgentData.id) {
- //if an agent is pinned we don't show the agent.name column
- fields.splice(index, 1);
- }
- if (fields) {
- scope.state.columns = fields;
- scope.addColumn(false);
- scope.removeColumn(false);
- }
- this.fetchWatch = scope.$watchCollection('fetchStatus', (fetchStatus) => {
- if (scope.fetchStatus === 'complete') {
- setTimeout(() => {
- ModulesHelper.cleanAvailableFields();
- }, 1000);
- // Check the discover table is in the DOM and enhance the initial table cells
- this.intervalCheckExistsDiscoverTable = setInterval(() => {
- const discoverTableTBody = document.querySelector('.kbn-table tbody');
- if (discoverTableTBody) {
- const options = { setFlyout: this.setFlyout, closeFlyout: this.closeFlyout };
- this.enhanceDiscoverTableCurrentRows(this.state.discoverRowsData, options, true);
- this.enhanceDiscoverTableAddObservers(options);
- clearInterval(this.intervalCheckExistsDiscoverTable);
- }
- }, this.intervalCheckExistsDiscoverTableTime);
- }
- this.setState({ discoverRowsData: scope.rows });
- });
- }
- }
-
- componentWillUnmount() {
- this.isMount = false;
- if (this.fetchWatch) this.fetchWatch();
- this.$rootScope.showModuleEvents = false;
- this.$rootScope.moduleDiscoverReady = false;
- this.$rootScope.$applyAsync();
- this.discoverTableRowsObserver && this.discoverTableRowsObserver.disconnect();
- this.discoverTableColumnsObserver && this.discoverTableColumnsObserver.disconnect();
- this.intervalCheckExistsDiscoverTableTime &&
- clearInterval(this.intervalCheckExistsDiscoverTable);
- }
-
- enhanceDiscoverTableAddObservers = (options) => {
- // Scrolling table observer, when load more events
- this.discoverTableRowsObserver = new MutationObserver((mutationsList) => {
- mutationsList.forEach((mutation) => {
- if (mutation.type === 'childList' && mutation.addedNodes && mutation.addedNodes[0]) {
- this.enhanceDiscoverTableScrolling(
- mutation.addedNodes[0],
- this.state.discoverRowsData,
- options
- );
- }
- });
- });
- const discoverTableTBody = document.querySelector('.kbn-table tbody');
- this.discoverTableRowsObserver.observe(discoverTableTBody, { childList: true });
-
- // Add observer when add or remove table header column
- this.discoverTableColumnsObserver = new MutationObserver((mutationsList) => {
- mutationsList.forEach((mutation) => {
- if (mutation.type === 'childList') {
- this.enhanceDiscoverTableCurrentRows(this.state.discoverRowsData, options);
- }
- });
- });
- const discoverTableElement = document.querySelector('.kbn-table').parentElement.parentElement
- .parentElement;
- this.discoverTableColumnsObserver.observe(discoverTableElement, { childList: true });
- };
-
- enhanceDiscoverTableCurrentRows = (discoverRowsData, options, addObserverDetails = false) => {
- // Get table headers
- const discoverTableHeaders = document.querySelectorAll(`.kbn-table thead th`);
- // Get table rows
- const discoverTableRows = document.querySelectorAll(`.kbn-table tbody tr.kbnDocTable__row`);
-
- discoverTableRows.forEach((row, rowIndex) => {
- // Enhance each cell of table rows
- discoverTableHeaders.forEach((header, headerIndex) => {
- const cell = row.querySelector(`td:nth-child(${headerIndex + 1}) div`);
- if (cell) {
- enhanceDiscoverEventsCell(
- header.textContent,
- cell.textContent,
- discoverRowsData[rowIndex],
- cell,
- options
- );
- }
- });
- // Add observer to row details
- if (addObserverDetails) {
- const rowDetails = row.nextElementSibling;
- this.enhanceDiscoverTableRowDetailsAddObserver(rowDetails, discoverRowsData, options);
- }
- });
- };
-
- checkDiscoverTableDetailsMutation(element, mutation, discoverRowsData, options) {
- const rowTable = element.previousElementSibling;
- const discoverTableRows = document.querySelectorAll(`.kbn-table tbody tr.kbnDocTable__row`);
- const rowIndex = Array.from(discoverTableRows).indexOf(rowTable);
- const rowDetailsFields = mutation.addedNodes[0].querySelectorAll('.kbnDocViewer__field');
- let hasUnknownFields = false;
- if (rowDetailsFields) {
- rowDetailsFields.forEach(async (rowDetailField, i) => {
- //check for unknown fields until 1 unknown field is found
- if (!hasUnknownFields && this.checkUnknownFields(rowDetailField))
- hasUnknownFields = true;
- const fieldName = rowDetailField.childNodes[0].childNodes[1].textContent || '';
- const fieldCell =
- rowDetailField.parentNode.childNodes &&
- rowDetailField.parentNode.childNodes[2].childNodes[0];
- if (!fieldCell) {
- return;
- }
- enhanceDiscoverEventsCell(
- fieldName,
- (fieldCell || {}).textContent || '',
- discoverRowsData[rowIndex],
- fieldCell,
- options
- );
- });
- if (hasUnknownFields) {
- this.refreshKnownFields();
- }
- }
- }
-
- checkUnknownFields(rowDetailField) {
- const fieldCell =
- rowDetailField.parentNode.childNodes && rowDetailField.parentNode.childNodes[2];
- return (fieldCell.querySelector('svg[data-test-subj="noMappingWarning"]'))
- }
-
- refreshKnownFields = async () => {
- if (!this.hasRefreshedKnownFields) {
- try {
- this.hasRefreshedKnownFields = true;
- this.isRefreshing = true;
- await PatternHandler.refreshIndexPattern();
- this.isRefreshing = false;
- this.reloadToast();
- } catch (error) {
- this.isRefreshing = false;
- throw error;
- }
- } else if (this.isRefreshing) {
- await new Promise((r) => setTimeout(r, 150));
- await this.refreshKnownFields();
- }
- };
-
- enhanceDiscoverTableRowDetailsAddObserver(element, discoverRowsData, options) {
- // Open for first time the row details
- const observer = new MutationObserver((mutationsList) => {
- mutationsList.forEach((mutation) => {
- if (mutation.type === 'childList' && mutation.addedNodes && mutation.addedNodes[0]) {
- this.checkDiscoverTableDetailsMutation(element, mutation, discoverRowsData, options);
- // Add observer when switch between the tabs of Table and JSON
- new MutationObserver((mutationList) => {
- if (
- mutation.addedNodes[0]
- .querySelector('div[role=tabpanel]')
- .getAttribute('aria-labelledby') === 'kbn_doc_viewer_tab_0'
- ) {
- this.checkDiscoverTableDetailsMutation(
- element,
- mutation,
- discoverRowsData,
- options
- );
- }
- }).observe(mutation.addedNodes[0].querySelector('div[role=tabpanel]'), {
- attributes: true,
- });
- }
- });
- });
- observer.observe(element, { childList: true });
- }
-
- enhanceDiscoverTableScrolling = (mutationElement, discoverRowsData, options) => {
- // Get table headers
- const discoverTableHeaders = document.querySelectorAll(`.kbn-table thead th`);
- // Get table rows
- const discoverTableRows = document.querySelectorAll(`.kbn-table tbody tr.kbnDocTable__row`);
- try {
- const rowIndex = Array.from(discoverTableRows).indexOf(mutationElement);
- if (rowIndex !== -1) {
- // It is a discover table row
- discoverTableHeaders.forEach((header, headerIndex) => {
- const cell = mutationElement.querySelector(`td:nth-child(${headerIndex + 1}) div`);
- if (!cell) {
- return;
- }
- enhanceDiscoverEventsCell(
- header.textContent,
- cell.textContent,
- discoverRowsData[rowIndex],
- cell,
- options
- );
- });
- } else {
- // It is a details table row
- this.enhanceDiscoverTableRowDetailsAddObserver(
- mutationElement,
- discoverRowsData,
- options
- );
- }
- } catch (error) {
- const options = {
- context: `${Events.name}.hideCreateCustomLabel`,
- level: UI_LOGGER_LEVELS.ERROR,
- severity: UI_ERROR_SEVERITIES.BUSINESS,
- error: {
- error: error,
- message: error.message || error,
- title: error.name || error,
- },
- };
- getErrorOrchestrator().handleError(options);
- }
- };
-
- setFlyout = (flyout) => {
- this.setState({ flyout });
- };
-
- closeFlyout = () => {
- this.setState({ flyout: false });
- };
-
- reloadToast = () => {
- const toastLifeTimeMs = 300000;
- getToasts().add({
- color: 'success',
- title: 'The index pattern was refreshed successfully.',
- text: toMountPoint(
-
@@ -81,23 +81,18 @@ export const WzElementPermissions = ({
{WzPermissionsFormatted(userPermissionRequirements)}
)}
- {userPermissionRequirements && userRolesRequirements && (
+ {userPermissionRequirements && userRequireAdministratorRequirements && (
- Require{' '}
- {userRolesRequirements
- .map(role => (
- {role}
- ))
- .reduce((prev, cur) => [prev, ', ', cur])}{' '}
- {userRolesRequirements.length > 1 ? 'roles' : 'role'}
+ Require administrator privilegies:{' '}
+ {userRequireAdministratorRequirements}
)}
- This section requires the {permissions.length > 1 ? 'permissions' : 'permission'}:
+ This section requires the{' '}
+ {permissions.length > 1 ? 'permissions' : 'permission'}:
{WzPermissionsFormatted(permissions)}
)}
- {permissions && roles &&
- This section requires{' '}
- {roles
- .map((role) => {role})
- .reduce((accum, cur) => [accum, ', ', cur])}{' '}
- {roles.length > 1 ? 'roles' : 'role'}
+ This section requires administrator privilegies:{' '}
+
+ {administrator}
+
)}
-
-
-
-
-
-
-
-
-
- Table
-
-
-
-
-
- Table
-
-
-
-
-
-
-
+
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Table
+
+
+
+
+
+ Table
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
-
+
-
+
+
-
+
-
+
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+ Sorting
+
+
+
+
+
+
+
+
-
-
+ }
+ closePopover={[Function]}
+ display="inlineBlock"
+ hasArrow={true}
+ isOpen={false}
+ ownFocus={true}
+ panelPaddingSize="none"
>
-
-
-
-
-
-
-
-
-
- Sorting
-
-
-
-
-
-
-
+ | - |
|---|
- {rest.title}{' '}
- {isLoading ? (
-
-
+ {rest.title}{' '}
+ {isLoading ? (
+
+
+
+ {outdatedAgents}
+
+ }
+ description={
+
+ Agents
+
+ }
+ titleColor='danger'
+ isLoading={isLoading}
+ titleSize='l'
+ textAlign='center'
+ reverse
+ />
+
+ );
+ };
+
+ return (
+
+
+ );
+};
diff --git a/plugins/main/public/components/endpoints-summary/endpoints-summary.scss b/plugins/main/public/components/endpoints-summary/endpoints-summary.scss
index e420ca4e33..f9e50aef92 100644
--- a/plugins/main/public/components/endpoints-summary/endpoints-summary.scss
+++ b/plugins/main/public/components/endpoints-summary/endpoints-summary.scss
@@ -101,3 +101,22 @@
white-space: nowrap;
}
}
+
+.endpoints-summary-container-indicators {
+ width: 100%;
+ display: grid;
+ grid-template-columns: 1fr;
+ gap: 20px 10px;
+ min-height: 200px;
+
+ @media (min-width: 1024px) {
+ grid-template-columns: 1fr 1fr;
+ }
+
+ @media (min-width: 1440px) {
+ gap: 10px;
+ grid-template-columns:
+ minmax(375px, 1fr) minmax(375px, 1fr) minmax(375px, 1fr)
+ minmax(150px, 300px);
+ }
+}
diff --git a/plugins/main/public/components/endpoints-summary/endpoints-summary.tsx b/plugins/main/public/components/endpoints-summary/endpoints-summary.tsx
index 494e2da137..7817da0711 100644
--- a/plugins/main/public/components/endpoints-summary/endpoints-summary.tsx
+++ b/plugins/main/public/components/endpoints-summary/endpoints-summary.tsx
@@ -12,25 +12,14 @@
*/
import React, { Component } from 'react';
-import {
- EuiPage,
- EuiFlexGroup,
- EuiFlexItem,
- EuiStat,
- EuiSpacer,
- EuiToolTip,
- EuiCard,
- EuiLink,
- EuiText,
-} from '@elastic/eui';
+import { EuiPage, EuiFlexItem, EuiSpacer } from '@elastic/eui';
import { AgentsTable } from './table/agents-table';
-import { WzRequest } from '../../react-services/wz-request';
import WzReduxProvider from '../../redux/wz-redux-provider';
import { VisFactoryHandler } from '../../react-services/vis-factory-handler';
import { AppState } from '../../react-services/app-state';
import { FilterHandler } from '../../utils/filter-handler';
import { TabVisualizations } from '../../factories/tab-visualizations';
-import { WazuhConfig } from '../../react-services/wazuh-config.js';
+import { WazuhConfig } from '../../react-services/wazuh-config';
import {
withReduxProvider,
withGlobalBreadcrumb,
@@ -38,22 +27,10 @@ import {
withErrorBoundary,
} from '../common/hocs';
import { compose } from 'redux';
-import {
- UI_LOGGER_LEVELS,
- UI_ORDER_AGENT_STATUS,
-} from '../../../common/constants';
-import { UI_ERROR_SEVERITIES } from '../../react-services/error-orchestrator/types';
-import { getErrorOrchestrator } from '../../react-services/common-services';
-import { VisualizationBasic } from '../common/charts/visualizations/basic';
-import {
- agentStatusColorByAgentStatus,
- agentStatusLabelByAgentStatus,
-} from '../../../common/services/wz_agent_status';
import { endpointSummary } from '../../utils/applications';
import { ShareAgent } from '../../factories/share-agent';
-import { getCore } from '../../kibana-services';
import './endpoints-summary.scss';
-import { RedirectAppLinks } from '../../../../../src/plugins/opensearch_dashboards_react/public';
+import { EndpointsSummaryDashboard } from './dashboard/endpoints-summary-dashboard';
export const EndpointsSummary = compose(
withErrorBoundary,
@@ -71,25 +48,25 @@ export const EndpointsSummary = compose(
constructor() {
super();
this.state = {
- loadingSummary: true,
- loadingLastRegisteredAgent: true,
agentTableFilters: {},
- agentStatusSummary: [],
- agentsActiveCoverage: undefined,
+ reload: 0,
};
this.wazuhConfig = new WazuhConfig();
- this.agentStatus = UI_ORDER_AGENT_STATUS.map(agentStatus => ({
- status: agentStatus,
- label: agentStatusLabelByAgentStatus(agentStatus),
- color: agentStatusColorByAgentStatus(agentStatus),
- }));
this.shareAgent = new ShareAgent();
+ this.filterAgentByStatus = this.filterAgentByStatus.bind(this);
+ this.filterAgentByOS = this.filterAgentByOS.bind(this);
+ this.filterAgentByGroup = this.filterAgentByGroup.bind(this);
+ this.filterByOutdatedAgent = this.filterByOutdatedAgent.bind(this);
}
+ setReload = (newValue: number) => {
+ this.setState({
+ reload: newValue,
+ });
+ };
+
async componentDidMount() {
this._isMount = true;
- this.getSummary();
- this.fetchLastRegisteredAgent();
if (this.wazuhConfig.getConfig()['wazuh.monitoring.enabled']) {
const tabVisualizations = new TabVisualizations();
tabVisualizations.removeAll();
@@ -118,91 +95,42 @@ export const EndpointsSummary = compose(
}, {});
};
- async getSummary() {
- try {
- this.setState({ loadingSummary: true });
-
- const {
- data: {
- data: {
- connection: agentStatusSummary,
- configuration: agentConfiguration,
- },
- },
- } = await WzRequest.apiReq('GET', '/agents/summary/status', {});
-
- const agentsActiveCoverage = (
- (agentStatusSummary?.active / agentStatusSummary?.total) *
- 100
- ).toFixed(2);
-
- this.setState({
- loadingSummary: false,
- agentStatusSummary,
- agentsActiveCoverage: isNaN(agentsActiveCoverage)
- ? 0
- : agentsActiveCoverage,
- });
- } catch (error) {
+ filterAgentByStatus(item: any) {
+ this._isMount &&
this.setState({
- loadingSummary: false,
- agentStatusSummary: [],
- agentsActiveCoverage: undefined,
+ agentTableFilters: { q: `id!=000;status=${item.status}` },
});
- const options = {
- context: `EndpointsSummary.getSummary`,
- level: UI_LOGGER_LEVELS.ERROR,
- severity: UI_ERROR_SEVERITIES.BUSINESS,
- store: true,
- error: {
- error: error,
- message: error.message || error,
- title: `Could not get agents summary`,
- },
- };
- getErrorOrchestrator().handleError(options);
- }
}
- async fetchLastRegisteredAgent() {
- try {
- this.setState({ loadingLastRegisteredAgent: true });
- const {
- data: {
- data: {
- affected_items: [lastRegisteredAgent],
- },
- },
- } = await WzRequest.apiReq('GET', '/agents', {
- params: { limit: 1, sort: '-dateAdd', q: 'id!=000' },
- });
+ filterAgentByOS(item: any) {
+ const query =
+ item.label === 'unknown'
+ ? 'id!=000;os.name=null'
+ : `id!=000;os.name~${item.label}`;
+ this._isMount &&
this.setState({
- loadingLastRegisteredAgent: false,
- lastRegisteredAgent,
+ agentTableFilters: { q: query },
});
- } catch (error) {
+ }
+
+ filterAgentByGroup(item: any) {
+ const query =
+ item.label === 'unknown'
+ ? 'id!=000;group=null'
+ : `id!=000;group=${item.label}`;
+ this._isMount &&
this.setState({
- loadingLastRegisteredAgent: false,
+ agentTableFilters: { q: query },
});
- const options = {
- context: `EndpointsSummary.fetchLastRegisteredAgent`,
- level: UI_LOGGER_LEVELS.ERROR,
- severity: UI_ERROR_SEVERITIES.BUSINESS,
- store: true,
- error: {
- error: error,
- message: error.message || error,
- title: `Could not get the last registered agent`,
- },
- };
- getErrorOrchestrator().handleError(options);
- }
}
- filterAgentByStatus(status) {
+ filterByOutdatedAgent(outdatedAgents: any) {
+ const ids: string = outdatedAgents
+ .map((agent: any) => `id=${agent.id}`)
+ .join(',');
this._isMount &&
this.setState({
- agentTableFilters: { q: `id!=000;status=${status}` },
+ agentTableFilters: { q: `id!=000;${ids}` },
});
}
@@ -210,116 +138,19 @@ export const EndpointsSummary = compose(
return (
-
-
-
-
-
- Agents - - (0) - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-`;
-
-exports[`AgentsTable component Renders correctly to match the snapshot with custom columns 1`] = `
-
-
-
-
-
-
-
-
-
-
-
- | - | -- - | -- - | -
+
- |
- - - | -
+
-
- |
-
+
+
+
+
+
+
+
+
+
+
+
- |
- - | -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- Actions
-
-
- |
-
|---|---|---|---|---|---|---|---|---|
|
+
+
+
+
+
-
- No items found
-
+
-
+
+
+
+
+ |
- ||||||||
-
+
+
+
+
+
+
+`;
+
+exports[`AgentsTable component Renders correctly to match the snapshot with custom columns 1`] = `
+
-
+
+
+
+
+ |
+
+
+
+
+
+
+ |
+ + + | ++ + | ++ + | ++ + | ++ + | ++ + | ++ + | ++ + | ++ + + Actions + + + | +
|---|---|---|---|---|---|---|---|---|---|
|
+
+
+ No items found
+
+
+ |
+ |||||||||
+
@@ -1038,250 +1275,86 @@ exports[`AgentsTable component Renders correctly to match the snapshot with no p
class="euiFlexItem"
>
+
-
-
+
+
+
-
-
-
- Agents - - (0) - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Deploy new agent
+
+
+
-
-
-
-
+
-
-
+
+
-
-
-
-
-
-
- | - | -- - | -
+
- |
- - - | -
+
-
- |
-
+
+
+
+
+
+
+
+
+
+
+
- |
- + + |
|---|---|---|---|---|---|---|
|
+
+
+
+
+
-
- No items found
-
+
-
+
+
+
+
+ |
- ||||||
|
+
+
+
+
+
+
+ |
+ + + | ++ + | ++ + | ++ + | ++ + | ++ + | ++ + + Actions + + + | +
|---|---|---|---|---|---|---|---|
|
+
+
+ No items found
+
+
+ |
+ |||||||
-
-
-
-
-
- Agents - - (0) - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Deploy new agent
+
+
+
-
-
-
-
diff --git a/plugins/main/public/components/endpoints-summary/table/actions/__snapshots__/edit-groups-modal.test.tsx.snap b/plugins/main/public/components/endpoints-summary/table/actions/__snapshots__/edit-groups-modal.test.tsx.snap
new file mode 100644
index 0000000000..29c18c734e
--- /dev/null
+++ b/plugins/main/public/components/endpoints-summary/table/actions/__snapshots__/edit-groups-modal.test.tsx.snap
@@ -0,0 +1,15 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EditAgentGroupsModal component should return the component 1`] = `
+
+`;
+
+exports[`EditAgentGroupsModal component should return the component with save disabled 1`] = `
+
+`;
diff --git a/plugins/main/public/components/endpoints-summary/table/actions.tsx b/plugins/main/public/components/endpoints-summary/table/actions/actions.tsx
similarity index 82%
rename from plugins/main/public/components/endpoints-summary/table/actions.tsx
rename to plugins/main/public/components/endpoints-summary/table/actions/actions.tsx
index cd0ec5718b..d6137893e8 100644
--- a/plugins/main/public/components/endpoints-summary/table/actions.tsx
+++ b/plugins/main/public/components/endpoints-summary/table/actions/actions.tsx
@@ -1,13 +1,14 @@
import React from 'react';
import { EuiToolTip } from '@elastic/eui';
-import { API_NAME_AGENT_STATUS } from '../../../../common/constants';
-import { getCore } from '../../../kibana-services';
-import { endpointSummary } from '../../../utils/applications';
-import { WzElementPermissions } from '../../common/permissions/element';
+import { endpointSummary } from '../../../../utils/applications';
+import { API_NAME_AGENT_STATUS } from '../../../../../common/constants';
+import { getCore } from '../../../../kibana-services';
+import { WzElementPermissions } from '../../../common/permissions/element';
+import { Agent } from '../../types';
export const agentsTableActions = (
allowEditGroups: boolean,
- setAgent: (agent) => void,
+ setAgent: (agent: Agent) => void,
setIsEditGroupsVisible: (visible: boolean) => void,
) => [
{
@@ -28,6 +29,7 @@ export const agentsTableActions = (
icon: 'eye',
type: 'icon',
isPrimary: true,
+ color: 'primary',
enabled: agent => agent.status !== API_NAME_AGENT_STATUS.NEVER_CONNECTED,
onClick: agent =>
getCore().application.navigateToApp(endpointSummary.id, {
@@ -71,11 +73,11 @@ export const agentsTableActions = (
description: 'Edit groups',
icon: 'pencil',
type: 'icon',
- onClick: agent => {
+ onClick: (agent: Agent) => {
setAgent(agent);
setIsEditGroupsVisible(true);
},
'data-test-subj': 'action-groups',
- enabled: () => !allowEditGroups,
+ enabled: () => allowEditGroups,
},
];
diff --git a/plugins/main/public/components/endpoints-summary/table/actions/edit-groups-modal.test.tsx b/plugins/main/public/components/endpoints-summary/table/actions/edit-groups-modal.test.tsx
new file mode 100644
index 0000000000..afb93a23c8
--- /dev/null
+++ b/plugins/main/public/components/endpoints-summary/table/actions/edit-groups-modal.test.tsx
@@ -0,0 +1,118 @@
+import React from 'react';
+import { render, fireEvent, waitFor, act } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { EditAgentGroupsModal } from './edit-groups-modal';
+import { useGetGroups } from '../../hooks';
+
+jest.mock('../../services', () => ({
+ addAgentToGroupService: jest.fn(),
+ removeAgentFromGroupsService: jest.fn(),
+}));
+
+jest.mock('../../hooks', () => ({
+ useGetGroups: jest.fn(),
+}));
+
+jest.mock('../../../../react-services/common-services', () => ({
+ getErrorOrchestrator: () => ({
+ handleError: () => {},
+ }),
+}));
+
+describe('EditAgentGroupsModal component', () => {
+ test('should return the component with save disabled', async () => {
+ (useGetGroups as jest.Mock).mockReturnValue({
+ isLoading: true,
+ });
+
+ const { container, getByText, getByRole } = render(
+
-
-
+
+
-
-
-
-
-
-
- | - | -- - | -
+
- |
-
+
-
- |
-
+
+
+
+
+
+
+
+
+
+
+
- |
- + + | - | -- |
|---|
+
+`;
diff --git a/plugins/main/public/components/endpoints-summary/table/global-actions/edit-groups/__snapshots__/edit-groups-modal.test.tsx.snap b/plugins/main/public/components/endpoints-summary/table/global-actions/edit-groups/__snapshots__/edit-groups-modal.test.tsx.snap
new file mode 100644
index 0000000000..94b2d4c435
--- /dev/null
+++ b/plugins/main/public/components/endpoints-summary/table/global-actions/edit-groups/__snapshots__/edit-groups-modal.test.tsx.snap
@@ -0,0 +1,8 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EditAgentsGroupsModal component should return the component with save disabled 1`] = `
+
+`;
diff --git a/plugins/main/public/components/endpoints-summary/table/global-actions/edit-groups/edit-groups-modal.test.tsx b/plugins/main/public/components/endpoints-summary/table/global-actions/edit-groups/edit-groups-modal.test.tsx
new file mode 100644
index 0000000000..fced06a7dd
--- /dev/null
+++ b/plugins/main/public/components/endpoints-summary/table/global-actions/edit-groups/edit-groups-modal.test.tsx
@@ -0,0 +1,100 @@
+import React from 'react';
+import { render, fireEvent, waitFor, act } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { useGetGroups } from '../../../hooks';
+import { EditAgentsGroupsModal } from './edit-groups-modal';
+import { Agent } from '../../../types';
+
+jest.mock('../../../services', () => ({
+ addAgentsToGroupService: jest.fn(),
+ getAgentsService: jest.fn(),
+ removeAgentsFromGroupService: jest.fn(),
+}));
+
+jest.mock('../../../hooks', () => ({
+ useGetGroups: jest.fn(),
+}));
+
+jest.mock('../../../../../react-services/common-services', () => ({
+ getErrorOrchestrator: () => ({
+ handleError: () => {},
+ }),
+}));
+
+describe('EditAgentsGroupsModal component', () => {
+ test('should return the component with save disabled', async () => {
+ (useGetGroups as jest.Mock).mockReturnValue({
+ isLoading: true,
+ });
+
+ const { container, getByText, getByRole } = render(
+
+
+
+
+
+ {children}
,
+}));
+
+describe('AgentsTableGlobalActions component', () => {
+ test('should return the component', async () => {
+ const { container, getByText } = render(
+ Requirements
{this.props.loadingAlerts ? (
-
+
{this.state.flyoutOn && (
- {
- return this.getRequirementKey();
- }}
- openDashboard={(e, itemId) => this.openDashboard(e, itemId)}
- openDiscover={(e, itemId) => this.openDiscover(e, itemId)}
- />
+ {
+ return this.getRequirementKey();
+ }}
+ openDashboard={(e, itemId) => this.openDashboard(e, itemId)}
+ openDiscover={(e, itemId) => this.openDiscover(e, itemId)}
+ />
)}
);
diff --git a/plugins/main/public/components/overview/malware-detection/events/malware-detection-columns.tsx b/plugins/main/public/components/overview/malware-detection/events/malware-detection-columns.tsx
new file mode 100644
index 0000000000..38cf4ad35b
--- /dev/null
+++ b/plugins/main/public/components/overview/malware-detection/events/malware-detection-columns.tsx
@@ -0,0 +1,19 @@
+import { tDataGridColumn } from '../../../common/data-grid';
+
+export const malwareDetectionColumns: tDataGridColumn[] = [
+ {
+ id: 'agent.name',
+ },
+ {
+ id: 'data.title',
+ },
+ {
+ id: 'rule.description',
+ },
+ {
+ id: 'rule.level',
+ },
+ {
+ id: 'rule.id',
+ },
+];
diff --git a/plugins/main/public/components/overview/mitre/components/tactics/tactics.tsx b/plugins/main/public/components/overview/mitre/components/tactics/tactics.tsx
index f89e4a28fd..24f183ec4f 100644
--- a/plugins/main/public/components/overview/mitre/components/tactics/tactics.tsx
+++ b/plugins/main/public/components/overview/mitre/components/tactics/tactics.tsx
@@ -20,10 +20,10 @@ import {
EuiButtonIcon,
EuiLoadingSpinner,
EuiContextMenu,
- EuiIcon
-} from '@elastic/eui'
+ EuiIcon,
+} from '@elastic/eui';
import { IFilterParams, getElasticAlerts } from '../../lib';
-import { getToasts } from '../../../../../kibana-services';
+import { getToasts } from '../../../../../kibana-services';
import { UI_LOGGER_LEVELS } from '../../../../../../common/constants';
import { UI_ERROR_SEVERITIES } from '../../../../../react-services/error-orchestrator/types';
import { getErrorOrchestrator } from '../../../../../react-services/common-services';
@@ -75,21 +75,30 @@ export class Tactics extends Component {
}
shouldComponentUpdate(nextProps, nextState) {
- const { filterParams, indexPattern, selectedTactics, isLoading } = this.props;
+ const { filterParams, indexPattern, selectedTactics, isLoading } =
+ this.props;
const { tacticsCount, loadingAlerts } = this.state;
if (nextState.loadingAlerts !== loadingAlerts) return true;
if (nextProps.isLoading !== isLoading) return true;
- if (JSON.stringify(nextProps.filterParams) !== JSON.stringify(filterParams)) return true;
- if (JSON.stringify(nextProps.indexPattern) !== JSON.stringify(indexPattern)) return true;
- if (JSON.stringify(nextState.tacticsCount) !== JSON.stringify(tacticsCount)) return true;
- if (JSON.stringify(nextState.selectedTactics) !== JSON.stringify(selectedTactics)) return true;
+ if (JSON.stringify(nextProps.filterParams) !== JSON.stringify(filterParams))
+ return true;
+ if (JSON.stringify(nextProps.indexPattern) !== JSON.stringify(indexPattern))
+ return true;
+ if (JSON.stringify(nextState.tacticsCount) !== JSON.stringify(tacticsCount))
+ return true;
+ if (
+ JSON.stringify(nextState.selectedTactics) !==
+ JSON.stringify(selectedTactics)
+ )
+ return true;
return false;
}
async componentDidUpdate(prevProps) {
const { isLoading, tacticsObject } = this.props;
if (
- JSON.stringify(prevProps.tacticsObject) !== JSON.stringify(tacticsObject) ||
+ JSON.stringify(prevProps.tacticsObject) !==
+ JSON.stringify(tacticsObject) ||
isLoading !== prevProps.isLoading
) {
this.getTacticsCount(this.state.firstTime);
@@ -125,12 +134,16 @@ export class Tactics extends Component {
// TODO: use `status` and `statusText` to show errors
// @ts-ignore
const { data } = await getElasticAlerts(indexPattern, filterParams, aggs);
- const { buckets } = data.aggregations.tactics;
+ const buckets = data?.aggregations?.tactics?.buckets || [];
if (firstTime) {
- this.initTactics(buckets); // top tactics are checked on component mount
+ this.initTactics(); // top tactics are checked on component mount
}
this._isMount &&
- this.setState({ tacticsCount: buckets, loadingAlerts: false, firstTime: false });
+ this.setState({
+ tacticsCount: buckets,
+ loadingAlerts: false,
+ firstTime: false,
+ });
} catch (error) {
const options = {
context: `${Tactics.name}.getTacticsCount`,
@@ -154,7 +167,8 @@ export class Tactics extends Component {
}
facetClicked(id) {
- const { selectedTactics: oldSelected, onChangeSelectedTactics } = this.props;
+ const { selectedTactics: oldSelected, onChangeSelectedTactics } =
+ this.props;
const selectedTactics = {
...oldSelected,
[id]: !oldSelected[id],
@@ -166,13 +180,14 @@ export class Tactics extends Component {
const { tacticsCount } = this.state;
const { selectedTactics } = this.props;
const tacticsIds = Object.keys(this.props.tacticsObject);
- const tacticsList: Array
+
-
+
-
+
this.onGearButtonClick()}
aria-label={'tactics options'}
>
}
isOpen={this.state.isPopoverOpen}
- panelPaddingSize="none"
+ panelPaddingSize='none'
closePopover={() => this.closePopover()}
>
{this.props.isLoading ? (
-
) : (
{this.getTacticsList()}
diff --git a/plugins/main/public/components/overview/mitre/components/techniques/techniques.tsx b/plugins/main/public/components/overview/mitre/components/techniques/techniques.tsx
index 50c4f10b28..2e9b2ac120 100644
--- a/plugins/main/public/components/overview/mitre/components/techniques/techniques.tsx
+++ b/plugins/main/public/components/overview/mitre/components/techniques/techniques.tsx
@@ -33,11 +33,14 @@ import { withWindowSize } from '../../../../../components/common/hocs/withWindow
import { WzRequest } from '../../../../../react-services/wz-request';
import { AppState } from '../../../../../react-services/app-state';
import { WzFieldSearchDelay } from '../../../../common/search';
-import { getDataPlugin, getToasts } from '../../../../../kibana-services';
+import {
+ getDataPlugin,
+ getToasts,
+ getWazuhCorePlugin,
+} from '../../../../../kibana-services';
import { UI_LOGGER_LEVELS } from '../../../../../../common/constants';
import { UI_ERROR_SEVERITIES } from '../../../../../react-services/error-orchestrator/types';
import { getErrorOrchestrator } from '../../../../../react-services/common-services';
-import { getSettingDefaultValue } from '../../../../../../common/services/settings';
const MITRE_ATTACK = 'mitre-attack';
@@ -85,11 +88,21 @@ export const Techniques = withWindowSize(
}
shouldComponentUpdate(nextProps, nextState) {
- const { filterParams, indexPattern, selectedTactics, isLoading } = this.props;
+ const { filterParams, indexPattern, selectedTactics, isLoading } =
+ this.props;
if (nextProps.isLoading !== isLoading) return true;
- if (JSON.stringify(nextProps.filterParams) !== JSON.stringify(filterParams)) return true;
- if (JSON.stringify(nextProps.indexPattern) !== JSON.stringify(indexPattern)) return true;
- if (JSON.stringify(nextState.selectedTactics) !== JSON.stringify(selectedTactics))
+ if (
+ JSON.stringify(nextProps.filterParams) !== JSON.stringify(filterParams)
+ )
+ return true;
+ if (
+ JSON.stringify(nextProps.indexPattern) !== JSON.stringify(indexPattern)
+ )
+ return true;
+ if (
+ JSON.stringify(nextState.selectedTactics) !==
+ JSON.stringify(selectedTactics)
+ )
return true;
return false;
}
@@ -97,9 +110,11 @@ export const Techniques = withWindowSize(
componentDidUpdate(prevProps) {
const { isLoading, tacticsObject, filters } = this.props;
if (
- JSON.stringify(prevProps.tacticsObject) !== JSON.stringify(tacticsObject) ||
+ JSON.stringify(prevProps.tacticsObject) !==
+ JSON.stringify(tacticsObject) ||
isLoading !== prevProps.isLoading ||
- JSON.stringify(prevProps.filterParams) !== JSON.stringify(this.props.filterParams)
+ JSON.stringify(prevProps.filterParams) !==
+ JSON.stringify(this.props.filterParams)
)
this.getTechniquesCount();
}
@@ -108,7 +123,12 @@ export const Techniques = withWindowSize(
this._isMount = false;
}
- showToast(color: string, title: string = '', text: string = '', time: number = 3000) {
+ showToast(
+ color: string,
+ title: string = '',
+ text: string = '',
+ time: number = 3000,
+ ) {
getToasts().add({
color: color,
title: title,
@@ -134,9 +154,14 @@ export const Techniques = withWindowSize(
this._isMount && this.setState({ loadingAlerts: true });
// TODO: use `status` and `statusText` to show errors
// @ts-ignore
- const { data, status, statusText } = await getElasticAlerts(indexPattern, filters, aggs);
- const { buckets } = data.aggregations.techniques;
- this._isMount && this.setState({ techniquesCount: buckets, loadingAlerts: false });
+ const { data, status, statusText } = await getElasticAlerts(
+ indexPattern,
+ filters,
+ aggs,
+ );
+ const buckets = data?.aggregations?.techniques?.buckets || [];
+ this._isMount &&
+ this.setState({ techniquesCount: buckets, loadingAlerts: false });
} catch (error) {
const options = {
context: `${Techniques.name}.getTechniquesCount`,
@@ -163,23 +188,31 @@ export const Techniques = withWindowSize(
items: [
{
name: 'Filter for value',
- icon: = [];
const currentTechniques = Object.keys(tacticsObject)
- .map((tacticsKey) => ({
+ .map(tacticsKey => ({
tactic: tacticsKey,
- techniques: this.buildObjTechniques(tacticsObject[tacticsKey].techniques),
+ techniques: this.buildObjTechniques(
+ tacticsObject[tacticsKey].techniques,
+ ),
}))
- .filter((tactic) => this.props.selectedTactics[tactic.tactic])
- .map((tactic) => tactic.techniques)
+ .filter(tactic => this.props.selectedTactics[tactic.tactic])
+ .map(tactic => tactic.techniques)
.flat()
- .filter((techniqueID, index, array) => array.indexOf(techniqueID) === index);
+ .filter(
+ (techniqueID, index, array) => array.indexOf(techniqueID) === index,
+ );
tacticsToRender = currentTechniques
- .filter((technique) =>
+ .filter(technique =>
this.state.filteredTechniques
? this.state.filteredTechniques.includes(technique.id)
: technique.id && hash[technique.id]
? false
- : (hash[technique.id] = true)
+ : (hash[technique.id] = true),
)
- .map((technique) => {
+ .map(technique => {
return {
id: technique.id,
label: `${technique.id} - ${technique.name}`,
quantity:
- (techniquesCount.find((item) => item.key === technique.id) || {}).doc_count || 0,
+ (techniquesCount.find(item => item.key === technique.id) || {})
+ .doc_count || 0,
};
})
- .filter((technique) => (this.state.hideAlerts ? technique.quantity !== 0 : true));
+ .filter(technique =>
+ this.state.hideAlerts ? technique.quantity !== 0 : true,
+ );
const tacticsToRenderOrdered = tacticsToRender
.sort((a, b) => b.quantity - a.quantity)
.map((item, idx) => {
const tooltipContent = `View details of ${item.label} (${item.id})`;
const toolTipAnchorClass =
- 'wz-display-inline-grid' + (this.state.hover === item.id ? ' wz-mitre-width' : ' ');
+ 'wz-display-inline-grid' +
+ (this.state.hover === item.id ? ' wz-mitre-width' : ' ');
return (
this.setState({ hover: item.id })}
onMouseLeave={() => this.setState({ hover: '' })}
key={idx}
- style={{ border: '1px solid #8080804a', maxWidth: 'calc(25% - 8px)', maxHeight: 41 }}
+ style={{
+ border: '1px solid #8080804a',
+ maxWidth: 'calc(25% - 8px)',
+ maxHeight: 41,
+ }}
>
this.showFlyout(item.id)}
>
@@ -340,25 +401,31 @@ export const Techniques = withWindowSize(
{this.state.hover === item.id && (
-
+
{
+ onClick={e => {
this.openDashboard(e, item.id);
e.stopPropagation();
}}
- color="primary"
- type="visualizeApp"
+ color='primary'
+ type='visualizeApp'
>
{' '}
-
+
{
+ onClick={e => {
this.openDiscover(e, item.id);
e.stopPropagation();
}}
- color="primary"
- type="discoverApp"
+ color='primary'
+ type='discoverApp'
>
@@ -367,19 +434,28 @@ export const Techniques = withWindowSize(
}
isOpen={this.state.actionsOpen === item.id}
closePopover={() => this.closeActionsMenu()}
- panelPaddingSize="none"
+ panelPaddingSize='none'
style={{ width: '100%' }}
- anchorPosition="downLeft"
+ anchorPosition='downLeft'
>
-
);
});
- if (this.state.isSearching || this.state.loadingAlerts || this.props.isLoading) {
+ if (
+ this.state.isSearching ||
+ this.state.loadingAlerts ||
+ this.props.isLoading
+ ) {
return (
-
-
+
);
}
@@ -387,7 +463,7 @@ export const Techniques = withWindowSize(
return (
+
-
+
@@ -518,26 +616,26 @@ export const Techniques = withWindowSize(
Hide techniques with no alerts
this.hideAlerts()}
+ onChange={e => this.hideAlerts()}
/>
-
@@ -141,248 +149,276 @@ exports[`Module Mitre Att&ck intelligence container should render the component
style="max-height:calc(100vh - 255px);overflow-y:auto;overflow-x:hidden"
>
Tactics
Techniques
{this.renderFacet()}
@@ -552,5 +650,5 @@ export const Techniques = withWindowSize(
-
-
-
- Groups - - (0) - -
-
+ class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--wrap"
+ >
+
+
+
+
+
+
+ + Groups + + (0) + +
+
+
+
+
-
+ ,
);
expect(component).toMatchSnapshot();
});
@@ -69,8 +71,10 @@ describe('Module Mitre Att&ck intelligence container', () => {
it('should render permissions prompt when no has permissions', () => {
const store = mockStore({
appStateReducers: {
+ userAccount: {
+ administrator: true,
+ },
withUserLogged: true,
- userRoles: ['administrator'],
userPermissions: {
'mitre:read': { '*:*:*': 'deny' },
},
@@ -79,7 +83,7 @@ describe('Module Mitre Att&ck intelligence container', () => {
const component = render(
+ ,
);
expect(component).toMatchSnapshot();
});
diff --git a/plugins/main/public/components/overview/virustotal/events/virustotal-columns.tsx b/plugins/main/public/components/overview/virustotal/events/virustotal-columns.tsx
new file mode 100644
index 0000000000..c449425a68
--- /dev/null
+++ b/plugins/main/public/components/overview/virustotal/events/virustotal-columns.tsx
@@ -0,0 +1,22 @@
+import { tDataGridColumn } from '../../../common/data-grid';
+
+export const virustotalColumns: tDataGridColumn[] = [
+ {
+ id: 'agent.name',
+ },
+ {
+ id: 'data.virustotal.source.file',
+ },
+ {
+ id: 'data.virustotal.permalink',
+ },
+ {
+ id: 'data.virustotal.malicious',
+ },
+ {
+ id: 'data.virustotal.positives',
+ },
+ {
+ id: 'data.virustotal.total',
+ },
+];
diff --git a/plugins/main/public/components/overview/vulnerabilities/common/components/check-module-enabled.tsx b/plugins/main/public/components/overview/vulnerabilities/common/components/check-module-enabled.tsx
new file mode 100644
index 0000000000..f254dbde95
--- /dev/null
+++ b/plugins/main/public/components/overview/vulnerabilities/common/components/check-module-enabled.tsx
@@ -0,0 +1,115 @@
+import React, { useEffect, useState } from 'react';
+import {
+ clusterReq,
+ clusterNodes,
+} from '../../../../../controllers/management/components/management/configuration/utils/wz-fetch';
+import { WzRequest } from '../../../../../react-services';
+import { webDocumentationLink } from '../../../../../../common/services/web_documentation';
+import { EuiCallOut, EuiLink } from '@elastic/eui';
+import { UI_LOGGER_LEVELS } from '../../../../../../common/constants';
+import { UI_ERROR_SEVERITIES } from '../../../../../react-services/error-orchestrator/types';
+import { getErrorOrchestrator } from '../../../../../react-services/common-services';
+import { useUserPermissionsRequirements } from '../../../../common/hooks';
+
+async function checkVDIsEnabledCluster() {
+ // Get nodes
+ const responseNodes = await clusterNodes();
+
+ const nodes = responseNodes.data.data.affected_items.map(({ name }) => name);
+
+ // Check if at least some of the nodes has the module enabled
+ for (const node of nodes) {
+ const responseNodeWmodules = await WzRequest.apiReq(
+ 'GET',
+ `/cluster/${node}/configuration/wmodules/wmodules`,
+ {},
+ );
+ const vdConfiguration =
+ responseNodeWmodules.data.data?.affected_items?.[0]?.wmodules?.find(
+ ({ ['vulnerability-detection']: wmodule }) => wmodule,
+ );
+ if (vdConfiguration?.['vulnerability-detection']?.enabled === 'yes') {
+ return true;
+ }
+ }
+ return false;
+}
+
+async function checkVDIsEnabledManager() {
+ const responseWmodules = await WzRequest.apiReq(
+ 'GET',
+ `/manager/configuration/wmodules/wmodules`,
+ {},
+ );
+
+ const vdConfiguration =
+ responseWmodules.data.data?.affected_items?.[0]?.wmodules?.find(
+ ({ ['vulnerability-detection']: wmodule }) => wmodule,
+ );
+ return vdConfiguration?.['vulnerability-detection']?.enabled === 'yes';
+}
+
+export const ModuleEnabledCheck = () => {
+ const [data, setData] = useState<{ enabled: boolean } | null>(null);
+ const [userPermissionRequirements] = useUserPermissionsRequirements([
+ { action: 'cluster:status', resource: '*:*:*' },
+ { action: 'cluster:read', resource: 'node:id:*' },
+ { action: 'manager:read', resource: '*:*:*' },
+ ]);
+
+ const checkVDIsEnabled = async () => {
+ try {
+ // Check cluster status
+ setData(null);
+ const clusterStatus = await clusterReq();
+
+ // Check if the module is enabled
+ const enabled =
+ clusterStatus.data.data.enabled === 'yes' &&
+ clusterStatus.data.data.running === 'yes'
+ ? await checkVDIsEnabledCluster()
+ : await checkVDIsEnabledManager();
+ setData({ enabled });
+ } catch (error) {
+ const options = {
+ context: `${ModuleEnabledCheck.name}.useEffect`,
+ level: UI_LOGGER_LEVELS.ERROR,
+ severity: UI_ERROR_SEVERITIES.BUSINESS,
+ error: {
+ error: error,
+ message: error.message || error,
+ title: 'Error checking if the module is enabled',
+ },
+ };
+ getErrorOrchestrator().handleError(options);
+ }
+ };
+
+ useEffect(() => {
+ /* Only check if the module is enabled if the user has the expected permissions to
+ do the API requests */
+ if (!userPermissionRequirements) {
+ checkVDIsEnabled();
+ }
+ }, [userPermissionRequirements]);
+
+ return data?.enabled === false ? (
+
+
+ ) : null;
+};
diff --git a/plugins/main/public/components/overview/vulnerabilities/common/hocs/validate-vulnerabilities-states-index-pattern.tsx b/plugins/main/public/components/overview/vulnerabilities/common/hocs/validate-vulnerabilities-states-index-pattern.tsx
new file mode 100644
index 0000000000..c021ace475
--- /dev/null
+++ b/plugins/main/public/components/overview/vulnerabilities/common/hocs/validate-vulnerabilities-states-index-pattern.tsx
@@ -0,0 +1,169 @@
+import React from 'react';
+import { compose } from 'redux';
+import { connect } from 'react-redux';
+import { withGuardAsync, withReduxProvider } from '../../../../common/hocs';
+import {
+ getAngularModule,
+ getCore,
+ getSavedObjects,
+} from '../../../../../kibana-services';
+import { SavedObject } from '../../../../../react-services';
+import { NOT_TIME_FIELD_NAME_INDEX_PATTERN } from '../../../../../../common/constants';
+import { EuiButton, EuiEmptyPrompt, EuiLink } from '@elastic/eui';
+import { webDocumentationLink } from '../../../../../../common/services/web_documentation';
+import { vulnerabilityDetection } from '../../../../../utils/applications';
+import { LoadingSpinnerDataSource } from '../../../../common/loading/loading-spinner-data-source';
+
+const INDEX_PATTERN_CREATION_NO_INDEX = 'INDEX_PATTERN_CREATION_NO_INDEX';
+
+async function checkExistenceIndexPattern(indexPatternID: string) {
+ const response = await getSavedObjects().client.get(
+ 'index-pattern',
+ indexPatternID,
+ );
+
+ return response?.error?.statusCode !== 404;
+}
+
+async function checkExistenceIndices(indexPatternTitle: string) {
+ try {
+ const fields = await SavedObject.getIndicesFields(indexPatternTitle);
+ return { exist: true, fields };
+ } catch (error) {
+ return { exist: false };
+ }
+}
+
+async function createIndexPattern(indexPattern, fields: any) {
+ try {
+ await SavedObject.createSavedObject(
+ 'index-pattern',
+ indexPattern,
+ {
+ attributes: {
+ title: indexPattern,
+ timeFieldName: NOT_TIME_FIELD_NAME_INDEX_PATTERN,
+ },
+ },
+ fields,
+ );
+ await SavedObject.validateIndexPatternSavedObjectCanBeFound([indexPattern]);
+ } catch (error) {
+ return { error: error.message };
+ }
+}
+
+export async function validateVulnerabilitiesStateDataSources({
+ vulnerabilitiesStatesindexPatternID: indexPatternID,
+}) {
+ try {
+ // Check the existence of related index pattern
+ const existIndexPattern = await checkExistenceIndexPattern(indexPatternID);
+
+ // If the idnex pattern does not exist, then check the existence of index
+ if (!existIndexPattern) {
+ // Check the existence of indices
+ const { exist, fields } = await checkExistenceIndices(indexPatternID);
+
+ if (!exist) {
+ return {
+ ok: true,
+ data: {
+ error: {
+ title:
+ 'Vulnerability detection seems to be disabled or has a problem',
+ type: INDEX_PATTERN_CREATION_NO_INDEX,
+ },
+ },
+ };
+ }
+ // If the some index match the index pattern, then create the index pattern
+ const resultCreateIndexPattern = await createIndexPattern(
+ indexPatternID,
+ fields,
+ );
+ if (resultCreateIndexPattern?.error) {
+ return {
+ ok: true,
+ data: {
+ error: {
+ title: 'There was a problem creating the index pattern',
+ message: resultCreateIndexPattern?.error,
+ },
+ },
+ };
+ }
+ /* WORKAROUND: Redirect to the root of Vulnerabilities Detection application that should
+ redirects to the Dashboard tab. We want to redirect to this view, because we need the
+ component is visible (visualizations) to ensure the process that defines the filters for the
+ Events tab is run when the Dashboard component is unmounted. This workaround solves a
+ problem in the Events tabs related there are no implicit filters when accessing if the HOC
+ that protect the view is passed.
+ */
+ getCore().application.navigateToApp(vulnerabilityDetection.id);
+ }
+ return {
+ ok: false,
+ data: {},
+ };
+ } catch (error) {
+ return {
+ ok: true,
+ data: {
+ error: { title: 'There was a problem', message: error.message },
+ },
+ };
+ }
+}
+
+const errorPromptBody = {
+ INDEX_PATTERN_CREATION_NO_INDEX: (
+ {title}}
+ body={body}
+ actions={
+
+ Refresh
+
+ }
+ />
+ );
+};
+
+const mapStateToProps = state => ({
+ vulnerabilitiesStatesindexPatternID:
+ state.appConfig.data['vulnerabilities.pattern'],
+});
+
+export const withVulnerabilitiesStateDataSource = compose(
+ withReduxProvider,
+ connect(mapStateToProps),
+ withGuardAsync(
+ validateVulnerabilitiesStateDataSources,
+ ({ error, check }) => (false);
const [error, setError] = useState(null);
const [isSuccess, setIsSuccess] = useState(false);
- const [resultIndexData, setResultIndexData] = useState(null);
const [isLoading, setIsLoading] = useState(true);
useEffect(() => {
@@ -39,26 +22,7 @@ const useCheckIndexFields = (
// Check that the index exists
await SavedObject.getIndicesFields(indexPatternId, indexType);
setIsSuccess(true);
-
- // Check that the index has data
- search({
- indexPattern: indexPattern as IndexPattern,
- filters,
- query,
- })
- .then((results: any) => {
- setResultIndexData(results);
- setIsLoading(false);
- })
- .catch((error: any) => {
- const searchError = ErrorFactory.create(HttpError, {
- error,
- message: 'Error fetching vulnerabilities',
- });
- setError(searchError);
- setIsError(true);
- setIsLoading(false);
- });
+ setIsLoading(false);
} catch (error) {
setError(error);
setIsError(true);
@@ -69,13 +33,12 @@ const useCheckIndexFields = (
checkIndexFields();
}
- }, [indexPatternId, query, indexPattern]);
+ }, [indexPatternId, indexType]);
return {
isError,
error,
isSuccess,
- resultIndexData,
isLoading,
} as UseCheckIndexFieldsResult;
};
diff --git a/plugins/main/public/components/overview/vulnerabilities/common/vulnerability_detector_adapters.tsx b/plugins/main/public/components/overview/vulnerabilities/common/vulnerability_detector_adapters.tsx
new file mode 100644
index 0000000000..b605aff9c4
--- /dev/null
+++ b/plugins/main/public/components/overview/vulnerabilities/common/vulnerability_detector_adapters.tsx
@@ -0,0 +1,279 @@
+import {
+ AUTHORIZED_AGENTS,
+ VULNERABILITY_IMPLICIT_CLUSTER_MODE_FILTER,
+ WAZUH_ALERTS_PATTERN,
+} from '../../../../../common/constants';
+import { AppState } from '../../../../react-services';
+import { FilterHandler } from '../../../../utils/filter-handler';
+import { Filter } from '../../../../../../../src/plugins/data/public';
+import { FilterManager } from '../../../../../../../src/plugins/data/public';
+import { FilterStateStore } from '../../../../../../../src/plugins/data/common';
+
+const SESSION_STORAGE_FILTERS_NAME = 'wazuh_persistent_searchbar_filters';
+const SESSION_STORAGE_PREV_FILTER_NAME = 'wazuh_persistent_current_filter';
+
+/**
+ * When the component is unmounted, the original filters that arrived
+ * when the component was mounted are added.
+ * Both when the component is mounted and unmounted, the index pattern is
+ * updated so that the pin action adds the agent with the correct index pattern.
+ */
+export const vulnerabilityIndexFiltersAdapter = (
+ filterManager: FilterManager,
+ defaultIndexPatternID: string,
+) => {
+ const filterHandler = new FilterHandler(AppState.getCurrentPattern());
+ const initialFilters: Filter[] = [];
+ const storagePreviousFilters = sessionStorage.getItem(
+ SESSION_STORAGE_FILTERS_NAME,
+ );
+ if (storagePreviousFilters) {
+ const previousFilters = JSON.parse(storagePreviousFilters);
+ const previousFiltersWithoutImplicitFilters = previousFilters.filter(
+ (filter: Filter) => !filter?.$state?.isImplicit,
+ );
+ previousFiltersWithoutImplicitFilters.forEach((filter: Filter) => {
+ initialFilters.push(filter);
+ });
+ }
+
+ /**
+ Add vulnerability module implicit filters
+ */
+ const isCluster = AppState.getClusterInfo().status == 'enabled';
+ const managerFilter = filterHandler.managerQuery(
+ isCluster
+ ? AppState.getClusterInfo().cluster
+ : AppState.getClusterInfo().manager,
+ true,
+ VULNERABILITY_IMPLICIT_CLUSTER_MODE_FILTER[
+ AppState.getClusterInfo().status
+ ],
+ );
+
+ // rule.groups is added so that the events tab can use it
+ const ruleGroupsFilter = filterHandler.ruleGroupQuery(
+ 'vulnerability-detector',
+ );
+ initialFilters.unshift(ruleGroupsFilter);
+ initialFilters.unshift(managerFilter);
+ const vulnerabilitiesFilters = initialFilters.map((filter: Filter) => {
+ return {
+ ...filter,
+ meta: {
+ ...filter.meta,
+ index: defaultIndexPatternID,
+ },
+ };
+ });
+ sessionStorage.setItem(
+ SESSION_STORAGE_FILTERS_NAME,
+ JSON.stringify(initialFilters),
+ );
+ /* The rule.groups filter is removed. It is not applicable to the case of the vulnerabilities module since it has its own index */
+ const vulnerabilitiesFiltersWithoutRuleGroup = vulnerabilitiesFilters.filter(
+ (filter: Filter) => filter.meta.key !== 'rule.groups',
+ );
+ const implicitPinnedAgent = getImplicitPinnedAgent(
+ initialFilters,
+ defaultIndexPatternID,
+ );
+ if (implicitPinnedAgent) {
+ const filtersWithoutNormalAgents =
+ vulnerabilitiesFiltersWithoutRuleGroup.filter(x => {
+ return x.meta.key !== 'agent.id';
+ });
+ filtersWithoutNormalAgents.push(implicitPinnedAgent);
+ filterManager.setFilters(filtersWithoutNormalAgents);
+ } else {
+ filterManager.setFilters(vulnerabilitiesFiltersWithoutRuleGroup);
+ }
+};
+
+export const restorePrevIndexFiltersAdapter = (
+ previousFilters: Filter[],
+ toIndexPattern: string | null,
+ filterManager: FilterManager,
+ defaultIndexPatternID: string,
+) => {
+ const filterHandler = new FilterHandler(AppState.getCurrentPattern());
+ const isCluster = AppState.getClusterInfo().status == 'enabled';
+ const cleanedFilters = cleanFilters(
+ previousFilters,
+ defaultIndexPatternID,
+ ).filter(
+ (filter: Filter) =>
+ filter?.meta?.key !==
+ VULNERABILITY_IMPLICIT_CLUSTER_MODE_FILTER[
+ AppState.getClusterInfo().status
+ ],
+ );
+ /* Restore original manager implicit filter */
+ const managerFilter = filterHandler.managerQuery(
+ isCluster
+ ? AppState.getClusterInfo().cluster
+ : AppState.getClusterInfo().manager,
+ isCluster,
+ );
+ cleanedFilters.unshift(managerFilter);
+ const implicitPinnedAgent = getImplicitPinnedAgent(
+ previousFilters,
+ toIndexPattern ?? WAZUH_ALERTS_PATTERN,
+ );
+ if (implicitPinnedAgent) {
+ const cleanedFiltersWithoutNormalAgents = cleanedFilters.filter(x => {
+ return x.meta.key !== 'agent.id';
+ });
+ cleanedFiltersWithoutNormalAgents.push(implicitPinnedAgent);
+ filterManager.setFilters(cleanedFiltersWithoutNormalAgents);
+ } else {
+ filterManager.setFilters(cleanedFilters);
+ }
+};
+
+export const onUpdateAdapter = (
+ filters: Filter[],
+ filterManager: FilterManager,
+ onFiltersUpdated?: (filters: Filter[]) => void,
+) => {
+ const prevStoragePattern = sessionStorage.getItem(
+ SESSION_STORAGE_PREV_FILTER_NAME,
+ );
+ const storagePreviousFilters = sessionStorage.getItem(
+ SESSION_STORAGE_FILTERS_NAME,
+ );
+ /**
+ * If there are persisted filters, it is necessary to add them when
+ * updating the filters in the filterManager
+ */
+ const cleanedFilters = cleanFilters(
+ filters,
+ prevStoragePattern ?? WAZUH_ALERTS_PATTERN,
+ );
+ if (storagePreviousFilters) {
+ const previousFilters = JSON.parse(storagePreviousFilters);
+ const previousImplicitFilters = previousFilters.filter(
+ (filter: Filter) => filter?.$state?.isImplicit,
+ );
+ const cleanedPreviousImplicitFilters = cleanFilters(
+ previousImplicitFilters,
+ prevStoragePattern ?? WAZUH_ALERTS_PATTERN,
+ );
+ /* Normal filters added to storagePreviousFilters are added to keep them between dashboard and inventory tab */
+ const newFilters = filters.filter(
+ (filter: Filter) => !filter?.$state?.isImplicit,
+ );
+
+ sessionStorage.setItem(
+ SESSION_STORAGE_FILTERS_NAME,
+ JSON.stringify([...previousImplicitFilters, ...newFilters]),
+ );
+
+ filterManager.setFilters([
+ ...cleanedPreviousImplicitFilters,
+ ...cleanedFilters,
+ ]);
+ onFiltersUpdated &&
+ onFiltersUpdated([...cleanedPreviousImplicitFilters, ...cleanedFilters]);
+ } else {
+ filterManager.setFilters(cleanedFilters);
+ onFiltersUpdated && onFiltersUpdated(cleanedFilters);
+ }
+};
+
+/**
+ * Verify if a pinned agent exists, identifying it by its meta.isImplicit attribute or by the agentId query param URL.
+ * We also compare the agent.id filter with the agentId query param because the OSD filter definition does not include the "isImplicit" attribute that Wazuh adds.
+ * There may be cases where the "isImplicit" attribute is lost, since any action regarding filters that is done with the
+ * filterManager ( addFilters, setFilters, setGlobalFilters, setAppFilters)
+ * does a mapAndFlattenFilters mapping to the filters that removes any attributes that are not part of the filter definition.
+ * */
+const getImplicitPinnedAgent = (
+ filters: Filter[],
+ toIndexPattern: string,
+): Filter | undefined => {
+ const pinnedAgentByFilterManager = filters.find(
+ (filter: Filter) =>
+ filter?.meta?.key === 'agent.id' && !!filter?.$state?.isImplicit,
+ );
+ const url = window.location.href;
+ const regex = new RegExp('agentId=' + '[^&]*');
+ const match = url.match(regex);
+ const isPinnedAgentByUrl = match && match[0];
+ if (pinnedAgentByFilterManager && isPinnedAgentByUrl) {
+ return {
+ ...pinnedAgentByFilterManager,
+ meta: {
+ ...pinnedAgentByFilterManager.meta,
+ index: toIndexPattern,
+ },
+ $state: { store: FilterStateStore.APP_STATE, isImplicit: true },
+ };
+ }
+
+ if (isPinnedAgentByUrl) {
+ const agentId = match[0].split('=')[1];
+ return {
+ meta: {
+ alias: null,
+ disabled: false,
+ key: 'agent.id',
+ negate: false,
+ params: { query: agentId },
+ type: 'phrase',
+ index: toIndexPattern,
+ },
+ query: {
+ match: {
+ 'agent.id': {
+ query: agentId,
+ type: 'phrase',
+ },
+ },
+ },
+ $state: { store: 'appState', isImplicit: true },
+ };
+ }
+ return undefined;
+};
+
+/**
+ * Return cleaned filters.
+ * Clean the known issue with the auto loaded agent.id filters from the searchbar
+ * and filters those filters that are not related to the default index pattern.
+ * This cleanup adjusts the index pattern of a pinned agent, if applicable.
+ * @param previousFilters
+ * @returns
+ */
+const cleanFilters = (
+ previousFilters: Filter[],
+ indexPatternToClean: string,
+) => {
+ const mappedFilters = previousFilters.filter(
+ (filter: Filter) =>
+ filter?.meta?.controlledBy !== AUTHORIZED_AGENTS && // remove auto loaded agent.id filters
+ filter?.meta?.index !== indexPatternToClean,
+ );
+ return mappedFilters;
+};
+
+export const updateFiltersStorage = (filters: Filter[]) => {
+ const storagePreviousFilters = sessionStorage.getItem(
+ SESSION_STORAGE_FILTERS_NAME,
+ );
+ if (storagePreviousFilters) {
+ const previousFilters = JSON.parse(storagePreviousFilters);
+ const previousImplicitFilters = previousFilters.filter(
+ (filter: Filter) => filter?.$state?.isImplicit,
+ );
+ /* Normal filters added to storagePreviousFilters are added to keep them between dashboard and inventory tab */
+ const newFilters = filters.filter(
+ (filter: Filter) => !filter?.$state?.isImplicit,
+ );
+
+ sessionStorage.setItem(
+ SESSION_STORAGE_FILTERS_NAME,
+ JSON.stringify([...previousImplicitFilters, ...newFilters]),
+ );
+ }
+};
diff --git a/plugins/main/public/components/overview/vulnerabilities/dashboards/inventory/inventory.tsx b/plugins/main/public/components/overview/vulnerabilities/dashboards/inventory/inventory.tsx
index 1fd7a8f421..9174ced121 100644
--- a/plugins/main/public/components/overview/vulnerabilities/dashboards/inventory/inventory.tsx
+++ b/plugins/main/public/components/overview/vulnerabilities/dashboards/inventory/inventory.tsx
@@ -37,8 +37,15 @@ import { useDocViewer } from '../../../../common/doc-viewer/use-doc-viewer';
import { withErrorBoundary } from '../../../../common/hocs';
import { search } from '../../../../common/search-bar/search-bar-service';
import { exportSearchToCSV } from '../../../../common/data-grid/data-grid-service';
-import { WAZUH_INDEX_TYPE_VULNERABILITIES } from '../../../../../../common/constants';
-import useCheckIndexFields from '../../common/hooks/useCheckIndexFields';
+import {
+ vulnerabilityIndexFiltersAdapter,
+ onUpdateAdapter,
+ restorePrevIndexFiltersAdapter,
+} from '../../common/vulnerability_detector_adapters';
+import { compose } from 'redux';
+import { withVulnerabilitiesStateDataSource } from '../../common/hocs/validate-vulnerabilities-states-index-pattern';
+import { ModuleEnabledCheck } from '../../common/components/check-module-enabled';
+import { DataSourceFilterManagerVulnerabilitiesStates } from '../../../../../react-services/data-sources';
const InventoryVulsComponent = () => {
const appConfig = useAppConfig();
@@ -46,7 +53,15 @@ const InventoryVulsComponent = () => {
appConfig.data['vulnerabilities.pattern'];
const { searchBarProps } = useSearchBar({
defaultIndexPatternID: VULNERABILITIES_INDEX_PATTERN_ID,
+ onMount: vulnerabilityIndexFiltersAdapter,
+ onUpdate: onUpdateAdapter,
+ onUnMount: restorePrevIndexFiltersAdapter,
});
+
+ const fetchFilters = DataSourceFilterManagerVulnerabilitiesStates.getFilters(
+ searchBarProps.filters,
+ VULNERABILITIES_INDEX_PATTERN_ID,
+ );
const { isLoading, filters, query, indexPatterns } = searchBarProps;
const SearchBar = getPlugins().data.ui.SearchBar;
const [results, setResults] = useState({} as SearchResponse);
@@ -97,26 +112,12 @@ const InventoryVulsComponent = () => {
indexPattern: indexPattern as IndexPattern,
});
- const {
- isError,
- error,
- isSuccess,
- resultIndexData,
- isLoading: isLoadingCheckIndex,
- } = useCheckIndexFields(
- VULNERABILITIES_INDEX_PATTERN_ID,
- indexPatterns?.[0],
- WAZUH_INDEX_TYPE_VULNERABILITIES,
- filters,
- query,
- );
-
useEffect(() => {
- if (!isLoading && isSuccess) {
+ if (!isLoading) {
setIndexPattern(indexPatterns?.[0] as IndexPattern);
search({
indexPattern: indexPatterns?.[0] as IndexPattern,
- filters,
+ filters: fetchFilters,
query,
pagination,
sorting,
@@ -138,13 +139,13 @@ const InventoryVulsComponent = () => {
JSON.stringify(searchBarProps),
JSON.stringify(pagination),
JSON.stringify(sorting),
- isLoadingCheckIndex,
+ JSON.stringify(fetchFilters),
]);
const onClickExportResults = async () => {
const params = {
indexPattern: indexPatterns?.[0] as IndexPattern,
- filters,
+ filters: fetchFilters,
query,
fields: columnVisibility.visibleColumns,
pagination: {
@@ -169,100 +170,97 @@ const InventoryVulsComponent = () => {
return (
-
- <>
- {isLoading || isLoadingCheckIndex ? (
-
- {}}
- tooltip={
- results?.hits?.total &&
- results?.hits?.total > MAX_ENTRIES_PER_QUERY
- ? {
- ariaLabel: 'Warning',
- content: `The query results has exceeded the limit of 10,000 hits. To provide a better experience the table only shows the first ${formatNumWithCommas(
- MAX_ENTRIES_PER_QUERY,
- )} hits.`,
- iconType: 'alert',
- position: 'top',
- }
- : undefined
- }
- />
-
- Export Formated
-
-
- ),
- }}
- />
- ) : null}
- {inspectedHit && (
- setInspectedHit(undefined)} size='m'>
-
-
-
-
-
-
-
-
-
-
-
- )}
-
-
+ <>
+
+ <>
+ {isLoading ? (
+
+ {}}
+ tooltip={
+ results?.hits?.total &&
+ results?.hits?.total > MAX_ENTRIES_PER_QUERY
+ ? {
+ ariaLabel: 'Warning',
+ content: `The query results has exceeded the limit of 10,000 hits. To provide a better experience the table only shows the first ${formatNumWithCommas(
+ MAX_ENTRIES_PER_QUERY,
+ )} hits.`,
+ iconType: 'alert',
+ position: 'top',
+ }
+ : undefined
+ }
+ />
+
+ Export Formated
+
+
+ ),
+ }}
+ />
+ ) : null}
+ {inspectedHit && (
+ setInspectedHit(undefined)} size='m'>
+
+
+
+
+
+
+
+
+
+
+
+ )}
+
+
+
);
};
-export const InventoryVuls = withErrorBoundary(InventoryVulsComponent);
+export const InventoryVuls = compose(
+ withErrorBoundary,
+ withVulnerabilitiesStateDataSource,
+)(InventoryVulsComponent);
diff --git a/plugins/main/public/components/overview/vulnerabilities/dashboards/overview/dashboard.tsx b/plugins/main/public/components/overview/vulnerabilities/dashboards/overview/dashboard.tsx
index c29bc6393b..6508987edb 100644
--- a/plugins/main/public/components/overview/vulnerabilities/dashboards/overview/dashboard.tsx
+++ b/plugins/main/public/components/overview/vulnerabilities/dashboards/overview/dashboard.tsx
@@ -1,4 +1,5 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
+import { SearchResponse } from '../../../../../../../../src/core/server';
import { getPlugins } from '../../../../../kibana-services';
import { ViewMode } from '../../../../../../../../src/plugins/embeddable/public';
import { getDashboardPanels } from './dashboard_panels';
@@ -10,9 +11,26 @@ import { getKPIsPanel } from './dashboard_panels_kpis';
import { useAppConfig } from '../../../../common/hooks';
import { withErrorBoundary } from '../../../../common/hocs';
import { DiscoverNoResults } from '../../common/components/no_results';
-import { WAZUH_INDEX_TYPE_VULNERABILITIES } from '../../../../../../common/constants';
import { LoadingSpinner } from '../../common/components/loading_spinner';
-import useCheckIndexFields from '../../common/hooks/useCheckIndexFields';
+import {
+ vulnerabilityIndexFiltersAdapter,
+ restorePrevIndexFiltersAdapter,
+ onUpdateAdapter,
+ updateFiltersStorage,
+} from '../../common/vulnerability_detector_adapters';
+import { search } from '../../../../common/search-bar/search-bar-service';
+import { IndexPattern } from '../../../../../../../../src/plugins/data/common';
+import {
+ ErrorFactory,
+ ErrorHandler,
+ HttpError,
+} from '../../../../../react-services/error-management';
+import { compose } from 'redux';
+import { withVulnerabilitiesStateDataSource } from '../../common/hocs/validate-vulnerabilities-states-index-pattern';
+import { ModuleEnabledCheck } from '../../common/components/check-module-enabled';
+import { DataSourceFilterManagerVulnerabilitiesStates } from '../../../../../react-services/data-sources';
+import { DashboardContainerInput } from '../../../../../../../../src/plugins/dashboard/public';
+
const plugins = getPlugins();
const SearchBar = getPlugins().data.ui.SearchBar;
@@ -29,29 +47,58 @@ const DashboardVulsComponent: React.FC = () => {
appConfig.data['vulnerabilities.pattern'];
const { searchBarProps } = useSearchBar({
defaultIndexPatternID: VULNERABILITIES_INDEX_PATTERN_ID,
+ onMount: vulnerabilityIndexFiltersAdapter,
+ onUpdate: onUpdateAdapter,
+ onUnMount: restorePrevIndexFiltersAdapter,
});
- const {
- isLoading: isLoadingSearchbar,
- filters,
- query,
- indexPatterns,
- } = searchBarProps;
- const { isError, error, isSuccess, resultIndexData, isLoading } =
- useCheckIndexFields(
- VULNERABILITIES_INDEX_PATTERN_ID,
- indexPatterns?.[0],
- WAZUH_INDEX_TYPE_VULNERABILITIES,
- filters,
- query,
- );
+ /* This function is responsible for updating the storage filters so that the
+ filters between dashboard and inventory added using visualizations call to actions.
+ Without this feature, filters added using visualizations call to actions are
+ not maintained between dashboard and inventory tabs */
+ const handleFilterByVisualization = (newInput: DashboardContainerInput) => {
+ updateFiltersStorage(newInput.filters);
+ };
+
+ const fetchFilters = DataSourceFilterManagerVulnerabilitiesStates.getFilters(
+ searchBarProps.filters,
+ VULNERABILITIES_INDEX_PATTERN_ID,
+ );
+
+ const { isLoading, query, indexPatterns } = searchBarProps;
+
+ const [isSearching, setIsSearching] = useState(false);
+ const [results, setResults] = useState({} as SearchResponse);
+
+ useEffect(() => {
+ if (!isLoading) {
+ search({
+ indexPattern: indexPatterns?.[0] as IndexPattern,
+ filters: fetchFilters,
+ query,
+ })
+ .then(results => {
+ setResults(results);
+ setIsSearching(false);
+ })
+ .catch(error => {
+ const searchError = ErrorFactory.create(HttpError, {
+ error,
+ message: 'Error fetching vulnerabilities',
+ });
+ ErrorHandler.handleError(searchError);
+ setIsSearching(false);
+ });
+ }
+ }, [JSON.stringify(searchBarProps), JSON.stringify(fetchFilters)]);
return (
<>
<>
- {isLoading || isLoadingSearchbar ? {
showQueryBar={true}
/>
) : null}
- {!isLoadingSearchbar &&
- !isLoading &&
- (isError ||
- !resultIndexData ||
- resultIndexData?.hits?.total === 0) ? (
- {
VULNERABILITIES_INDEX_PATTERN_ID,
),
isFullScreenMode: false,
- filters: searchBarProps.filters ?? [],
+ filters: fetchFilters ?? [],
useMargins: false,
id: 'vulnerability-detector-dashboard-tab-filters',
timeRange: {
@@ -98,6 +138,7 @@ const DashboardVulsComponent: React.FC = () => {
},
hidePanelTitles: true,
}}
+ onInputUpdated={handleFilterByVisualization}
/>
{
viewMode: ViewMode.VIEW,
panels: getKPIsPanel(VULNERABILITIES_INDEX_PATTERN_ID),
isFullScreenMode: false,
- filters: searchBarProps.filters ?? [],
+ filters: fetchFilters ?? [],
useMargins: true,
id: 'kpis-vulnerability-detector-dashboard-tab',
timeRange: {
@@ -121,13 +162,14 @@ const DashboardVulsComponent: React.FC = () => {
},
hidePanelTitles: true,
}}
+ onInputUpdated={handleFilterByVisualization}
/>
{
},
hidePanelTitles: false,
}}
+ onInputUpdated={handleFilterByVisualization}
/>
) : null}
@@ -152,4 +195,7 @@ const DashboardVulsComponent: React.FC = () => {
);
};
-export const DashboardVuls = withErrorBoundary(DashboardVulsComponent);
+export const DashboardVuls = compose(
+ withErrorBoundary,
+ withVulnerabilitiesStateDataSource,
+)(DashboardVulsComponent);
diff --git a/plugins/main/public/components/overview/vulnerabilities/dashboards/overview/dashboard_panels.ts b/plugins/main/public/components/overview/vulnerabilities/dashboards/overview/dashboard_panels.ts
index 3269a8d65b..b7c98727e1 100644
--- a/plugins/main/public/components/overview/vulnerabilities/dashboards/overview/dashboard_panels.ts
+++ b/plugins/main/public/components/overview/vulnerabilities/dashboards/overview/dashboard_panels.ts
@@ -245,7 +245,7 @@ const getVisStateTopVulnerabilitiesEndpoints = (indexPatternId: string) => {
enabled: true,
type: 'terms',
params: {
- field: 'agent.id',
+ field: 'agent.name',
orderBy: '1',
order: 'desc',
size: 10,
@@ -253,7 +253,7 @@ const getVisStateTopVulnerabilitiesEndpoints = (indexPatternId: string) => {
otherBucketLabel: 'Other',
missingBucket: false,
missingBucketLabel: 'Missing',
- customLabel: 'package.path',
+ customLabel: 'Endpoint name',
},
schema: 'segment',
},
diff --git a/plugins/main/public/components/overview/vulnerabilities/dashboards/overview/dashboard_panels_filters.ts b/plugins/main/public/components/overview/vulnerabilities/dashboards/overview/dashboard_panels_filters.ts
index 7d8e2c64be..6f3c07cb35 100644
--- a/plugins/main/public/components/overview/vulnerabilities/dashboards/overview/dashboard_panels_filters.ts
+++ b/plugins/main/public/components/overview/vulnerabilities/dashboards/overview/dashboard_panels_filters.ts
@@ -6,7 +6,7 @@ const getVisStateFilter = (
indexPatternId: string,
title: string,
label: string,
- fieldName: string
+ fieldName: string,
) => {
return {
id,
@@ -79,9 +79,11 @@ const getVisStateFilter = (
};
export const getDashboardFilters = (
- indexPatternId: string
+ indexPatternId: string,
): {
- [panelId: string]: DashboardPanelState;
+ [panelId: string]: DashboardPanelState<
+ EmbeddableInput & { [k: string]: unknown }
+ >;
} => {
return {
topPackageSelector: {
@@ -100,7 +102,7 @@ export const getDashboardFilters = (
indexPatternId,
'Top packages vulnerabilities',
'Top 5 packages',
- 'package.name'
+ 'package.name',
),
},
},
@@ -120,7 +122,7 @@ export const getDashboardFilters = (
indexPatternId,
'Top operating system vulnerabilities',
'Top 5 OS',
- 'host.os.full'
+ 'host.os.full',
),
},
},
@@ -140,7 +142,7 @@ export const getDashboardFilters = (
indexPatternId,
'Agent filter',
'Top 5 agents',
- 'agent.id'
+ 'agent.name',
),
},
},
@@ -160,7 +162,7 @@ export const getDashboardFilters = (
indexPatternId,
'Top vulnerabilities',
'Top 5 vulnerabilities',
- 'vulnerability.id'
+ 'vulnerability.id',
),
},
},
diff --git a/plugins/main/public/components/search-bar/query-language/__snapshots__/aql.test.tsx.snap b/plugins/main/public/components/search-bar/query-language/__snapshots__/aql.test.tsx.snap
index 0ef68d2e9e..3f9bd54fc2 100644
--- a/plugins/main/public/components/search-bar/query-language/__snapshots__/aql.test.tsx.snap
+++ b/plugins/main/public/components/search-bar/query-language/__snapshots__/aql.test.tsx.snap
@@ -39,7 +39,11 @@ exports[`SearchBar component Renders correctly to match the snapshot of query la
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
- />
+ >
+
+ >
+
+
-
-
-
-
-
+
-
-
-
-
+
-
+
+
-
- WQL
-
-
-
+
+
+ WQL
+
+
+
+
+
-
diff --git a/plugins/main/public/components/overview/mitre_attack_intelligence/intelligence.test.tsx b/plugins/main/public/components/overview/mitre_attack_intelligence/intelligence.test.tsx
index a7979eabb0..94cda9b639 100644
--- a/plugins/main/public/components/overview/mitre_attack_intelligence/intelligence.test.tsx
+++ b/plugins/main/public/components/overview/mitre_attack_intelligence/intelligence.test.tsx
@@ -22,7 +22,7 @@ jest.mock(
'../../../../../../node_modules/@elastic/eui/lib/services/accessibility/html_id_generator',
() => ({
htmlIdGenerator: () => () => 'htmlId',
- })
+ }),
);
jest.mock('../../../react-services', () => ({
@@ -51,8 +51,10 @@ describe('Module Mitre Att&ck intelligence container', () => {
it('should render the component if has permissions', () => {
const store = mockStore({
appStateReducers: {
+ userAccount: {
+ administrator: true,
+ },
withUserLogged: true,
- userRoles: ['administrator'],
userPermissions: {
'mitre:read': { '*:*:*': 'allow' },
},
@@ -61,7 +63,7 @@ describe('Module Mitre Att&ck intelligence container', () => {
const component = render(
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | + + + ID + + + | +
-
-
-
-
-
-
-
| |||||
|---|---|---|---|---|---|---|
+ Vulnerabilies detection module is not enabled. You can learn to how to
+ configure following the{' '}
+
+ Please check the cluster status. Also, you can check the{' '}
+
{message}
; + + return ( +Document details
-Document details
+
- {(this.state.status === 'warning' ||
- this.state.status === 'danger') && (
-
- Check that the {PLUGIN_PLATFORM_NAME} server can reach the configured Wazuh API(s).
-
- await this.checkConnection()}
- isLoading={this.state.fetchingData}
- >
- Check connection
-
- {(this.state.closedEnabled || this.state.enableClose) &&
- !this.state.blockClose && (
- this.props.closeAddApi()}>
- Close
-
- )}
-
- );
-
- const editConfigChildren = (
-
-
- Modify{' '}
- {getPluginDataPath('config/wazuh.yml')} {' '}
- to set the connection information.
-
- {apiExample}
-
- Where {''} is an arbitrary ID,{' '}
- {''} is the URL of the Wazuh API,{' '}
- {''} is the port,{' '}
- {''} and{' '}
- {''} are the credentials to
- authenticate,{' '}
- {''} defines if the app user's permissions depends on the authentication context ({'true'} / {'false'} ).
-
-
- );
-
- const steps = [
- {
- title: 'Edit the configuration',
- children: editConfigChildren
- },
- {
- title: 'Test the configuration',
- children: checkConnectionChildren,
- status: this.state.status
- }
- ];
-
- const view = (
- Getting started
-
+ {[
+ 'id',
+ 'url',
+ 'port',
+ 'username',
+ 'password',
+ 'password_confirm',
+ 'run_as',
+ ].map(key => {
+ const { _meta, ...field } = fields[key];
+ return (
+
+ Password must match.
+
+ )}
+
+
+
+ Apply
+
+
+
+
+ );
+};
diff --git a/plugins/main/public/components/settings/api/api-is-down.js b/plugins/main/public/components/settings/api/api-is-down.js
deleted file mode 100644
index 9fd899aca6..0000000000
--- a/plugins/main/public/components/settings/api/api-is-down.js
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * Wazuh app - React component for the adding an API entry form.
- *
- * Copyright (C) 2015-2022 Wazuh, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Find more information about this on the LICENSE file.
- */
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import {
- EuiFlexGroup,
- EuiFlexItem,
- EuiCodeBlock,
- EuiText,
- EuiSpacer,
- EuiCode,
- EuiButton,
- EuiButtonEmpty,
- EuiSteps,
- EuiBasicTable,
- EuiHealth,
- EuiCallOut,
- EuiLoadingSpinner,
- EuiToolTip,
- EuiButtonIcon,
- EuiPanel
-} from '@elastic/eui';
-import { withErrorBoundary } from '../../common/hocs';
-import {
- UI_ERROR_SEVERITIES,
-} from '../../../react-services/error-orchestrator/types';
-import { UI_LOGGER_LEVELS, PLUGIN_PLATFORM_NAME } from '../../../../common/constants';
-import { getErrorOrchestrator } from '../../../react-services/common-services';
-import { getPluginDataPath } from '../../../../common/plugin';
-
-export const ApiIsDown = withErrorBoundary (class ApiIsDown extends Component {
- constructor(props) {
- super(props);
- this.state = {
- status: 'incomplete',
- fetchingData: false,
- apiEntries: [],
- refreshingEntries: false
- };
- }
-
- componentDidMount() {
- this.setState({
- apiEntries: [...this.props.apiEntries]
- });
- }
-
- /**
- * Checks again the connection in order to know the state of the API entries
- */
- async checkConnection() {
- try {
- let status = 'complete';
- this.setState({ error: false });
- const hosts = await this.props.getHosts();
- this.setState({
- fetchingData: true,
- refreshingEntries: true,
- apiEntries: hosts
- });
- const entries = this.state.apiEntries;
- let numErr = 0;
- for (let idx in entries) {
- const entry = entries[idx];
- try {
- const data = await this.props.testApi(entry, true); // token refresh is forced
- const clusterInfo = data.data || {};
- const id = entries[idx].id;
- entries[idx].status = 'online';
- entries[idx].cluster_info = clusterInfo;
- //Updates the cluster info in the registry
- await this.props.updateClusterInfoInRegistry(id, clusterInfo);
- this.props.setDefault(entry);
- } catch (error) {
- numErr = numErr + 1;
- const code = ((error || {}).data || {}).code;
- const downReason = typeof error === 'string' ? error :
- (error || {}).message || ((error || {}).data || {}).message || 'Wazuh is not reachable';
- const status = code === 3099 ? 'down' : 'unknown';
- entries[idx].status = { status, downReason };
- }
- }
- if (numErr) {
- status = numErr >= entries.length ? 'danger' : 'warning';
- }
- this.setState({
- apiEntries: entries,
- fetchingData: false,
- status: status,
- refreshingEntries: false
- });
- } catch (error) {
- if (
- error &&
- error.data &&
- error.data.message &&
- error.data.code === 2001
- ) {
- this.setState({ error: error.data.message, status: 'danger' });
- }
-
- const options = {
- context: `${ApiIsDown.name}.checkConnection`,
- level: UI_LOGGER_LEVELS.ERROR,
- severity: UI_ERROR_SEVERITIES.UI,
- store: true,
- error: {
- error: error,
- message: error.message || error,
- title: error.message || error,
- },
- };
-
- getErrorOrchestrator().handleError(options);
- }
- }
-
- render() {
- const apiExample = `# Example Wazuh API configuration
-hosts:
- - production:
- url: https://172.16.1.2
- port: 55000
- username: wazuh-wui
- password: wazuh-wui
- run_as: false
-`;
-
- const checkConnectionChildren = (
-
-
- Check that the {PLUGIN_PLATFORM_NAME} server can reach the configured Wazuh API(s).
-
- await this.checkConnection()}
- isLoading={this.state.fetchingData}
- >
- Check connection
-
- {this.state.status !== 'danger' &&
- this.state.status !== 'incomplete' && (
- this.props.closeApiIsDown()}>
- Close
-
- )}
- Already configured Wazuh API(s)
- {
- if (item) {
- return item === 'online' ? (
- Online
- ) : item.status === 'down' ? (
-
- Warning
-
-
- this.props.copyToClipBoard(item.downReason)
- }
- />
-
-
- ) : (
-
- Offline
-
-
- this.props.copyToClipBoard(item.downReason)
- }
- />
-
-
- );
- } else {
- return (
-
-
- );
-
- const steps = [
- {
- title: 'Check the Wazuh API service status',
- children: (
-
- For Systemd
- $ sudo systemctl status wazuh-manager
- For SysV Init
- $ sudo service wazuh-manager status
-
- )
- },
- {
- title: 'Check the configuration',
- children: (
-
-
- Review the settings in the{' '}
-
- {getPluginDataPath('config/wazuh.yml')}
- {' '}
- file.
-
- {apiExample}
-
- )
- },
- {
- title: 'Test the configuration',
- children: checkConnectionChildren,
- status: this.state.status
- }
- ];
- return (
- Wazuh API seems to be down
-
+
+ {command}
+
+
+ {copy => (
+
+
+
+
+ )}
+
+
+
`;
diff --git a/plugins/main/public/components/settings/api/available-updates-flyout/__snapshots__/update-detail.test.tsx.snap b/plugins/main/public/components/settings/api/available-updates-flyout/__snapshots__/update-detail.test.tsx.snap
index 08a8b8e821..79276268d1 100644
--- a/plugins/main/public/components/settings/api/available-updates-flyout/__snapshots__/update-detail.test.tsx.snap
+++ b/plugins/main/public/components/settings/api/available-updates-flyout/__snapshots__/update-detail.test.tsx.snap
@@ -27,7 +27,11 @@ exports[`UpdateDetail component should return the UpdateDetail component 1`] = `
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
- />
+ >
+
+
+
+
+
+ -
+
- + API ID + +
- + api id + +
+
+ -
+
- + Version + +
- + 4.3.1 + +
+ Update detail
+
+
+ Update detail
+
+
+ Update detail
+
+Available updates
-{title}{
- documentationLink &&
-
- <>
-
-
- }
+
+ {title}
+ {documentationLink && (
+
+ <>
+
+
+ )}
App current settings
-
+
var closing = Boolean(ln.match(/<\/.+>/)); // is this a closing tag? ex. var opening = Boolean(ln.match(/<[^!].*>/)); // is this even a tag (that's not ) - var type = single ? 'single' : closing ? 'closing' : opening ? 'opening' : 'other'; + var type = single + ? 'single' + : closing + ? 'closing' + : opening + ? 'opening' + : 'other'; var fromTo = lastType + '->' + type; lastType = type; var padding = ''; @@ -91,7 +97,7 @@ class WzGroupsActionButtonsFiles extends Component { async showGroupConfiguration() { const { itemDetail } = this.props.state; let result = await this.groupsHandler.getFileContent( - `/groups/${itemDetail.name}/files/agent.conf/xml` + `/groups/${itemDetail.name}/files/agent.conf?raw=true`, ); if (Object.keys(result).length == 0) { @@ -113,12 +119,15 @@ class WzGroupsActionButtonsFiles extends Component { // Add new group button const groupConfigurationButton = (
-
+
this.actionFile(item, false)}
- color="primary"
+ color='primary'
/>
{item.filename === 'agent.conf' && (
this.actionFile(item, true)}
- color="primary"
+ color='primary'
/>
)}
);
- }
+ },
});
};
@@ -115,7 +123,7 @@ export default class GroupsFilesColumns {
'other->single': 0,
'other->closing': -1,
'other->opening': 0,
- 'other->other': 0
+ 'other->other': 0,
};
for (var i = 0; i < lines.length; i++) {
@@ -130,10 +138,10 @@ export default class GroupsFilesColumns {
var type = single
? 'single'
: closing
- ? 'closing'
- : opening
- ? 'opening'
- : 'other';
+ ? 'closing'
+ : opening
+ ? 'opening'
+ : 'other';
var fromTo = lastType + '->' + type;
lastType = type;
var padding = '';
diff --git a/plugins/main/public/controllers/management/components/management/groups/utils/columns-main.js b/plugins/main/public/controllers/management/components/management/groups/utils/columns-main.js
index a4143218df..b52e263e0c 100644
--- a/plugins/main/public/controllers/management/components/management/groups/utils/columns-main.js
+++ b/plugins/main/public/controllers/management/components/management/groups/utils/columns-main.js
@@ -14,19 +14,19 @@ export default class GroupsColums {
field: 'name',
name: 'Name',
align: 'left',
- sortable: true
+ sortable: true,
},
{
field: 'count',
name: 'Agents',
align: 'left',
- sortable: true
+ sortable: true,
},
{
field: 'configSum',
name: 'Configuration checksum',
- align: 'left'
- }
+ align: 'left',
+ },
];
this.columns.push({
name: 'Actions',
@@ -36,21 +36,31 @@ export default class GroupsColums {
-
+
this.goReport(item.name)}
- color="primary"
+ color='primary'
/>
- {
this.tableProps.updateListItemsForRemove([item]);
this.tableProps.updateShowModal(true);
}}
- color="danger"
+ color='danger'
isDisabled={item.name === 'default'}
/>
);
- }
+ },
});
};
diff --git a/plugins/main/public/controllers/management/monitoring.js b/plugins/main/public/controllers/management/monitoring.js
index be56f6ab53..4c0f1f04a9 100644
--- a/plugins/main/public/controllers/management/monitoring.js
+++ b/plugins/main/public/controllers/management/monitoring.js
@@ -18,7 +18,6 @@ import { TabVisualizations } from '../../factories/tab-visualizations';
import store from '../../redux/store';
import { updateGlobalBreadcrumb } from '../../redux/actions/globalBreadcrumbActions';
import { ModulesHelper } from '../../components/common/modules/modules-helper';
-import { WAZUH_ROLE_ADMINISTRATOR_NAME } from '../../../common/constants';
import { getCore, getDataPlugin } from '../../kibana-services';
import { cluster, endpointSummary } from '../../utils/applications';
diff --git a/plugins/main/public/controllers/overview/components/__snapshots__/stats.test.tsx.snap b/plugins/main/public/controllers/overview/components/__snapshots__/stats.test.tsx.snap
index 624404e142..6f6d02f5a1 100644
--- a/plugins/main/public/controllers/overview/components/__snapshots__/stats.test.tsx.snap
+++ b/plugins/main/public/controllers/overview/components/__snapshots__/stats.test.tsx.snap
@@ -34,12 +34,13 @@ exports[`Stats component renders correctly to match the snapshot 1`] = `
-
-
-
+
@@ -67,12 +68,13 @@ exports[`Stats component renders correctly to match the snapshot 1`] = `
-
-
-
+
@@ -107,7 +109,7 @@ exports[`Stats component renders correctly to match the snapshot 1`] = `
class="euiLink euiLink--primary statWithLink"
href=""
rel="noreferrer"
- style="font-weight: normal;"
+ style="font-weight: normal; color: rgb(0, 120, 113);"
>
-
diff --git a/plugins/main/public/controllers/overview/components/alerts-stats.js b/plugins/main/public/controllers/overview/components/alerts-stats.js
index dca476c482..c97828c452 100644
--- a/plugins/main/public/controllers/overview/components/alerts-stats.js
+++ b/plugins/main/public/controllers/overview/components/alerts-stats.js
@@ -15,12 +15,13 @@ import { visualizations } from '../../../components/visualize/visualizations';
import PropTypes from 'prop-types';
import { EuiFlexGroup, EuiFlexItem, EuiStat } from '@elastic/eui';
import { connect } from 'react-redux';
-import { buildPhrasesFilter, buildRangeFilter } from '../../../../../../src/plugins/data/common';
+import {
+ buildPhrasesFilter,
+ buildRangeFilter,
+} from '../../../../../../src/plugins/data/common';
import { getIndexPattern } from '../../../../public/components/overview/mitre/lib';
import { AppState } from '../../../react-services/app-state';
-import { getDataPlugin } from '../../../kibana-services';
-import { getSettingDefaultValue } from '../../../../common/services/settings';
-
+import { getDataPlugin, getWazuhCorePlugin } from '../../../kibana-services';
class AlertsStats extends Component {
constructor(props) {
@@ -38,39 +39,49 @@ class AlertsStats extends Component {
});
}
this.setState({
- items: nextProps.items
+ items: nextProps.items,
});
}
async componentDidMount() {
const indexPattern = await getIndexPattern();
- this.setState({indexPattern: indexPattern})
+ this.setState({ indexPattern: indexPattern });
}
buildStats() {
const stats = (this.state.items || []).map((item, index) => {
const title = typeof item.value !== 'undefined' ? item.value : '-';
let auxFunction;
- switch(item.description) {
+ switch (item.description) {
case 'Level 12 or above alerts':
- auxFunction = () => this.filterLevel()
+ auxFunction = () => this.filterLevel();
break;
case 'Authentication failure':
- auxFunction = () => this.filterAuthenticationFailure()
+ auxFunction = () => this.filterAuthenticationFailure();
break;
case 'Authentication success':
- auxFunction = () => this.filterAuthenticationSuccess()
+ auxFunction = () => this.filterAuthenticationSuccess();
break;
default:
- auxFunction = () => {}
+ auxFunction = () => {};
}
return (
- {
+ return `${await context.wazuh_core.configuration.get(
+ 'alerts.sample.prefix',
+ )}sample-${category}`;
}
/**
@@ -251,36 +238,6 @@ export class WazuhElasticCtrl {
}
}
- /**
- * Checks one by one if the requesting user has enough privileges to use
- * an index pattern from the list.
- * @param {Array
+
diff --git a/plugins/main/public/utils/filter-handler.js b/plugins/main/public/utils/filter-handler.js
index 29c7e210af..e6ffbad168 100644
--- a/plugins/main/public/utils/filter-handler.js
+++ b/plugins/main/public/utils/filter-handler.js
@@ -96,25 +96,29 @@ export class FilterHandler {
};
return result;
}
-
- managerQuery(manager, isCluster) {
+ /**
+ * This function takes two parameters, the isCluster parameter is a boolean thats defines if it uses cluster.name key or manager.name
+ * @param {*} manager
+ * @param {*} isCluster
+ * @param {*} fixedKey
+ * @returns
+ */
+ managerQuery(manager, isCluster, fixedKey = undefined) {
+ const metaKey = fixedKey
+ ? fixedKey
+ : isCluster
+ ? 'cluster.name'
+ : 'manager.name';
const result = this.base();
- result.meta.key = isCluster ? 'cluster.name' : 'manager.name';
+ result.meta.key = metaKey;
result.meta.value = manager;
result.meta.params.query = manager;
- result.query.match = isCluster
- ? {
- 'cluster.name': {
- query: manager,
- type: 'phrase',
- },
- }
- : {
- 'manager.name': {
- query: manager,
- type: 'phrase',
- },
- };
+ result.query.match = {
+ [metaKey]: {
+ query: manager,
+ type: 'phrase',
+ },
+ };
return result;
}
diff --git a/plugins/main/public/utils/fontawesome/scss/_fixed-width.scss b/plugins/main/public/utils/fontawesome/scss/_fixed-width.scss
index b221c98133..7102bbac0c 100644
--- a/plugins/main/public/utils/fontawesome/scss/_fixed-width.scss
+++ b/plugins/main/public/utils/fontawesome/scss/_fixed-width.scss
@@ -1,6 +1,6 @@
// Fixed Width Icons
// -------------------------
.#{$fa-css-prefix}-fw {
- width: (18em / 14);
+ width: calc(18em / 14);
text-align: center;
}
diff --git a/plugins/main/public/utils/fontawesome/scss/_larger.scss b/plugins/main/public/utils/fontawesome/scss/_larger.scss
index 41e9a8184a..72eab24e7c 100644
--- a/plugins/main/public/utils/fontawesome/scss/_larger.scss
+++ b/plugins/main/public/utils/fontawesome/scss/_larger.scss
@@ -3,11 +3,19 @@
/* makes the font 33% larger relative to the icon container */
.#{$fa-css-prefix}-lg {
- font-size: (4em / 3);
- line-height: (3em / 4);
+ font-size: calc(4em / 3);
+ line-height: calc(3em / 4);
vertical-align: -15%;
}
-.#{$fa-css-prefix}-2x { font-size: 2em; }
-.#{$fa-css-prefix}-3x { font-size: 3em; }
-.#{$fa-css-prefix}-4x { font-size: 4em; }
-.#{$fa-css-prefix}-5x { font-size: 5em; }
+.#{$fa-css-prefix}-2x {
+ font-size: 2em;
+}
+.#{$fa-css-prefix}-3x {
+ font-size: 3em;
+}
+.#{$fa-css-prefix}-4x {
+ font-size: 4em;
+}
+.#{$fa-css-prefix}-5x {
+ font-size: 5em;
+}
diff --git a/plugins/main/public/utils/fontawesome/scss/_list.scss b/plugins/main/public/utils/fontawesome/scss/_list.scss
index 7d1e4d54d6..728bc3fe67 100644
--- a/plugins/main/public/utils/fontawesome/scss/_list.scss
+++ b/plugins/main/public/utils/fontawesome/scss/_list.scss
@@ -5,15 +5,17 @@
padding-left: 0;
margin-left: $fa-li-width;
list-style-type: none;
- > li { position: relative; }
+ > li {
+ position: relative;
+ }
}
.#{$fa-css-prefix}-li {
position: absolute;
left: -$fa-li-width;
width: $fa-li-width;
- top: (2em / 14);
+ top: calc(2em / 14);
text-align: center;
&.#{$fa-css-prefix}-lg {
- left: -$fa-li-width + (4em / 14);
+ left: -$fa-li-width + calc(4em / 14);
}
}
diff --git a/plugins/main/public/utils/fontawesome/scss/_variables.scss b/plugins/main/public/utils/fontawesome/scss/_variables.scss
index a5a89ef97b..a5a4420d1b 100644
--- a/plugins/main/public/utils/fontawesome/scss/_variables.scss
+++ b/plugins/main/public/utils/fontawesome/scss/_variables.scss
@@ -9,7 +9,7 @@ $fa-css-prefix: fa !default;
$fa-version: "4.6.3" !default;
$fa-border-color: #eee !default;
$fa-inverse: #fff !default;
-$fa-li-width: (30em / 14) !default;
+$fa-li-width: calc(30em / 14) !default;
$fa-var-500px: "\f26e";
$fa-var-adjust: "\f042";
diff --git a/plugins/main/server/controllers/decorators.ts b/plugins/main/server/controllers/decorators.ts
new file mode 100644
index 0000000000..8f6aeacada
--- /dev/null
+++ b/plugins/main/server/controllers/decorators.ts
@@ -0,0 +1,22 @@
+import { ErrorResponse } from '../lib/error-response';
+
+export function routeDecoratorProtectedAdministrator(
+ routeHandler,
+ errorCode: number,
+) {
+ return async (context, request, response) => {
+ try {
+ try {
+ await context.wazuh_core.dashboardSecurity.isAdministratorUser(
+ context,
+ request,
+ );
+ } catch (error) {
+ return ErrorResponse(error.message, 403, 403, response);
+ }
+ return await routeHandler(context, request, response);
+ } catch (error) {
+ return ErrorResponse(error.message || error, errorCode, 500, response);
+ }
+ };
+}
diff --git a/plugins/main/server/controllers/wazuh-api.ts b/plugins/main/server/controllers/wazuh-api.ts
index 0f366841ed..115bc5850a 100644
--- a/plugins/main/server/controllers/wazuh-api.ts
+++ b/plugins/main/server/controllers/wazuh-api.ts
@@ -17,7 +17,6 @@ import { KeyEquivalence } from '../../common/csv-key-equivalence';
import { ApiErrorEquivalence } from '../lib/api-errors-equivalence';
import apiRequestList from '../../common/api-info/endpoints';
import { HTTP_STATUS_CODES } from '../../common/constants';
-import { getCustomizationSetting } from '../../common/services/settings';
import { addJobToQueue } from '../start/queue';
import fs from 'fs';
import jwtDecode from 'jwt-decode';
@@ -27,7 +26,6 @@ import {
OpenSearchDashboardsResponseFactory,
} from 'src/core/server';
import { getCookieValueByName } from '../lib/cookie';
-import { getConfiguration } from '../lib/get-configuration';
export class WazuhApiCtrl {
constructor() {}
@@ -75,8 +73,11 @@ export class WazuhApiCtrl {
}
let token;
if (
- (await context.wazuh_core.cacheAPIUserAllowRunAs.canUse(idHost)) ===
- context.wazuh_core.cacheAPIUserAllowRunAs.API_USER_STATUS_RUN_AS.ENABLED
+ (await context.wazuh_core.manageHosts.cacheAPIUserAllowRunAs.canUse(
+ idHost,
+ )) ===
+ context.wazuh_core.manageHosts.cacheAPIUserAllowRunAs
+ .API_USER_STATUS_RUN_AS.ENABLED
) {
token = await context.wazuh.api.client.asCurrentUser.authenticate(
idHost,
@@ -129,17 +130,16 @@ export class WazuhApiCtrl {
response: OpenSearchDashboardsResponseFactory,
) {
try {
- // Get config from wazuh.yml
+ // Get config from configuration
const id = request.body.id;
context.wazuh.logger.debug(`Getting server API host by ID: ${id}`);
- const api = await context.wazuh_core.manageHosts.getHostById(id);
+ const apiHostData = await context.wazuh_core.manageHosts.get(id, {
+ excludePassword: true,
+ });
+ const api = { ...apiHostData };
context.wazuh.logger.debug(
`Server API host data: ${JSON.stringify(api)}`,
);
- // Check Manage Hosts
- if (!Object.keys(api).length) {
- throw new Error('Could not find server API entry in the configuration');
- }
context.wazuh.logger.debug(`${id} exists`);
@@ -237,15 +237,10 @@ export class WazuhApiCtrl {
api.cluster_info,
);
- // Hide Wazuh API secret, username, password
- const copied = { ...api };
- copied.secret = '****';
- copied.password = '****';
-
return response.ok({
body: {
statusCode: HTTP_STATUS_CODES.OK,
- data: copied,
+ data: api,
idChanged: request.body.idChanged || null,
},
});
@@ -275,10 +270,10 @@ export class WazuhApiCtrl {
});
} else {
try {
- const apis = await context.wazuh_core.manageHosts.getHosts();
+ const apis = await context.wazuh_core.manageHosts.get();
for (const api of apis) {
try {
- const id = Object.keys(api)[0];
+ const { id } = api;
const responseManagerInfo =
await context.wazuh.api.client.asInternalUser.request(
@@ -371,9 +366,9 @@ export class WazuhApiCtrl {
// if (notValid) return ErrorResponse(notValid, 3003, HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR, response);
context.wazuh.logger.debug(`${request.body.id} is valid`);
// Check if a Wazuh API id is given (already stored API)
- const data = await context.wazuh_core.manageHosts.getHostById(
- request.body.id,
- );
+ const data = await context.wazuh_core.manageHosts.get(request.body.id, {
+ excludePassword: true,
+ });
if (data) {
apiAvailable = data;
} else {
@@ -436,8 +431,8 @@ export class WazuhApiCtrl {
// Check the run_as for the API user and update it
let apiUserAllowRunAs =
- context.wazuh_core.cacheAPIUserAllowRunAs.API_USER_STATUS_RUN_AS
- .ALL_DISABLED;
+ context.wazuh_core.manageHosts.cacheAPIUserAllowRunAs
+ .API_USER_STATUS_RUN_AS.ALL_DISABLED;
const responseApiUserAllowRunAs =
await context.wazuh.api.client.asInternalUser.request(
'GET',
@@ -453,25 +448,25 @@ export class WazuhApiCtrl {
if (allow_run_as && apiAvailable && apiAvailable.run_as)
// HOST AND USER ENABLED
apiUserAllowRunAs =
- context.wazuh_core.cacheAPIUserAllowRunAs.API_USER_STATUS_RUN_AS
- .ENABLED;
+ context.wazuh_core.manageHosts.cacheAPIUserAllowRunAs
+ .API_USER_STATUS_RUN_AS.ENABLED;
else if (!allow_run_as && apiAvailable && apiAvailable.run_as)
// HOST ENABLED AND USER DISABLED
apiUserAllowRunAs =
- context.wazuh_core.cacheAPIUserAllowRunAs.API_USER_STATUS_RUN_AS
- .USER_NOT_ALLOWED;
+ context.wazuh_core.manageHosts.cacheAPIUserAllowRunAs
+ .API_USER_STATUS_RUN_AS.USER_NOT_ALLOWED;
else if (allow_run_as && (!apiAvailable || !apiAvailable.run_as))
// USER ENABLED AND HOST DISABLED
apiUserAllowRunAs =
- context.wazuh_core.cacheAPIUserAllowRunAs.API_USER_STATUS_RUN_AS
- .HOST_DISABLED;
+ context.wazuh_core.manageHosts.cacheAPIUserAllowRunAs
+ .API_USER_STATUS_RUN_AS.HOST_DISABLED;
else if (!allow_run_as && (!apiAvailable || !apiAvailable.run_as))
// HOST AND USER DISABLED
apiUserAllowRunAs =
- context.wazuh_core.cacheAPIUserAllowRunAs.API_USER_STATUS_RUN_AS
- .ALL_DISABLED;
+ context.wazuh_core.manageHosts.cacheAPIUserAllowRunAs
+ .API_USER_STATUS_RUN_AS.ALL_DISABLED;
}
- context.wazuh_core.cacheAPIUserAllowRunAs.set(
+ context.wazuh_core.manageHosts.cacheAPIUserAllowRunAs.set(
request.body.id,
apiAvailable.username,
apiUserAllowRunAs,
@@ -665,12 +660,12 @@ export class WazuhApiCtrl {
async makeRequest(context, method, path, data, id, response) {
const devTools = !!(data || {}).devTools;
try {
- const api = await context.wazuh_core.manageHosts.getHostById(id);
- if (devTools) {
- delete data.devTools;
- }
-
- if (!Object.keys(api).length) {
+ let api;
+ try {
+ api = await context.wazuh_core.manageHosts.get(id, {
+ excludePassword: true,
+ });
+ } catch (error) {
context.wazuh.logger.error('Could not get host credentials');
//Can not get credentials from wazuh-hosts
return ErrorResponse(
@@ -681,6 +676,10 @@ export class WazuhApiCtrl {
);
}
+ if (devTools) {
+ delete data.devTools;
+ }
+
if (!data) {
data = {};
}
@@ -1258,16 +1257,18 @@ export class WazuhApiCtrl {
response: OpenSearchDashboardsResponseFactory,
) {
try {
- const configuration = getConfiguration();
const APP_LOGO = 'customization.logo.app';
const HEALTHCHECK_LOGO = 'customization.logo.healthcheck';
const logos = {
- [APP_LOGO]: getCustomizationSetting(configuration, APP_LOGO),
- [HEALTHCHECK_LOGO]: getCustomizationSetting(
- configuration,
- HEALTHCHECK_LOGO,
- ),
+ [APP_LOGO]:
+ await context.wazuh_core.configuration.getCustomizationSetting(
+ APP_LOGO,
+ ),
+ [HEALTHCHECK_LOGO]:
+ await context.wazuh_core.configuration.getCustomizationSetting(
+ HEALTHCHECK_LOGO,
+ ),
};
return response.ok({
diff --git a/plugins/main/server/controllers/wazuh-elastic.ts b/plugins/main/server/controllers/wazuh-elastic.ts
index 9e9eb66f55..b10dda5459 100644
--- a/plugins/main/server/controllers/wazuh-elastic.ts
+++ b/plugins/main/server/controllers/wazuh-elastic.ts
@@ -10,7 +10,6 @@
* Find more information about this on the LICENSE file.
*/
import { ErrorResponse } from '../lib/error-response';
-import { getConfiguration } from '../lib/get-configuration';
import {
AgentsVisualizations,
OverviewVisualizations,
@@ -19,47 +18,35 @@ import {
import { generateAlerts } from '../lib/generate-alerts/generate-alerts-script';
import {
- WAZUH_ROLE_ADMINISTRATOR_ID,
WAZUH_SAMPLE_ALERTS_INDEX_SHARDS,
WAZUH_SAMPLE_ALERTS_INDEX_REPLICAS,
} from '../../common/constants';
-import jwtDecode from 'jwt-decode';
import {
OpenSearchDashboardsRequest,
RequestHandlerContext,
OpenSearchDashboardsResponseFactory,
} from 'src/core/server';
-import { getCookieValueByName } from '../lib/cookie';
import {
WAZUH_SAMPLE_ALERTS_CATEGORIES_TYPE_ALERTS,
WAZUH_SAMPLE_ALERTS_DEFAULT_NUMBER_ALERTS,
} from '../../common/constants';
-import { getSettingDefaultValue } from '../../common/services/settings';
import { WAZUH_INDEXER_NAME } from '../../common/constants';
+import { routeDecoratorProtectedAdministrator } from './decorators';
export class WazuhElasticCtrl {
- wzSampleAlertsIndexPrefix: string;
- constructor() {
- this.wzSampleAlertsIndexPrefix = this.getSampleAlertPrefix();
- }
+ constructor() {}
/**
* This returns the index according the category
* @param {string} category
*/
- buildSampleIndexByCategory(category: string): string {
- return `${this.wzSampleAlertsIndexPrefix}sample-${category}`;
- }
-
- /**
- * This returns the defined config for sample alerts prefix or the default value.
- */
- getSampleAlertPrefix(): string {
- const config = getConfiguration();
- return (
- config['alerts.sample.prefix'] ||
- getSettingDefaultValue('alerts.sample.prefix')
- );
+ async buildSampleIndexByCategory(
+ context: RequestHandlerContext,
+ category: string,
+ ): Promise
-
-
-
-
-