Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix deploy new agent filters #6327

Merged
merged 5 commits into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ All notable changes to the Wazuh app project will be documented in this file.
- Fixed pinned agent state in URL [#6177](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6177)
- Fixed invalid date format in about and agent views [#6234](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6234)
- Fixed script to install agents on macOS when you have password to deploy [#6305](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6305)
- Fixed a problem with the address validation on Deploy New Agent [#6327](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6327)

### Removed

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,42 @@ describe('Validations', () => {
expect(result).toBeUndefined();
});

it('should return undefined for a valid IP', () => {
it('should return undefined for a valid IPv4', () => {
const validIP = '192.168.1.1';
const result = validateServerAddress(validIP);
expect(result).toBeUndefined();
});

it('should return undefined for a valid IPv6', () => {
const validIP = '2001:0db8:85a3:0000:0000:8a2e:0370:7334';
const result = validateServerAddress(validIP);
expect(result).toBeUndefined();
});

it('should return an error message for an invalid IPv6', () => {
const invalidIPV6 = '2001:db8:85a3::8a2e:370:7334';
const result = validateServerAddress(invalidIPV6);
expect(result).toBe(
'It should be a valid hostname, FQDN, IPv4 or uncompressed IPv6',
);
});

it('should return an error message for a compressed IPv6', () => {
const compressedIPV6 = '2001:0db8:85a3:0000:0000:8a2e:0370:7334:KL12';
const result = validateServerAddress(compressedIPV6);
expect(result).toBe(
'It should be a valid hostname, FQDN, IPv4 or uncompressed IPv6',
);
});

it('should return an error message for an invalid FQDN', () => {
const invalidFQDN = 'example.';
const result = validateServerAddress(invalidFQDN);
expect(result).toBe(
'Each label must have a letter or number at the beginning. The maximum length is 63 characters.',
'It should be a valid hostname, FQDN, IPv4 or uncompressed IPv6',
);
});

test('should return an error message for an invalid IP', () => {
const invalidIP = '999.999.999.999.999';
const result = validateServerAddress(invalidIP);
expect(result).toBe('Not a valid IP');
});

test('should return undefined for an empty value', () => {
const emptyValue = '';
const result = validateAgentName(emptyValue);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,41 +1,27 @@
//IP: This is a set of four numbers, for example, 192.158.1.38. Each number in the set can range from 0 to 255. Therefore, the full range of IP addresses goes from 0.0.0.0 to 255.255.255.255
// O ipv6: 2001:0db8:85a3:0000:0000:8a2e:0370:7334
//IPv4: This is a set of four numbers, for example, 192.158.1.38. Each number in the set can range from 0 to 255. Therefore, the full range of IP addresses goes from 0.0.0.0 to 255.255.255.255
//IPv6: This is a set or eight hexadecimal expressions, each from 0000 to FFFF. 2001:0db8:85a3:0000:0000:8a2e:0370:7334

// FQDN: Maximum of 63 characters per label.
// Can only contain numbers, letters and hyphens (-)
// Labels cannot begin or end with a hyphen
// Currently supports multilingual characters, i.e. letters not included in the English alphabet: e.g. á é í ó ú ü ñ.
// Minimum 3 labels
export const validateServerAddress = (value: any) => {
const isFQDN =
/^(?!-)(?!.*--)(?!.*\d$)[a-zA-Z0-9áéíóúüñ]{1,63}(?:-[a-zA-Z0-9áéíóúüñ]{1,63})*(?:\.[a-zA-Z0-9áéíóúüñ]{1,63}(?:-[a-zA-Z0-9áéíóúüñ]{1,63})*){1,}$/;
const isIP =
/^(?:(?:[0-9]{1,3}\.){3}[0-9]{1,3}|(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4})$/;
const numbersAndPoints = /^[0-9.]+$/;
const areLettersNumbersAndColons = /^[a-zA-Z0-9:]+$/;
const letters = /[a-zA-Z]/;
const isFQDNFormatValid = isFQDN.test(value);
const isIPFormatValid = isIP.test(value);
const areNumbersAndPoints = numbersAndPoints.test(value);
const hasLetters = letters.test(value);
const hasPoints = value.includes('.');
// A label can contain only numbers

let validation = undefined;
if (value.length === 0) {
return validation;
} else if (isFQDNFormatValid && value !== '') {
return validation; // FQDN valid
} else if (isIPFormatValid && value !== '') {
return validation; // IP valid
} else if (hasPoints && hasLetters && !isFQDNFormatValid) {
return (validation =
'Each label must have a letter or number at the beginning. The maximum length is 63 characters.'); // FQDN invalid
} else if (
(areNumbersAndPoints || areLettersNumbersAndColons) &&
!isIPFormatValid
// Hostname: Maximum of 63 characters per label. Same rules as FQDN apply.

export const validateServerAddress = (value: string) => {
const isFQDNOrHostname =
/^(?!-)(?!.*--)[a-zA-Z0-9áéíóúüñ-]{0,62}[a-zA-Z0-9áéíóúüñ](?:\.[a-zA-Z0-9áéíóúüñ-]{0,62}[a-zA-Z0-9áéíóúüñ]){0,}$/;
const isIPv6 = /^(?:[0-9a-fA-F]{4}:){7}[0-9a-fA-F]{4}$/;

if (
value.length > 255 ||
(value.length > 0 && !isFQDNOrHostname.test(value) && !isIPv6.test(value))
) {
return (validation = 'Not a valid IP'); // IP invalid
return 'It should be a valid hostname, FQDN, IPv4 or uncompressed IPv6';
}
return undefined;
};

export const validateAgentName = (value: any) => {
Expand Down
Loading