Merge in DNS/adguard-home from 3772-cache-upstreams to master
Updates #3772.
Squashed commit of the following:
commit 809e874fe8847fdbd7f8a7221f18393509f41339
Merge: 5774798c 2d328ea8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Dec 7 17:15:59 2021 +0300
Merge branch 'master' into 3772-cache-upstreams
commit 5774798ce1897bf292be49410794ce06cd084f93
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Dec 7 16:48:38 2021 +0300
client: fix formatting
commit 4b4bb668c762c9b4d47cf40a007f34fe47a6e260
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Dec 7 16:47:18 2021 +0300
client: remove comment
commit a2a9f904a6ab52194bb811a2a83967660a25f2cc
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Dec 7 16:45:31 2021 +0300
client: handle cached upstream
commit a56804c4910da838cb10c8ef0af2a525e9722b1c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Nov 26 15:33:43 2021 +0300
querylog: rm todo
commit 16c0a62ad2dfc7fcb5a6adbc868b296b7840fd27
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Nov 26 15:31:53 2021 +0300
all: revise log of changes
commit 9f4b793205f17b6e85d74e83126093ed09eb24e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Nov 25 17:23:42 2021 +0300
WIP
commit 7fbc6d596295570d2c61c3e507160f65c9adccb8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Nov 25 17:03:42 2021 +0300
all: imp upstream info in querylog
330 lines
7.5 KiB
JavaScript
330 lines
7.5 KiB
JavaScript
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,
|
|
} 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) => {
|
|
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 = (_, allValues) => {
|
|
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) => {
|
|
if (value && !R_IPV4.test(value)) {
|
|
return 'form_error_ip4_format';
|
|
}
|
|
return undefined;
|
|
};
|
|
|
|
/**
|
|
* @returns {undefined|string}
|
|
* @param _
|
|
* @param allValues
|
|
*/
|
|
export const validateNotInRange = (value, allValues) => {
|
|
if (!allValues.v4) {
|
|
return undefined;
|
|
}
|
|
|
|
const { range_start, range_end } = allValues.v4;
|
|
|
|
if (range_start && validateIpv4(range_start)) {
|
|
return 'form_error_ip4_range_start_format';
|
|
}
|
|
|
|
if (range_end && validateIpv4(range_end)) {
|
|
return 'form_error_ip4_range_end_format';
|
|
}
|
|
|
|
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,
|
|
});
|
|
}
|
|
|
|
if (!range_end && isAboveMin) {
|
|
return 'lower_range_start_error';
|
|
}
|
|
|
|
if (!range_start && isBelowMax) {
|
|
return 'greater_range_end_error';
|
|
}
|
|
|
|
return undefined;
|
|
};
|
|
|
|
/**
|
|
* @returns {undefined|string}
|
|
* @param _
|
|
* @param allValues
|
|
*/
|
|
export const validateGatewaySubnetMask = (_, allValues) => {
|
|
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 'form_error_ip4_gateway_format';
|
|
}
|
|
|
|
return parseSubnetMask(subnet_mask) ? undefined : 'gateway_or_subnet_invalid';
|
|
};
|
|
|
|
/**
|
|
* @returns {undefined|string}
|
|
* @param value
|
|
* @param allValues
|
|
*/
|
|
export const validateIpForGatewaySubnetMask = (value, allValues) => {
|
|
if (!allValues || !allValues.v4 || !value) {
|
|
return undefined;
|
|
}
|
|
|
|
const {
|
|
gateway_ip, subnet_mask,
|
|
} = allValues.v4;
|
|
|
|
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) => {
|
|
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) => {
|
|
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) => {
|
|
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) => {
|
|
if (value && !R_IPV6.test(value)) {
|
|
return 'form_error_ip6_format';
|
|
}
|
|
return undefined;
|
|
};
|
|
|
|
/**
|
|
* @param value {string}
|
|
* @returns {undefined|string}
|
|
*/
|
|
export const validateIp = (value) => {
|
|
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) => {
|
|
if (value && !R_MAC.test(value)) {
|
|
return 'form_error_mac_format';
|
|
}
|
|
return undefined;
|
|
};
|
|
|
|
/**
|
|
* @param value {number}
|
|
* @returns {undefined|string}
|
|
*/
|
|
export const validatePort = (value) => {
|
|
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) => {
|
|
if (value < 1 || value > MAX_PORT) {
|
|
return 'form_error_port';
|
|
}
|
|
return undefined;
|
|
};
|
|
|
|
/**
|
|
* @param value {number}
|
|
* @returns {undefined|string}
|
|
*/
|
|
export const validatePortTLS = (value) => {
|
|
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) => {
|
|
if (UNSAFE_PORTS.includes(value)) {
|
|
return 'form_error_port_unsafe';
|
|
}
|
|
return undefined;
|
|
};
|
|
|
|
/**
|
|
* @param value {string}
|
|
* @returns {undefined|string}
|
|
*/
|
|
export const validateDomain = (value) => {
|
|
if (value && !R_HOST.test(value)) {
|
|
return 'form_error_domain_format';
|
|
}
|
|
return undefined;
|
|
};
|
|
|
|
/**
|
|
* @param value {string}
|
|
* @returns {undefined|string}
|
|
*/
|
|
export const validateAnswer = (value) => {
|
|
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) => {
|
|
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, allValues) => {
|
|
if (!isIpInCidr(valueIp, allValues.cidr)) {
|
|
return i18next.t('form_error_subnet', { ip: valueIp, cidr: allValues.cidr });
|
|
}
|
|
return undefined;
|
|
};
|