Pull request #2231: ADG-8368 Frontend rewritten in TypeScript, added Node 18 support

Merge in DNS/adguard-home from ADG-8368-typescript-node-18 to master Squashed commit of the following: commit daa288ae0d76178af24595cc807055902e6f09ab Merge: 4c89cf720 1085d59a6 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Mon Jun 10 17:22:20 2024 +0200 merge commit 4c89cf7209 Author: Ildar Kamalov <ik@adguard.com> Date: Thu Jun 6 13:27:18 2024 +0300 remove install from initial state commit b943f2011f Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 23:10:55 2024 +0200 frontend production build fix commit cd1be2d66d Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 20:23:14 2024 +0200 production build quickfix commit 7b8ac01fc2 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jun 5 19:57:31 2024 +0300 all: upd node docker commit 02afed66d5 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 18:23:12 2024 +0200 changelog fixes commit 9c0f736f0c Merge: 62c4fbf1e e04775c4f Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 18:18:29 2024 +0200 merge commit 62c4fbf1e3 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:22:22 2024 +0200 empty line in changelog commit 76b1e44a93 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:20:37 2024 +0200 changelog commit f783e90040 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:19:13 2024 +0200 filters.js -> filters.ts commit 3d4ce6554c Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:18:03 2024 +0200 generated file removed commit e35ba58f2a Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 15:45:21 2024 +0200 rollback unwanted changes commit 1f30d4216d Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 15:27:36 2024 +0200 review fix commit 6cd4e44f07 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 11:55:39 2024 +0200 missing generated file restoresd commit 2ab738b303 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 11:40:32 2024 +0200 Frontend rewritten in TypeScript, added Node 18 support
2024-06-10 18:42:23 +03:00
parent 1085d59a65
commit 1afe226ce8
296 changed files with 32122 additions and 32651 deletions
--- a/client/src/helpers/validators.ts
+++ b/client/src/helpers/validators.ts
@@ -0,0 +1,409 @@
+import i18next from 'i18next';
+
+import {
+    MAX_PORT,
+    R_CIDR,
+    R_CIDR_IPV6,
+    R_HOST,
+    R_IPV4,
+    R_IPV6,
+    R_MAC,
+    R_URL_REQUIRES_PROTOCOL,
+    STANDARD_WEB_PORT,
+    UNSAFE_PORTS,
+    R_CLIENT_ID,
+    R_DOMAIN,
+    MAX_PASSWORD_LENGTH,
+    MIN_PASSWORD_LENGTH,
+    R_IPV4_SUBNET,
+    R_IPV6_SUBNET,
+} from './constants';
+
+import { ip4ToInt, isValidAbsolutePath } from './form';
+
+import { isIpInCidr, parseSubnetMask } from './helpers';
+
+// Validation functions
+// https://redux-form.com/8.3.0/examples/fieldlevelvalidation/
+// If the value is valid, the validation function should return undefined.
+/**
+ * @param value {string|number}
+ * @returns {undefined|string}
+ */
+export const validateRequiredValue = (value: any) => {
+    const formattedValue = typeof value === 'string' ? value.trim() : value;
+    if (formattedValue || formattedValue === 0 || (formattedValue && formattedValue.length !== 0)) {
+        return undefined;
+    }
+    return 'form_error_required';
+};
+
+/**
+ * @returns {undefined|string}
+ * @param _
+ * @param allValues
+ */
+export const validateIpv4RangeEnd = (_: any, allValues: any) => {
+    if (!allValues || !allValues.v4 || !allValues.v4.range_end || !allValues.v4.range_start) {
+        return undefined;
+    }
+
+    const { range_end, range_start } = allValues.v4;
+
+    if (ip4ToInt(range_end) <= ip4ToInt(range_start)) {
+        return 'greater_range_start_error';
+    }
+
+    return undefined;
+};
+
+/**
+ * @param value {string}
+ * @returns {undefined|string}
+ */
+export const validateIpv4 = (value: any) => {
+    if (value && !R_IPV4.test(value)) {
+        return 'form_error_ip4_format';
+    }
+    return undefined;
+};
+
+/**
+ * @returns {undefined|string}
+ * @param _
+ * @param allValues
+ */
+export const validateNotInRange = (value: any, allValues: any) => {
+    if (!allValues.v4) {
+        return undefined;
+    }
+
+    const { range_start, range_end } = allValues.v4;
+
+    if (range_start && validateIpv4(range_start)) {
+        return undefined;
+    }
+
+    if (range_end && validateIpv4(range_end)) {
+        return undefined;
+    }
+
+    const isAboveMin = range_start && ip4ToInt(value) >= ip4ToInt(range_start);
+    const isBelowMax = range_end && ip4ToInt(value) <= ip4ToInt(range_end);
+
+    if (isAboveMin && isBelowMax) {
+        return i18next.t('out_of_range_error', {
+            start: range_start,
+            end: range_end,
+        });
+    }
+
+    return undefined;
+};
+
+/**
+ * @returns {undefined|string}
+ * @param _
+ * @param allValues
+ */
+export const validateGatewaySubnetMask = (_: any, allValues: any) => {
+    if (!allValues || !allValues.v4 || !allValues.v4.subnet_mask || !allValues.v4.gateway_ip) {
+        return 'gateway_or_subnet_invalid';
+    }
+
+    const { subnet_mask, gateway_ip } = allValues.v4;
+
+    if (validateIpv4(gateway_ip)) {
+        return 'gateway_or_subnet_invalid';
+    }
+
+    return parseSubnetMask(subnet_mask) ? undefined : 'gateway_or_subnet_invalid';
+};
+
+/**
+ * @returns {undefined|string}
+ * @param value
+ * @param allValues
+ */
+export const validateIpForGatewaySubnetMask = (value: any, allValues: any) => {
+    if (!allValues || !allValues.v4 || !value) {
+        return undefined;
+    }
+
+    const { gateway_ip, subnet_mask } = allValues.v4;
+
+    if ((gateway_ip && validateIpv4(gateway_ip)) || (subnet_mask && validateIpv4(subnet_mask))) {
+        return undefined;
+    }
+
+    const subnetPrefix = parseSubnetMask(subnet_mask);
+
+    if (!isIpInCidr(value, `${gateway_ip}/${subnetPrefix}`)) {
+        return 'subnet_error';
+    }
+
+    return undefined;
+};
+
+/**
+ * @param value {string}
+ * @returns {undefined|string}
+ */
+export const validateClientId = (value: any) => {
+    if (!value) {
+        return undefined;
+    }
+    const formattedValue = value.trim();
+    if (
+        formattedValue &&
+        !(
+            R_IPV4.test(formattedValue) ||
+            R_IPV6.test(formattedValue) ||
+            R_MAC.test(formattedValue) ||
+            R_CIDR.test(formattedValue) ||
+            R_CIDR_IPV6.test(formattedValue) ||
+            R_CLIENT_ID.test(formattedValue)
+        )
+    ) {
+        return 'form_error_client_id_format';
+    }
+    return undefined;
+};
+
+/**
+ * @param value {string}
+ * @returns {undefined|string}
+ */
+export const validateConfigClientId = (value: any) => {
+    if (!value) {
+        return undefined;
+    }
+    const formattedValue = value.trim();
+    if (formattedValue && !R_CLIENT_ID.test(formattedValue)) {
+        return 'form_error_client_id_format';
+    }
+    return undefined;
+};
+
+/**
+ * @param value {string}
+ * @returns {undefined|string}
+ */
+export const validateServerName = (value: any) => {
+    if (!value) {
+        return undefined;
+    }
+    const formattedValue = value ? value.trim() : value;
+    if (formattedValue && !R_DOMAIN.test(formattedValue)) {
+        return 'form_error_server_name';
+    }
+    return undefined;
+};
+
+/**
+ * @param value {string}
+ * @returns {undefined|string}
+ */
+export const validateIpv6 = (value: any) => {
+    if (value && !R_IPV6.test(value)) {
+        return 'form_error_ip6_format';
+    }
+    return undefined;
+};
+
+/**
+ * @param value {string}
+ * @returns {undefined|string}
+ */
+export const validateIp = (value: any) => {
+    if (value && !R_IPV4.test(value) && !R_IPV6.test(value)) {
+        return 'form_error_ip_format';
+    }
+    return undefined;
+};
+
+/**
+ * @param value {string}
+ * @returns {undefined|string}
+ */
+export const validateMac = (value: any) => {
+    if (value && !R_MAC.test(value)) {
+        return 'form_error_mac_format';
+    }
+    return undefined;
+};
+
+/**
+ * @param value {number}
+ * @returns {undefined|string}
+ */
+export const validatePort = (value: any) => {
+    if ((value || value === 0) && (value < STANDARD_WEB_PORT || value > MAX_PORT)) {
+        return 'form_error_port_range';
+    }
+    return undefined;
+};
+
+/**
+ * @param value {number}
+ * @returns {undefined|string}
+ */
+export const validateInstallPort = (value: any) => {
+    if (value < 1 || value > MAX_PORT) {
+        return 'form_error_port';
+    }
+    return undefined;
+};
+
+/**
+ * @param value {number}
+ * @returns {undefined|string}
+ */
+export const validatePortTLS = (value: any) => {
+    if (value === 0) {
+        return undefined;
+    }
+    if (value && (value < STANDARD_WEB_PORT || value > MAX_PORT)) {
+        return 'form_error_port_range';
+    }
+    return undefined;
+};
+
+/**
+ * @param value {number}
+ * @returns {undefined|string}
+ */
+export const validatePortQuic = validatePortTLS;
+
+/**
+ * @param value {number}
+ * @returns {undefined|string}
+ */
+export const validateIsSafePort = (value: any) => {
+    if (UNSAFE_PORTS.includes(value)) {
+        return 'form_error_port_unsafe';
+    }
+    return undefined;
+};
+
+/**
+ * @param value {string}
+ * @returns {undefined|string}
+ */
+export const validateDomain = (value: any) => {
+    if (value && !R_HOST.test(value)) {
+        return 'form_error_domain_format';
+    }
+    return undefined;
+};
+
+/**
+ * @param value {string}
+ * @returns {undefined|string}
+ */
+export const validateAnswer = (value: any) => {
+    if (value && !R_IPV4.test(value) && !R_IPV6.test(value) && !R_HOST.test(value)) {
+        return 'form_error_answer_format';
+    }
+    return undefined;
+};
+
+/**
+ * @param value {string}
+ * @returns {undefined|string}
+ */
+export const validatePath = (value: any) => {
+    if (value && !isValidAbsolutePath(value) && !R_URL_REQUIRES_PROTOCOL.test(value)) {
+        return 'form_error_url_or_path_format';
+    }
+    return undefined;
+};
+
+/**
+ * @param cidr {string}
+ * @returns {Function}
+ */
+export const validateIpv4InCidr = (valueIp: any, allValues: any) => {
+    if (!isIpInCidr(valueIp, allValues.cidr)) {
+        return i18next.t('form_error_subnet', { ip: valueIp, cidr: allValues.cidr });
+    }
+    return undefined;
+};
+
+/**
+ * @param value {string}
+ * @returns {number}
+ */
+const utf8StringLength = (value: any) => {
+    const encoder = new TextEncoder();
+    const view = encoder.encode(value);
+
+    return view.length;
+};
+
+/**
+ * @param value {string}
+ * @returns {Function}
+ */
+export const validatePasswordLength = (value: any) => {
+    if (value) {
+        const length = utf8StringLength(value);
+        if (length < MIN_PASSWORD_LENGTH || length > MAX_PASSWORD_LENGTH) {
+            // TODO: Make the i18n clearer with regards to bytes vs. characters.
+            return i18next.t('form_error_password_length', {
+                min: MIN_PASSWORD_LENGTH,
+                max: MAX_PASSWORD_LENGTH,
+            });
+        }
+    }
+
+    return undefined;
+};
+
+/**
+ * @param value {string}
+ * @returns {Function}
+ */
+export const validateIpGateway = (value: any, allValues: any) => {
+    if (value === allValues.gatewayIp) {
+        return i18next.t('form_error_gateway_ip');
+    }
+    return undefined;
+};
+
+/**
+ * @param value {string}
+ * @returns {Function}
+ */
+export const validateIPv4Subnet = (value: any) => {
+    if (!R_IPV4_SUBNET.test(value)) {
+        return i18next.t('rate_limit_subnet_len_ipv4_error');
+    }
+    return undefined;
+};
+
+/**
+ * @param value {string}
+ * @returns {Function}
+ */
+export const validateIPv6Subnet = (value: any) => {
+    if (!R_IPV6_SUBNET.test(value)) {
+        return i18next.t('rate_limit_subnet_len_ipv6_error');
+    }
+    return undefined;
+};
+
+/**
+ * @returns {undefined|string}
+ * @param value
+ * @param allValues
+ */
+export const validatePlainDns = (value: any, allValues: any) => {
+    const { enabled } = allValues;
+
+    if (!enabled && !value) {
+        return 'encryption_plain_dns_error';
+    }
+
+    return undefined;
+};