From 2a5b0b8da1f85727e36a4601c51bdfb79ef2583f Mon Sep 17 00:00:00 2001 From: Artem Baskal Date: Mon, 14 Sep 2020 20:16:46 +0300 Subject: [PATCH 1/2] - client: Allow change minimum TTL override in UI Close #2091 #2094 #2056 Squashed commit of the following: commit a84384bb409bfe60c4bd6477b2249c4431aa3b63 Merge: cdc5f27f a22db5f3 Author: ArtemBaskal Date: Mon Sep 14 19:59:47 2020 +0300 Merge branch 'master' into fix/2091 commit cdc5f27f279f33c7d988f2927adc172e77e0a6af Author: ArtemBaskal Date: Mon Sep 14 15:41:00 2020 +0300 Fix uint32 fields validation commit 0c6fcb90f9741ae8a33bf6c4d53bd954f2033a88 Author: ArtemBaskal Date: Mon Sep 14 14:43:20 2020 +0300 Validate DNS cache configuration DNS values unit32 range commit 1f90a1fcbc04f6c7ffb75b453e5c67e117d1c5bf Author: ArtemBaskal Date: Mon Sep 14 12:11:39 2020 +0300 Remove the limit on cache-min-ttl commit 72e961034cc5752a50a4afc57c7be6a93d652f7d Author: ArtemBaskal Date: Fri Sep 11 16:50:19 2020 +0300 Fix translation commit 6aebf4b87bb806ac0729b40418ba6056b3f71afa Author: ArtemBaskal Date: Fri Sep 11 12:53:01 2020 +0300 - client: Allow change minimum TTL override in UI --- client/src/__locales/en.json | 7 +- .../components/Settings/Dhcp/FormDHCPv4.js | 8 +-- .../components/Settings/Dhcp/FormDHCPv6.js | 13 ++-- .../src/components/Settings/Dns/Cache/Form.js | 65 +++++++++---------- .../components/Settings/Dns/Cache/index.js | 11 ++++ .../components/Settings/Dns/Config/Form.js | 7 +- client/src/helpers/constants.js | 13 +++- client/src/helpers/validators.js | 23 ------- 8 files changed, 69 insertions(+), 78 deletions(-) diff --git a/client/src/__locales/en.json b/client/src/__locales/en.json index ece13f64..a5e0208b 100644 --- a/client/src/__locales/en.json +++ b/client/src/__locales/en.json @@ -253,7 +253,7 @@ "rate_limit": "Rate limit", "edns_enable": "Enable EDNS Client Subnet", "edns_cs_desc": "If enabled, AdGuard Home will be sending clients' subnets to the DNS servers.", - "rate_limit_desc": "The number of requests per second that a single client is allowed to make (0: unlimited)", + "rate_limit_desc": "The number of requests per second that a single client is allowed to make (setting it to 0 means unlimited)", "blocking_ipv4_desc": "IP address to be returned for a blocked A request", "blocking_ipv6_desc": "IP address to be returned for a blocked AAAA request", "blocking_mode_default": "Default: Respond with REFUSED when blocked by Adblock-style rule; respond with the IP address specified in the rule when blocked by /etc/hosts-style rule", @@ -564,10 +564,9 @@ "enter_cache_size": "Enter cache size", "enter_cache_ttl_min_override": "Enter minimum TTL", "enter_cache_ttl_max_override": "Enter maximum TTL", - "cache_ttl_min_override_desc": "Override TTL value (minimum) received from upstream server. This value can't larger than 3600 (1 hour)", + "cache_ttl_min_override_desc": "Override TTL value (minimum) received from upstream server", "cache_ttl_max_override_desc": "Override TTL value (maximum) received from upstream server", - "min_exceeds_max_value": "Minimum value exceeds maximum value", - "value_not_larger_than": "Value can't be larger than {{maximum}}", + "ttl_cache_validation": "Minimum cache TTL value must be less than or equal to the maximum value", "filter_category_general": "General", "filter_category_security": "Security", "filter_category_regional": "Regional", diff --git a/client/src/components/Settings/Dhcp/FormDHCPv4.js b/client/src/components/Settings/Dhcp/FormDHCPv4.js index b938b6f0..873e7696 100644 --- a/client/src/components/Settings/Dhcp/FormDHCPv4.js +++ b/client/src/components/Settings/Dhcp/FormDHCPv4.js @@ -8,10 +8,9 @@ import { renderInputField, toNumber, } from '../../../helpers/form'; -import { FORM_NAME } from '../../../helpers/constants'; +import { FORM_NAME, UINT32_RANGE } from '../../../helpers/constants'; import { validateIpv4, - validateIsPositiveValue, validateRequiredValue, validateIpv4RangeEnd, } from '../../../helpers/validators'; @@ -110,9 +109,10 @@ const FormDHCPv4 = ({ type="number" className="form-control" placeholder={t(ipv4placeholders.lease_duration)} - validate={[validateIsPositiveValue, validateRequired]} + validate={validateRequired} normalize={toNumber} - min={0} + min={1} + max={UINT32_RANGE.MAX} disabled={!isInterfaceIncludesIpv4} /> diff --git a/client/src/components/Settings/Dhcp/FormDHCPv6.js b/client/src/components/Settings/Dhcp/FormDHCPv6.js index 80219fd6..e37a6213 100644 --- a/client/src/components/Settings/Dhcp/FormDHCPv6.js +++ b/client/src/components/Settings/Dhcp/FormDHCPv6.js @@ -8,12 +8,8 @@ import { renderInputField, toNumber, } from '../../../helpers/form'; -import { FORM_NAME } from '../../../helpers/constants'; -import { - validateIpv6, - validateIsPositiveValue, - validateRequiredValue, -} from '../../../helpers/validators'; +import { FORM_NAME, UINT32_RANGE } from '../../../helpers/constants'; +import { validateIpv6, validateRequiredValue } from '../../../helpers/validators'; const FormDHCPv6 = ({ handleSubmit, @@ -86,9 +82,10 @@ const FormDHCPv6 = ({ type="number" className="form-control" placeholder={t(ipv6placeholders.lease_duration)} - validate={[validateIsPositiveValue, validateRequired]} + validate={validateRequired} normalizeOnBlur={toNumber} - min={0} + min={1} + max={UINT32_RANGE.MAX} disabled={!isInterfaceIncludesIpv6} /> diff --git a/client/src/components/Settings/Dns/Cache/Form.js b/client/src/components/Settings/Dns/Cache/Form.js index c7b2d6ed..f17310c9 100644 --- a/client/src/components/Settings/Dns/Cache/Form.js +++ b/client/src/components/Settings/Dns/Cache/Form.js @@ -4,32 +4,30 @@ import { Field, reduxForm } from 'redux-form'; import { Trans, useTranslation } from 'react-i18next'; import { shallowEqual, useSelector } from 'react-redux'; import { renderInputField, toNumber } from '../../../../helpers/form'; -import { validateBiggerOrEqualZeroValue, getMaxValueValidator, validateRequiredValue } from '../../../../helpers/validators'; -import { FORM_NAME, SECONDS_IN_HOUR } from '../../../../helpers/constants'; +import { validateRequiredValue } from '../../../../helpers/validators'; +import { CACHE_CONFIG_FIELDS, FORM_NAME, UINT32_RANGE } from '../../../../helpers/constants'; -const validateMaxValue3600 = getMaxValueValidator(SECONDS_IN_HOUR); - -const getInputFields = ({ validateRequiredValue, validateMaxValue3600 }) => [{ - name: 'cache_size', - title: 'cache_size', - description: 'cache_size_desc', - placeholder: 'enter_cache_size', - validate: validateRequiredValue, -}, -{ - name: 'cache_ttl_min', - title: 'cache_ttl_min_override', - description: 'cache_ttl_min_override_desc', - placeholder: 'enter_cache_ttl_min_override', - max: SECONDS_IN_HOUR, - validate: validateMaxValue3600, -}, -{ - name: 'cache_ttl_max', - title: 'cache_ttl_max_override', - description: 'cache_ttl_max_override_desc', - placeholder: 'enter_cache_ttl_max_override', -}]; +const getInputFields = (validateRequiredValue) => [ + { + name: CACHE_CONFIG_FIELDS.cache_size, + title: 'cache_size', + description: 'cache_size_desc', + placeholder: 'enter_cache_size', + validate: validateRequiredValue, + }, + { + name: CACHE_CONFIG_FIELDS.cache_ttl_min, + title: 'cache_ttl_min_override', + description: 'cache_ttl_min_override_desc', + placeholder: 'enter_cache_ttl_min_override', + }, + { + name: CACHE_CONFIG_FIELDS.cache_ttl_max, + title: 'cache_ttl_max_override', + description: 'cache_ttl_max_override_desc', + placeholder: 'enter_cache_ttl_max_override', + }, +]; const Form = ({ handleSubmit, submitting, invalid, @@ -41,17 +39,16 @@ const Form = ({ cache_ttl_max, cache_ttl_min, } = useSelector((state) => state.form[FORM_NAME.CACHE].values, shallowEqual); - const minExceedsMax = cache_ttl_min > cache_ttl_max; + const minExceedsMax = typeof cache_ttl_min === 'number' + && typeof cache_ttl_max === 'number' + && cache_ttl_min > cache_ttl_max; - const INPUTS_FIELDS = getInputFields({ - validateRequiredValue, - validateMaxValue3600, - }); + const INPUTS_FIELDS = getInputFields(validateRequiredValue); return
{INPUTS_FIELDS.map(({ - name, title, description, placeholder, validate, max, + name, title, description, placeholder, validate, min = 0, max = UINT32_RANGE.MAX, }) =>
@@ -66,15 +63,15 @@ const Form = ({ disabled={processingSetConfig} normalize={toNumber} className="form-control" - validate={[validateBiggerOrEqualZeroValue].concat(validate || [])} - min={0} + validate={validate} + min={min} max={max} />
)} {minExceedsMax - && {t('min_exceeds_max_value')}} + && {t('ttl_cache_validation')}}