docstring_tokens stringlengths 18 16.9k | code_tokens stringlengths 75 1.81M | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|
keep keep keep keep replace keep keep keep keep keep | <mask> ipv6,
<mask> biggerOrEqualZero,
<mask> toNumber,
<mask> } from '../../../../helpers/form';
<mask> import { BLOCKING_MODES } from '../../../../helpers/constants';
<mask>
<mask> const checkboxes = [{
<mask> name: 'edns_cs_enabled',
<mask> placeholder: 'edns_enable',
<mask> subtitle: 'edns_cs_desc',
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove import { DNS_REQUEST_OPTIONS } from '../../../../helpers/constants';
</s> add import { DNS_REQUEST_OPTIONS, FORM_NAME } from '../../../../helpers/constants';
import { testUpstream } from '../../../../actions'; </s> remove name: 'dnsRequestOption',
</s> add name: 'upstream_mode', </s> remove value: DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS,
</s> add value: DNS_REQUEST_OPTIONS.LOAD_BALANCING,
component: renderRadioField,
subtitle: 'load_balancing_desc',
placeholder: 'load_balancing',
},
{
name: 'upstream_mode',
type: 'radio',
value: DNS_REQUEST_OPTIONS.PARALLEL, </s> remove name: 'dnsRequestOption',
</s> add name: 'upstream_mode', </s> add import { FORM_NAME } from '../../../../helpers/constants'; </s> add import { FORM_NAME } from '../../../../helpers/constants'; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/Config/Form.js |
keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep replace | <mask> }) => <form onSubmit={handleSubmit}>
<mask> <div className="row">
<mask> <div className="col-12 col-sm-6">
<mask> <div className="form__group form__group--settings">
<mask> <label htmlFor="ratelimit"
<mask> className="form__label form__label--with-desc">
<mask> <Trans>rate_limit</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> <Trans>rate_limit_desc</Trans>
<mask> </div>
<mask> <Field
<mask> name="ratelimit"
<mask> type="number"
<mask> component={renderInputField}
<mask> className="form-control"
<mask> placeholder={t('form_enter_rate_limit')}
<mask> normalize={toNumber}
<mask> validate={[required, biggerOrEqualZero]}
<mask> />
<mask> </div>
<mask> </div>
<mask> {checkboxes.map(({ name, placeholder, subtitle }) => <div className="col-12" key={name}>
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> add <label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>{description}</Trans>
</div> </s> remove type="checkbox"
component={renderSelectField}
placeholder={t(placeholder)}
disabled={processing}
subtitle={t(subtitle)}
</s> add component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[validateIp, required]} </s> remove <div className="col-12">
<div className="form__group form__group--settings mb-4">
<label className="form__label form__label--with-desc">
<Trans>blocking_mode</Trans>
</label>
<div className="form__desc form__desc--top">
{Object.values(BLOCKING_MODES)
.map((mode) => (
<li key={mode}>
<Trans>{`blocking_mode_${mode}`}</Trans>
</li>
))}
</div>
<div className="custom-controls-stacked">
{getFields(processing, t)}
</div>
</div>
</div>
{blockingMode === BLOCKING_MODES.custom_ip && (
<Fragment>
{customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}>
<div className="form__group form__group--settings">
<label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>{description}</Trans>
</div>
<Field
name={name}
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[validateIp, required]}
/>
</div>
</div>)}
</Fragment>
)}
</div>
<button
type="submit"
className="btn btn-success btn-standard btn-large"
disabled={submitting || invalid || processing}
>
<Trans>save_btn</Trans>
</button>
</form>;
</s> add </Fragment>
)}
</div>
<button
type="submit"
className="btn btn-success btn-standard btn-large"
disabled={submitting || invalid || processing}
>
<Trans>save_btn</Trans>
</button>
</form>; </s> remove <div className="form__group">
<Field
id="name"
name="name"
type="text"
component={renderInputField}
className="form-control"
placeholder={t('enter_name_hint')}
validate={[required]}
normalizeOnBlur={(data) => data.trim()}
/>
</div>
</s> add <div className="form__group">
<Field
id="name"
name="name"
type="text"
component={renderInputField}
className="form-control"
placeholder={t('enter_name_hint')}
validate={[required]}
normalizeOnBlur={(data) => data.trim()}
/>
</div> </s> remove render() {
const {
t,
processingTestUpstream,
dnsConfig: {
upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests,
processingSetConfig,
},
} = this.props;
const dnsRequestOption = cn({
parallel_requests,
fastest_addr,
});
return (
<Card
title={t('upstream_dns')}
subtitle={t('upstream_dns_hint')}
bodyType="card-body box-body--settings"
>
<div className="row">
<div className="col">
<Form
initialValues={{
upstream_dns,
bootstrap_dns,
dnsRequestOption,
}}
testUpstream={this.handleTest}
onSubmit={this.handleSubmit}
processingTestUpstream={processingTestUpstream}
processingSetConfig={processingSetConfig}
/>
</div>
</s> add const {
processingTestUpstream,
dnsConfig: {
upstream_dns,
bootstrap_dns,
processingSetConfig,
upstream_mode,
},
} = props;
return (
<Card
title={t('upstream_dns')}
subtitle={t('upstream_dns_hint')}
bodyType="card-body box-body--settings"
>
<div className="row">
<div className="col">
<Form
initialValues={{
upstream_dns,
bootstrap_dns,
upstream_mode,
}}
onSubmit={handleSubmit}
processingTestUpstream={processingTestUpstream}
processingSetConfig={processingSetConfig}
/> | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/Config/Form.js |
keep add keep keep keep keep keep keep | <mask> }) => <div className="col-12 col-sm-6" key={name}>
<mask> <div className="form__group form__group--settings">
<mask> <Field
<mask> name={name}
<mask> component={renderInputField}
<mask> className="form-control"
<mask> placeholder={t('form_enter_ip')}
<mask> validate={[validateIp, required]}
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove type="checkbox"
component={renderSelectField}
placeholder={t(placeholder)}
disabled={processing}
subtitle={t(subtitle)}
</s> add component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[validateIp, required]} </s> remove <div className="row">
<div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="ratelimit"
className="form__label form__label--with-desc">
<Trans>rate_limit</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>rate_limit_desc</Trans>
</div>
<Field
name="ratelimit"
type="number"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_rate_limit')}
normalize={toNumber}
validate={[required, biggerOrEqualZero]}
/>
</s> add <div className="row">
<div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="ratelimit"
className="form__label form__label--with-desc">
<Trans>rate_limit</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>rate_limit_desc</Trans> </s> remove {checkboxes.map(({ name, placeholder, subtitle }) => <div className="col-12" key={name}>
</s> add </div>)}
<div className="col-12">
<div className="form__group form__group--settings mb-4">
<label className="form__label form__label--with-desc">
<Trans>blocking_mode</Trans>
</label>
<div className="form__desc form__desc--top">
{Object.values(BLOCKING_MODES)
.map((mode) => (
<li key={mode}>
<Trans>{`blocking_mode_${mode}`}</Trans>
</li>
))}
</div>
<div className="custom-controls-stacked">
{getFields(processing, t)}
</div>
</div>
</div>
{blockingMode === BLOCKING_MODES.custom_ip && (
<Fragment>
{customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> remove <div className="col-12">
<div className="form__group form__group--settings mb-4">
<label className="form__label form__label--with-desc">
<Trans>blocking_mode</Trans>
</label>
<div className="form__desc form__desc--top">
{Object.values(BLOCKING_MODES)
.map((mode) => (
<li key={mode}>
<Trans>{`blocking_mode_${mode}`}</Trans>
</li>
))}
</div>
<div className="custom-controls-stacked">
{getFields(processing, t)}
</div>
</div>
</div>
{blockingMode === BLOCKING_MODES.custom_ip && (
<Fragment>
{customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}>
<div className="form__group form__group--settings">
<label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>{description}</Trans>
</div>
<Field
name={name}
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[validateIp, required]}
/>
</div>
</div>)}
</Fragment>
)}
</div>
<button
type="submit"
className="btn btn-success btn-standard btn-large"
disabled={submitting || invalid || processing}
>
<Trans>save_btn</Trans>
</button>
</form>;
</s> add </Fragment>
)}
</div>
<button
type="submit"
className="btn btn-success btn-standard btn-large"
disabled={submitting || invalid || processing}
>
<Trans>save_btn</Trans>
</button>
</form>; </s> remove <div className="form__group">
<Field
id="name"
name="name"
type="text"
component={renderInputField}
className="form-control"
placeholder={t('enter_name_hint')}
validate={[required]}
normalizeOnBlur={(data) => data.trim()}
/>
</div>
</s> add <div className="form__group">
<Field
id="name"
name="name"
type="text"
component={renderInputField}
className="form-control"
placeholder={t('enter_name_hint')}
validate={[required]}
normalizeOnBlur={(data) => data.trim()}
/>
</div> </s> remove onClick={() => testUpstream({
upstream_dns,
bootstrap_dns,
})
}
</s> add onClick={handleUpstreamTest} | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/Config/Form.js |
keep keep keep keep replace replace replace replace replace keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep | <mask> {checkboxes.map(({ name, placeholder, subtitle }) => <div className="col-12" key={name}>
<mask> <div className="form__group form__group--settings">
<mask> <Field
<mask> name={name}
<mask> type="checkbox"
<mask> component={renderSelectField}
<mask> placeholder={t(placeholder)}
<mask> disabled={processing}
<mask> subtitle={t(subtitle)}
<mask> />
<mask> </div>
<mask> </div>)}
<mask> <div className="col-12">
<mask> <div className="form__group form__group--settings mb-4">
<mask> <label className="form__label form__label--with-desc">
<mask> <Trans>blocking_mode</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> {Object.values(BLOCKING_MODES)
<mask> .map((mode) => (
<mask> <li key={mode}>
<mask> <Trans>{`blocking_mode_${mode}`}</Trans>
<mask> </li>
<mask> ))}
<mask> </div>
<mask> <div className="custom-controls-stacked">
<mask> {getFields(processing, t)}
<mask> </div>
<mask> </div>
<mask> </div>
<mask> {blockingMode === BLOCKING_MODES.custom_ip && (
<mask> <Fragment>
<mask> {customIps.map(({
<mask> description,
<mask> name,
<mask> validateIp,
<mask> }) => <div className="col-12 col-sm-6" key={name}>
<mask> <div className="form__group form__group--settings">
<mask> <label className="form__label form__label--with-desc"
<mask> htmlFor={name}><Trans>{name}</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> <Trans>{description}</Trans>
<mask> </div>
<mask> <Field
<mask> name={name}
<mask> component={renderInputField}
<mask> className="form-control"
<mask> placeholder={t('form_enter_ip')}
<mask> validate={[validateIp, required]}
<mask> />
<mask> </div>
<mask> </div>)}
<mask> </Fragment>
<mask> )}
<mask> </div>
<mask> <button
<mask> type="submit"
<mask> className="btn btn-success btn-standard btn-large"
<mask> disabled={submitting || invalid || processing}
<mask> >
<mask> <Trans>save_btn</Trans>
<mask> </button>
<mask> </form>;
<mask>
<mask> Form.propTypes = {
<mask> blockingMode: PropTypes.string.isRequired,
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove {checkboxes.map(({ name, placeholder, subtitle }) => <div className="col-12" key={name}>
</s> add </div>)}
<div className="col-12">
<div className="form__group form__group--settings mb-4">
<label className="form__label form__label--with-desc">
<Trans>blocking_mode</Trans>
</label>
<div className="form__desc form__desc--top">
{Object.values(BLOCKING_MODES)
.map((mode) => (
<li key={mode}>
<Trans>{`blocking_mode_${mode}`}</Trans>
</li>
))}
</div>
<div className="custom-controls-stacked">
{getFields(processing, t)}
</div>
</div>
</div>
{blockingMode === BLOCKING_MODES.custom_ip && (
<Fragment>
{customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> add <label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>{description}</Trans>
</div> </s> remove <div className="row">
<div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="ratelimit"
className="form__label form__label--with-desc">
<Trans>rate_limit</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>rate_limit_desc</Trans>
</div>
<Field
name="ratelimit"
type="number"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_rate_limit')}
normalize={toNumber}
validate={[required, biggerOrEqualZero]}
/>
</s> add <div className="row">
<div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="ratelimit"
className="form__label form__label--with-desc">
<Trans>rate_limit</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>rate_limit_desc</Trans> </s> remove <div className="form__group">
<Field
id="name"
name="name"
type="text"
component={renderInputField}
className="form-control"
placeholder={t('enter_name_hint')}
validate={[required]}
normalizeOnBlur={(data) => data.trim()}
/>
</div>
</s> add <div className="form__group">
<Field
id="name"
name="name"
type="text"
component={renderInputField}
className="form-control"
placeholder={t('enter_name_hint')}
validate={[required]}
normalizeOnBlur={(data) => data.trim()}
/>
</div> </s> remove render() {
const {
t,
processingTestUpstream,
dnsConfig: {
upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests,
processingSetConfig,
},
} = this.props;
const dnsRequestOption = cn({
parallel_requests,
fastest_addr,
});
return (
<Card
title={t('upstream_dns')}
subtitle={t('upstream_dns_hint')}
bodyType="card-body box-body--settings"
>
<div className="row">
<div className="col">
<Form
initialValues={{
upstream_dns,
bootstrap_dns,
dnsRequestOption,
}}
testUpstream={this.handleTest}
onSubmit={this.handleSubmit}
processingTestUpstream={processingTestUpstream}
processingSetConfig={processingSetConfig}
/>
</div>
</s> add const {
processingTestUpstream,
dnsConfig: {
upstream_dns,
bootstrap_dns,
processingSetConfig,
upstream_mode,
},
} = props;
return (
<Card
title={t('upstream_dns')}
subtitle={t('upstream_dns_hint')}
bodyType="card-body box-body--settings"
>
<div className="row">
<div className="col">
<Form
initialValues={{
upstream_dns,
bootstrap_dns,
upstream_mode,
}}
onSubmit={handleSubmit}
processingTestUpstream={processingTestUpstream}
processingSetConfig={processingSetConfig}
/> | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/Config/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> processing: PropTypes.bool.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> const selector = formValueSelector('blockingModeForm');
<mask>
<mask> Form = connect((state) => {
<mask> const blockingMode = selector(state, 'blocking_mode');
<mask> return {
<mask> blockingMode,
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove const selector = formValueSelector('clientForm');
</s> add const selector = formValueSelector(FORM_NAME.CLIENT); </s> remove const selector = formValueSelector('dhcpForm');
</s> add const selector = formValueSelector(FORM_NAME.DHCP); </s> remove const selector = formValueSelector('install');
</s> add const selector = formValueSelector(FORM_NAME.INSTALL); </s> remove const selector = formValueSelector('encryptionForm');
</s> add const selector = formValueSelector(FORM_NAME.ENCRYPTION); </s> remove const selector = formValueSelector('upstreamForm');
Form = connect((state) => {
const upstream_dns = selector(state, 'upstream_dns');
const bootstrap_dns = selector(state, 'bootstrap_dns');
return {
upstream_dns,
bootstrap_dns,
};
})(Form);
export default flow([
withTranslation(),
reduxForm({
form: 'upstreamForm',
}),
])(Form);
</s> add export default reduxForm({ form: FORM_NAME.UPSTREAM })(Form); </s> remove t: PropTypes.func,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/Config/Form.js |
keep keep keep keep replace replace replace keep | <mask> })(Form);
<mask>
<mask> export default flow([
<mask> withTranslation(),
<mask> reduxForm({
<mask> form: 'blockingModeForm',
<mask> }),
<mask> ])(Form);
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove reduxForm({ form: 'dhcpForm' }),
</s> add reduxForm({ form: FORM_NAME.DHCP }), </s> remove reduxForm({
form: 'loginForm',
}),
</s> add reduxForm({ form: FORM_NAME.LOGIN }), </s> remove reduxForm({
form: 'filterForm',
}),
</s> add reduxForm({ form: FORM_NAME.FILTER }), </s> remove reduxForm({ form: 'leaseForm' }),
</s> add reduxForm({ form: FORM_NAME.LEASE }), </s> remove reduxForm({
form: 'filterConfigForm',
}),
</s> add reduxForm({ form: FORM_NAME.FILTER_CONFIG }), </s> remove reduxForm({
form: 'logConfigForm',
}),
</s> add reduxForm({ form: FORM_NAME.LOG_CONFIG }), | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/Config/Form.js |
keep replace keep replace replace replace keep keep | <mask> import React from 'react';
<mask> import { connect } from 'react-redux';
<mask> import PropTypes from 'prop-types';
<mask> import { Field, reduxForm, formValueSelector } from 'redux-form';
<mask> import { Trans, withTranslation } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask> import classnames from 'classnames';
<mask>
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove import React, { Component } from 'react';
</s> add import React from 'react'; </s> remove import { withTranslation } from 'react-i18next';
import cn from 'classnames';
</s> add import { useTranslation } from 'react-i18next';
import { useDispatch } from 'react-redux'; </s> remove import React, { Component, Fragment } from 'react';
</s> add import React, { useEffect } from 'react'; </s> remove import { withTranslation } from 'react-i18next';
</s> add import { useTranslation } from 'react-i18next'; </s> add import { FORM_NAME } from '../../../../helpers/constants'; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> import classnames from 'classnames';
<mask>
<mask> import Examples from './Examples';
<mask> import { renderRadioField } from '../../../../helpers/form';
<mask> import { DNS_REQUEST_OPTIONS } from '../../../../helpers/constants';
<mask>
<mask> const getInputFields = () => [{
<mask> // eslint-disable-next-line react/display-name
<mask> getTitle: () => <label className="form__label" htmlFor="upstream_dns">
<mask> <Trans>upstream_dns</Trans>
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove import { Field, reduxForm, formValueSelector } from 'redux-form';
import { Trans, withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
</s> add import { Field, reduxForm } from 'redux-form';
import { Trans, useTranslation } from 'react-i18next'; </s> remove import { BLOCKING_MODES } from '../../../../helpers/constants';
</s> add import { BLOCKING_MODES, FORM_NAME } from '../../../../helpers/constants'; </s> remove import { withTranslation } from 'react-i18next';
import cn from 'classnames';
</s> add import { useTranslation } from 'react-i18next';
import { useDispatch } from 'react-redux'; </s> add import { FORM_NAME } from '../../../../helpers/constants'; </s> add import { FORM_NAME } from '../../../../helpers/constants'; </s> remove import { connect } from 'react-redux';
</s> add import { useDispatch, useSelector } from 'react-redux'; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep replace keep replace keep keep | <mask> },
<mask> {
<mask> name: 'dnsRequestOption',
<mask> type: 'radio',
<mask> value: DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS,
<mask> component: renderRadioField,
<mask> subtitle: 'upstream_parallel',
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove name: 'dnsRequestOption',
</s> add name: 'upstream_mode', </s> remove import { BLOCKING_MODES } from '../../../../helpers/constants';
</s> add import { BLOCKING_MODES, FORM_NAME } from '../../../../helpers/constants'; </s> remove import { SERVICES } from '../../../helpers/constants';
</s> add import { FORM_NAME, SERVICES } from '../../../helpers/constants'; </s> remove render() {
const {
t,
settings,
access,
setAccessList,
testUpstream,
dnsConfig,
setDnsConfig,
} = this.props;
</s> add useEffect(() => {
props.getAccessList();
props.getDnsConfig();
}, []); </s> remove render() {
const {
t,
processingTestUpstream,
dnsConfig: {
upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests,
processingSetConfig,
},
} = this.props;
const dnsRequestOption = cn({
parallel_requests,
fastest_addr,
});
return (
<Card
title={t('upstream_dns')}
subtitle={t('upstream_dns_hint')}
bodyType="card-body box-body--settings"
>
<div className="row">
<div className="col">
<Form
initialValues={{
upstream_dns,
bootstrap_dns,
dnsRequestOption,
}}
testUpstream={this.handleTest}
onSubmit={this.handleSubmit}
processingTestUpstream={processingTestUpstream}
processingSetConfig={processingSetConfig}
/>
</div>
</s> add const {
processingTestUpstream,
dnsConfig: {
upstream_dns,
bootstrap_dns,
processingSetConfig,
upstream_mode,
},
} = props;
return (
<Card
title={t('upstream_dns')}
subtitle={t('upstream_dns_hint')}
bodyType="card-body box-body--settings"
>
<div className="row">
<div className="col">
<Form
initialValues={{
upstream_dns,
bootstrap_dns,
upstream_mode,
}}
onSubmit={handleSubmit}
processingTestUpstream={processingTestUpstream}
processingSetConfig={processingSetConfig}
/> | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> subtitle: 'upstream_parallel',
<mask> placeholder: 'parallel_requests',
<mask> },
<mask> {
<mask> name: 'dnsRequestOption',
<mask> type: 'radio',
<mask> value: DNS_REQUEST_OPTIONS.FASTEST_ADDR,
<mask> component: renderRadioField,
<mask> subtitle: 'fastest_addr_desc',
<mask> placeholder: 'fastest_addr',
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove value: DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS,
</s> add value: DNS_REQUEST_OPTIONS.LOAD_BALANCING,
component: renderRadioField,
subtitle: 'load_balancing_desc',
placeholder: 'load_balancing',
},
{
name: 'upstream_mode',
type: 'radio',
value: DNS_REQUEST_OPTIONS.PARALLEL, </s> remove name: 'dnsRequestOption',
</s> add name: 'upstream_mode', </s> remove import { BLOCKING_MODES } from '../../../../helpers/constants';
</s> add import { BLOCKING_MODES, FORM_NAME } from '../../../../helpers/constants'; </s> remove let Form = (props) => {
const {
t,
handleSubmit,
testUpstream,
submitting,
invalid,
processingSetConfig,
processingTestUpstream,
</s> add const Form = ({
submitting, invalid, processingSetConfig, processingTestUpstream, handleSubmit,
}) => {
const dispatch = useDispatch();
const [t] = useTranslation();
const upstream_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM].values.upstream_dns);
const bootstrap_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM]
.values.bootstrap_dns);
const handleUpstreamTest = () => dispatch(testUpstream({ </s> remove PARALLEL_REQUESTS: 'parallel_requests',
</s> add PARALLEL: 'parallel', </s> remove import { SERVICES } from '../../../helpers/constants';
</s> add import { FORM_NAME, SERVICES } from '../../../helpers/constants'; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/Upstream/Form.js |
keep replace replace replace replace replace replace replace replace replace keep keep replace keep keep | <mask>
<mask> let Form = (props) => {
<mask> const {
<mask> t,
<mask> handleSubmit,
<mask> testUpstream,
<mask> submitting,
<mask> invalid,
<mask> processingSetConfig,
<mask> processingTestUpstream,
<mask> upstream_dns,
<mask> bootstrap_dns,
<mask> } = props;
<mask>
<mask> const testButtonClass = classnames({
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove const testButtonClass = classnames({
'btn btn-primary btn-standard mr-2': true,
'btn btn-primary btn-standard mr-2 btn-loading': processingTestUpstream,
</s> add const testButtonClass = classnames('btn btn-primary btn-standard mr-2', {
'btn-loading': processingTestUpstream, </s> add import { FORM_NAME } from '../../helpers/constants'; </s> remove render() {
const {
t,
processingTestUpstream,
dnsConfig: {
upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests,
processingSetConfig,
},
} = this.props;
const dnsRequestOption = cn({
parallel_requests,
fastest_addr,
});
return (
<Card
title={t('upstream_dns')}
subtitle={t('upstream_dns_hint')}
bodyType="card-body box-body--settings"
>
<div className="row">
<div className="col">
<Form
initialValues={{
upstream_dns,
bootstrap_dns,
dnsRequestOption,
}}
testUpstream={this.handleTest}
onSubmit={this.handleSubmit}
processingTestUpstream={processingTestUpstream}
processingSetConfig={processingSetConfig}
/>
</div>
</s> add const {
processingTestUpstream,
dnsConfig: {
upstream_dns,
bootstrap_dns,
processingSetConfig,
upstream_mode,
},
} = props;
return (
<Card
title={t('upstream_dns')}
subtitle={t('upstream_dns_hint')}
bodyType="card-body box-body--settings"
>
<div className="row">
<div className="col">
<Form
initialValues={{
upstream_dns,
bootstrap_dns,
upstream_mode,
}}
onSubmit={handleSubmit}
processingTestUpstream={processingTestUpstream}
processingSetConfig={processingSetConfig}
/> </s> add import { FORM_NAME } from '../../../../helpers/constants'; </s> add import { FORM_NAME } from '../../../helpers/constants'; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> upstream_dns,
<mask> bootstrap_dns,
<mask> } = props;
<mask>
<mask> const testButtonClass = classnames({
<mask> 'btn btn-primary btn-standard mr-2': true,
<mask> 'btn btn-primary btn-standard mr-2 btn-loading': processingTestUpstream,
<mask> });
<mask>
<mask> const INPUT_FIELDS = getInputFields();
<mask>
<mask> return <form onSubmit={handleSubmit}>
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove } = props;
</s> add })); </s> remove let Form = (props) => {
const {
t,
handleSubmit,
testUpstream,
submitting,
invalid,
processingSetConfig,
processingTestUpstream,
</s> add const Form = ({
submitting, invalid, processingSetConfig, processingTestUpstream, handleSubmit,
}) => {
const dispatch = useDispatch();
const [t] = useTranslation();
const upstream_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM].values.upstream_dns);
const bootstrap_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM]
.values.bootstrap_dns);
const handleUpstreamTest = () => dispatch(testUpstream({ </s> remove render() {
const {
t,
processingTestUpstream,
dnsConfig: {
upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests,
processingSetConfig,
},
} = this.props;
const dnsRequestOption = cn({
parallel_requests,
fastest_addr,
});
return (
<Card
title={t('upstream_dns')}
subtitle={t('upstream_dns_hint')}
bodyType="card-body box-body--settings"
>
<div className="row">
<div className="col">
<Form
initialValues={{
upstream_dns,
bootstrap_dns,
dnsRequestOption,
}}
testUpstream={this.handleTest}
onSubmit={this.handleSubmit}
processingTestUpstream={processingTestUpstream}
processingSetConfig={processingSetConfig}
/>
</div>
</s> add const {
processingTestUpstream,
dnsConfig: {
upstream_dns,
bootstrap_dns,
processingSetConfig,
upstream_mode,
},
} = props;
return (
<Card
title={t('upstream_dns')}
subtitle={t('upstream_dns_hint')}
bodyType="card-body box-body--settings"
>
<div className="row">
<div className="col">
<Form
initialValues={{
upstream_dns,
bootstrap_dns,
upstream_mode,
}}
onSubmit={handleSubmit}
processingTestUpstream={processingTestUpstream}
processingSetConfig={processingSetConfig}
/> </s> remove import { DNS_REQUEST_OPTIONS } from '../../../../helpers/constants';
class Upstream extends Component {
handleSubmit = ({ bootstrap_dns, upstream_dns, dnsRequestOption }) => {
const disabledOption = dnsRequestOption === DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS
? DNS_REQUEST_OPTIONS.FASTEST_ADDR
: DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS;
const formattedValues = {
bootstrap_dns,
upstream_dns,
[dnsRequestOption]: true,
[disabledOption]: false,
};
</s> add import { setDnsConfig } from '../../../../actions/dnsConfig'; </s> remove const selector = formValueSelector('upstreamForm');
Form = connect((state) => {
const upstream_dns = selector(state, 'upstream_dns');
const bootstrap_dns = selector(state, 'bootstrap_dns');
return {
upstream_dns,
bootstrap_dns,
};
})(Form);
export default flow([
withTranslation(),
reduxForm({
form: 'upstreamForm',
}),
])(Form);
</s> add export default reduxForm({ form: FORM_NAME.UPSTREAM })(Form); </s> remove const isDataLoading = access.processing || dnsConfig.processingGetConfig;
</s> add const {
settings,
access,
setAccessList,
dnsConfig,
setDnsConfig,
} = props; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> <div className="btn-list">
<mask> <button
<mask> type="button"
<mask> className={testButtonClass}
<mask> onClick={() => testUpstream({
<mask> upstream_dns,
<mask> bootstrap_dns,
<mask> })
<mask> }
<mask> disabled={!upstream_dns || processingTestUpstream}
<mask> >
<mask> <Trans>test_upstream_btn</Trans>
<mask> </button>
<mask> <button
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove <div className="col-12">
<div className="form__group form__group--settings mb-4">
<label className="form__label form__label--with-desc">
<Trans>blocking_mode</Trans>
</label>
<div className="form__desc form__desc--top">
{Object.values(BLOCKING_MODES)
.map((mode) => (
<li key={mode}>
<Trans>{`blocking_mode_${mode}`}</Trans>
</li>
))}
</div>
<div className="custom-controls-stacked">
{getFields(processing, t)}
</div>
</div>
</div>
{blockingMode === BLOCKING_MODES.custom_ip && (
<Fragment>
{customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}>
<div className="form__group form__group--settings">
<label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>{description}</Trans>
</div>
<Field
name={name}
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[validateIp, required]}
/>
</div>
</div>)}
</Fragment>
)}
</div>
<button
type="submit"
className="btn btn-success btn-standard btn-large"
disabled={submitting || invalid || processing}
>
<Trans>save_btn</Trans>
</button>
</form>;
</s> add </Fragment>
)}
</div>
<button
type="submit"
className="btn btn-success btn-standard btn-large"
disabled={submitting || invalid || processing}
>
<Trans>save_btn</Trans>
</button>
</form>; </s> remove render() {
const {
t,
processingTestUpstream,
dnsConfig: {
upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests,
processingSetConfig,
},
} = this.props;
const dnsRequestOption = cn({
parallel_requests,
fastest_addr,
});
return (
<Card
title={t('upstream_dns')}
subtitle={t('upstream_dns_hint')}
bodyType="card-body box-body--settings"
>
<div className="row">
<div className="col">
<Form
initialValues={{
upstream_dns,
bootstrap_dns,
dnsRequestOption,
}}
testUpstream={this.handleTest}
onSubmit={this.handleSubmit}
processingTestUpstream={processingTestUpstream}
processingSetConfig={processingSetConfig}
/>
</div>
</s> add const {
processingTestUpstream,
dnsConfig: {
upstream_dns,
bootstrap_dns,
processingSetConfig,
upstream_mode,
},
} = props;
return (
<Card
title={t('upstream_dns')}
subtitle={t('upstream_dns_hint')}
bodyType="card-body box-body--settings"
>
<div className="row">
<div className="col">
<Form
initialValues={{
upstream_dns,
bootstrap_dns,
upstream_mode,
}}
onSubmit={handleSubmit}
processingTestUpstream={processingTestUpstream}
processingSetConfig={processingSetConfig}
/> </s> remove import { DNS_REQUEST_OPTIONS } from '../../../../helpers/constants';
class Upstream extends Component {
handleSubmit = ({ bootstrap_dns, upstream_dns, dnsRequestOption }) => {
const disabledOption = dnsRequestOption === DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS
? DNS_REQUEST_OPTIONS.FASTEST_ADDR
: DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS;
const formattedValues = {
bootstrap_dns,
upstream_dns,
[dnsRequestOption]: true,
[disabledOption]: false,
};
</s> add import { setDnsConfig } from '../../../../actions/dnsConfig'; </s> remove <div className="row">
<div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="ratelimit"
className="form__label form__label--with-desc">
<Trans>rate_limit</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>rate_limit_desc</Trans>
</div>
<Field
name="ratelimit"
type="number"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_rate_limit')}
normalize={toNumber}
validate={[required, biggerOrEqualZero]}
/>
</s> add <div className="row">
<div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="ratelimit"
className="form__label form__label--with-desc">
<Trans>rate_limit</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>rate_limit_desc</Trans> </s> remove {checkboxes.map(({ name, placeholder, subtitle }) => <div className="col-12" key={name}>
</s> add </div>)}
<div className="col-12">
<div className="form__group form__group--settings mb-4">
<label className="form__label form__label--with-desc">
<Trans>blocking_mode</Trans>
</label>
<div className="form__desc form__desc--top">
{Object.values(BLOCKING_MODES)
.map((mode) => (
<li key={mode}>
<Trans>{`blocking_mode_${mode}`}</Trans>
</li>
))}
</div>
<div className="custom-controls-stacked">
{getFields(processing, t)}
</div>
</div>
</div>
{blockingMode === BLOCKING_MODES.custom_ip && (
<Fragment>
{customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> add <label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>{description}</Trans>
</div> | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> };
<mask>
<mask> Form.propTypes = {
<mask> handleSubmit: PropTypes.func,
<mask> testUpstream: PropTypes.func,
<mask> submitting: PropTypes.bool,
<mask> invalid: PropTypes.bool,
<mask> initialValues: PropTypes.object,
<mask> upstream_dns: PropTypes.string,
<mask> bootstrap_dns: PropTypes.string,
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove t: PropTypes.func,
</s> add </s> remove const selector = formValueSelector('upstreamForm');
Form = connect((state) => {
const upstream_dns = selector(state, 'upstream_dns');
const bootstrap_dns = selector(state, 'bootstrap_dns');
return {
upstream_dns,
bootstrap_dns,
};
})(Form);
export default flow([
withTranslation(),
reduxForm({
form: 'upstreamForm',
}),
])(Form);
</s> add export default reduxForm({ form: FORM_NAME.UPSTREAM })(Form); </s> remove const selector = formValueSelector('encryptionForm');
</s> add const selector = formValueSelector(FORM_NAME.ENCRYPTION); </s> remove const selector = formValueSelector('install');
</s> add const selector = formValueSelector(FORM_NAME.INSTALL); </s> remove export default flow([withTranslation(), reduxForm({ form: 'accessForm' })])(Form);
</s> add export default flow([withTranslation(), reduxForm({ form: FORM_NAME.ACCESS })])(Form); </s> remove const selector = formValueSelector('clientForm');
</s> add const selector = formValueSelector(FORM_NAME.CLIENT); | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep keep keep replace keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace | <mask> upstream_dns: PropTypes.string,
<mask> bootstrap_dns: PropTypes.string,
<mask> processingTestUpstream: PropTypes.bool,
<mask> processingSetConfig: PropTypes.bool,
<mask> t: PropTypes.func,
<mask> };
<mask>
<mask> const selector = formValueSelector('upstreamForm');
<mask>
<mask> Form = connect((state) => {
<mask> const upstream_dns = selector(state, 'upstream_dns');
<mask> const bootstrap_dns = selector(state, 'bootstrap_dns');
<mask>
<mask> return {
<mask> upstream_dns,
<mask> bootstrap_dns,
<mask> };
<mask> })(Form);
<mask>
<mask> export default flow([
<mask> withTranslation(),
<mask> reduxForm({
<mask> form: 'upstreamForm',
<mask> }),
<mask> ])(Form);
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove testUpstream: PropTypes.func,
</s> add </s> remove const selector = formValueSelector('encryptionForm');
</s> add const selector = formValueSelector(FORM_NAME.ENCRYPTION); </s> remove const selector = formValueSelector('blockingModeForm');
</s> add const selector = formValueSelector(FORM_NAME.BLOCKING_MODE); </s> remove const selector = formValueSelector('clientForm');
</s> add const selector = formValueSelector(FORM_NAME.CLIENT); </s> remove const selector = formValueSelector('install');
</s> add const selector = formValueSelector(FORM_NAME.INSTALL); | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/Upstream/Form.js |
replace keep replace replace replace keep keep keep keep keep | <mask> import React, { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { withTranslation } from 'react-i18next';
<mask> import cn from 'classnames';
<mask>
<mask> import Form from './Form';
<mask> import Card from '../../../ui/Card';
<mask> import { DNS_REQUEST_OPTIONS } from '../../../../helpers/constants';
<mask>
<mask>
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove import React, { Component, Fragment } from 'react';
</s> add import React, { useEffect } from 'react'; </s> remove import { Field, reduxForm, formValueSelector } from 'redux-form';
import { Trans, withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
</s> add import { Field, reduxForm } from 'redux-form';
import { Trans, useTranslation } from 'react-i18next'; </s> remove import { withTranslation } from 'react-i18next';
</s> add import { useTranslation } from 'react-i18next'; </s> remove import { DNS_REQUEST_OPTIONS } from '../../../../helpers/constants';
class Upstream extends Component {
handleSubmit = ({ bootstrap_dns, upstream_dns, dnsRequestOption }) => {
const disabledOption = dnsRequestOption === DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS
? DNS_REQUEST_OPTIONS.FASTEST_ADDR
: DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS;
const formattedValues = {
bootstrap_dns,
upstream_dns,
[dnsRequestOption]: true,
[disabledOption]: false,
};
</s> add import { setDnsConfig } from '../../../../actions/dnsConfig'; </s> remove import { connect } from 'react-redux';
</s> add import { useDispatch, useSelector } from 'react-redux'; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/Upstream/index.js |
keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep replace replace keep | <mask> import Form from './Form';
<mask> import Card from '../../../ui/Card';
<mask> import { DNS_REQUEST_OPTIONS } from '../../../../helpers/constants';
<mask>
<mask>
<mask> class Upstream extends Component {
<mask> handleSubmit = ({ bootstrap_dns, upstream_dns, dnsRequestOption }) => {
<mask> const disabledOption = dnsRequestOption === DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS
<mask> ? DNS_REQUEST_OPTIONS.FASTEST_ADDR
<mask> : DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS;
<mask>
<mask> const formattedValues = {
<mask> bootstrap_dns,
<mask> upstream_dns,
<mask> [dnsRequestOption]: true,
<mask> [disabledOption]: false,
<mask> };
<mask>
<mask> this.props.setDnsConfig(formattedValues);
<mask> };
<mask>
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove import { withTranslation } from 'react-i18next';
import cn from 'classnames';
</s> add import { useTranslation } from 'react-i18next';
import { useDispatch } from 'react-redux'; </s> remove class Dns extends Component {
componentDidMount() {
this.props.getAccessList();
this.props.getDnsConfig();
}
</s> add const Dns = (props) => {
const [t] = useTranslation(); </s> remove render() {
const {
t,
processingTestUpstream,
dnsConfig: {
upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests,
processingSetConfig,
},
} = this.props;
const dnsRequestOption = cn({
parallel_requests,
fastest_addr,
});
return (
<Card
title={t('upstream_dns')}
subtitle={t('upstream_dns_hint')}
bodyType="card-body box-body--settings"
>
<div className="row">
<div className="col">
<Form
initialValues={{
upstream_dns,
bootstrap_dns,
dnsRequestOption,
}}
testUpstream={this.handleTest}
onSubmit={this.handleSubmit}
processingTestUpstream={processingTestUpstream}
processingSetConfig={processingSetConfig}
/>
</div>
</s> add const {
processingTestUpstream,
dnsConfig: {
upstream_dns,
bootstrap_dns,
processingSetConfig,
upstream_mode,
},
} = props;
return (
<Card
title={t('upstream_dns')}
subtitle={t('upstream_dns_hint')}
bodyType="card-body box-body--settings"
>
<div className="row">
<div className="col">
<Form
initialValues={{
upstream_dns,
bootstrap_dns,
upstream_mode,
}}
onSubmit={handleSubmit}
processingTestUpstream={processingTestUpstream}
processingSetConfig={processingSetConfig}
/> </s> remove import { STATS_INTERVALS_DAYS } from '../../../helpers/constants';
</s> add import { FORM_NAME, STATS_INTERVALS_DAYS } from '../../../helpers/constants'; </s> remove import { QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants';
</s> add import { FORM_NAME, QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants'; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/Upstream/index.js |
keep keep keep keep replace replace keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep | <mask>
<mask> this.props.setDnsConfig(formattedValues);
<mask> };
<mask>
<mask> handleTest = (values) => {
<mask> this.props.testUpstream(values);
<mask> };
<mask>
<mask> render() {
<mask> const {
<mask> t,
<mask> processingTestUpstream,
<mask> dnsConfig: {
<mask> upstream_dns,
<mask> bootstrap_dns,
<mask> fastest_addr,
<mask> parallel_requests,
<mask> processingSetConfig,
<mask> },
<mask> } = this.props;
<mask>
<mask> const dnsRequestOption = cn({
<mask> parallel_requests,
<mask> fastest_addr,
<mask> });
<mask>
<mask> return (
<mask> <Card
<mask> title={t('upstream_dns')}
<mask> subtitle={t('upstream_dns_hint')}
<mask> bodyType="card-body box-body--settings"
<mask> >
<mask> <div className="row">
<mask> <div className="col">
<mask> <Form
<mask> initialValues={{
<mask> upstream_dns,
<mask> bootstrap_dns,
<mask> dnsRequestOption,
<mask> }}
<mask> testUpstream={this.handleTest}
<mask> onSubmit={this.handleSubmit}
<mask> processingTestUpstream={processingTestUpstream}
<mask> processingSetConfig={processingSetConfig}
<mask> />
<mask> </div>
<mask> </div>
<mask> </Card>
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove import { DNS_REQUEST_OPTIONS } from '../../../../helpers/constants';
class Upstream extends Component {
handleSubmit = ({ bootstrap_dns, upstream_dns, dnsRequestOption }) => {
const disabledOption = dnsRequestOption === DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS
? DNS_REQUEST_OPTIONS.FASTEST_ADDR
: DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS;
const formattedValues = {
bootstrap_dns,
upstream_dns,
[dnsRequestOption]: true,
[disabledOption]: false,
};
</s> add import { setDnsConfig } from '../../../../actions/dnsConfig'; </s> remove </Card>
);
}
}
</s> add </div>
</Card>
);
}; </s> remove } = props;
</s> add })); </s> remove this.props.setDnsConfig(formattedValues);
};
</s> add const Upstream = (props) => {
const [t] = useTranslation();
const dispatch = useDispatch(); </s> remove let Form = (props) => {
const {
t,
handleSubmit,
testUpstream,
submitting,
invalid,
processingSetConfig,
processingTestUpstream,
</s> add const Form = ({
submitting, invalid, processingSetConfig, processingTestUpstream, handleSubmit,
}) => {
const dispatch = useDispatch();
const [t] = useTranslation();
const upstream_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM].values.upstream_dns);
const bootstrap_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM]
.values.bootstrap_dns);
const handleUpstreamTest = () => dispatch(testUpstream({ | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/Upstream/index.js |
keep keep replace replace replace replace keep keep replace | <mask> </div>
<mask> </div>
<mask> </Card>
<mask> );
<mask> }
<mask> }
<mask>
<mask> Upstream.propTypes = {
<mask> testUpstream: PropTypes.func.isRequired,
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove t: PropTypes.func.isRequired,
</s> add </s> remove render() {
const {
t,
processingTestUpstream,
dnsConfig: {
upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests,
processingSetConfig,
},
} = this.props;
const dnsRequestOption = cn({
parallel_requests,
fastest_addr,
});
return (
<Card
title={t('upstream_dns')}
subtitle={t('upstream_dns_hint')}
bodyType="card-body box-body--settings"
>
<div className="row">
<div className="col">
<Form
initialValues={{
upstream_dns,
bootstrap_dns,
dnsRequestOption,
}}
testUpstream={this.handleTest}
onSubmit={this.handleSubmit}
processingTestUpstream={processingTestUpstream}
processingSetConfig={processingSetConfig}
/>
</div>
</s> add const {
processingTestUpstream,
dnsConfig: {
upstream_dns,
bootstrap_dns,
processingSetConfig,
upstream_mode,
},
} = props;
return (
<Card
title={t('upstream_dns')}
subtitle={t('upstream_dns_hint')}
bodyType="card-body box-body--settings"
>
<div className="row">
<div className="col">
<Form
initialValues={{
upstream_dns,
bootstrap_dns,
upstream_mode,
}}
onSubmit={handleSubmit}
processingTestUpstream={processingTestUpstream}
processingSetConfig={processingSetConfig}
/> </s> remove testUpstream: PropTypes.func.isRequired,
</s> add </s> remove <div className="col-12">
<div className="form__group form__group--settings mb-4">
<label className="form__label form__label--with-desc">
<Trans>blocking_mode</Trans>
</label>
<div className="form__desc form__desc--top">
{Object.values(BLOCKING_MODES)
.map((mode) => (
<li key={mode}>
<Trans>{`blocking_mode_${mode}`}</Trans>
</li>
))}
</div>
<div className="custom-controls-stacked">
{getFields(processing, t)}
</div>
</div>
</div>
{blockingMode === BLOCKING_MODES.custom_ip && (
<Fragment>
{customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}>
<div className="form__group form__group--settings">
<label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>{description}</Trans>
</div>
<Field
name={name}
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[validateIp, required]}
/>
</div>
</div>)}
</Fragment>
)}
</div>
<button
type="submit"
className="btn btn-success btn-standard btn-large"
disabled={submitting || invalid || processing}
>
<Trans>save_btn</Trans>
</button>
</form>;
</s> add </Fragment>
)}
</div>
<button
type="submit"
className="btn btn-success btn-standard btn-large"
disabled={submitting || invalid || processing}
>
<Trans>save_btn</Trans>
</button>
</form>; </s> remove return (
<Fragment>
<PageTitle title={t('dns_settings')} />
{isDataLoading
? <Loading />
: <Fragment>
<Upstream
processingTestUpstream={settings.processingTestUpstream}
testUpstream={testUpstream}
dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig}
/>
<Config
dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig}
/>
<Access access={access} setAccessList={setAccessList} />
</Fragment>}
</Fragment>
);
}
}
</s> add const isDataLoading = access.processing || dnsConfig.processingGetConfig;
return (
<>
<PageTitle title={t('dns_settings')} />
{isDataLoading
? <Loading />
: <>
<Upstream
processingTestUpstream={settings.processingTestUpstream}
dnsConfig={dnsConfig}
/>
<Config
dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig}
/>
<Access access={access} setAccessList={setAccessList} />
</>}
</>
);
}; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/Upstream/index.js |
keep keep keep replace keep replace | <mask> Upstream.propTypes = {
<mask> testUpstream: PropTypes.func.isRequired,
<mask> processingTestUpstream: PropTypes.bool.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> dnsConfig: PropTypes.object.isRequired,
<mask> setDnsConfig: PropTypes.func.isRequired,
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove testUpstream: PropTypes.func.isRequired,
</s> add </s> remove testUpstream: PropTypes.func.isRequired,
</s> add </s> remove </Card>
);
}
}
</s> add </div>
</Card>
);
}; </s> remove t: PropTypes.func.isRequired,
</s> add </s> remove export default withTranslation()(Upstream);
</s> add export default Upstream; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/Upstream/index.js |
keep keep keep keep replace | <mask> dnsConfig: PropTypes.object.isRequired,
<mask> setDnsConfig: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withTranslation()(Upstream);
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove setDnsConfig: PropTypes.func.isRequired,
</s> add </s> remove t: PropTypes.func.isRequired,
</s> add </s> remove t: PropTypes.func.isRequired,
</s> add </s> remove testUpstream: PropTypes.func.isRequired,
</s> add </s> remove testUpstream: PropTypes.func.isRequired,
</s> add </s> remove export default withTranslation()(Dns);
</s> add export default Dns; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/Upstream/index.js |
replace keep replace keep keep keep keep keep | <mask> import React, { Component, Fragment } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { withTranslation } from 'react-i18next';
<mask>
<mask> import Upstream from './Upstream';
<mask> import Access from './Access';
<mask> import Config from './Config';
<mask> import PageTitle from '../../ui/PageTitle';
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove import React, { Component } from 'react';
</s> add import React from 'react'; </s> remove import { withTranslation } from 'react-i18next';
import cn from 'classnames';
</s> add import { useTranslation } from 'react-i18next';
import { useDispatch } from 'react-redux'; </s> remove import { connect } from 'react-redux';
</s> add import { useDispatch, useSelector } from 'react-redux'; </s> remove import { Field, reduxForm, formValueSelector } from 'redux-form';
import { Trans, withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
</s> add import { Field, reduxForm } from 'redux-form';
import { Trans, useTranslation } from 'react-i18next'; </s> remove class Dns extends Component {
componentDidMount() {
this.props.getAccessList();
this.props.getDnsConfig();
}
</s> add const Dns = (props) => {
const [t] = useTranslation(); | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/index.js |
keep keep replace replace replace replace replace keep replace replace replace replace replace replace replace replace replace replace keep keep keep | <mask> import Loading from '../../ui/Loading';
<mask>
<mask> class Dns extends Component {
<mask> componentDidMount() {
<mask> this.props.getAccessList();
<mask> this.props.getDnsConfig();
<mask> }
<mask>
<mask> render() {
<mask> const {
<mask> t,
<mask> settings,
<mask> access,
<mask> setAccessList,
<mask> testUpstream,
<mask> dnsConfig,
<mask> setDnsConfig,
<mask> } = this.props;
<mask>
<mask> const isDataLoading = access.processing || dnsConfig.processingGetConfig;
<mask>
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove const isDataLoading = access.processing || dnsConfig.processingGetConfig;
</s> add const {
settings,
access,
setAccessList,
dnsConfig,
setDnsConfig,
} = props; </s> remove import { DNS_REQUEST_OPTIONS } from '../../../../helpers/constants';
class Upstream extends Component {
handleSubmit = ({ bootstrap_dns, upstream_dns, dnsRequestOption }) => {
const disabledOption = dnsRequestOption === DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS
? DNS_REQUEST_OPTIONS.FASTEST_ADDR
: DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS;
const formattedValues = {
bootstrap_dns,
upstream_dns,
[dnsRequestOption]: true,
[disabledOption]: false,
};
</s> add import { setDnsConfig } from '../../../../actions/dnsConfig'; </s> remove return (
<Fragment>
<PageTitle title={t('dns_settings')} />
{isDataLoading
? <Loading />
: <Fragment>
<Upstream
processingTestUpstream={settings.processingTestUpstream}
testUpstream={testUpstream}
dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig}
/>
<Config
dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig}
/>
<Access access={access} setAccessList={setAccessList} />
</Fragment>}
</Fragment>
);
}
}
</s> add const isDataLoading = access.processing || dnsConfig.processingGetConfig;
return (
<>
<PageTitle title={t('dns_settings')} />
{isDataLoading
? <Loading />
: <>
<Upstream
processingTestUpstream={settings.processingTestUpstream}
dnsConfig={dnsConfig}
/>
<Config
dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig}
/>
<Access access={access} setAccessList={setAccessList} />
</>}
</>
);
}; </s> remove testUpstream,
</s> add </s> remove handleTest = (values) => {
this.props.testUpstream(values);
</s> add const handleSubmit = (values) => {
dispatch(setDnsConfig(values)); | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/index.js |
keep replace keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep | <mask>
<mask> const isDataLoading = access.processing || dnsConfig.processingGetConfig;
<mask>
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title={t('dns_settings')} />
<mask> {isDataLoading
<mask> ? <Loading />
<mask> : <Fragment>
<mask> <Upstream
<mask> processingTestUpstream={settings.processingTestUpstream}
<mask> testUpstream={testUpstream}
<mask> dnsConfig={dnsConfig}
<mask> setDnsConfig={setDnsConfig}
<mask> />
<mask> <Config
<mask> dnsConfig={dnsConfig}
<mask> setDnsConfig={setDnsConfig}
<mask> />
<mask> <Access access={access} setAccessList={setAccessList} />
<mask> </Fragment>}
<mask> </Fragment>
<mask> );
<mask> }
<mask> }
<mask>
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove render() {
const {
t,
settings,
access,
setAccessList,
testUpstream,
dnsConfig,
setDnsConfig,
} = this.props;
</s> add useEffect(() => {
props.getAccessList();
props.getDnsConfig();
}, []); </s> remove <hr/>
</s> add <hr /> </s> remove <Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/>
</s> add <Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/> </s> remove <Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/>
</s> add <Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/> </s> remove </Card>
);
}
}
</s> add </div>
</Card>
);
}; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/index.js |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> Dns.propTypes = {
<mask> settings: PropTypes.object.isRequired,
<mask> testUpstream: PropTypes.func.isRequired,
<mask> getAccessList: PropTypes.func.isRequired,
<mask> setAccessList: PropTypes.func.isRequired,
<mask> access: PropTypes.object.isRequired,
<mask> dnsConfig: PropTypes.object.isRequired,
<mask> setDnsConfig: PropTypes.func.isRequired,
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove t: PropTypes.func.isRequired,
</s> add </s> remove testUpstream: PropTypes.func.isRequired,
</s> add </s> remove t: PropTypes.func.isRequired,
</s> add </s> remove setDnsConfig: PropTypes.func.isRequired,
</s> add </s> remove export default withTranslation()(Upstream);
</s> add export default Upstream; </s> remove return (
<Fragment>
<PageTitle title={t('dns_settings')} />
{isDataLoading
? <Loading />
: <Fragment>
<Upstream
processingTestUpstream={settings.processingTestUpstream}
testUpstream={testUpstream}
dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig}
/>
<Config
dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig}
/>
<Access access={access} setAccessList={setAccessList} />
</Fragment>}
</Fragment>
);
}
}
</s> add const isDataLoading = access.processing || dnsConfig.processingGetConfig;
return (
<>
<PageTitle title={t('dns_settings')} />
{isDataLoading
? <Loading />
: <>
<Upstream
processingTestUpstream={settings.processingTestUpstream}
dnsConfig={dnsConfig}
/>
<Config
dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig}
/>
<Access access={access} setAccessList={setAccessList} />
</>}
</>
);
}; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/index.js |
keep keep keep keep replace keep keep replace | <mask> access: PropTypes.object.isRequired,
<mask> dnsConfig: PropTypes.object.isRequired,
<mask> setDnsConfig: PropTypes.func.isRequired,
<mask> getDnsConfig: PropTypes.func.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withTranslation()(Dns);
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove testUpstream: PropTypes.func.isRequired,
</s> add </s> remove setDnsConfig: PropTypes.func.isRequired,
</s> add </s> remove t: PropTypes.func.isRequired,
</s> add </s> remove testUpstream: PropTypes.func.isRequired,
</s> add </s> remove export default withTranslation()(Upstream);
</s> add export default Upstream; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Dns/index.js |
keep keep add keep keep keep keep | <mask> import i18n from '../../../i18n';
<mask> import KeyStatus from './KeyStatus';
<mask> import CertificateStatus from './CertificateStatus';
<mask>
<mask> const validate = (values) => {
<mask> const errors = {};
<mask>
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove import { DNS_REQUEST_OPTIONS } from '../../../../helpers/constants';
class Upstream extends Component {
handleSubmit = ({ bootstrap_dns, upstream_dns, dnsRequestOption }) => {
const disabledOption = dnsRequestOption === DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS
? DNS_REQUEST_OPTIONS.FASTEST_ADDR
: DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS;
const formattedValues = {
bootstrap_dns,
upstream_dns,
[dnsRequestOption]: true,
[disabledOption]: false,
};
</s> add import { setDnsConfig } from '../../../../actions/dnsConfig'; </s> add import { FORM_NAME } from '../../../helpers/constants'; </s> remove import { SERVICES } from '../../../helpers/constants';
</s> add import { FORM_NAME, SERVICES } from '../../../helpers/constants'; </s> add import { FORM_NAME } from '../../helpers/constants'; </s> remove import { ALL_INTERFACES_IP } from '../../helpers/constants';
</s> add import { ALL_INTERFACES_IP, FORM_NAME } from '../../helpers/constants'; </s> remove import { RESPONSE_FILTER } from '../../../helpers/constants';
</s> add import { FORM_NAME, RESPONSE_FILTER } from '../../../helpers/constants'; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Encryption/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> certificateSource: PropTypes.string,
<mask> privateKeySource: PropTypes.string,
<mask> };
<mask>
<mask> const selector = formValueSelector('encryptionForm');
<mask>
<mask> Form = connect((state) => {
<mask> const isEnabled = selector(state, 'enabled');
<mask> const certificateChain = selector(state, 'certificate_chain');
<mask> const privateKey = selector(state, 'private_key');
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove const selector = formValueSelector('clientForm');
</s> add const selector = formValueSelector(FORM_NAME.CLIENT); </s> remove const selector = formValueSelector('install');
</s> add const selector = formValueSelector(FORM_NAME.INSTALL); </s> remove const selector = formValueSelector('dhcpForm');
</s> add const selector = formValueSelector(FORM_NAME.DHCP); </s> remove const selector = formValueSelector('blockingModeForm');
</s> add const selector = formValueSelector(FORM_NAME.BLOCKING_MODE); </s> remove t: PropTypes.func,
</s> add </s> remove const selector = formValueSelector('upstreamForm');
Form = connect((state) => {
const upstream_dns = selector(state, 'upstream_dns');
const bootstrap_dns = selector(state, 'bootstrap_dns');
return {
upstream_dns,
bootstrap_dns,
};
})(Form);
export default flow([
withTranslation(),
reduxForm({
form: 'upstreamForm',
}),
])(Form);
</s> add export default reduxForm({ form: FORM_NAME.UPSTREAM })(Form); | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Encryption/Form.js |
keep keep keep keep replace keep keep keep | <mask>
<mask> export default flow([
<mask> withTranslation(),
<mask> reduxForm({
<mask> form: 'encryptionForm',
<mask> validate,
<mask> }),
<mask> ])(Form);
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove form: 'clientForm',
</s> add form: FORM_NAME.CLIENT, </s> remove form: 'install',
</s> add form: FORM_NAME.INSTALL, </s> remove reduxForm({
form: 'filterForm',
}),
</s> add reduxForm({ form: FORM_NAME.FILTER }), </s> remove reduxForm({
form: 'blockingModeForm',
}),
</s> add reduxForm({ form: FORM_NAME.BLOCKING_MODE }), </s> remove reduxForm({ form: 'leaseForm' }),
</s> add reduxForm({ form: FORM_NAME.LEASE }), </s> remove reduxForm({ form: 'dhcpForm' }),
</s> add reduxForm({ form: FORM_NAME.DHCP }), | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/Encryption/Form.js |
keep keep keep keep replace keep keep keep keep replace keep keep keep keep | <mask> import { Trans, withTranslation } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask>
<mask> import { renderSelectField, toNumber } from '../../../helpers/form';
<mask> import { FILTERS_INTERVALS_HOURS } from '../../../helpers/constants';
<mask>
<mask> const getTitleForInterval = (interval, t) => {
<mask> if (interval === 0) {
<mask> return t('disabled');
<mask> } if (interval === 72 || interval === 168) {
<mask> return t('interval_days', { count: interval / 24 });
<mask> }
<mask>
<mask> return t('interval_hours', { count: interval });
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove import { QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants';
</s> add import { FORM_NAME, QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants'; </s> remove import { STATS_INTERVALS_DAYS } from '../../../helpers/constants';
</s> add import { FORM_NAME, STATS_INTERVALS_DAYS } from '../../../helpers/constants'; </s> add import { FORM_NAME } from '../../helpers/constants'; </s> remove <Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/>
</s> add <Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/> </s> remove <Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/>
</s> add <Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/> | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/FiltersConfig/Form.js |
keep keep keep keep replace replace replace keep | <mask> };
<mask>
<mask> export default flow([
<mask> withTranslation(),
<mask> reduxForm({
<mask> form: 'filterConfigForm',
<mask> }),
<mask> ])(Form);
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove reduxForm({
form: 'loginForm',
}),
</s> add reduxForm({ form: FORM_NAME.LOGIN }), </s> remove reduxForm({
form: 'statsConfigForm',
}),
</s> add reduxForm({ form: FORM_NAME.STATS_CONFIG }), </s> remove reduxForm({ form: 'leaseForm' }),
</s> add reduxForm({ form: FORM_NAME.LEASE }), </s> remove reduxForm({
form: 'logConfigForm',
}),
</s> add reduxForm({ form: FORM_NAME.LOG_CONFIG }), </s> remove reduxForm({
form: 'filterForm',
}),
</s> add reduxForm({ form: FORM_NAME.FILTER }), </s> remove reduxForm({ form: 'dhcpForm' }),
</s> add reduxForm({ form: FORM_NAME.DHCP }), | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/FiltersConfig/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> import { Trans, withTranslation } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask>
<mask> import { renderSelectField, renderRadioField, toNumber } from '../../../helpers/form';
<mask> import { QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants';
<mask>
<mask> const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => {
<mask> const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
<mask>
<mask> return (
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove import { STATS_INTERVALS_DAYS } from '../../../helpers/constants';
</s> add import { FORM_NAME, STATS_INTERVALS_DAYS } from '../../../helpers/constants'; </s> remove <Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/>
</s> add <Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/> </s> remove import { FILTERS_INTERVALS_HOURS } from '../../../helpers/constants';
</s> add import { FILTERS_INTERVALS_HOURS, FORM_NAME } from '../../../helpers/constants'; </s> remove <Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/>
</s> add <Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/> </s> add import { FORM_NAME } from '../../helpers/constants'; </s> remove import { RESPONSE_FILTER } from '../../../helpers/constants';
</s> add import { FORM_NAME, RESPONSE_FILTER } from '../../../helpers/constants'; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/LogsConfig/Form.js |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => {
<mask> const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
<mask>
<mask> return (
<mask> <Field
<mask> key={interval}
<mask> name="interval"
<mask> type="radio"
<mask> component={renderRadioField}
<mask> value={interval}
<mask> placeholder={title}
<mask> normalize={toNumber}
<mask> disabled={processing}
<mask> />
<mask> );
<mask> });
<mask>
<mask> const Form = (props) => {
<mask> const {
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove <Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/>
</s> add <Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/> </s> remove import { QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants';
</s> add import { FORM_NAME, QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants'; </s> remove import { STATS_INTERVALS_DAYS } from '../../../helpers/constants';
</s> add import { FORM_NAME, STATS_INTERVALS_DAYS } from '../../../helpers/constants'; </s> remove } if (interval === 72 || interval === 168) {
</s> add }
if (interval === 72 || interval === 168) { </s> remove return (
<Fragment>
<PageTitle title={t('dns_settings')} />
{isDataLoading
? <Loading />
: <Fragment>
<Upstream
processingTestUpstream={settings.processingTestUpstream}
testUpstream={testUpstream}
dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig}
/>
<Config
dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig}
/>
<Access access={access} setAccessList={setAccessList} />
</Fragment>}
</Fragment>
);
}
}
</s> add const isDataLoading = access.processing || dnsConfig.processingGetConfig;
return (
<>
<PageTitle title={t('dns_settings')} />
{isDataLoading
? <Loading />
: <>
<Upstream
processingTestUpstream={settings.processingTestUpstream}
dnsConfig={dnsConfig}
/>
<Config
dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig}
/>
<Access access={access} setAccessList={setAccessList} />
</>}
</>
);
}; </s> remove render() {
const {
t,
processingTestUpstream,
dnsConfig: {
upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests,
processingSetConfig,
},
} = this.props;
const dnsRequestOption = cn({
parallel_requests,
fastest_addr,
});
return (
<Card
title={t('upstream_dns')}
subtitle={t('upstream_dns_hint')}
bodyType="card-body box-body--settings"
>
<div className="row">
<div className="col">
<Form
initialValues={{
upstream_dns,
bootstrap_dns,
dnsRequestOption,
}}
testUpstream={this.handleTest}
onSubmit={this.handleSubmit}
processingTestUpstream={processingTestUpstream}
processingSetConfig={processingSetConfig}
/>
</div>
</s> add const {
processingTestUpstream,
dnsConfig: {
upstream_dns,
bootstrap_dns,
processingSetConfig,
upstream_mode,
},
} = props;
return (
<Card
title={t('upstream_dns')}
subtitle={t('upstream_dns_hint')}
bodyType="card-body box-body--settings"
>
<div className="row">
<div className="col">
<Form
initialValues={{
upstream_dns,
bootstrap_dns,
upstream_mode,
}}
onSubmit={handleSubmit}
processingTestUpstream={processingTestUpstream}
processingSetConfig={processingSetConfig}
/> | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/LogsConfig/Form.js |
keep keep keep keep replace replace replace keep | <mask> };
<mask>
<mask> export default flow([
<mask> withTranslation(),
<mask> reduxForm({
<mask> form: 'logConfigForm',
<mask> }),
<mask> ])(Form);
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove reduxForm({
form: 'loginForm',
}),
</s> add reduxForm({ form: FORM_NAME.LOGIN }), </s> remove reduxForm({
form: 'statsConfigForm',
}),
</s> add reduxForm({ form: FORM_NAME.STATS_CONFIG }), </s> remove reduxForm({ form: 'leaseForm' }),
</s> add reduxForm({ form: FORM_NAME.LEASE }), </s> remove reduxForm({
form: 'filterConfigForm',
}),
</s> add reduxForm({ form: FORM_NAME.FILTER_CONFIG }), </s> remove reduxForm({
form: 'filterForm',
}),
</s> add reduxForm({ form: FORM_NAME.FILTER }), </s> remove reduxForm({ form: 'dhcpForm' }),
</s> add reduxForm({ form: FORM_NAME.DHCP }), | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/LogsConfig/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> import { Trans, withTranslation } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask>
<mask> import { renderRadioField, toNumber } from '../../../helpers/form';
<mask> import { STATS_INTERVALS_DAYS } from '../../../helpers/constants';
<mask>
<mask> const getIntervalFields = (processing, t, toNumber) => STATS_INTERVALS_DAYS.map((interval) => {
<mask> const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
<mask>
<mask> return (
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove import { QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants';
</s> add import { FORM_NAME, QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants'; </s> remove <Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/>
</s> add <Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/> </s> remove <Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/>
</s> add <Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/> </s> remove import { FILTERS_INTERVALS_HOURS } from '../../../helpers/constants';
</s> add import { FILTERS_INTERVALS_HOURS, FORM_NAME } from '../../../helpers/constants'; </s> add import { FORM_NAME } from '../../helpers/constants'; </s> remove import { RESPONSE_FILTER } from '../../../helpers/constants';
</s> add import { FORM_NAME, RESPONSE_FILTER } from '../../../helpers/constants'; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/StatsConfig/Form.js |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> const getIntervalFields = (processing, t, toNumber) => STATS_INTERVALS_DAYS.map((interval) => {
<mask> const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
<mask>
<mask> return (
<mask> <Field
<mask> key={interval}
<mask> name="interval"
<mask> type="radio"
<mask> component={renderRadioField}
<mask> value={interval}
<mask> placeholder={title}
<mask> normalize={toNumber}
<mask> disabled={processing}
<mask> />
<mask> );
<mask> });
<mask>
<mask> const Form = (props) => {
<mask> const {
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove <Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/>
</s> add <Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/> </s> remove import { STATS_INTERVALS_DAYS } from '../../../helpers/constants';
</s> add import { FORM_NAME, STATS_INTERVALS_DAYS } from '../../../helpers/constants'; </s> remove import { QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants';
</s> add import { FORM_NAME, QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants'; </s> remove } if (interval === 72 || interval === 168) {
</s> add }
if (interval === 72 || interval === 168) { </s> remove return (
<Fragment>
<PageTitle title={t('dns_settings')} />
{isDataLoading
? <Loading />
: <Fragment>
<Upstream
processingTestUpstream={settings.processingTestUpstream}
testUpstream={testUpstream}
dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig}
/>
<Config
dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig}
/>
<Access access={access} setAccessList={setAccessList} />
</Fragment>}
</Fragment>
);
}
}
</s> add const isDataLoading = access.processing || dnsConfig.processingGetConfig;
return (
<>
<PageTitle title={t('dns_settings')} />
{isDataLoading
? <Loading />
: <>
<Upstream
processingTestUpstream={settings.processingTestUpstream}
dnsConfig={dnsConfig}
/>
<Config
dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig}
/>
<Access access={access} setAccessList={setAccessList} />
</>}
</>
);
}; </s> remove render() {
const {
t,
processingTestUpstream,
dnsConfig: {
upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests,
processingSetConfig,
},
} = this.props;
const dnsRequestOption = cn({
parallel_requests,
fastest_addr,
});
return (
<Card
title={t('upstream_dns')}
subtitle={t('upstream_dns_hint')}
bodyType="card-body box-body--settings"
>
<div className="row">
<div className="col">
<Form
initialValues={{
upstream_dns,
bootstrap_dns,
dnsRequestOption,
}}
testUpstream={this.handleTest}
onSubmit={this.handleSubmit}
processingTestUpstream={processingTestUpstream}
processingSetConfig={processingSetConfig}
/>
</div>
</s> add const {
processingTestUpstream,
dnsConfig: {
upstream_dns,
bootstrap_dns,
processingSetConfig,
upstream_mode,
},
} = props;
return (
<Card
title={t('upstream_dns')}
subtitle={t('upstream_dns_hint')}
bodyType="card-body box-body--settings"
>
<div className="row">
<div className="col">
<Form
initialValues={{
upstream_dns,
bootstrap_dns,
upstream_mode,
}}
onSubmit={handleSubmit}
processingTestUpstream={processingTestUpstream}
processingSetConfig={processingSetConfig}
/> | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/StatsConfig/Form.js |
keep keep keep keep replace replace replace keep | <mask> };
<mask>
<mask> export default flow([
<mask> withTranslation(),
<mask> reduxForm({
<mask> form: 'statsConfigForm',
<mask> }),
<mask> ])(Form);
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove reduxForm({
form: 'loginForm',
}),
</s> add reduxForm({ form: FORM_NAME.LOGIN }), </s> remove reduxForm({ form: 'leaseForm' }),
</s> add reduxForm({ form: FORM_NAME.LEASE }), </s> remove reduxForm({
form: 'filterConfigForm',
}),
</s> add reduxForm({ form: FORM_NAME.FILTER_CONFIG }), </s> remove reduxForm({
form: 'logConfigForm',
}),
</s> add reduxForm({ form: FORM_NAME.LOG_CONFIG }), </s> remove reduxForm({
form: 'filterForm',
}),
</s> add reduxForm({ form: FORM_NAME.FILTER }), </s> remove reduxForm({ form: 'dhcpForm' }),
</s> add reduxForm({ form: FORM_NAME.DHCP }), | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/components/Settings/StatsConfig/Form.js |
keep replace keep keep keep keep keep | <mask> import { connect } from 'react-redux';
<mask> import { testUpstream } from '../actions';
<mask> import { getAccessList, setAccessList } from '../actions/access';
<mask> import {
<mask> getRewritesList,
<mask> addRewrite,
<mask> deleteRewrite,
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove import { connect } from 'react-redux';
</s> add import { useDispatch, useSelector } from 'react-redux'; </s> remove testUpstream,
</s> add </s> remove import { Field, reduxForm, formValueSelector } from 'redux-form';
import { Trans, withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
</s> add import { Field, reduxForm } from 'redux-form';
import { Trans, useTranslation } from 'react-i18next'; </s> remove import { withTranslation } from 'react-i18next';
import cn from 'classnames';
</s> add import { useTranslation } from 'react-i18next';
import { useDispatch } from 'react-redux'; </s> remove import { DNS_REQUEST_OPTIONS } from '../../../../helpers/constants';
</s> add import { DNS_REQUEST_OPTIONS, FORM_NAME } from '../../../../helpers/constants';
import { testUpstream } from '../../../../actions'; </s> remove import { ALL_INTERFACES_IP } from '../../helpers/constants';
</s> add import { ALL_INTERFACES_IP, FORM_NAME } from '../../helpers/constants'; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/containers/Dns.js |
keep keep keep keep replace keep keep keep keep keep | <mask> return props;
<mask> };
<mask>
<mask> const mapDispatchToProps = {
<mask> testUpstream,
<mask> getAccessList,
<mask> setAccessList,
<mask> getRewritesList,
<mask> addRewrite,
<mask> deleteRewrite,
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove import { testUpstream } from '../actions';
</s> add </s> remove render() {
const {
t,
settings,
access,
setAccessList,
testUpstream,
dnsConfig,
setDnsConfig,
} = this.props;
</s> add useEffect(() => {
props.getAccessList();
props.getDnsConfig();
}, []); </s> remove const isDataLoading = access.processing || dnsConfig.processingGetConfig;
</s> add const {
settings,
access,
setAccessList,
dnsConfig,
setDnsConfig,
} = props; </s> remove let Form = (props) => {
const {
t,
handleSubmit,
testUpstream,
submitting,
invalid,
processingSetConfig,
processingTestUpstream,
</s> add const Form = ({
submitting, invalid, processingSetConfig, processingTestUpstream, handleSubmit,
}) => {
const dispatch = useDispatch();
const [t] = useTranslation();
const upstream_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM].values.upstream_dns);
const bootstrap_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM]
.values.bootstrap_dns);
const handleUpstreamTest = () => dispatch(testUpstream({ </s> remove const testButtonClass = classnames({
'btn btn-primary btn-standard mr-2': true,
'btn btn-primary btn-standard mr-2 btn-loading': processingTestUpstream,
</s> add const testButtonClass = classnames('btn btn-primary btn-standard mr-2', {
'btn-loading': processingTestUpstream, </s> add import { FORM_NAME } from '../../helpers/constants'; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/containers/Dns.js |
keep keep keep keep replace keep keep keep keep keep | <mask> unblock: 'unblock',
<mask> };
<mask>
<mask> export const DNS_REQUEST_OPTIONS = {
<mask> PARALLEL_REQUESTS: 'parallel_requests',
<mask> FASTEST_ADDR: 'fastest_addr',
<mask> };
<mask>
<mask> export const IP_MATCH_LIST_STATUS = {
<mask> NOT_FOUND: 'NOT_FOUND', // not found in the list
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> add LOAD_BALANCING: '', </s> remove EXACT: 'EXACT', // found exact match (ip === ip)
</s> add EXACT: 'EXACT', // found exact match (including the match of short and long forms) </s> remove name: 'dnsRequestOption',
</s> add name: 'upstream_mode', </s> remove const selector = formValueSelector('upstreamForm');
Form = connect((state) => {
const upstream_dns = selector(state, 'upstream_dns');
const bootstrap_dns = selector(state, 'bootstrap_dns');
return {
upstream_dns,
bootstrap_dns,
};
})(Form);
export default flow([
withTranslation(),
reduxForm({
form: 'upstreamForm',
}),
])(Form);
</s> add export default reduxForm({ form: FORM_NAME.UPSTREAM })(Form); </s> remove import { DNS_REQUEST_OPTIONS } from '../../../../helpers/constants';
</s> add import { DNS_REQUEST_OPTIONS, FORM_NAME } from '../../../../helpers/constants';
import { testUpstream } from '../../../../actions'; </s> remove import { DNS_REQUEST_OPTIONS } from '../../../../helpers/constants';
class Upstream extends Component {
handleSubmit = ({ bootstrap_dns, upstream_dns, dnsRequestOption }) => {
const disabledOption = dnsRequestOption === DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS
? DNS_REQUEST_OPTIONS.FASTEST_ADDR
: DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS;
const formattedValues = {
bootstrap_dns,
upstream_dns,
[dnsRequestOption]: true,
[disabledOption]: false,
};
</s> add import { setDnsConfig } from '../../../../actions/dnsConfig'; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/helpers/constants.js |
keep keep keep add keep keep keep keep keep keep | <mask>
<mask> export const DNS_REQUEST_OPTIONS = {
<mask> PARALLEL: 'parallel',
<mask> FASTEST_ADDR: 'fastest_addr',
<mask> };
<mask>
<mask> export const IP_MATCH_LIST_STATUS = {
<mask> NOT_FOUND: 'NOT_FOUND', // not found in the list
<mask> EXACT: 'EXACT', // found exact match (including the match of short and long forms)
<mask> CIDR: 'CIDR', // the ip is in the specified CIDR range
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove EXACT: 'EXACT', // found exact match (ip === ip)
</s> add EXACT: 'EXACT', // found exact match (including the match of short and long forms) </s> remove PARALLEL_REQUESTS: 'parallel_requests',
</s> add PARALLEL: 'parallel', </s> add "load_balancing": "Load-balancing",
"load_balancing_desc": "Query one server at a time. AdGuard Home will use the weighted random algorithm to pick the server so that the fastest server will be used more often.", </s> remove import { DNS_REQUEST_OPTIONS } from '../../../../helpers/constants';
</s> add import { DNS_REQUEST_OPTIONS, FORM_NAME } from '../../../../helpers/constants';
import { testUpstream } from '../../../../actions'; </s> remove const selector = formValueSelector('upstreamForm');
Form = connect((state) => {
const upstream_dns = selector(state, 'upstream_dns');
const bootstrap_dns = selector(state, 'bootstrap_dns');
return {
upstream_dns,
bootstrap_dns,
};
})(Form);
export default flow([
withTranslation(),
reduxForm({
form: 'upstreamForm',
}),
])(Form);
</s> add export default reduxForm({ form: FORM_NAME.UPSTREAM })(Form); </s> remove import { DNS_REQUEST_OPTIONS } from '../../../../helpers/constants';
class Upstream extends Component {
handleSubmit = ({ bootstrap_dns, upstream_dns, dnsRequestOption }) => {
const disabledOption = dnsRequestOption === DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS
? DNS_REQUEST_OPTIONS.FASTEST_ADDR
: DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS;
const formattedValues = {
bootstrap_dns,
upstream_dns,
[dnsRequestOption]: true,
[disabledOption]: false,
};
</s> add import { setDnsConfig } from '../../../../actions/dnsConfig'; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/helpers/constants.js |
keep keep keep keep replace keep keep | <mask> };
<mask>
<mask> export const IP_MATCH_LIST_STATUS = {
<mask> NOT_FOUND: 'NOT_FOUND', // not found in the list
<mask> EXACT: 'EXACT', // found exact match (ip === ip)
<mask> CIDR: 'CIDR', // the ip is in the specified CIDR range
<mask> };
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> add LOAD_BALANCING: '', </s> remove PARALLEL_REQUESTS: 'parallel_requests',
</s> add PARALLEL: 'parallel', </s> add "load_balancing": "Load-balancing",
"load_balancing_desc": "Query one server at a time. AdGuard Home will use the weighted random algorithm to pick the server so that the fastest server will be used more often.", </s> remove import { DNS_REQUEST_OPTIONS } from '../../../../helpers/constants';
</s> add import { DNS_REQUEST_OPTIONS, FORM_NAME } from '../../../../helpers/constants';
import { testUpstream } from '../../../../actions'; </s> remove } if (interval === 72 || interval === 168) {
</s> add }
if (interval === 72 || interval === 168) { </s> remove import { DNS_REQUEST_OPTIONS } from '../../../../helpers/constants';
class Upstream extends Component {
handleSubmit = ({ bootstrap_dns, upstream_dns, dnsRequestOption }) => {
const disabledOption = dnsRequestOption === DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS
? DNS_REQUEST_OPTIONS.FASTEST_ADDR
: DNS_REQUEST_OPTIONS.PARALLEL_REQUESTS;
const formattedValues = {
bootstrap_dns,
upstream_dns,
[dnsRequestOption]: true,
[disabledOption]: false,
};
</s> add import { setDnsConfig } from '../../../../actions/dnsConfig'; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/helpers/constants.js |
keep add keep keep keep keep keep | <mask> import Controls from './Controls';
<mask> import { renderInputField } from '../../helpers/form';
<mask>
<mask> const required = (value) => {
<mask> if (value || value === 0) {
<mask> return false;
<mask> }
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove import { FILTERS_INTERVALS_HOURS } from '../../../helpers/constants';
</s> add import { FILTERS_INTERVALS_HOURS, FORM_NAME } from '../../../helpers/constants'; </s> remove } if (interval === 72 || interval === 168) {
</s> add }
if (interval === 72 || interval === 168) { </s> remove import { ALL_INTERFACES_IP } from '../../helpers/constants';
</s> add import { ALL_INTERFACES_IP, FORM_NAME } from '../../helpers/constants'; </s> add import { FORM_NAME } from '../../helpers/constants'; </s> add import { FORM_NAME } from '../../helpers/constants'; </s> add import { FORM_NAME } from '../../../helpers/constants'; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/install/Setup/Auth.js |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> export default flow([
<mask> withTranslation(),
<mask> reduxForm({
<mask> form: 'install',
<mask> destroyOnUnmount: false,
<mask> forceUnregisterOnUnmount: true,
<mask> validate,
<mask> }),
<mask> ])(Auth);
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove form: 'install',
</s> add form: FORM_NAME.INSTALL, </s> remove form: 'install',
</s> add form: FORM_NAME.INSTALL, </s> remove form: 'install',
</s> add form: FORM_NAME.INSTALL, </s> remove form: 'clientForm',
</s> add form: FORM_NAME.CLIENT, </s> remove form: 'encryptionForm',
</s> add form: FORM_NAME.ENCRYPTION, </s> remove form: 'servicesForm',
</s> add form: FORM_NAME.SERVICES, | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/install/Setup/Auth.js |
keep keep keep add keep keep keep keep keep keep | <mask>
<mask> import Guide from '../../components/ui/Guide';
<mask> import Controls from './Controls';
<mask> import AddressList from './AddressList';
<mask>
<mask> let Devices = (props) => (
<mask> <div className="setup__step">
<mask> <div className="setup__group">
<mask> <div className="setup__subtitle">
<mask> <Trans>install_devices_title</Trans>
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> add import { FORM_NAME } from '../../helpers/constants'; </s> remove import { ALL_INTERFACES_IP } from '../../helpers/constants';
</s> add import { ALL_INTERFACES_IP, FORM_NAME } from '../../helpers/constants'; </s> add import { FORM_NAME } from '../../helpers/constants'; </s> remove <div className="row">
<div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="ratelimit"
className="form__label form__label--with-desc">
<Trans>rate_limit</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>rate_limit_desc</Trans>
</div>
<Field
name="ratelimit"
type="number"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_rate_limit')}
normalize={toNumber}
validate={[required, biggerOrEqualZero]}
/>
</s> add <div className="row">
<div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="ratelimit"
className="form__label form__label--with-desc">
<Trans>rate_limit</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>rate_limit_desc</Trans> </s> remove {checkboxes.map(({ name, placeholder, subtitle }) => <div className="col-12" key={name}>
</s> add </div>)}
<div className="col-12">
<div className="form__group form__group--settings mb-4">
<label className="form__label form__label--with-desc">
<Trans>blocking_mode</Trans>
</label>
<div className="form__desc form__desc--top">
{Object.values(BLOCKING_MODES)
.map((mode) => (
<li key={mode}>
<Trans>{`blocking_mode_${mode}`}</Trans>
</li>
))}
</div>
<div className="custom-controls-stacked">
{getFields(processing, t)}
</div>
</div>
</div>
{blockingMode === BLOCKING_MODES.custom_ip && (
<Fragment>
{customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> remove <div className="form__group">
<Field
id="name"
name="name"
type="text"
component={renderInputField}
className="form-control"
placeholder={t('enter_name_hint')}
validate={[required]}
normalizeOnBlur={(data) => data.trim()}
/>
</div>
</s> add <div className="form__group">
<Field
id="name"
name="name"
type="text"
component={renderInputField}
className="form-control"
placeholder={t('enter_name_hint')}
validate={[required]}
normalizeOnBlur={(data) => data.trim()}
/>
</div> | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/install/Setup/Devices.js |
keep keep keep keep replace keep keep keep keep | <mask>
<mask> export default flow([
<mask> withTranslation(),
<mask> reduxForm({
<mask> form: 'install',
<mask> destroyOnUnmount: false,
<mask> forceUnregisterOnUnmount: true,
<mask> }),
<mask> ])(Devices);
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove form: 'install',
</s> add form: FORM_NAME.INSTALL, </s> remove form: 'install',
</s> add form: FORM_NAME.INSTALL, </s> remove form: 'install',
</s> add form: FORM_NAME.INSTALL, </s> remove form: 'servicesForm',
</s> add form: FORM_NAME.SERVICES, </s> remove form: 'rewritesForm',
</s> add form: FORM_NAME.REWRITES, </s> remove form: 'clientForm',
</s> add form: FORM_NAME.CLIENT, | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/install/Setup/Devices.js |
keep keep keep keep replace keep keep keep keep keep | <mask> import Controls from './Controls';
<mask> import AddressList from './AddressList';
<mask>
<mask> import { getInterfaceIp } from '../../helpers/helpers';
<mask> import { ALL_INTERFACES_IP } from '../../helpers/constants';
<mask> import {
<mask> renderInputField, required, validInstallPort, toNumber,
<mask> } from '../../helpers/form';
<mask>
<mask> const STATIC_STATUS = {
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> add import { FORM_NAME } from '../../helpers/constants'; </s> add import { FORM_NAME } from '../../helpers/constants'; </s> add import { FORM_NAME } from '../../helpers/constants'; </s> add import { FORM_NAME } from '../../helpers/constants'; </s> add import { FORM_NAME } from '../../../helpers/constants'; </s> add import { FORM_NAME } from '../../helpers/constants'; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/install/Setup/Settings.js |
keep keep keep keep replace keep keep keep keep keep | <mask> initialValues: PropTypes.object,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> const selector = formValueSelector('install');
<mask>
<mask> const SettingsForm = connect((state) => {
<mask> const webIp = selector(state, 'web.ip');
<mask> const webPort = selector(state, 'web.port');
<mask> const dnsIp = selector(state, 'dns.ip');
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove const selector = formValueSelector('blockingModeForm');
</s> add const selector = formValueSelector(FORM_NAME.BLOCKING_MODE); </s> remove const selector = formValueSelector('encryptionForm');
</s> add const selector = formValueSelector(FORM_NAME.ENCRYPTION); </s> remove const selector = formValueSelector('clientForm');
</s> add const selector = formValueSelector(FORM_NAME.CLIENT); </s> remove const selector = formValueSelector('dhcpForm');
</s> add const selector = formValueSelector(FORM_NAME.DHCP); </s> remove const selector = formValueSelector('upstreamForm');
Form = connect((state) => {
const upstream_dns = selector(state, 'upstream_dns');
const bootstrap_dns = selector(state, 'bootstrap_dns');
return {
upstream_dns,
bootstrap_dns,
};
})(Form);
export default flow([
withTranslation(),
reduxForm({
form: 'upstreamForm',
}),
])(Form);
</s> add export default reduxForm({ form: FORM_NAME.UPSTREAM })(Form); </s> remove t: PropTypes.func,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/install/Setup/Settings.js |
keep keep keep keep replace keep keep keep keep | <mask>
<mask> export default flow([
<mask> withTranslation(),
<mask> reduxForm({
<mask> form: 'install',
<mask> destroyOnUnmount: false,
<mask> forceUnregisterOnUnmount: true,
<mask> }),
<mask> ])(SettingsForm);
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove form: 'install',
</s> add form: FORM_NAME.INSTALL, </s> remove form: 'install',
</s> add form: FORM_NAME.INSTALL, </s> remove form: 'install',
</s> add form: FORM_NAME.INSTALL, </s> remove form: 'servicesForm',
</s> add form: FORM_NAME.SERVICES, </s> remove form: 'rewritesForm',
</s> add form: FORM_NAME.REWRITES, </s> remove form: 'clientForm',
</s> add form: FORM_NAME.CLIENT, | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/install/Setup/Settings.js |
keep keep add keep keep keep keep keep keep | <mask> import flow from 'lodash/flow';
<mask>
<mask> import Controls from './Controls';
<mask>
<mask> let Submit = (props) => (
<mask> <div className="setup__step">
<mask> <div className="setup__group">
<mask> <h1 className="setup__title">
<mask> <Trans>install_submit_title</Trans>
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> add import { FORM_NAME } from '../../helpers/constants'; </s> add import { FORM_NAME } from '../../helpers/constants'; </s> add import { FORM_NAME } from '../../helpers/constants'; </s> remove import { SERVICES } from '../../../helpers/constants';
</s> add import { FORM_NAME, SERVICES } from '../../../helpers/constants'; </s> remove import { ALL_INTERFACES_IP } from '../../helpers/constants';
</s> add import { ALL_INTERFACES_IP, FORM_NAME } from '../../helpers/constants'; </s> remove import { STATS_INTERVALS_DAYS } from '../../../helpers/constants';
</s> add import { FORM_NAME, STATS_INTERVALS_DAYS } from '../../../helpers/constants'; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/install/Setup/Submit.js |
keep keep keep keep replace keep keep keep keep | <mask>
<mask> export default flow([
<mask> withTranslation(),
<mask> reduxForm({
<mask> form: 'install',
<mask> destroyOnUnmount: false,
<mask> forceUnregisterOnUnmount: true,
<mask> }),
<mask> ])(Submit);
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove form: 'install',
</s> add form: FORM_NAME.INSTALL, </s> remove form: 'install',
</s> add form: FORM_NAME.INSTALL, </s> remove form: 'install',
</s> add form: FORM_NAME.INSTALL, </s> remove form: 'servicesForm',
</s> add form: FORM_NAME.SERVICES, </s> remove form: 'rewritesForm',
</s> add form: FORM_NAME.REWRITES, </s> remove form: 'clientForm',
</s> add form: FORM_NAME.CLIENT, | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/install/Setup/Submit.js |
keep add keep keep keep keep keep | <mask>
<mask> import { renderInputField, required } from '../../helpers/form';
<mask>
<mask> const Form = (props) => {
<mask> const {
<mask> handleSubmit, processing, invalid, t,
<mask> } = props;
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> add import { FORM_NAME } from '../../../../helpers/constants'; </s> add import { FORM_NAME } from '../../../helpers/constants'; </s> add import { FORM_NAME } from '../../helpers/constants'; </s> remove let Form = (props) => {
const {
t,
handleSubmit,
testUpstream,
submitting,
invalid,
processingSetConfig,
processingTestUpstream,
</s> add const Form = ({
submitting, invalid, processingSetConfig, processingTestUpstream, handleSubmit,
}) => {
const dispatch = useDispatch();
const [t] = useTranslation();
const upstream_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM].values.upstream_dns);
const bootstrap_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM]
.values.bootstrap_dns);
const handleUpstreamTest = () => dispatch(testUpstream({ </s> add import { FORM_NAME } from '../../helpers/constants'; </s> remove import { SERVICES } from '../../../helpers/constants';
</s> add import { FORM_NAME, SERVICES } from '../../../helpers/constants'; | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/login/Login/Form.js |
keep keep keep keep replace replace replace keep | <mask> };
<mask>
<mask> export default flow([
<mask> withTranslation(),
<mask> reduxForm({
<mask> form: 'loginForm',
<mask> }),
<mask> ])(Form);
</s> - client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master
Close #1770
Squashed commit of the following:
commit c1f75ea643623af78de020bd1bc49aa5b66e25c4
Merge: a5df78ad a869ec4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 18:56:24 2020 +0300
Merge branch 'master' into fix/1770
commit a5df78ad303305efcafcfa2a170ff567a3a06db5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 10 12:50:50 2020 +0300
Revert "Update locales"
This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6.
commit 4b2b4499dea12949c53bce4ceeed595c17df84c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 9 19:56:34 2020 +0300
Update locales
commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 17:56:01 2020 +0300
Update Upstream component with new api, extract reduxForm HOC names in constant
commit 72de3d5a92cc33d5b234c837879fc6990291e07b
Merge: 92a4a6ae 501a4e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 15:55:39 2020 +0300
Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:53:42 2020 +0300
- client: Add default mode in the DNS settings </s> remove reduxForm({
form: 'statsConfigForm',
}),
</s> add reduxForm({ form: FORM_NAME.STATS_CONFIG }), </s> remove reduxForm({ form: 'leaseForm' }),
</s> add reduxForm({ form: FORM_NAME.LEASE }), </s> remove reduxForm({
form: 'filterConfigForm',
}),
</s> add reduxForm({ form: FORM_NAME.FILTER_CONFIG }), </s> remove reduxForm({
form: 'logConfigForm',
}),
</s> add reduxForm({ form: FORM_NAME.LOG_CONFIG }), </s> remove reduxForm({
form: 'filterForm',
}),
</s> add reduxForm({ form: FORM_NAME.FILTER }), </s> remove reduxForm({ form: 'dhcpForm' }),
</s> add reduxForm({ form: FORM_NAME.DHCP }), | https://github.com/AdguardTeam/AdGuardHome/commit/a79dda55661c3a50cfc89a620aabd402dd490ecb | client/src/login/Login/Form.js |
keep add keep keep keep keep | <mask> // therefore, we must do it manually instead of using a lib
<mask> {
<mask> var configFilename *string
<mask> var bindHost *string
<mask> var bindPort *int
<mask> var opts = []struct {
</s> Flag parser -- support options without values, move code for help and verbose into table. </s> remove longName string
shortName string
description string
callback func(value string)
</s> add longName string
shortName string
description string
callbackWithValue func(value string)
callbackNoValue func() </s> remove {"config", "c", "path to config file", func(value string) { configFilename = &value }},
{"host", "h", "host address to bind HTTP server on", func(value string) { bindHost = &value }},
</s> add {"config", "c", "path to config file", func(value string) { configFilename = &value }, nil},
{"host", "h", "host address to bind HTTP server on", func(value string) { bindHost = &value }, nil}, </s> remove // short-circuit for help
if v == "--help" || v == "-h" {
printHelp()
os.Exit(64)
}
if v == "--verbose" || v == "-v" {
log.SetLevel(log.TraceLevel)
}
</s> add </s> remove }},
{"verbose", "v", "enable verbose output", nil},
{"help", "h", "print this help", nil},
</s> add }, nil},
{"verbose", "v", "enable verbose output", nil, func() { log.SetLevel(log.TraceLevel) }},
{"help", "h", "print this help", nil, func() { printHelp(); os.Exit(64) }}, </s> remove if v == "--"+opt.longName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
}
i++
opt.callback(os.Args[i])
knownParam = true
break
}
if v == "-"+opt.shortName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
</s> add if v == "--"+opt.longName || v == "-"+opt.shortName {
if opt.callbackWithValue != nil {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
}
i++
opt.callbackWithValue(os.Args[i])
} else if opt.callbackNoValue != nil {
opt.callbackNoValue() </s> remove printHelp := func() {
</s> add printHelp = func() { | https://github.com/AdguardTeam/AdGuardHome/commit/a7e0f664921f8ac7de59d770c26e390e389b009e | app.go |
keep replace replace replace replace keep replace replace keep keep | <mask> var opts = []struct {
<mask> longName string
<mask> shortName string
<mask> description string
<mask> callback func(value string)
<mask> }{
<mask> {"config", "c", "path to config file", func(value string) { configFilename = &value }},
<mask> {"host", "h", "host address to bind HTTP server on", func(value string) { bindHost = &value }},
<mask> {"port", "p", "port to serve HTTP pages on", func(value string) {
<mask> v, err := strconv.Atoi(value)
</s> Flag parser -- support options without values, move code for help and verbose into table. </s> add var printHelp func() </s> remove if v == "--"+opt.longName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
}
i++
opt.callback(os.Args[i])
knownParam = true
break
}
if v == "-"+opt.shortName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
</s> add if v == "--"+opt.longName || v == "-"+opt.shortName {
if opt.callbackWithValue != nil {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
}
i++
opt.callbackWithValue(os.Args[i])
} else if opt.callbackNoValue != nil {
opt.callbackNoValue() </s> remove printHelp := func() {
</s> add printHelp = func() { </s> remove }},
{"verbose", "v", "enable verbose output", nil},
{"help", "h", "print this help", nil},
</s> add }, nil},
{"verbose", "v", "enable verbose output", nil, func() { log.SetLevel(log.TraceLevel) }},
{"help", "h", "print this help", nil, func() { printHelp(); os.Exit(64) }}, </s> remove i++
opt.callback(os.Args[i])
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a7e0f664921f8ac7de59d770c26e390e389b009e | app.go |
keep keep keep keep replace replace replace keep replace | <mask> if err != nil {
<mask> panic("Got port that is not a number")
<mask> }
<mask> bindPort = &v
<mask> }},
<mask> {"verbose", "v", "enable verbose output", nil},
<mask> {"help", "h", "print this help", nil},
<mask> }
<mask> printHelp := func() {
</s> Flag parser -- support options without values, move code for help and verbose into table. </s> remove {"config", "c", "path to config file", func(value string) { configFilename = &value }},
{"host", "h", "host address to bind HTTP server on", func(value string) { bindHost = &value }},
</s> add {"config", "c", "path to config file", func(value string) { configFilename = &value }, nil},
{"host", "h", "host address to bind HTTP server on", func(value string) { bindHost = &value }, nil}, </s> remove if v == "--"+opt.longName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
}
i++
opt.callback(os.Args[i])
knownParam = true
break
}
if v == "-"+opt.shortName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
</s> add if v == "--"+opt.longName || v == "-"+opt.shortName {
if opt.callbackWithValue != nil {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
}
i++
opt.callbackWithValue(os.Args[i])
} else if opt.callbackNoValue != nil {
opt.callbackNoValue() </s> add var printHelp func() </s> remove // short-circuit for help
if v == "--help" || v == "-h" {
printHelp()
os.Exit(64)
}
if v == "--verbose" || v == "-v" {
log.SetLevel(log.TraceLevel)
}
</s> add </s> remove i++
opt.callback(os.Args[i])
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a7e0f664921f8ac7de59d770c26e390e389b009e | app.go |
keep keep replace replace replace replace replace replace replace replace keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep | <mask> for i := 1; i < len(os.Args); i++ {
<mask> v := os.Args[i]
<mask> // short-circuit for help
<mask> if v == "--help" || v == "-h" {
<mask> printHelp()
<mask> os.Exit(64)
<mask> }
<mask> if v == "--verbose" || v == "-v" {
<mask> log.SetLevel(log.TraceLevel)
<mask> }
<mask> knownParam := false
<mask> for _, opt := range opts {
<mask> if v == "--"+opt.longName {
<mask> if i+1 > len(os.Args) {
<mask> log.Printf("ERROR: Got %s without argument\n", v)
<mask> os.Exit(64)
<mask> }
<mask> i++
<mask> opt.callback(os.Args[i])
<mask> knownParam = true
<mask> break
<mask> }
<mask> if v == "-"+opt.shortName {
<mask> if i+1 > len(os.Args) {
<mask> log.Printf("ERROR: Got %s without argument\n", v)
<mask> os.Exit(64)
<mask> }
<mask> i++
<mask> opt.callback(os.Args[i])
</s> Flag parser -- support options without values, move code for help and verbose into table. </s> remove i++
opt.callback(os.Args[i])
</s> add </s> remove printHelp := func() {
</s> add printHelp = func() { </s> remove }},
{"verbose", "v", "enable verbose output", nil},
{"help", "h", "print this help", nil},
</s> add }, nil},
{"verbose", "v", "enable verbose output", nil, func() { log.SetLevel(log.TraceLevel) }},
{"help", "h", "print this help", nil, func() { printHelp(); os.Exit(64) }}, </s> remove {"config", "c", "path to config file", func(value string) { configFilename = &value }},
{"host", "h", "host address to bind HTTP server on", func(value string) { bindHost = &value }},
</s> add {"config", "c", "path to config file", func(value string) { configFilename = &value }, nil},
{"host", "h", "host address to bind HTTP server on", func(value string) { bindHost = &value }, nil}, </s> add var printHelp func() | https://github.com/AdguardTeam/AdGuardHome/commit/a7e0f664921f8ac7de59d770c26e390e389b009e | app.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> if i+1 > len(os.Args) {
<mask> log.Printf("ERROR: Got %s without argument\n", v)
<mask> os.Exit(64)
<mask> }
<mask> i++
<mask> opt.callback(os.Args[i])
<mask> knownParam = true
<mask> break
<mask> }
<mask> }
<mask> if !knownParam {
</s> Flag parser -- support options without values, move code for help and verbose into table. </s> remove if v == "--"+opt.longName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
}
i++
opt.callback(os.Args[i])
knownParam = true
break
}
if v == "-"+opt.shortName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
</s> add if v == "--"+opt.longName || v == "-"+opt.shortName {
if opt.callbackWithValue != nil {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
}
i++
opt.callbackWithValue(os.Args[i])
} else if opt.callbackNoValue != nil {
opt.callbackNoValue() </s> remove // short-circuit for help
if v == "--help" || v == "-h" {
printHelp()
os.Exit(64)
}
if v == "--verbose" || v == "-v" {
log.SetLevel(log.TraceLevel)
}
</s> add </s> remove }},
{"verbose", "v", "enable verbose output", nil},
{"help", "h", "print this help", nil},
</s> add }, nil},
{"verbose", "v", "enable verbose output", nil, func() { log.SetLevel(log.TraceLevel) }},
{"help", "h", "print this help", nil, func() { printHelp(); os.Exit(64) }}, </s> remove {"config", "c", "path to config file", func(value string) { configFilename = &value }},
{"host", "h", "host address to bind HTTP server on", func(value string) { bindHost = &value }},
</s> add {"config", "c", "path to config file", func(value string) { configFilename = &value }, nil},
{"host", "h", "host address to bind HTTP server on", func(value string) { bindHost = &value }, nil}, </s> remove printHelp := func() {
</s> add printHelp = func() { </s> remove longName string
shortName string
description string
callback func(value string)
</s> add longName string
shortName string
description string
callbackWithValue func(value string)
callbackNoValue func() | https://github.com/AdguardTeam/AdGuardHome/commit/a7e0f664921f8ac7de59d770c26e390e389b009e | app.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> go 1.17
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.42.4
<mask> github.com/AdguardTeam/golibs v0.10.8
<mask> github.com/AdguardTeam/urlfilter v0.16.0
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.3
<mask> github.com/digineo/go-ipset/v2 v2.2.1
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove github.com/AdguardTeam/dnsproxy v0.42.4 h1:Rf45a3H6U/8XqWMYAMEsC1g/dVudyfgx4WY8N2syJMw=
github.com/AdguardTeam/dnsproxy v0.42.4/go.mod h1:thHuk3599mgmucsv5J9HR9lBVQHnf4YleE08EbxNrN0=
</s> add github.com/AdguardTeam/dnsproxy v0.43.0 h1:K082nx37DaNqSyT3kDtAfgBACNWc+ZDI1Yr/kGppu1k=
github.com/AdguardTeam/dnsproxy v0.43.0/go.mod h1:JUGTm5dmlll47JltztsT0N//pVJjdg6zu0SNeUeaA7g= </s> remove // quicSession is a narrow interface for quic.Session to simplify testing.
type quicSession interface {
</s> add // quicConnection is a narrow interface for quic.Connection to simplify testing.
type quicConnection interface { </s> remove github.com/lucas-clemente/quic-go v0.26.0
</s> add github.com/lucas-clemente/quic-go v0.27.1 </s> remove github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg=
github.com/lucas-clemente/quic-go v0.26.0 h1:ALBQXr9UJ8A1LyzvceX4jd9QFsHvlI0RR6BkV16o00A=
github.com/lucas-clemente/quic-go v0.26.0/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI=
</s> add github.com/lucas-clemente/quic-go v0.27.1 h1:sOw+4kFSVrdWOYmUjufQ9GBVPqZ+tu+jMtXxXNmRJyk=
github.com/lucas-clemente/quic-go v0.27.1/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI= </s> remove github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
</s> add </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b | go.mod |
keep keep keep keep replace keep keep keep keep keep | <mask> github.com/google/gopacket v1.1.19
<mask> github.com/google/renameio v1.0.1
<mask> github.com/insomniacslk/dhcp v0.0.0-20220405050111-12fbdcb11b41
<mask> github.com/kardianos/service v1.2.1
<mask> github.com/lucas-clemente/quic-go v0.26.0
<mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118
<mask> github.com/mdlayher/netlink v1.6.0
<mask> // TODO(a.garipov): This package is deprecated; find a new one or use
<mask> // our own code for that.
<mask> github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove // quicSession is a narrow interface for quic.Session to simplify testing.
type quicSession interface {
</s> add // quicConnection is a narrow interface for quic.Connection to simplify testing.
type quicConnection interface { </s> remove // testQUICSession is a quicSession for tests.
type testQUICSession struct {
// Session is embedded here simply to make testQUICSession a quic.Session
// without actually implementing all methods.
quic.Session
</s> add // testQUICConnection is a quicConnection for tests.
type testQUICConnection struct {
// Connection is embedded here simply to make testQUICConnection a
// quic.Connection without actually implementing all methods.
quic.Connection </s> remove // ConnectionState implements the quicSession interface for testQUICSession.
func (c testQUICSession) ConnectionState() (cs quic.ConnectionState) {
</s> add // ConnectionState implements the quicConnection interface for
// testQUICConnection.
func (c testQUICConnection) ConnectionState() (cs quic.ConnectionState) { </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
github.com/marten-seemann/qtls-go1-18 v0.1.0/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
</s> add </s> remove github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg=
github.com/lucas-clemente/quic-go v0.26.0 h1:ALBQXr9UJ8A1LyzvceX4jd9QFsHvlI0RR6BkV16o00A=
github.com/lucas-clemente/quic-go v0.26.0/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI=
</s> add github.com/lucas-clemente/quic-go v0.27.1 h1:sOw+4kFSVrdWOYmUjufQ9GBVPqZ+tu+jMtXxXNmRJyk=
github.com/lucas-clemente/quic-go v0.27.1/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI= </s> remove github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b | go.mod |
keep keep keep keep replace replace keep keep keep keep keep | <mask> dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
<mask> dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
<mask> dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
<mask> git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
<mask> github.com/AdguardTeam/dnsproxy v0.42.4 h1:Rf45a3H6U/8XqWMYAMEsC1g/dVudyfgx4WY8N2syJMw=
<mask> github.com/AdguardTeam/dnsproxy v0.42.4/go.mod h1:thHuk3599mgmucsv5J9HR9lBVQHnf4YleE08EbxNrN0=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
<mask> github.com/AdguardTeam/golibs v0.10.8 h1:diU9gP9qG1qeLbAkzIwfUerpHSqzR6zaBgzvRMR/m6Q=
<mask> github.com/AdguardTeam/golibs v0.10.8/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove github.com/AdguardTeam/dnsproxy v0.42.4
</s> add github.com/AdguardTeam/dnsproxy v0.43.0 </s> remove // quicSession is a narrow interface for quic.Session to simplify testing.
type quicSession interface {
</s> add // quicConnection is a narrow interface for quic.Connection to simplify testing.
type quicConnection interface { </s> remove github.com/lucas-clemente/quic-go v0.26.0
</s> add github.com/lucas-clemente/quic-go v0.27.1 </s> remove github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg=
github.com/lucas-clemente/quic-go v0.26.0 h1:ALBQXr9UJ8A1LyzvceX4jd9QFsHvlI0RR6BkV16o00A=
github.com/lucas-clemente/quic-go v0.26.0/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI=
</s> add github.com/lucas-clemente/quic-go v0.27.1 h1:sOw+4kFSVrdWOYmUjufQ9GBVPqZ+tu+jMtXxXNmRJyk=
github.com/lucas-clemente/quic-go v0.27.1/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI= </s> remove github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
</s> add </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b | go.sum |
keep keep replace replace replace keep keep keep replace replace keep keep keep keep | <mask> github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
<mask> github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
<mask> github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg=
<mask> github.com/lucas-clemente/quic-go v0.26.0 h1:ALBQXr9UJ8A1LyzvceX4jd9QFsHvlI0RR6BkV16o00A=
<mask> github.com/lucas-clemente/quic-go v0.26.0/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI=
<mask> github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
<mask> github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
<mask> github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
<mask> github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
<mask> github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
<mask> github.com/marten-seemann/qtls-go1-16 v0.1.5 h1:o9JrYPPco/Nukd/HpOHMHZoBDXQqoNtUCmny98/1uqQ=
<mask> github.com/marten-seemann/qtls-go1-16 v0.1.5/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.1 h1:DQjHPq+aOzUeh9/lixAGunn6rIOQyWChPSI4+hgW7jc=
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
</s> add </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
github.com/marten-seemann/qtls-go1-18 v0.1.0/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
</s> add </s> remove github.com/lucas-clemente/quic-go v0.26.0
</s> add github.com/lucas-clemente/quic-go v0.27.1 </s> remove Proto: tc.proto,
Conn: conn,
QUICSession: qs,
</s> add Proto: tc.proto,
Conn: conn,
QUICConnection: qconn, </s> remove // quicSession is a narrow interface for quic.Session to simplify testing.
type quicSession interface {
</s> add // quicConnection is a narrow interface for quic.Connection to simplify testing.
type quicConnection interface { | https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b | go.sum |
keep keep replace keep keep replace replace | <mask> github.com/marten-seemann/qtls-go1-16 v0.1.5 h1:o9JrYPPco/Nukd/HpOHMHZoBDXQqoNtUCmny98/1uqQ=
<mask> github.com/marten-seemann/qtls-go1-16 v0.1.5/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.1 h1:DQjHPq+aOzUeh9/lixAGunn6rIOQyWChPSI4+hgW7jc=
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.1/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s=
<mask> github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
<mask> github.com/marten-seemann/qtls-go1-18 v0.1.0/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
</s> add </s> remove github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg=
github.com/lucas-clemente/quic-go v0.26.0 h1:ALBQXr9UJ8A1LyzvceX4jd9QFsHvlI0RR6BkV16o00A=
github.com/lucas-clemente/quic-go v0.26.0/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI=
</s> add github.com/lucas-clemente/quic-go v0.27.1 h1:sOw+4kFSVrdWOYmUjufQ9GBVPqZ+tu+jMtXxXNmRJyk=
github.com/lucas-clemente/quic-go v0.27.1/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI= </s> remove Proto: tc.proto,
Conn: conn,
QUICSession: qs,
</s> add Proto: tc.proto,
Conn: conn,
QUICConnection: qconn, </s> remove // quicSession is a narrow interface for quic.Session to simplify testing.
type quicSession interface {
</s> add // quicConnection is a narrow interface for quic.Connection to simplify testing.
type quicConnection interface { </s> remove github.com/lucas-clemente/quic-go v0.26.0
</s> add github.com/lucas-clemente/quic-go v0.27.1 | https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> type tlsConn interface {
<mask> ConnectionState() (cs tls.ConnectionState)
<mask> }
<mask>
<mask> // quicSession is a narrow interface for quic.Session to simplify testing.
<mask> type quicSession interface {
<mask> ConnectionState() (cs quic.ConnectionState)
<mask> }
<mask>
<mask> // clientIDFromDNSContext extracts the client's ID from the server name of the
<mask> // client's DoT or DoQ request or the path of the client's DoH. If the protocol
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove // ConnectionState implements the quicSession interface for testQUICSession.
func (c testQUICSession) ConnectionState() (cs quic.ConnectionState) {
</s> add // ConnectionState implements the quicConnection interface for
// testQUICConnection.
func (c testQUICConnection) ConnectionState() (cs quic.ConnectionState) { </s> remove // testQUICSession is a quicSession for tests.
type testQUICSession struct {
// Session is embedded here simply to make testQUICSession a quic.Session
// without actually implementing all methods.
quic.Session
</s> add // testQUICConnection is a quicConnection for tests.
type testQUICConnection struct {
// Connection is embedded here simply to make testQUICConnection a
// quic.Connection without actually implementing all methods.
quic.Connection </s> remove github.com/lucas-clemente/quic-go v0.26.0
</s> add github.com/lucas-clemente/quic-go v0.27.1 </s> remove "proxy ctx quic session of proto %s is %T, want quic.Session",
</s> add "proxy ctx quic conn of proto %s is %T, want quic.Connection", </s> remove pctx.QUICSession,
</s> add pctx.QUICConnection, </s> remove qs, ok := pctx.QUICSession.(quicSession)
</s> add conn, ok := pctx.QUICConnection.(quicConnection) | https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b | internal/dnsforward/clientid.go |
keep keep keep replace keep keep replace keep keep keep | <mask>
<mask> cliSrvName = tc.ConnectionState().ServerName
<mask> case proxy.ProtoQUIC:
<mask> qs, ok := pctx.QUICSession.(quicSession)
<mask> if !ok {
<mask> return "", fmt.Errorf(
<mask> "proxy ctx quic session of proto %s is %T, want quic.Session",
<mask> proto,
<mask> pctx.QUICSession,
<mask> )
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove pctx.QUICSession,
</s> add pctx.QUICConnection, </s> remove cliSrvName = qs.ConnectionState().TLS.ServerName
</s> add cliSrvName = conn.ConnectionState().TLS.ServerName </s> remove qs = testQUICSession{
</s> add qconn = testQUICConnection{ </s> remove Proto: tc.proto,
Conn: conn,
QUICSession: qs,
</s> add Proto: tc.proto,
Conn: conn,
QUICConnection: qconn, </s> remove // quicSession is a narrow interface for quic.Session to simplify testing.
type quicSession interface {
</s> add // quicConnection is a narrow interface for quic.Connection to simplify testing.
type quicConnection interface { | https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b | internal/dnsforward/clientid.go |
keep keep replace keep keep keep replace keep keep keep | <mask> "proxy ctx quic session of proto %s is %T, want quic.Session",
<mask> proto,
<mask> pctx.QUICSession,
<mask> )
<mask> }
<mask>
<mask> cliSrvName = qs.ConnectionState().TLS.ServerName
<mask> }
<mask>
<mask> clientID, err = clientIDFromClientServerName(
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove "proxy ctx quic session of proto %s is %T, want quic.Session",
</s> add "proxy ctx quic conn of proto %s is %T, want quic.Connection", </s> remove qs, ok := pctx.QUICSession.(quicSession)
</s> add conn, ok := pctx.QUICConnection.(quicConnection) </s> remove Proto: tc.proto,
Conn: conn,
QUICSession: qs,
</s> add Proto: tc.proto,
Conn: conn,
QUICConnection: qconn, </s> remove qs = testQUICSession{
</s> add qconn = testQUICConnection{ </s> remove var qs quic.Session
</s> add var qconn quic.Connection | https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b | internal/dnsforward/clientid.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask>
<mask> return cs
<mask> }
<mask>
<mask> // testQUICSession is a quicSession for tests.
<mask> type testQUICSession struct {
<mask> // Session is embedded here simply to make testQUICSession a quic.Session
<mask> // without actually implementing all methods.
<mask> quic.Session
<mask>
<mask> serverName string
<mask> }
<mask>
<mask> // ConnectionState implements the quicSession interface for testQUICSession.
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove // ConnectionState implements the quicSession interface for testQUICSession.
func (c testQUICSession) ConnectionState() (cs quic.ConnectionState) {
</s> add // ConnectionState implements the quicConnection interface for
// testQUICConnection.
func (c testQUICConnection) ConnectionState() (cs quic.ConnectionState) { </s> remove // quicSession is a narrow interface for quic.Session to simplify testing.
type quicSession interface {
</s> add // quicConnection is a narrow interface for quic.Connection to simplify testing.
type quicConnection interface { </s> remove github.com/lucas-clemente/quic-go v0.26.0
</s> add github.com/lucas-clemente/quic-go v0.27.1 </s> remove var qs quic.Session
</s> add var qconn quic.Connection </s> remove qs = testQUICSession{
</s> add qconn = testQUICConnection{ </s> remove pctx.QUICSession,
</s> add pctx.QUICConnection, | https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b | internal/dnsforward/clientid_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask>
<mask> serverName string
<mask> }
<mask>
<mask> // ConnectionState implements the quicSession interface for testQUICSession.
<mask> func (c testQUICSession) ConnectionState() (cs quic.ConnectionState) {
<mask> cs.TLS.ServerName = c.serverName
<mask>
<mask> return cs
<mask> }
<mask>
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove // testQUICSession is a quicSession for tests.
type testQUICSession struct {
// Session is embedded here simply to make testQUICSession a quic.Session
// without actually implementing all methods.
quic.Session
</s> add // testQUICConnection is a quicConnection for tests.
type testQUICConnection struct {
// Connection is embedded here simply to make testQUICConnection a
// quic.Connection without actually implementing all methods.
quic.Connection </s> remove // quicSession is a narrow interface for quic.Session to simplify testing.
type quicSession interface {
</s> add // quicConnection is a narrow interface for quic.Connection to simplify testing.
type quicConnection interface { </s> remove pctx.QUICSession,
</s> add pctx.QUICConnection, </s> remove qs = testQUICSession{
</s> add qconn = testQUICConnection{ </s> remove cliSrvName = qs.ConnectionState().TLS.ServerName
</s> add cliSrvName = conn.ConnectionState().TLS.ServerName </s> remove var qs quic.Session
</s> add var qconn quic.Connection | https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b | internal/dnsforward/clientid_test.go |
keep keep replace keep keep keep keep keep keep keep keep replace keep | <mask> }
<mask>
<mask> var qs quic.Session
<mask> if tc.proto == proxy.ProtoQUIC {
<mask> qs = testQUICSession{
<mask> serverName: tc.cliSrvName,
<mask> }
<mask> }
<mask>
<mask> var qs quic.Session
<mask> if tc.proto == proxy.ProtoQUIC {
<mask> qs = testQUICSession{
<mask> serverName: tc.cliSrvName,
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove pctx.QUICSession,
</s> add pctx.QUICConnection, </s> remove cliSrvName = qs.ConnectionState().TLS.ServerName
</s> add cliSrvName = conn.ConnectionState().TLS.ServerName </s> remove qs, ok := pctx.QUICSession.(quicSession)
</s> add conn, ok := pctx.QUICConnection.(quicConnection) </s> remove // testQUICSession is a quicSession for tests.
type testQUICSession struct {
// Session is embedded here simply to make testQUICSession a quic.Session
// without actually implementing all methods.
quic.Session
</s> add // testQUICConnection is a quicConnection for tests.
type testQUICConnection struct {
// Connection is embedded here simply to make testQUICConnection a
// quic.Connection without actually implementing all methods.
quic.Connection </s> remove // ConnectionState implements the quicSession interface for testQUICSession.
func (c testQUICSession) ConnectionState() (cs quic.ConnectionState) {
</s> add // ConnectionState implements the quicConnection interface for
// testQUICConnection.
func (c testQUICConnection) ConnectionState() (cs quic.ConnectionState) { | https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b | internal/dnsforward/clientid_test.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> pctx := &proxy.DNSContext{
<mask> Proto: tc.proto,
<mask> Conn: conn,
<mask> QUICSession: qs,
<mask> }
<mask>
<mask> clientID, err := srv.clientIDFromDNSContext(pctx)
<mask> assert.Equal(t, tc.wantClientID, clientID)
<mask>
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove qs = testQUICSession{
</s> add qconn = testQUICConnection{ </s> remove qs, ok := pctx.QUICSession.(quicSession)
</s> add conn, ok := pctx.QUICConnection.(quicConnection) </s> remove cliSrvName = qs.ConnectionState().TLS.ServerName
</s> add cliSrvName = conn.ConnectionState().TLS.ServerName </s> remove "proxy ctx quic session of proto %s is %T, want quic.Session",
</s> add "proxy ctx quic conn of proto %s is %T, want quic.Connection", </s> remove var qs quic.Session
</s> add var qconn quic.Connection </s> remove pctx.QUICSession,
</s> add pctx.QUICConnection, | https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b | internal/dnsforward/clientid_test.go |
keep keep keep add keep keep keep keep keep | <mask> "dhcp_disable": "Disable DHCP server",
<mask> "dhcp_not_found": "It is safe to enable the built-in DHCP server - we didn't find any active DHCP servers on the network. However, we encourage you to re-check it manually as our automatic test currently doesn't give 100% guarantee.",
<mask> "dhcp_found": "An active DHCP server is found on the network. It is not safe to enable the built-in DHCP server.",
<mask> "dhcp_leases": "DHCP leases",
<mask> "dhcp_leases_not_found": "No DHCP leases found",
<mask> "dhcp_config_saved": "Saved DHCP server config",
<mask> "form_error_required": "Required field",
<mask> "form_error_ip_format": "Invalid IPv4 format",
<mask> "form_error_mac_format": "Invalid MAC format",
</s> + client: add table to show static leases </s> add staticLeases: [], </s> add ...values, </s> remove ...payload,
</s> add staticLeases, </s> add const {
static_leases: staticLeases,
...values
} = payload;
</s> remove </div>
</Card>
</s> add </Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<StaticLeases staticLeases={dhcp.staticLeases} />
</div>
</div>
</Card>
</Fragment> </s> remove <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</s> add <Fragment>
<Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</div> | https://github.com/AdguardTeam/AdGuardHome/commit/a8384c004ef41dcfb97f01dbd9e4c7dfb5723bb6 | client/src/__locales/en.json |
keep keep add keep keep keep keep keep keep | <mask> import { DHCP_STATUS_RESPONSE } from '../../../helpers/constants';
<mask> import Form from './Form';
<mask> import Leases from './Leases';
<mask> import Interface from './Interface';
<mask> import Card from '../../ui/Card';
<mask> import Accordion from '../../ui/Accordion';
<mask>
<mask> class Dhcp extends Component {
<mask> handleFormSubmit = (values) => {
</s> + client: add table to show static leases </s> add const {
static_leases: staticLeases,
...values
} = payload;
</s> remove ...payload,
</s> add staticLeases, </s> add staticLeases: [], </s> add ...values, </s> remove </div>
</Card>
</s> add </Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<StaticLeases staticLeases={dhcp.staticLeases} />
</div>
</div>
</Card>
</Fragment> </s> remove <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</s> add <Fragment>
<Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</div> | https://github.com/AdguardTeam/AdGuardHome/commit/a8384c004ef41dcfb97f01dbd9e4c7dfb5723bb6 | client/src/components/Settings/Dhcp/index.js |
keep keep replace replace replace replace keep replace replace keep | <mask> </Card>
<mask> {!dhcp.processing && dhcp.config.enabled &&
<mask> <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<mask> <div className="row">
<mask> <div className="col">
<mask> <Leases leases={dhcp.leases} />
<mask> </div>
<mask> </div>
<mask> </Card>
<mask> }
</s> + client: add table to show static leases </s> add staticLeases: [], </s> add ...values, </s> remove ...payload,
</s> add staticLeases, </s> add const {
static_leases: staticLeases,
...values
} = payload;
</s> add import StaticLeases from './StaticLeases'; | https://github.com/AdguardTeam/AdGuardHome/commit/a8384c004ef41dcfb97f01dbd9e4c7dfb5723bb6 | client/src/components/Settings/Dhcp/index.js |
keep add keep keep keep keep keep | <mask> [actions.getDhcpStatusFailure]: state => ({ ...state, processing: false }),
<mask> [actions.getDhcpStatusSuccess]: (state, { payload }) => {
<mask> const newState = {
<mask> ...state,
<mask> staticLeases,
<mask> processing: false,
<mask> ...values,
</s> + client: add table to show static leases </s> remove ...payload,
</s> add staticLeases, </s> add ...values, </s> add import StaticLeases from './StaticLeases'; </s> add staticLeases: [], </s> remove </div>
</Card>
</s> add </Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<StaticLeases staticLeases={dhcp.staticLeases} />
</div>
</div>
</Card>
</Fragment> </s> remove <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</s> add <Fragment>
<Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</div> | https://github.com/AdguardTeam/AdGuardHome/commit/a8384c004ef41dcfb97f01dbd9e4c7dfb5723bb6 | client/src/reducers/index.js |
keep keep keep keep replace keep keep keep keep keep | <mask> [actions.getDhcpStatusFailure]: state => ({ ...state, processing: false }),
<mask> [actions.getDhcpStatusSuccess]: (state, { payload }) => {
<mask> const newState = {
<mask> ...state,
<mask> ...payload,
<mask> processing: false,
<mask> };
<mask> return newState;
<mask> },
<mask>
</s> + client: add table to show static leases </s> add const {
static_leases: staticLeases,
...values
} = payload;
</s> add ...values, </s> add import StaticLeases from './StaticLeases'; </s> add staticLeases: [], </s> remove </div>
</Card>
</s> add </Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<StaticLeases staticLeases={dhcp.staticLeases} />
</div>
</div>
</Card>
</Fragment> </s> remove <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</s> add <Fragment>
<Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</div> | https://github.com/AdguardTeam/AdGuardHome/commit/a8384c004ef41dcfb97f01dbd9e4c7dfb5723bb6 | client/src/reducers/index.js |
keep keep add keep keep keep keep | <mask> ...state,
<mask> staticLeases,
<mask> processing: false,
<mask> };
<mask>
<mask> return newState;
<mask> },
</s> + client: add table to show static leases </s> remove ...payload,
</s> add staticLeases, </s> add const {
static_leases: staticLeases,
...values
} = payload;
</s> add staticLeases: [], </s> remove </div>
</Card>
</s> add </Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<StaticLeases staticLeases={dhcp.staticLeases} />
</div>
</div>
</Card>
</Fragment> </s> remove <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</s> add <Fragment>
<Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</div> </s> add import StaticLeases from './StaticLeases'; | https://github.com/AdguardTeam/AdGuardHome/commit/a8384c004ef41dcfb97f01dbd9e4c7dfb5723bb6 | client/src/reducers/index.js |
keep add keep keep keep keep | <mask> check: null,
<mask> leases: [],
<mask> });
<mask>
<mask> export default combineReducers({
<mask> settings,
</s> + client: add table to show static leases </s> add ...values, </s> remove ...payload,
</s> add staticLeases, </s> add const {
static_leases: staticLeases,
...values
} = payload;
</s> remove </div>
</Card>
</s> add </Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<StaticLeases staticLeases={dhcp.staticLeases} />
</div>
</div>
</Card>
</Fragment> </s> remove <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</s> add <Fragment>
<Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</div> </s> add import StaticLeases from './StaticLeases'; | https://github.com/AdguardTeam/AdGuardHome/commit/a8384c004ef41dcfb97f01dbd9e4c7dfb5723bb6 | client/src/reducers/index.js |
keep keep keep replace keep replace keep keep keep keep | <mask> UpstreamConfig: s.conf.UpstreamConfig,
<mask> BeforeRequestHandler: s.beforeRequestHandler,
<mask> RequestHandler: s.handleDNSRequest,
<mask> AllServers: s.conf.AllServers,
<mask> EnableEDNSClientSubnet: s.conf.EnableEDNSClientSubnet,
<mask> FindFastestAddr: s.conf.FastestAddr,
<mask> }
<mask>
<mask> if len(s.conf.BogusNXDomain) > 0 {
<mask> for _, s := range s.conf.BogusNXDomain {
</s> * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
Squashed commit of the following:
commit f18b7231f3f3f84446c0d837855af342f3c971b4
Merge: 501a4e06 dae275e6
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jun 10 15:24:15 2020 +0300
Merge remote-tracking branch 'origin/master' into update-dnsproxy
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0 </s> remove if js.Exists("fastest_addr") {
s.conf.FastestAddr = req.FastestAddr
}
</s> add if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
case "parallel":
s.conf.AllServers = true </s> remove if js.Exists("parallel_requests") {
s.conf.AllServers = req.ParallelRequests
</s> add case "fastest_addr":
s.conf.FastestAddr = true
} </s> remove resp.FastestAddr = s.conf.FastestAddr
resp.ParallelRequests = s.conf.AllServers
</s> add if s.conf.FastestAddr {
resp.UpstreamMode = "fastest_addr"
} else if s.conf.AllServers {
resp.UpstreamMode = "parallel"
} </s> add if js.Exists("upstream_mode") &&
!(req.UpstreamMode == "" || req.UpstreamMode == "fastest_addr" || req.UpstreamMode == "parallel") {
httpError(r, w, http.StatusBadRequest, "upstream_mode: incorrect value")
return
}
</s> remove FastestAddr bool `json:"fastest_addr"`
ParallelRequests bool `json:"parallel_requests"`
</s> add UpstreamMode string `json:"upstream_mode"` | https://github.com/AdguardTeam/AdGuardHome/commit/a869ec4cbb98301e799627a09c2e1902e57aab03 | dnsforward/config.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> BlockingIPv6 string `json:"blocking_ipv6"`
<mask> EDNSCSEnabled bool `json:"edns_cs_enabled"`
<mask> DNSSECEnabled bool `json:"dnssec_enabled"`
<mask> DisableIPv6 bool `json:"disable_ipv6"`
<mask> FastestAddr bool `json:"fastest_addr"`
<mask> ParallelRequests bool `json:"parallel_requests"`
<mask> }
<mask>
<mask> func (s *Server) handleGetConfig(w http.ResponseWriter, r *http.Request) {
<mask> resp := dnsConfigJSON{}
<mask> s.RLock()
</s> * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
Squashed commit of the following:
commit f18b7231f3f3f84446c0d837855af342f3c971b4
Merge: 501a4e06 dae275e6
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jun 10 15:24:15 2020 +0300
Merge remote-tracking branch 'origin/master' into update-dnsproxy
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0 </s> remove FindFastestAddr: s.conf.FastestAddr,
</s> add }
proxyConfig.UpstreamMode = proxy.UModeLoadBalance
if s.conf.AllServers {
proxyConfig.UpstreamMode = proxy.UModeParallel
} else if s.conf.FastestAddr {
proxyConfig.UpstreamMode = proxy.UModeFastestAddr </s> add if js.Exists("upstream_mode") &&
!(req.UpstreamMode == "" || req.UpstreamMode == "fastest_addr" || req.UpstreamMode == "parallel") {
httpError(r, w, http.StatusBadRequest, "upstream_mode: incorrect value")
return
}
</s> remove resp.FastestAddr = s.conf.FastestAddr
resp.ParallelRequests = s.conf.AllServers
</s> add if s.conf.FastestAddr {
resp.UpstreamMode = "fastest_addr"
} else if s.conf.AllServers {
resp.UpstreamMode = "parallel"
} </s> remove if js.Exists("fastest_addr") {
s.conf.FastestAddr = req.FastestAddr
}
</s> add if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
case "parallel":
s.conf.AllServers = true </s> remove if js.Exists("parallel_requests") {
s.conf.AllServers = req.ParallelRequests
</s> add case "fastest_addr":
s.conf.FastestAddr = true
} </s> remove AllServers: s.conf.AllServers,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a869ec4cbb98301e799627a09c2e1902e57aab03 | dnsforward/dnsforward_http.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> resp.RateLimit = s.conf.Ratelimit
<mask> resp.EDNSCSEnabled = s.conf.EnableEDNSClientSubnet
<mask> resp.DNSSECEnabled = s.conf.EnableDNSSEC
<mask> resp.DisableIPv6 = s.conf.AAAADisabled
<mask> resp.FastestAddr = s.conf.FastestAddr
<mask> resp.ParallelRequests = s.conf.AllServers
<mask> s.RUnlock()
<mask>
<mask> js, err := json.Marshal(resp)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusInternalServerError, "json.Marshal: %s", err)
</s> * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
Squashed commit of the following:
commit f18b7231f3f3f84446c0d837855af342f3c971b4
Merge: 501a4e06 dae275e6
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jun 10 15:24:15 2020 +0300
Merge remote-tracking branch 'origin/master' into update-dnsproxy
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0 </s> add if js.Exists("upstream_mode") &&
!(req.UpstreamMode == "" || req.UpstreamMode == "fastest_addr" || req.UpstreamMode == "parallel") {
httpError(r, w, http.StatusBadRequest, "upstream_mode: incorrect value")
return
}
</s> remove if js.Exists("fastest_addr") {
s.conf.FastestAddr = req.FastestAddr
}
</s> add if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
case "parallel":
s.conf.AllServers = true </s> remove FindFastestAddr: s.conf.FastestAddr,
</s> add }
proxyConfig.UpstreamMode = proxy.UModeLoadBalance
if s.conf.AllServers {
proxyConfig.UpstreamMode = proxy.UModeParallel
} else if s.conf.FastestAddr {
proxyConfig.UpstreamMode = proxy.UModeFastestAddr </s> remove if js.Exists("parallel_requests") {
s.conf.AllServers = req.ParallelRequests
</s> add case "fastest_addr":
s.conf.FastestAddr = true
} </s> remove AllServers: s.conf.AllServers,
</s> add </s> remove FastestAddr bool `json:"fastest_addr"`
ParallelRequests bool `json:"parallel_requests"`
</s> add UpstreamMode string `json:"upstream_mode"` | https://github.com/AdguardTeam/AdGuardHome/commit/a869ec4cbb98301e799627a09c2e1902e57aab03 | dnsforward/dnsforward_http.go |
keep keep add keep keep keep keep keep keep | <mask> return
<mask> }
<mask>
<mask> restart := false
<mask> s.Lock()
<mask>
<mask> if js.Exists("upstream_dns") {
<mask> s.conf.UpstreamDNS = req.Upstreams
<mask> restart = true
</s> * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
Squashed commit of the following:
commit f18b7231f3f3f84446c0d837855af342f3c971b4
Merge: 501a4e06 dae275e6
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jun 10 15:24:15 2020 +0300
Merge remote-tracking branch 'origin/master' into update-dnsproxy
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0 </s> remove if js.Exists("fastest_addr") {
s.conf.FastestAddr = req.FastestAddr
}
</s> add if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
case "parallel":
s.conf.AllServers = true </s> remove if js.Exists("parallel_requests") {
s.conf.AllServers = req.ParallelRequests
</s> add case "fastest_addr":
s.conf.FastestAddr = true
} </s> remove FindFastestAddr: s.conf.FastestAddr,
</s> add }
proxyConfig.UpstreamMode = proxy.UModeLoadBalance
if s.conf.AllServers {
proxyConfig.UpstreamMode = proxy.UModeParallel
} else if s.conf.FastestAddr {
proxyConfig.UpstreamMode = proxy.UModeFastestAddr </s> remove resp.FastestAddr = s.conf.FastestAddr
resp.ParallelRequests = s.conf.AllServers
</s> add if s.conf.FastestAddr {
resp.UpstreamMode = "fastest_addr"
} else if s.conf.AllServers {
resp.UpstreamMode = "parallel"
} </s> remove AllServers: s.conf.AllServers,
</s> add </s> remove FastestAddr bool `json:"fastest_addr"`
ParallelRequests bool `json:"parallel_requests"`
</s> add UpstreamMode string `json:"upstream_mode"` | https://github.com/AdguardTeam/AdGuardHome/commit/a869ec4cbb98301e799627a09c2e1902e57aab03 | dnsforward/dnsforward_http.go |
keep keep keep keep replace replace replace keep replace replace | <mask> if js.Exists("disable_ipv6") {
<mask> s.conf.AAAADisabled = req.DisableIPv6
<mask> }
<mask>
<mask> if js.Exists("fastest_addr") {
<mask> s.conf.FastestAddr = req.FastestAddr
<mask> }
<mask>
<mask> if js.Exists("parallel_requests") {
<mask> s.conf.AllServers = req.ParallelRequests
</s> * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
Squashed commit of the following:
commit f18b7231f3f3f84446c0d837855af342f3c971b4
Merge: 501a4e06 dae275e6
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jun 10 15:24:15 2020 +0300
Merge remote-tracking branch 'origin/master' into update-dnsproxy
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0 </s> remove resp.FastestAddr = s.conf.FastestAddr
resp.ParallelRequests = s.conf.AllServers
</s> add if s.conf.FastestAddr {
resp.UpstreamMode = "fastest_addr"
} else if s.conf.AllServers {
resp.UpstreamMode = "parallel"
} </s> remove FindFastestAddr: s.conf.FastestAddr,
</s> add }
proxyConfig.UpstreamMode = proxy.UModeLoadBalance
if s.conf.AllServers {
proxyConfig.UpstreamMode = proxy.UModeParallel
} else if s.conf.FastestAddr {
proxyConfig.UpstreamMode = proxy.UModeFastestAddr </s> add if js.Exists("upstream_mode") &&
!(req.UpstreamMode == "" || req.UpstreamMode == "fastest_addr" || req.UpstreamMode == "parallel") {
httpError(r, w, http.StatusBadRequest, "upstream_mode: incorrect value")
return
}
</s> remove AllServers: s.conf.AllServers,
</s> add </s> remove FastestAddr bool `json:"fastest_addr"`
ParallelRequests bool `json:"parallel_requests"`
</s> add UpstreamMode string `json:"upstream_mode"` | https://github.com/AdguardTeam/AdGuardHome/commit/a869ec4cbb98301e799627a09c2e1902e57aab03 | dnsforward/dnsforward_http.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> go 1.14
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.28.1
<mask> github.com/AdguardTeam/golibs v0.4.2
<mask> github.com/AdguardTeam/urlfilter v0.10.1
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/fsnotify/fsnotify v1.4.7
<mask> github.com/gobuffalo/packr v1.30.1
</s> * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
Squashed commit of the following:
commit f18b7231f3f3f84446c0d837855af342f3c971b4
Merge: 501a4e06 dae275e6
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jun 10 15:24:15 2020 +0300
Merge remote-tracking branch 'origin/master' into update-dnsproxy
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0 </s> remove github.com/AdguardTeam/dnsproxy v0.28.1 h1:WkLjrUcVf/njbTLyL7bNt6e18zQjF2ZYv/HWwL9cMmU=
github.com/AdguardTeam/dnsproxy v0.28.1/go.mod h1:hOYFV9TW+pd5XKYz7KZf2FFD8SvSPqjyGTxUae86s58=
</s> add github.com/AdguardTeam/dnsproxy v0.29.0 h1:cHurldpiipPBAH+kgytcg9pkeYjG43KWiVYPbN3rAw4=
github.com/AdguardTeam/dnsproxy v0.29.0/go.mod h1:hOYFV9TW+pd5XKYz7KZf2FFD8SvSPqjyGTxUae86s58= </s> remove fastest_addr:
type: boolean
parallel_requests:
type: boolean
description: If true, parallel queries to all configured upstream servers are
enabled
</s> add upstream_mode:
enum:
- ""
- parallel
- fastest_addr </s> remove if js.Exists("parallel_requests") {
s.conf.AllServers = req.ParallelRequests
</s> add case "fastest_addr":
s.conf.FastestAddr = true
} </s> remove if js.Exists("fastest_addr") {
s.conf.FastestAddr = req.FastestAddr
}
</s> add if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
case "parallel":
s.conf.AllServers = true </s> add if js.Exists("upstream_mode") &&
!(req.UpstreamMode == "" || req.UpstreamMode == "fastest_addr" || req.UpstreamMode == "parallel") {
httpError(r, w, http.StatusBadRequest, "upstream_mode: incorrect value")
return
}
</s> remove resp.FastestAddr = s.conf.FastestAddr
resp.ParallelRequests = s.conf.AllServers
</s> add if s.conf.FastestAddr {
resp.UpstreamMode = "fastest_addr"
} else if s.conf.AllServers {
resp.UpstreamMode = "parallel"
} | https://github.com/AdguardTeam/AdGuardHome/commit/a869ec4cbb98301e799627a09c2e1902e57aab03 | go.mod |
replace replace keep keep keep keep keep | <mask> github.com/AdguardTeam/dnsproxy v0.28.1 h1:WkLjrUcVf/njbTLyL7bNt6e18zQjF2ZYv/HWwL9cMmU=
<mask> github.com/AdguardTeam/dnsproxy v0.28.1/go.mod h1:hOYFV9TW+pd5XKYz7KZf2FFD8SvSPqjyGTxUae86s58=
<mask> github.com/AdguardTeam/golibs v0.4.0 h1:4VX6LoOqFe9p9Gf55BeD8BvJD6M6RDYmgEiHrENE9KU=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.2 h1:7M28oTZFoFwNmp8eGPb3ImmYbxGaJLyQXeIFVHjME0o=
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
</s> * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
Squashed commit of the following:
commit f18b7231f3f3f84446c0d837855af342f3c971b4
Merge: 501a4e06 dae275e6
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jun 10 15:24:15 2020 +0300
Merge remote-tracking branch 'origin/master' into update-dnsproxy
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0 </s> remove github.com/AdguardTeam/dnsproxy v0.28.1
</s> add github.com/AdguardTeam/dnsproxy v0.29.0 </s> remove fastest_addr:
type: boolean
parallel_requests:
type: boolean
description: If true, parallel queries to all configured upstream servers are
enabled
</s> add upstream_mode:
enum:
- ""
- parallel
- fastest_addr </s> remove if js.Exists("parallel_requests") {
s.conf.AllServers = req.ParallelRequests
</s> add case "fastest_addr":
s.conf.FastestAddr = true
} </s> remove if js.Exists("fastest_addr") {
s.conf.FastestAddr = req.FastestAddr
}
</s> add if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
case "parallel":
s.conf.AllServers = true </s> add if js.Exists("upstream_mode") &&
!(req.UpstreamMode == "" || req.UpstreamMode == "fastest_addr" || req.UpstreamMode == "parallel") {
httpError(r, w, http.StatusBadRequest, "upstream_mode: incorrect value")
return
}
</s> remove resp.FastestAddr = s.conf.FastestAddr
resp.ParallelRequests = s.conf.AllServers
</s> add if s.conf.FastestAddr {
resp.UpstreamMode = "fastest_addr"
} else if s.conf.AllServers {
resp.UpstreamMode = "parallel"
} | https://github.com/AdguardTeam/AdGuardHome/commit/a869ec4cbb98301e799627a09c2e1902e57aab03 | go.sum |
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep | <mask> edns_cs_enabled:
<mask> type: boolean
<mask> dnssec_enabled:
<mask> type: boolean
<mask> fastest_addr:
<mask> type: boolean
<mask> parallel_requests:
<mask> type: boolean
<mask> description: If true, parallel queries to all configured upstream servers are
<mask> enabled
<mask> UpstreamsConfig:
<mask> type: object
<mask> description: Upstreams configuration
<mask> required:
<mask> - bootstrap_dns
</s> * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
Squashed commit of the following:
commit f18b7231f3f3f84446c0d837855af342f3c971b4
Merge: 501a4e06 dae275e6
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jun 10 15:24:15 2020 +0300
Merge remote-tracking branch 'origin/master' into update-dnsproxy
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0 </s> remove github.com/AdguardTeam/dnsproxy v0.28.1 h1:WkLjrUcVf/njbTLyL7bNt6e18zQjF2ZYv/HWwL9cMmU=
github.com/AdguardTeam/dnsproxy v0.28.1/go.mod h1:hOYFV9TW+pd5XKYz7KZf2FFD8SvSPqjyGTxUae86s58=
</s> add github.com/AdguardTeam/dnsproxy v0.29.0 h1:cHurldpiipPBAH+kgytcg9pkeYjG43KWiVYPbN3rAw4=
github.com/AdguardTeam/dnsproxy v0.29.0/go.mod h1:hOYFV9TW+pd5XKYz7KZf2FFD8SvSPqjyGTxUae86s58= </s> remove github.com/AdguardTeam/dnsproxy v0.28.1
</s> add github.com/AdguardTeam/dnsproxy v0.29.0 </s> remove if js.Exists("parallel_requests") {
s.conf.AllServers = req.ParallelRequests
</s> add case "fastest_addr":
s.conf.FastestAddr = true
} </s> remove if js.Exists("fastest_addr") {
s.conf.FastestAddr = req.FastestAddr
}
</s> add if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
case "parallel":
s.conf.AllServers = true </s> add if js.Exists("upstream_mode") &&
!(req.UpstreamMode == "" || req.UpstreamMode == "fastest_addr" || req.UpstreamMode == "parallel") {
httpError(r, w, http.StatusBadRequest, "upstream_mode: incorrect value")
return
}
</s> remove resp.FastestAddr = s.conf.FastestAddr
resp.ParallelRequests = s.conf.AllServers
</s> add if s.conf.FastestAddr {
resp.UpstreamMode = "fastest_addr"
} else if s.conf.AllServers {
resp.UpstreamMode = "parallel"
} | https://github.com/AdguardTeam/AdGuardHome/commit/a869ec4cbb98301e799627a09c2e1902e57aab03 | openapi/openapi.yaml |
keep keep replace replace replace replace replace keep replace replace keep keep | <mask> }
<mask>
<mask> setDNSServers(newconfig.upstreams, true)
<mask> setDNSServers(newconfig.bootstrapDNS, false)
<mask> config.DNS.AllServers = newconfig.allServers
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> // setDNSServers sets upstream and bootstrap DNS servers
<mask> func setDNSServers(hosts []string, upstreams bool) {
<mask> // bootstrap servers are plain DNS only. We should remove tls:// https:// and sdns:// hosts from slice
<mask> bootstraps := []string{}
</s> [change] control: Fix issues from review </s> remove if !upstreams && len(hosts) > 0 {
for _, host := range hosts {
</s> add if len(newconfig.bootstrapDNS) > 0 {
for _, host := range newconfig.bootstrapDNS { </s> remove hosts = append(bootstraps, host)
</s> add bootstraps = append(bootstraps, host) </s> remove // count of upstream or bootstrap servers
count := len(hosts)
if !upstreams {
count = len(bootstraps)
</s> add config.DNS.BootstrapDNS = defaultBootstrap
if len(bootstraps) > 0 {
config.DNS.BootstrapDNS = bootstraps </s> remove if upstreams {
config.DNS.UpstreamDNS = defaultDNS
if count != 0 {
config.DNS.UpstreamDNS = hosts
}
} else {
config.DNS.BootstrapDNS = defaultBootstrap
if count != 0 {
config.DNS.BootstrapDNS = bootstraps
}
}
</s> add config.DNS.AllServers = newconfig.allServers
httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/a8812908c1062e4dcfe6e30e9cf9612e41967aa1 | control.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> // setDNSServers sets upstream and bootstrap DNS servers
<mask> func setDNSServers(hosts []string, upstreams bool) {
<mask> // bootstrap servers are plain DNS only. We should remove tls:// https:// and sdns:// hosts from slice
<mask> bootstraps := []string{}
<mask> if !upstreams && len(hosts) > 0 {
<mask> for _, host := range hosts {
<mask> err := checkBootstrapDNS(host)
<mask> if err != nil {
<mask> log.Tracef("%s can not be used as bootstrap DNS cause: %s", host, err)
<mask> continue
<mask> }
</s> [change] control: Fix issues from review </s> remove hosts = append(bootstraps, host)
</s> add bootstraps = append(bootstraps, host) </s> remove // setDNSServers sets upstream and bootstrap DNS servers
func setDNSServers(hosts []string, upstreams bool) {
</s> add </s> remove // count of upstream or bootstrap servers
count := len(hosts)
if !upstreams {
count = len(bootstraps)
</s> add config.DNS.BootstrapDNS = defaultBootstrap
if len(bootstraps) > 0 {
config.DNS.BootstrapDNS = bootstraps </s> remove setDNSServers(newconfig.upstreams, true)
setDNSServers(newconfig.bootstrapDNS, false)
config.DNS.AllServers = newconfig.allServers
httpUpdateConfigReloadDNSReturnOK(w, r)
}
</s> add config.DNS.UpstreamDNS = defaultDNS
if len(newconfig.upstreams) > 0 {
config.DNS.UpstreamDNS = newconfig.upstreams
} </s> remove if upstreams {
config.DNS.UpstreamDNS = defaultDNS
if count != 0 {
config.DNS.UpstreamDNS = hosts
}
} else {
config.DNS.BootstrapDNS = defaultBootstrap
if count != 0 {
config.DNS.BootstrapDNS = bootstraps
}
}
</s> add config.DNS.AllServers = newconfig.allServers
httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/a8812908c1062e4dcfe6e30e9cf9612e41967aa1 | control.go |
keep replace keep keep keep replace replace replace replace keep | <mask> }
<mask> hosts = append(bootstraps, host)
<mask> }
<mask> }
<mask>
<mask> // count of upstream or bootstrap servers
<mask> count := len(hosts)
<mask> if !upstreams {
<mask> count = len(bootstraps)
<mask> }
</s> [change] control: Fix issues from review </s> remove if upstreams {
config.DNS.UpstreamDNS = defaultDNS
if count != 0 {
config.DNS.UpstreamDNS = hosts
}
} else {
config.DNS.BootstrapDNS = defaultBootstrap
if count != 0 {
config.DNS.BootstrapDNS = bootstraps
}
}
</s> add config.DNS.AllServers = newconfig.allServers
httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove // setDNSServers sets upstream and bootstrap DNS servers
func setDNSServers(hosts []string, upstreams bool) {
</s> add </s> remove setDNSServers(newconfig.upstreams, true)
setDNSServers(newconfig.bootstrapDNS, false)
config.DNS.AllServers = newconfig.allServers
httpUpdateConfigReloadDNSReturnOK(w, r)
}
</s> add config.DNS.UpstreamDNS = defaultDNS
if len(newconfig.upstreams) > 0 {
config.DNS.UpstreamDNS = newconfig.upstreams
} </s> remove if !upstreams && len(hosts) > 0 {
for _, host := range hosts {
</s> add if len(newconfig.bootstrapDNS) > 0 {
for _, host := range newconfig.bootstrapDNS { | https://github.com/AdguardTeam/AdGuardHome/commit/a8812908c1062e4dcfe6e30e9cf9612e41967aa1 | control.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> if !upstreams {
<mask> count = len(bootstraps)
<mask> }
<mask>
<mask> if upstreams {
<mask> config.DNS.UpstreamDNS = defaultDNS
<mask> if count != 0 {
<mask> config.DNS.UpstreamDNS = hosts
<mask> }
<mask> } else {
<mask> config.DNS.BootstrapDNS = defaultBootstrap
<mask> if count != 0 {
<mask> config.DNS.BootstrapDNS = bootstraps
<mask> }
<mask> }
<mask> }
<mask>
<mask> // checkBootstrapDNS checks if host is plain DNS
<mask> func checkBootstrapDNS(host string) error {
<mask> // Check if host is ip without port
</s> [change] control: Fix issues from review </s> remove // count of upstream or bootstrap servers
count := len(hosts)
if !upstreams {
count = len(bootstraps)
</s> add config.DNS.BootstrapDNS = defaultBootstrap
if len(bootstraps) > 0 {
config.DNS.BootstrapDNS = bootstraps </s> remove setDNSServers(newconfig.upstreams, true)
setDNSServers(newconfig.bootstrapDNS, false)
config.DNS.AllServers = newconfig.allServers
httpUpdateConfigReloadDNSReturnOK(w, r)
}
</s> add config.DNS.UpstreamDNS = defaultDNS
if len(newconfig.upstreams) > 0 {
config.DNS.UpstreamDNS = newconfig.upstreams
} </s> remove hosts = append(bootstraps, host)
</s> add bootstraps = append(bootstraps, host) </s> remove // setDNSServers sets upstream and bootstrap DNS servers
func setDNSServers(hosts []string, upstreams bool) {
</s> add </s> remove if !upstreams && len(hosts) > 0 {
for _, host := range hosts {
</s> add if len(newconfig.bootstrapDNS) > 0 {
for _, host := range newconfig.bootstrapDNS { | https://github.com/AdguardTeam/AdGuardHome/commit/a8812908c1062e4dcfe6e30e9cf9612e41967aa1 | control.go |
keep keep add keep keep keep keep keep | <mask> }
<mask>
<mask> // Check for duplicates
<mask> for i := range config.Filters {
<mask> if config.Filters[i].URL == f.URL {
<mask> config.RUnlock()
<mask> httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL)
<mask> return
</s> - control: use locks when operating on config.Filters array </s> add config.RUnlock() </s> add config.Lock()
// Check for duplicates
for i := range config.Filters {
if config.Filters[i].URL == f.URL {
config.Unlock()
httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL)
return
}
}
</s> add config.Lock() </s> add config.Lock() </s> add config.Lock() </s> add config.Unlock()
| https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578 | control.go |
keep keep add keep keep keep keep keep keep | <mask> config.RLock()
<mask> for i := range config.Filters {
<mask> if config.Filters[i].URL == f.URL {
<mask> httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL)
<mask> return
<mask> }
<mask> }
<mask> config.RUnlock()
<mask>
</s> - control: use locks when operating on config.Filters array </s> add config.RLock() </s> add config.Lock()
// Check for duplicates
for i := range config.Filters {
if config.Filters[i].URL == f.URL {
config.Unlock()
httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL)
return
}
}
</s> add config.Unlock()
</s> add config.Lock() </s> add config.Lock() </s> add config.Lock() | https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578 | control.go |
keep keep add keep keep keep keep | <mask> return
<mask> }
<mask> }
<mask>
<mask> // Set necessary properties
<mask> f.ID = assignUniqueFilterID()
<mask> f.Enabled = true
</s> - control: use locks when operating on config.Filters array </s> add config.Unlock() </s> add config.Lock()
// Check for duplicates
for i := range config.Filters {
if config.Filters[i].URL == f.URL {
config.Unlock()
httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL)
return
}
}
</s> add config.Lock() </s> add config.Lock() </s> add config.Unlock()
</s> add config.Unlock() | https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578 | control.go |
keep keep add keep keep keep keep | <mask>
<mask> // URL is deemed valid, append it to filters, update config, write new filter file and tell dns to reload it
<mask> // TODO: since we directly feed filters in-memory, revisit if writing configs is always necessary
<mask> config.Filters = append(config.Filters, f)
<mask> config.Unlock()
<mask>
<mask> err = writeAllConfigs()
</s> - control: use locks when operating on config.Filters array </s> add config.Unlock()
</s> add config.RUnlock() </s> add config.Lock() </s> add config.Lock() </s> add config.Lock() </s> add config.Unlock() | https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578 | control.go |
keep keep add keep keep keep keep keep | <mask> }
<mask>
<mask> config.Filters = append(config.Filters, f)
<mask> err = writeAllConfigs()
<mask> if err != nil {
<mask> httpError(w, http.StatusInternalServerError, "Couldn't write config file: %s", err)
<mask> return
<mask> }
</s> - control: use locks when operating on config.Filters array </s> add config.Lock()
// Check for duplicates
for i := range config.Filters {
if config.Filters[i].URL == f.URL {
config.Unlock()
httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL)
return
}
}
</s> add config.Unlock() </s> add config.RUnlock() </s> add config.Lock() </s> add config.RLock() </s> add config.Unlock() | https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578 | control.go |
keep add keep keep keep keep | <mask>
<mask> // go through each element and delete if url matches
<mask> newFilters := config.Filters[:0]
<mask> for _, filter := range config.Filters {
<mask> if filter.URL != url {
<mask> newFilters = append(newFilters, filter)
</s> - control: use locks when operating on config.Filters array </s> add config.Lock() </s> add config.Lock() </s> add config.Unlock() </s> add config.Lock()
// Check for duplicates
for i := range config.Filters {
if config.Filters[i].URL == f.URL {
config.Unlock()
httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL)
return
}
}
</s> add config.RLock() </s> add config.Unlock()
| https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578 | control.go |
keep keep keep add keep keep keep keep keep keep | <mask> }
<mask> }
<mask> // Update the configuration after removing filter files
<mask> config.Filters = newFilters
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> func handleFilteringEnableURL(w http.ResponseWriter, r *http.Request) {
<mask> log.Tracef("%s %v", r.Method, r.URL)
<mask> parameters, err := parseParametersFromBody(r.Body)
</s> - control: use locks when operating on config.Filters array </s> add config.Unlock()
</s> add config.Lock() </s> add config.Lock() </s> add config.Lock()
// Check for duplicates
for i := range config.Filters {
if config.Filters[i].URL == f.URL {
config.Unlock()
httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL)
return
}
}
</s> add config.Lock() </s> add config.RUnlock() | https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578 | control.go |
keep keep add keep keep keep keep keep | <mask> }
<mask>
<mask> found := false
<mask> for i := range config.Filters {
<mask> filter := &config.Filters[i] // otherwise we will be operating on a copy
<mask> if filter.URL == url {
<mask> filter.Enabled = true
<mask> found = true
</s> - control: use locks when operating on config.Filters array </s> add config.Lock() </s> add config.Lock() </s> add config.Unlock() </s> add config.Lock()
// Check for duplicates
for i := range config.Filters {
if config.Filters[i].URL == f.URL {
config.Unlock()
httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL)
return
}
}
</s> add config.RLock() </s> add config.RUnlock() | https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578 | control.go |
keep add keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> if !found {
<mask> http.Error(w, "URL parameter was not previously added", http.StatusBadRequest)
<mask> return
</s> - control: use locks when operating on config.Filters array </s> add config.Unlock() </s> add config.RUnlock() </s> add config.Unlock()
</s> add config.RLock() </s> add config.Lock() </s> add config.RUnlock() | https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578 | control.go |
keep keep add keep keep keep keep keep keep | <mask> }
<mask>
<mask> found := false
<mask> for i := range config.Filters {
<mask> filter := &config.Filters[i] // otherwise we will be operating on a copy
<mask> if filter.URL == url {
<mask> filter.Enabled = false
<mask> found = true
<mask> }
</s> - control: use locks when operating on config.Filters array </s> add config.Lock() </s> add config.Lock() </s> add config.Unlock() </s> add config.Lock()
// Check for duplicates
for i := range config.Filters {
if config.Filters[i].URL == f.URL {
config.Unlock()
httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL)
return
}
}
</s> add config.RLock() </s> add config.RUnlock() | https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578 | control.go |
keep keep add keep keep keep keep | <mask> found = true
<mask> }
<mask> }
<mask>
<mask> if !found {
<mask> http.Error(w, "URL parameter was not previously added", http.StatusBadRequest)
<mask> return
</s> - control: use locks when operating on config.Filters array </s> add config.Unlock() </s> add config.Lock() </s> add config.Lock() </s> add config.RUnlock() </s> add config.Unlock()
</s> add config.RUnlock() | https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578 | control.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.