Merge branch '4.4-7.10' into fix/add-agent-name-length-validation

wazuh · Dec 22, 2022 · d3ac68f · d3ac68f
2 parents 5ae353f + 549edd0
commit d3ac68f
Show file tree

Hide file tree

Showing 8 changed files with 1,375 additions and 1,041 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,8 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Added powerPC architecture in redhat7, in the section 'Deploy new agent'. [#4833](https:/wazuh/wazuh-kibana-app/pull/4833)
 - Added a centralized service to handle the requests [#4831](https:/wazuh/wazuh-kibana-app/pull/4831)
 - Added data-test-subj create policy [#4873](https:/wazuh/wazuh-kibana-app/pull/4873)
+- Added extra steps message and new command for windows xp and windows server 2008, added alpine agent with all its steps. [#4933](https:/wazuh/wazuh-kibana-app/pull/4933)
+- Deploy new agent section: Added link for additional steps to alpine os. [#4933](https:/wazuh/wazuh-kibana-app/pull/4933)
 - Added file saving conditions in File Editor [#4970](https:/wazuh/wazuh-kibana-app/pull/4970)
 - Added character validation to avoid invalid agent names in the section 'Deploy new agent'. [#5021](https:/wazuh/wazuh-kibana-app/pull/5021)[#5028](https:/wazuh/wazuh-kibana-app/pull/5028)
 
@@ -48,7 +50,11 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Fixed pagination to SCA table [#4653](https:/wazuh/wazuh-kibana-app/issues/4653) [#5010](https:/wazuh/wazuh-kibana-app/pull/5010)
 - Fixed WAZUH_PROTOCOL param suggestion [#4849](https:/wazuh/wazuh-kibana-app/pull/4849)
 - Raspbian OS, Ubuntu, Amazon Linux and Amazon Linux 2 commands in the wizard deploy agent now change when a different architecture is selected [#4876](https:/wazuh/wazuh-kibana-app/pull/4876) [#4880](https:/wazuh/wazuh-kibana-app/pull/4880)
+- Fixed the manager option in the agent deployment section [#4981](https:/wazuh/wazuh-kibana-app/pull/4981)
 - Fixed commands in the deploy new agent section(most of the commands are missing '-1') [#4962](https:/wazuh/wazuh-kibana-app/pull/4962)
+- Fixed agent installation command for macOS in the deploy new agent section. [#4968](https:/wazuh/wazuh-kibana-app/pull/4968)
+- Deploy new agent section: Fixed the way macos versions and architectures were displayed, fixed the way agents were displayed, fixed the way ubuntu versions were displayed. [#4933](https:/wazuh/wazuh-kibana-app/pull/4933)
+- Fixed agent deployment instructions for HP-UX and Solaris. [#4943](https:/wazuh/wazuh-kibana-app/pull/4943)
 - Fixed Inventory checks table filters by stats [#4999](https:/wazuh/wazuh-kibana-app/pull/4999)
 - Fixed vulnerabilities default last scan date formatter [#4975](https:/wazuh/wazuh-kibana-app/pull/4975)
 

diff --git a/public/controllers/agent/components/register-agent-service.test.ts b/public/controllers/agent/components/register-agent-service.test.ts
@@ -3,12 +3,21 @@ import { WzRequest } from '../../../react-services/wz-request';
 import { ServerAddressOptions } from '../register-agent/steps';
 
 jest.mock('../../../react-services', () => ({
- ...jest.requireActual('../../../react-services') as object,
+ ...(jest.requireActual('../../../react-services') as object),
  WzRequest: () => ({
  apiReq: jest.fn(),
  }),
 }));
 
+const mockedResponseClusterStatus = {
+ data: {
+ data: {
+ enabled: 'yes',
+ running: 'yes',
+ },
+ error: 0,
+ },
+};
 
 describe('Register agent service', () => {
  beforeEach(() => jest.clearAllMocks());
@@ -41,9 +50,15 @@ describe('Register agent service', () => {
  },
  },
  };
- WzRequest.apiReq = jest.fn().mockResolvedValueOnce(mockedResponse);
+
+ WzRequest.apiReq = jest
+ .fn()
+ .mockResolvedValueOnce(mockedResponseClusterStatus)
+ .mockResolvedValueOnce(mockedResponse);
  const nodeName = 'example-node';
- const res = await RegisterAgentService.getRemoteConfiguration('example-node');
+ const res = await RegisterAgentService.getRemoteConfiguration(
+ 'example-node',
+ );
  expect(res.name).toBe(nodeName);
  expect(res.haveSecureConnection).toBe(true);
  });
@@ -69,130 +84,149 @@ describe('Register agent service', () => {
  },
  },
  };
- WzRequest.apiReq = jest.fn().mockResolvedValueOnce(mockedResponse);
+ WzRequest.apiReq = jest
+ .fn()
+ .mockResolvedValueOnce(mockedResponseClusterStatus)
+ .mockResolvedValueOnce(mockedResponse);
  const nodeName = 'example-node';
- const res = await RegisterAgentService.getRemoteConfiguration('example-node');
+ const res = await RegisterAgentService.getRemoteConfiguration(
+ 'example-node',
+ );
  expect(res.name).toBe(nodeName);
  expect(res.haveSecureConnection).toBe(false);
  });
 
  it('should return protocols UDP when is the only connection protocol available', async () => {
- const remoteWithSecureAndNoSecure = [
- {
- connection: 'syslog',
- ipv6: 'no',
- protocol: ['UDP'],
- port: '514',
- 'allowed-ips': ['0.0.0.0/0'],
- },
- {
- connection: 'secure',
- ipv6: 'no',
- protocol: ['UDP'],
- port: '1514',
- queue_size: '131072',
- },
- ];
- const mockedResponse = {
+ const remoteWithSecureAndNoSecure = [
+ {
+ connection: 'syslog',
+ ipv6: 'no',
+ protocol: ['UDP'],
+ port: '514',
+ 'allowed-ips': ['0.0.0.0/0'],
+ },
+ {
+ connection: 'secure',
+ ipv6: 'no',
+ protocol: ['UDP'],
+ port: '1514',
+ queue_size: '131072',
+ },
+ ];
+ const mockedResponse = {
+ data: {
  data: {
- data: {
- affected_items: [
- {
- remote: remoteWithSecureAndNoSecure,
- },
- ],
- },
+ affected_items: [
+ {
+ remote: remoteWithSecureAndNoSecure,
+ },
+ ],
  },
- };
- WzRequest.apiReq = jest.fn().mockResolvedValueOnce(mockedResponse);
- const nodeName = 'example-node';
- const res = await RegisterAgentService.getRemoteConfiguration('example-node');
- expect(res.name).toBe(nodeName);
- expect(res.isUdp).toEqual(true);
- });
+ },
+ };
+ WzRequest.apiReq = jest
+ .fn()
+ .mockResolvedValueOnce(mockedResponseClusterStatus)
+ .mockResolvedValueOnce(mockedResponse);
+ const nodeName = 'example-node';
+ const res = await RegisterAgentService.getRemoteConfiguration(
+ 'example-node',
+ );
+ expect(res.name).toBe(nodeName);
+ expect(res.isUdp).toEqual(true);
+ });
 
- it('should return protocols TCP when is the only connection protocol available', async () => {
- const remoteWithSecureAndNoSecure = [
- {
- connection: 'syslog',
- ipv6: 'no',
- protocol: ['TCP'],
- port: '514',
- 'allowed-ips': ['0.0.0.0/0'],
- },
- {
- connection: 'secure',
- ipv6: 'no',
- protocol: ['TCP'],
- port: '1514',
- queue_size: '131072',
- },
- ];
- const mockedResponse = {
+ it('should return protocols TCP when is the only connection protocol available', async () => {
+ const remoteWithSecureAndNoSecure = [
+ {
+ connection: 'syslog',
+ ipv6: 'no',
+ protocol: ['TCP'],
+ port: '514',
+ 'allowed-ips': ['0.0.0.0/0'],
+ },
+ {
+ connection: 'secure',
+ ipv6: 'no',
+ protocol: ['TCP'],
+ port: '1514',
+ queue_size: '131072',
+ },
+ ];
+ const mockedResponse = {
+ data: {
  data: {
- data: {
- affected_items: [
- {
- remote: remoteWithSecureAndNoSecure,
- },
- ],
- },
+ affected_items: [
+ {
+ remote: remoteWithSecureAndNoSecure,
+ },
+ ],
  },
- };
- WzRequest.apiReq = jest.fn().mockResolvedValueOnce(mockedResponse);
- const nodeName = 'example-node';
- const res = await RegisterAgentService.getRemoteConfiguration('example-node');
- expect(res.name).toBe(nodeName);
- expect(res.isUdp).toEqual(false);
- });
+ },
+ };
+ WzRequest.apiReq = jest
+ .fn()
+ .mockResolvedValueOnce(mockedResponseClusterStatus)
+ .mockResolvedValueOnce(mockedResponse);
+ const nodeName = 'example-node';
+ const res = await RegisterAgentService.getRemoteConfiguration(
+ 'example-node',
+ );
+ expect(res.name).toBe(nodeName);
+ expect(res.isUdp).toEqual(false);
+ });
 
- it('should return is not UDP when have UDP and TCP protocols available', async () => {
- const remoteWithSecureAndNoSecure = [
- {
- connection: 'syslog',
- ipv6: 'no',
- protocol: ['TCP'],
- port: '514',
- 'allowed-ips': ['0.0.0.0/0'],
- },
- {
- connection: 'secure',
- ipv6: 'no',
- protocol: ['UDP'],
- port: '1514',
- queue_size: '131072',
- },
- ];
- const mockedResponse = {
+ it('should return is not UDP when have UDP and TCP protocols available', async () => {
+ const remoteWithSecureAndNoSecure = [
+ {
+ connection: 'syslog',
+ ipv6: 'no',
+ protocol: ['TCP'],
+ port: '514',
+ 'allowed-ips': ['0.0.0.0/0'],
+ },
+ {
+ connection: 'secure',
+ ipv6: 'no',
+ protocol: ['UDP'],
+ port: '1514',
+ queue_size: '131072',
+ },
+ ];
+ const mockedResponse = {
+ data: {
  data: {
- data: {
- affected_items: [
- {
- remote: remoteWithSecureAndNoSecure,
- },
- ],
- },
+ affected_items: [
+ {
+ remote: remoteWithSecureAndNoSecure,
+ },
+ ],
  },
- };
- WzRequest.apiReq = jest.fn().mockResolvedValueOnce(mockedResponse);
- const nodeName = 'example-node';
- const res = await RegisterAgentService.getRemoteConfiguration('example-node');
- expect(res.name).toBe(nodeName);
- expect(res.isUdp).toEqual(false);
- });
+ },
+ };
+ WzRequest.apiReq = jest
+ .fn()
+ .mockResolvedValueOnce(mockedResponseClusterStatus)
+ .mockResolvedValueOnce(mockedResponse);
+ const nodeName = 'example-node';
+ const res = await RegisterAgentService.getRemoteConfiguration(
+ 'example-node',
+ );
+ expect(res.name).toBe(nodeName);
+ expect(res.isUdp).toEqual(false);
+ });
  });
 
  describe('getConnectionConfig', () => {
-
  beforeAll(() => {
  jest.clearAllMocks();
- })
+ });
 
  it('should return IS NOT UDP when the server address is typed manually (custom)', async () => {
  const nodeSelected: ServerAddressOptions = {
  label: 'node-selected',
  value: 'node-selected',
- nodetype: 'master'
+ nodetype: 'master',
  };
 
  const remoteWithSecureAndNoSecure = [
@@ -223,17 +257,20 @@ describe('Register agent service', () => {
  },
  };
  WzRequest.apiReq = jest.fn().mockResolvedValueOnce(mockedResponse);
-
- const config = await RegisterAgentService.getConnectionConfig(nodeSelected, 'default-dns-address');
+
+ const config = await RegisterAgentService.getConnectionConfig(
+ nodeSelected,
+ 'default-dns-address',
+ );
  expect(config.udpProtocol).toEqual(false);
  expect(config.serverAddress).toBe('default-dns-address');
- })
+ });
 
  it('should return IS NOT UDP when the server address is received like default server address dns (custom)', async () => {
  const nodeSelected: ServerAddressOptions = {
  label: 'node-selected',
  value: 'node-selected',
- nodetype: 'master'
+ nodetype: 'master',
  };
 
  const remoteWithSecureAndNoSecure = [
@@ -264,9 +301,12 @@ describe('Register agent service', () => {
  },
  };
  WzRequest.apiReq = jest.fn().mockResolvedValueOnce(mockedResponse);
-
- const config = await RegisterAgentService.getConnectionConfig(nodeSelected, 'custom-server-address');
+
+ const config = await RegisterAgentService.getConnectionConfig(
+ nodeSelected,
+ 'custom-server-address',
+ );
  expect(config.udpProtocol).toEqual(false);
- })
- })
+ });
+ });
 });