docstring_tokens
stringlengths 18
16.9k
| code_tokens
stringlengths 75
1.81M
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|
keep keep add keep keep keep keep keep | <mask> import { saveAs } from 'file-saver/FileSaver';
<mask> import escapeRegExp from 'lodash/escapeRegExp';
<mask> import endsWith from 'lodash/endsWith';
<mask> import PageTitle from '../ui/PageTitle';
<mask> import Card from '../ui/Card';
<mask> import Loading from '../ui/Loading';
<mask> import Tooltip from '../ui/Tooltip';
<mask> import './Logs.css';
</s> Fix sorting issue and show loader
Closes #362 </s> remove const formatTime = (time) => {
</s> add export const formatTime = (time) => { </s> remove time: formatTime(time),
</s> add time, </s> add Cell: ({ value }) => (<div className="logs__row"><span className="logs__text" title={value}>{formatTime(value)}</span></div>), </s> remove {queryLogEnabled && queryLogs.processing && <Loading />}
{queryLogEnabled && !queryLogs.processing &&
</s> add {queryLogEnabled && queryLogs.getLogsProcessing && <Loading />}
{queryLogEnabled && !queryLogs.getLogsProcessing && | https://github.com/AdguardTeam/AdGuardHome/commit/1cdbe3f879566f8e08ad0fa88daad5b568750820 | client/src/components/Logs/index.js |
keep keep keep add keep keep keep keep keep | <mask> Header: 'Time',
<mask> accessor: 'time',
<mask> maxWidth: 110,
<mask> filterable: false,
<mask> }, {
<mask> Header: 'Domain name',
<mask> accessor: 'domain',
<mask> Cell: (row) => {
<mask> const response = row.value;
</s> Fix sorting issue and show loader
Closes #362 </s> remove const formatTime = (time) => {
</s> add export const formatTime = (time) => { </s> remove time: formatTime(time),
</s> add time, </s> add import { formatTime } from '../../helpers/helpers'; </s> remove {queryLogEnabled && queryLogs.processing && <Loading />}
{queryLogEnabled && !queryLogs.processing &&
</s> add {queryLogEnabled && queryLogs.getLogsProcessing && <Loading />}
{queryLogEnabled && !queryLogs.getLogsProcessing && | https://github.com/AdguardTeam/AdGuardHome/commit/1cdbe3f879566f8e08ad0fa88daad5b568750820 | client/src/components/Logs/index.js |
keep keep keep keep replace replace keep keep keep keep keep | <mask> {this.renderButtons(queryLogEnabled)}
<mask> </div>
<mask> </PageTitle>
<mask> <Card>
<mask> {queryLogEnabled && queryLogs.processing && <Loading />}
<mask> {queryLogEnabled && !queryLogs.processing &&
<mask> this.renderLogs(queryLogs.logs)}
<mask> </Card>
<mask> </Fragment>
<mask> );
<mask> }
</s> Fix sorting issue and show loader
Closes #362 </s> add import { formatTime } from '../../helpers/helpers'; </s> remove time: formatTime(time),
</s> add time, </s> remove const formatTime = (time) => {
</s> add export const formatTime = (time) => { </s> add Cell: ({ value }) => (<div className="logs__row"><span className="logs__text" title={value}>{formatTime(value)}</span></div>), | https://github.com/AdguardTeam/AdGuardHome/commit/1cdbe3f879566f8e08ad0fa88daad5b568750820 | client/src/components/Logs/index.js |
keep keep keep keep replace keep keep keep keep keep | <mask> import round from 'lodash/round';
<mask>
<mask> import { STATS_NAMES } from './constants';
<mask>
<mask> const formatTime = (time) => {
<mask> const parsedTime = dateParse(time);
<mask> return dateFormat(parsedTime, 'HH:mm:ss');
<mask> };
<mask>
<mask> export const normalizeLogs = logs => logs.map((log) => {
</s> Fix sorting issue and show loader
Closes #362 </s> add import { formatTime } from '../../helpers/helpers'; </s> add Cell: ({ value }) => (<div className="logs__row"><span className="logs__text" title={value}>{formatTime(value)}</span></div>), </s> remove time: formatTime(time),
</s> add time, </s> remove {queryLogEnabled && queryLogs.processing && <Loading />}
{queryLogEnabled && !queryLogs.processing &&
</s> add {queryLogEnabled && queryLogs.getLogsProcessing && <Loading />}
{queryLogEnabled && !queryLogs.getLogsProcessing && | https://github.com/AdguardTeam/AdGuardHome/commit/1cdbe3f879566f8e08ad0fa88daad5b568750820 | client/src/helpers/helpers.js |
keep keep keep keep replace keep keep keep keep keep | <mask> const { value, type, ttl } = response;
<mask> return `${type}: ${value} (ttl=${ttl})`;
<mask> }) : [];
<mask> return {
<mask> time: formatTime(time),
<mask> domain,
<mask> type,
<mask> response: responsesArray,
<mask> reason,
<mask> client,
</s> Fix sorting issue and show loader
Closes #362 </s> remove const formatTime = (time) => {
</s> add export const formatTime = (time) => { </s> add Cell: ({ value }) => (<div className="logs__row"><span className="logs__text" title={value}>{formatTime(value)}</span></div>), </s> add import { formatTime } from '../../helpers/helpers'; </s> remove {queryLogEnabled && queryLogs.processing && <Loading />}
{queryLogEnabled && !queryLogs.processing &&
</s> add {queryLogEnabled && queryLogs.getLogsProcessing && <Loading />}
{queryLogEnabled && !queryLogs.getLogsProcessing && | https://github.com/AdguardTeam/AdGuardHome/commit/1cdbe3f879566f8e08ad0fa88daad5b568750820 | client/src/helpers/helpers.js |
keep keep keep add keep keep keep keep keep | <mask> columns={[
<mask> {
<mask> Header: 'MAC',
<mask> accessor: 'mac',
<mask> Cell: this.cellWrap,
<mask> }, {
<mask> Header: 'IP',
<mask> accessor: 'ip',
<mask> minWidth: 230,
</s> Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110b
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:23:34 2023 +0200
client: fix leases table on mobile </s> add minWidth: 160, </s> add minWidth: 230, </s> add minWidth: 230, </s> add minWidth: 230, </s> add minWidth: 230, </s> add minWidth: 130, | https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c | client/src/components/Settings/Dhcp/Leases.js |
keep keep keep add keep keep keep keep keep keep | <mask> Cell: this.cellWrap,
<mask> }, {
<mask> Header: 'IP',
<mask> accessor: 'ip',
<mask> Cell: this.cellWrap,
<mask> sortMethod: sortIp,
<mask> }, {
<mask> Header: <Trans>dhcp_table_hostname</Trans>,
<mask> accessor: 'hostname',
<mask> minWidth: 230,
</s> Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110b
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:23:34 2023 +0200
client: fix leases table on mobile </s> add minWidth: 230, </s> add minWidth: 230, </s> add minWidth: 230, </s> add minWidth: 160, </s> add minWidth: 160, </s> add minWidth: 130, | https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c | client/src/components/Settings/Dhcp/Leases.js |
keep keep add keep keep keep keep | <mask> }, {
<mask> Header: <Trans>dhcp_table_hostname</Trans>,
<mask> accessor: 'hostname',
<mask> Cell: this.cellWrap,
<mask> }, {
<mask> Header: <Trans>dhcp_table_expires</Trans>,
<mask> accessor: 'expires',
</s> Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110b
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:23:34 2023 +0200
client: fix leases table on mobile </s> add minWidth: 130, </s> add minWidth: 230, </s> add minWidth: 230, </s> add minWidth: 160, </s> add minWidth: 160, </s> add minWidth: 230, | https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c | client/src/components/Settings/Dhcp/Leases.js |
keep keep keep add keep keep keep keep keep keep | <mask> Cell: this.cellWrap,
<mask> }, {
<mask> Header: <Trans>dhcp_table_expires</Trans>,
<mask> accessor: 'expires',
<mask> Cell: this.cellWrap,
<mask> },
<mask> ]}
<mask> pageSize={LEASES_TABLE_DEFAULT_PAGE_SIZE}
<mask> showPageSizeOptions={false}
<mask> showPagination={leases.length > LEASES_TABLE_DEFAULT_PAGE_SIZE}
</s> Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110b
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:23:34 2023 +0200
client: fix leases table on mobile </s> add minWidth: 230, </s> add minWidth: 230, </s> add minWidth: 160, </s> add minWidth: 160, </s> add minWidth: 230, </s> add minWidth: 230, | https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c | client/src/components/Settings/Dhcp/Leases.js |
keep keep add keep keep keep keep | <mask> {
<mask> Header: 'MAC',
<mask> accessor: 'mac',
<mask> Cell: cellWrap,
<mask> },
<mask> {
<mask> Header: 'IP',
</s> Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110b
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:23:34 2023 +0200
client: fix leases table on mobile </s> add minWidth: 160, </s> add minWidth: 230, </s> add minWidth: 230, </s> add minWidth: 230, </s> add minWidth: 230, </s> add minWidth: 130, | https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c | client/src/components/Settings/Dhcp/StaticLeases/index.js |
keep add keep keep keep keep | <mask> Header: 'IP',
<mask> accessor: 'ip',
<mask> sortMethod: sortIp,
<mask> Cell: cellWrap,
<mask> },
<mask> {
</s> Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110b
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:23:34 2023 +0200
client: fix leases table on mobile </s> add minWidth: 230, </s> add minWidth: 160, </s> add minWidth: 230, </s> add minWidth: 160, </s> add minWidth: 230, </s> add minWidth: 130, | https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c | client/src/components/Settings/Dhcp/StaticLeases/index.js |
keep add keep keep keep keep keep | <mask> Header: <Trans>dhcp_table_hostname</Trans>,
<mask> accessor: 'hostname',
<mask> Cell: cellWrap,
<mask> },
<mask> {
<mask> Header: <Trans>actions_table_header</Trans>,
<mask> accessor: 'actions',
</s> Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110b
Author: Vladislav Abdulmyanov <[email protected]>
Date: Mon Mar 20 17:23:34 2023 +0200
client: fix leases table on mobile </s> add minWidth: 230, </s> add minWidth: 230, </s> add minWidth: 160, </s> add minWidth: 230, </s> add minWidth: 160, </s> add minWidth: 130, | https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c | client/src/components/Settings/Dhcp/StaticLeases/index.js |
keep add keep keep keep keep keep | <mask> "local_ptr_title": "Private reverse DNS servers",
<mask> "local_ptr_desc": "The DNS servers that AdGuard Home uses for local PTR queries. These servers are used to resolve the hostnames of clients with private IP addresses, for example \"192.168.12.34\", using rDNS. If not set, AdGuard Home uses the default DNS resolvers of your OS.",
<mask> "local_ptr_placeholder": "Enter one server address per line",
<mask> "resolve_clients_title": "Enable reverse resolving of clients' IP addresses",
<mask> "resolve_clients_desc": "If enabled, AdGuard Home will attempt to reversely resolve clients' IP addresses into their hostnames by sending PTR queries to corresponding resolvers (private DNS servers for local clients, upstream servers for clients with public IP addresses).",
<mask> "use_private_ptr_resolvers_title": "Use private rDNS resolvers",
<mask> "use_private_ptr_resolvers_desc": "Perform reverse DNS lookups for locally-served addresses using these upstream servers. If disabled, AdGuard Home responds with NXDOMAIN to all such PTR requests except for clients known from DHCP, /etc/hosts, and so on.",
</s> Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </s> remove // Get returns the slice of local resolvers' addresses.
// It should be safe for concurrent use.
</s> add // Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use. </s> remove ourAddrsSet := aghstrings.NewSet(ourAddrs...)
// TODO(e.burkov): The approach of subtracting sets of strings is not
// really applicable here since in case of listening on all network
// interfaces we should check the whole interface's network to cut off
// all the loopback addresses as well.
localAddrs = aghstrings.FilterOut(localAddrs, ourAddrsSet.Has)
</s> add log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs) </s> add func (s *Server) filterOurDNSAddrs(addrs []string) (filtered []string, err error) {
var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
if err != nil {
return nil, err
}
ourAddrsSet := aghstrings.NewSet(ourAddrs...)
// TODO(e.burkov): The approach of subtracting sets of strings is not
// really applicable here since in case of listening on all network
// interfaces we should check the whole interface's network to cut off
// all the loopback addresses as well.
return aghstrings.FilterOut(addrs, ourAddrsSet.Has), nil
}
</s> remove log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
</s> add </s> remove var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
</s> add localAddrs, err = s.filterOurDNSAddrs(localAddrs) </s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | client/src/__locales/en.json |
keep keep keep add keep keep keep keep keep | <mask> const { t } = useTranslation();
<mask> const upstream_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM].values.upstream_dns);
<mask> const processingTestUpstream = useSelector((state) => state.settings.processingTestUpstream);
<mask> const processingSetConfig = useSelector((state) => state.dnsConfig.processingSetConfig);
<mask>
<mask> const handleUpstreamTest = () => dispatch(testUpstreamWithFormValues());
<mask>
<mask> const testButtonClass = classnames('btn btn-primary btn-standard mr-2', {
<mask> 'btn-loading': processingTestUpstream,
</s> Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </s> add <div className="form__desc form__desc--top">
{/** TODO: Add internazionalization for "" */}
{defaultLocalPtrUpstreams?.length > 0 ? (
<Trans values={{ ip: defaultLocalPtrUpstreams.map((s) => `"${s}"`).join(', ') }}>local_ptr_default_resolver</Trans>
) : (
<Trans>local_ptr_no_default_resolver</Trans>
)}
</div> </s> remove log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
</s> add </s> remove var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
</s> add localAddrs, err = s.filterOurDNSAddrs(localAddrs) </s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() </s> add // TODO(e.burkov): Enable the refresher after the actual implementation
// passes the public testing.
s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return nil, fmt.Errorf("initializing system resolvers: %w", err)
}
</s> add s.sysResolvers = &fakeSystemResolvers{}
| https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | client/src/components/Settings/Dns/Upstream/Form.js |
keep add keep keep keep keep keep | <mask> <Trans>local_ptr_desc</Trans>
<mask> </div>
<mask> <Field
<mask> id="local_ptr_upstreams"
<mask> name="local_ptr_upstreams"
<mask> component={renderTextareaField}
<mask> type="text"
</s> Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </s> remove '$ref': '#/components/schemas/DNSConfig'
</s> add 'allOf':
- '$ref': '#/components/schemas/DNSConfig'
- 'type': 'object'
'properties':
'default_local_ptr_upstreams':
'type': 'array'
'items':
'type': 'string'
'example':
- '192.168.168.192'
- '10.0.0.10' </s> add s.sysResolvers = &fakeSystemResolvers{} </s> add const defaultLocalPtrUpstreams = useSelector(
(state) => state.dnsConfig.default_local_ptr_upstreams,
); </s> remove // Get returns the slice of local resolvers' addresses.
// It should be safe for concurrent use.
</s> add // Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use. </s> add sysResolvers aghnet.SystemResolvers </s> add // TODO(e.burkov): Enable the refresher after the actual implementation
// passes the public testing.
s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return nil, fmt.Errorf("initializing system resolvers: %w", err)
}
| https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep keep keep replace replace keep keep keep keep keep | <mask> type HostGenFunc func() (host string)
<mask>
<mask> // SystemResolvers helps to work with local resolvers' addresses provided by OS.
<mask> type SystemResolvers interface {
<mask> // Get returns the slice of local resolvers' addresses.
<mask> // It should be safe for concurrent use.
<mask> Get() (rs []string)
<mask> // refresh refreshes the local resolvers' addresses cache. It should be
<mask> // safe for concurrent use.
<mask> refresh() (err error)
<mask> }
</s> Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </s> add // fakeSystemResolvers is a mock aghnet.SystemResolvers implementation for tests.
type fakeSystemResolvers struct {
// SystemResolvers is embedded here simply to make *fakeSystemResolvers
// an aghnet.SystemResolvers without actually implementing all methods.
aghnet.SystemResolvers
}
// Get implements the aghnet.SystemResolvers interface for *fakeSystemResolvers.
// It always returns nil.
func (fsr *fakeSystemResolvers) Get() (rs []string) {
return nil
}
</s> add func (s *Server) filterOurDNSAddrs(addrs []string) (filtered []string, err error) {
var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
if err != nil {
return nil, err
}
ourAddrsSet := aghstrings.NewSet(ourAddrs...)
// TODO(e.burkov): The approach of subtracting sets of strings is not
// really applicable here since in case of listening on all network
// interfaces we should check the whole interface's network to cut off
// all the loopback addresses as well.
return aghstrings.FilterOut(addrs, ourAddrsSet.Has), nil
}
</s> remove ourAddrsSet := aghstrings.NewSet(ourAddrs...)
// TODO(e.burkov): The approach of subtracting sets of strings is not
// really applicable here since in case of listening on all network
// interfaces we should check the whole interface's network to cut off
// all the loopback addresses as well.
localAddrs = aghstrings.FilterOut(localAddrs, ourAddrsSet.Has)
</s> add log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs) </s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() </s> add "local_ptr_default_resolver": "By default, AdGuard Home will use the following DNS resolvers: {{ip}}",
"local_ptr_no_default_resolver": "AdGuard Home could not determine suitable private rDNS resolvers for this system.", </s> remove resp := s.getDNSConfig()
</s> add defLocalPTRUps, err := s.filterOurDNSAddrs(s.sysResolvers.Get())
if err != nil {
log.Debug("getting dns configuration: %s", err)
}
resp := struct {
dnsConfig
// DefautLocalPTRUpstreams is used to pass the addresses from
// systemResolvers to the front-end. It's not a pointer to the slice
// since there is no need to omit it while decoding from JSON.
DefautLocalPTRUpstreams []string `json:"default_local_ptr_upstreams,omitempty"`
}{
dnsConfig: s.getDNSConfig(),
DefautLocalPTRUpstreams: defLocalPTRUps,
} | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/aghnet/systemresolvers.go |
keep keep add keep keep keep keep keep | <mask> ipset ipsetCtx
<mask> subnetDetector *aghnet.SubnetDetector
<mask> localResolvers *proxy.Proxy
<mask> recDetector *recursionDetector
<mask>
<mask> tableHostToIP hostToIPTable
<mask> tableHostToIPLock sync.Mutex
<mask>
</s> Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </s> remove '$ref': '#/components/schemas/DNSConfig'
</s> add 'allOf':
- '$ref': '#/components/schemas/DNSConfig'
- 'type': 'object'
'properties':
'default_local_ptr_upstreams':
'type': 'array'
'items':
'type': 'string'
'example':
- '192.168.168.192'
- '10.0.0.10' </s> add s.sysResolvers = &fakeSystemResolvers{} </s> add const defaultLocalPtrUpstreams = useSelector(
(state) => state.dnsConfig.default_local_ptr_upstreams,
); </s> add <div className="form__desc form__desc--top">
{/** TODO: Add internazionalization for "" */}
{defaultLocalPtrUpstreams?.length > 0 ? (
<Trans values={{ ip: defaultLocalPtrUpstreams.map((s) => `"${s}"`).join(', ') }}>local_ptr_default_resolver</Trans>
) : (
<Trans>local_ptr_no_default_resolver</Trans>
)}
</div> </s> remove // Get returns the slice of local resolvers' addresses.
// It should be safe for concurrent use.
</s> add // Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use. </s> add // TODO(e.burkov): Enable the refresher after the actual implementation
// passes the public testing.
s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return nil, fmt.Errorf("initializing system resolvers: %w", err)
}
| https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/dnsforward.go |
keep keep keep add keep keep keep keep keep | <mask> localDomainSuffix: localDomainSuffix,
<mask> recDetector: newRecursionDetector(recursionTTL, cachedRecurrentReqNum),
<mask> }
<mask>
<mask> if p.DHCPServer != nil {
<mask> s.dhcpServer = p.DHCPServer
<mask> s.dhcpServer.SetOnLeaseChanged(s.onDHCPLeaseChanged)
<mask> s.onDHCPLeaseChanged(dhcpd.LeaseChangedAdded)
<mask> }
</s> Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </s> remove enc := json.NewEncoder(w)
if err := enc.Encode(resp); err != nil {
</s> add if err = json.NewEncoder(w).Encode(resp); err != nil { </s> remove var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
</s> add localAddrs, err = s.filterOurDNSAddrs(localAddrs) </s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() </s> remove log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
</s> add </s> add s.sysResolvers = &fakeSystemResolvers{}
</s> remove resp := s.getDNSConfig()
</s> add defLocalPTRUps, err := s.filterOurDNSAddrs(s.sysResolvers.Get())
if err != nil {
log.Debug("getting dns configuration: %s", err)
}
resp := struct {
dnsConfig
// DefautLocalPTRUpstreams is used to pass the addresses from
// systemResolvers to the front-end. It's not a pointer to the slice
// since there is no need to omit it while decoding from JSON.
DefautLocalPTRUpstreams []string `json:"default_local_ptr_upstreams,omitempty"`
}{
dnsConfig: s.getDNSConfig(),
DefautLocalPTRUpstreams: defLocalPTRUps,
} | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/dnsforward.go |
keep keep keep add keep keep keep keep keep | <mask>
<mask> return addrs[:i], nil
<mask> }
<mask>
<mask> // setupResolvers initializes the resolvers for local addresses. For internal
<mask> // use only.
<mask> func (s *Server) setupResolvers(localAddrs []string) (err error) {
<mask> bootstraps := s.conf.BootstrapDNS
<mask> if len(localAddrs) == 0 {
</s> Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() </s> remove // Get returns the slice of local resolvers' addresses.
// It should be safe for concurrent use.
</s> add // Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use. </s> remove resp := s.getDNSConfig()
</s> add defLocalPTRUps, err := s.filterOurDNSAddrs(s.sysResolvers.Get())
if err != nil {
log.Debug("getting dns configuration: %s", err)
}
resp := struct {
dnsConfig
// DefautLocalPTRUpstreams is used to pass the addresses from
// systemResolvers to the front-end. It's not a pointer to the slice
// since there is no need to omit it while decoding from JSON.
DefautLocalPTRUpstreams []string `json:"default_local_ptr_upstreams,omitempty"`
}{
dnsConfig: s.getDNSConfig(),
DefautLocalPTRUpstreams: defLocalPTRUps,
} </s> add // fakeSystemResolvers is a mock aghnet.SystemResolvers implementation for tests.
type fakeSystemResolvers struct {
// SystemResolvers is embedded here simply to make *fakeSystemResolvers
// an aghnet.SystemResolvers without actually implementing all methods.
aghnet.SystemResolvers
}
// Get implements the aghnet.SystemResolvers interface for *fakeSystemResolvers.
// It always returns nil.
func (fsr *fakeSystemResolvers) Get() (rs []string) {
return nil
}
</s> remove log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
</s> add </s> remove var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
</s> add localAddrs, err = s.filterOurDNSAddrs(localAddrs) | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/dnsforward.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> // use only.
<mask> func (s *Server) setupResolvers(localAddrs []string) (err error) {
<mask> bootstraps := s.conf.BootstrapDNS
<mask> if len(localAddrs) == 0 {
<mask> var sysRes aghnet.SystemResolvers
<mask> // TODO(e.burkov): Enable the refresher after the actual
<mask> // implementation passes the public testing.
<mask> sysRes, err = aghnet.NewSystemResolvers(0, nil)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> localAddrs = sysRes.Get()
<mask> bootstraps = nil
<mask> }
<mask> log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
<mask>
<mask> var ourAddrs []string
</s> Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </s> add func (s *Server) filterOurDNSAddrs(addrs []string) (filtered []string, err error) {
var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
if err != nil {
return nil, err
}
ourAddrsSet := aghstrings.NewSet(ourAddrs...)
// TODO(e.burkov): The approach of subtracting sets of strings is not
// really applicable here since in case of listening on all network
// interfaces we should check the whole interface's network to cut off
// all the loopback addresses as well.
return aghstrings.FilterOut(addrs, ourAddrsSet.Has), nil
}
</s> add // TODO(e.burkov): Enable the refresher after the actual implementation
// passes the public testing.
s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return nil, fmt.Errorf("initializing system resolvers: %w", err)
}
</s> remove log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
</s> add </s> remove var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
</s> add localAddrs, err = s.filterOurDNSAddrs(localAddrs) </s> remove ourAddrsSet := aghstrings.NewSet(ourAddrs...)
// TODO(e.burkov): The approach of subtracting sets of strings is not
// really applicable here since in case of listening on all network
// interfaces we should check the whole interface's network to cut off
// all the loopback addresses as well.
localAddrs = aghstrings.FilterOut(localAddrs, ourAddrsSet.Has)
</s> add log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs) </s> add // fakeSystemResolvers is a mock aghnet.SystemResolvers implementation for tests.
type fakeSystemResolvers struct {
// SystemResolvers is embedded here simply to make *fakeSystemResolvers
// an aghnet.SystemResolvers without actually implementing all methods.
aghnet.SystemResolvers
}
// Get implements the aghnet.SystemResolvers interface for *fakeSystemResolvers.
// It always returns nil.
func (fsr *fakeSystemResolvers) Get() (rs []string) {
return nil
}
| https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/dnsforward.go |
keep keep keep replace keep replace replace keep keep | <mask> localAddrs = sysRes.Get()
<mask> bootstraps = nil
<mask> }
<mask> log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
<mask>
<mask> var ourAddrs []string
<mask> ourAddrs, err = s.collectDNSIPAddrs()
<mask> if err != nil {
<mask> return err
</s> Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() </s> remove ourAddrsSet := aghstrings.NewSet(ourAddrs...)
// TODO(e.burkov): The approach of subtracting sets of strings is not
// really applicable here since in case of listening on all network
// interfaces we should check the whole interface's network to cut off
// all the loopback addresses as well.
localAddrs = aghstrings.FilterOut(localAddrs, ourAddrsSet.Has)
</s> add log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs) </s> add func (s *Server) filterOurDNSAddrs(addrs []string) (filtered []string, err error) {
var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
if err != nil {
return nil, err
}
ourAddrsSet := aghstrings.NewSet(ourAddrs...)
// TODO(e.burkov): The approach of subtracting sets of strings is not
// really applicable here since in case of listening on all network
// interfaces we should check the whole interface's network to cut off
// all the loopback addresses as well.
return aghstrings.FilterOut(addrs, ourAddrsSet.Has), nil
}
</s> remove enc := json.NewEncoder(w)
if err := enc.Encode(resp); err != nil {
</s> add if err = json.NewEncoder(w).Encode(resp); err != nil { </s> add // TODO(e.burkov): Enable the refresher after the actual implementation
// passes the public testing.
s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return nil, fmt.Errorf("initializing system resolvers: %w", err)
}
| https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/dnsforward.go |
keep keep keep keep replace replace replace replace replace replace replace keep keep keep keep keep | <mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> ourAddrsSet := aghstrings.NewSet(ourAddrs...)
<mask>
<mask> // TODO(e.burkov): The approach of subtracting sets of strings is not
<mask> // really applicable here since in case of listening on all network
<mask> // interfaces we should check the whole interface's network to cut off
<mask> // all the loopback addresses as well.
<mask> localAddrs = aghstrings.FilterOut(localAddrs, ourAddrsSet.Has)
<mask>
<mask> var upsConfig proxy.UpstreamConfig
<mask> upsConfig, err = proxy.ParseUpstreamsConfig(localAddrs, upstream.Options{
<mask> Bootstrap: bootstraps,
<mask> Timeout: defaultLocalTimeout,
</s> Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </s> add func (s *Server) filterOurDNSAddrs(addrs []string) (filtered []string, err error) {
var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
if err != nil {
return nil, err
}
ourAddrsSet := aghstrings.NewSet(ourAddrs...)
// TODO(e.burkov): The approach of subtracting sets of strings is not
// really applicable here since in case of listening on all network
// interfaces we should check the whole interface's network to cut off
// all the loopback addresses as well.
return aghstrings.FilterOut(addrs, ourAddrsSet.Has), nil
}
</s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() </s> remove var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
</s> add localAddrs, err = s.filterOurDNSAddrs(localAddrs) </s> remove // Get returns the slice of local resolvers' addresses.
// It should be safe for concurrent use.
</s> add // Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use. </s> remove resp := s.getDNSConfig()
</s> add defLocalPTRUps, err := s.filterOurDNSAddrs(s.sysResolvers.Get())
if err != nil {
log.Debug("getting dns configuration: %s", err)
}
resp := struct {
dnsConfig
// DefautLocalPTRUpstreams is used to pass the addresses from
// systemResolvers to the front-end. It's not a pointer to the slice
// since there is no need to omit it while decoding from JSON.
DefautLocalPTRUpstreams []string `json:"default_local_ptr_upstreams,omitempty"`
}{
dnsConfig: s.getDNSConfig(),
DefautLocalPTRUpstreams: defLocalPTRUps,
} </s> add // fakeSystemResolvers is a mock aghnet.SystemResolvers implementation for tests.
type fakeSystemResolvers struct {
// SystemResolvers is embedded here simply to make *fakeSystemResolvers
// an aghnet.SystemResolvers without actually implementing all methods.
aghnet.SystemResolvers
}
// Get implements the aghnet.SystemResolvers interface for *fakeSystemResolvers.
// It always returns nil.
func (fsr *fakeSystemResolvers) Get() (rs []string) {
return nil
}
| https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/dnsforward.go |
keep keep keep replace keep keep keep replace replace keep keep | <mask> }
<mask>
<mask> func (s *Server) handleGetConfig(w http.ResponseWriter, r *http.Request) {
<mask> resp := s.getDNSConfig()
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask>
<mask> enc := json.NewEncoder(w)
<mask> if err := enc.Encode(resp); err != nil {
<mask> httpError(r, w, http.StatusInternalServerError, "json.Encoder: %s", err)
<mask> return
</s> Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </s> add func (s *Server) filterOurDNSAddrs(addrs []string) (filtered []string, err error) {
var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
if err != nil {
return nil, err
}
ourAddrsSet := aghstrings.NewSet(ourAddrs...)
// TODO(e.burkov): The approach of subtracting sets of strings is not
// really applicable here since in case of listening on all network
// interfaces we should check the whole interface's network to cut off
// all the loopback addresses as well.
return aghstrings.FilterOut(addrs, ourAddrsSet.Has), nil
}
</s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() </s> add // TODO(e.burkov): Enable the refresher after the actual implementation
// passes the public testing.
s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return nil, fmt.Errorf("initializing system resolvers: %w", err)
}
</s> remove var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
</s> add localAddrs, err = s.filterOurDNSAddrs(localAddrs) </s> add // fakeSystemResolvers is a mock aghnet.SystemResolvers implementation for tests.
type fakeSystemResolvers struct {
// SystemResolvers is embedded here simply to make *fakeSystemResolvers
// an aghnet.SystemResolvers without actually implementing all methods.
aghnet.SystemResolvers
}
// Get implements the aghnet.SystemResolvers interface for *fakeSystemResolvers.
// It always returns nil.
func (fsr *fakeSystemResolvers) Get() (rs []string) {
return nil
}
| https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/http.go |
keep add keep keep keep keep keep keep | <mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> // fakeSystemResolvers is a mock aghnet.SystemResolvers implementation for tests.
</s> Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </s> add // fakeSystemResolvers is a mock aghnet.SystemResolvers implementation for tests.
type fakeSystemResolvers struct {
// SystemResolvers is embedded here simply to make *fakeSystemResolvers
// an aghnet.SystemResolvers without actually implementing all methods.
aghnet.SystemResolvers
}
// Get implements the aghnet.SystemResolvers interface for *fakeSystemResolvers.
// It always returns nil.
func (fsr *fakeSystemResolvers) Get() (rs []string) {
return nil
}
</s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() </s> remove resp := s.getDNSConfig()
</s> add defLocalPTRUps, err := s.filterOurDNSAddrs(s.sysResolvers.Get())
if err != nil {
log.Debug("getting dns configuration: %s", err)
}
resp := struct {
dnsConfig
// DefautLocalPTRUpstreams is used to pass the addresses from
// systemResolvers to the front-end. It's not a pointer to the slice
// since there is no need to omit it while decoding from JSON.
DefautLocalPTRUpstreams []string `json:"default_local_ptr_upstreams,omitempty"`
}{
dnsConfig: s.getDNSConfig(),
DefautLocalPTRUpstreams: defLocalPTRUps,
} </s> add <div className="form__desc form__desc--top">
{/** TODO: Add internazionalization for "" */}
{defaultLocalPtrUpstreams?.length > 0 ? (
<Trans values={{ ip: defaultLocalPtrUpstreams.map((s) => `"${s}"`).join(', ') }}>local_ptr_default_resolver</Trans>
) : (
<Trans>local_ptr_no_default_resolver</Trans>
)}
</div> </s> add sysResolvers aghnet.SystemResolvers </s> remove ourAddrsSet := aghstrings.NewSet(ourAddrs...)
// TODO(e.burkov): The approach of subtracting sets of strings is not
// really applicable here since in case of listening on all network
// interfaces we should check the whole interface's network to cut off
// all the loopback addresses as well.
localAddrs = aghstrings.FilterOut(localAddrs, ourAddrsSet.Has)
</s> add log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs) | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/http_test.go |
keep add keep keep keep keep keep | <mask> )
<mask>
<mask> func loadTestData(t *testing.T, casesFileName string, cases interface{}) {
<mask> t.Helper()
<mask>
<mask> var f *os.File
<mask> f, err := os.Open(filepath.Join("testdata", casesFileName))
</s> Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() </s> add func (s *Server) filterOurDNSAddrs(addrs []string) (filtered []string, err error) {
var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
if err != nil {
return nil, err
}
ourAddrsSet := aghstrings.NewSet(ourAddrs...)
// TODO(e.burkov): The approach of subtracting sets of strings is not
// really applicable here since in case of listening on all network
// interfaces we should check the whole interface's network to cut off
// all the loopback addresses as well.
return aghstrings.FilterOut(addrs, ourAddrsSet.Has), nil
}
</s> remove resp := s.getDNSConfig()
</s> add defLocalPTRUps, err := s.filterOurDNSAddrs(s.sysResolvers.Get())
if err != nil {
log.Debug("getting dns configuration: %s", err)
}
resp := struct {
dnsConfig
// DefautLocalPTRUpstreams is used to pass the addresses from
// systemResolvers to the front-end. It's not a pointer to the slice
// since there is no need to omit it while decoding from JSON.
DefautLocalPTRUpstreams []string `json:"default_local_ptr_upstreams,omitempty"`
}{
dnsConfig: s.getDNSConfig(),
DefautLocalPTRUpstreams: defLocalPTRUps,
} </s> remove log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
</s> add </s> remove var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
</s> add localAddrs, err = s.filterOurDNSAddrs(localAddrs) </s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/http_test.go |
keep add keep keep keep keep keep | <mask> }
<mask> s := createTestServer(t, filterConf, forwardConf, nil)
<mask> require.Nil(t, s.Start())
<mask> t.Cleanup(func() {
<mask> require.Nil(t, s.Stop())
<mask> })
<mask>
</s> Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </s> add s.sysResolvers = &fakeSystemResolvers{} </s> add // TODO(e.burkov): Enable the refresher after the actual implementation
// passes the public testing.
s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return nil, fmt.Errorf("initializing system resolvers: %w", err)
}
</s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() </s> remove enc := json.NewEncoder(w)
if err := enc.Encode(resp); err != nil {
</s> add if err = json.NewEncoder(w).Encode(resp); err != nil { </s> remove resp := s.getDNSConfig()
</s> add defLocalPTRUps, err := s.filterOurDNSAddrs(s.sysResolvers.Get())
if err != nil {
log.Debug("getting dns configuration: %s", err)
}
resp := struct {
dnsConfig
// DefautLocalPTRUpstreams is used to pass the addresses from
// systemResolvers to the front-end. It's not a pointer to the slice
// since there is no need to omit it while decoding from JSON.
DefautLocalPTRUpstreams []string `json:"default_local_ptr_upstreams,omitempty"`
}{
dnsConfig: s.getDNSConfig(),
DefautLocalPTRUpstreams: defLocalPTRUps,
} </s> add func (s *Server) filterOurDNSAddrs(addrs []string) (filtered []string, err error) {
var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
if err != nil {
return nil, err
}
ourAddrsSet := aghstrings.NewSet(ourAddrs...)
// TODO(e.burkov): The approach of subtracting sets of strings is not
// really applicable here since in case of listening on all network
// interfaces we should check the whole interface's network to cut off
// all the loopback addresses as well.
return aghstrings.FilterOut(addrs, ourAddrsSet.Has), nil
}
| https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/http_test.go |
keep keep add keep keep keep keep | <mask> ConfigModified: func() {},
<mask> }
<mask> s := createTestServer(t, filterConf, forwardConf, nil)
<mask>
<mask> defaultConf := s.conf
<mask>
<mask> err := s.Start()
</s> Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </s> add s.sysResolvers = &fakeSystemResolvers{}
</s> add // TODO(e.burkov): Enable the refresher after the actual implementation
// passes the public testing.
s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return nil, fmt.Errorf("initializing system resolvers: %w", err)
}
</s> remove var sysRes aghnet.SystemResolvers
// TODO(e.burkov): Enable the refresher after the actual
// implementation passes the public testing.
sysRes, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return err
}
localAddrs = sysRes.Get()
</s> add localAddrs = s.sysResolvers.Get() </s> remove // Get returns the slice of local resolvers' addresses.
// It should be safe for concurrent use.
</s> add // Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use. </s> remove enc := json.NewEncoder(w)
if err := enc.Encode(resp); err != nil {
</s> add if err = json.NewEncoder(w).Encode(resp); err != nil { </s> remove var ourAddrs []string
ourAddrs, err = s.collectDNSIPAddrs()
</s> add localAddrs, err = s.filterOurDNSAddrs(localAddrs) | https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | internal/dnsforward/http_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> 'description': 'OK'
<mask> 'content':
<mask> 'application/json':
<mask> 'schema':
<mask> '$ref': '#/components/schemas/DNSConfig'
<mask> '/dns_config':
<mask> 'post':
<mask> 'tags':
<mask> - 'global'
<mask> 'operationId': 'dnsConfig'
</s> Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master
Closes #3136.
Squashed commit of the following:
commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:11:24 2021 +0300
openapi: fix typo
commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 1 11:09:51 2021 +0300
Merge branch 'master' into 3136-show-default
commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 1 10:55:09 2021 +0300
client: check upstreams
commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <[email protected]>
Date: Mon May 31 19:23:35 2021 +0300
add defaul resolvers line
commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <[email protected]>
Date: Mon May 31 11:56:08 2021 +0300
all: imp changelog
commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <[email protected]>
Date: Fri May 28 20:23:05 2021 +0300
all: add local ptr resolvers addresses output </s> add s.sysResolvers = &fakeSystemResolvers{} </s> add const defaultLocalPtrUpstreams = useSelector(
(state) => state.dnsConfig.default_local_ptr_upstreams,
); </s> add <div className="form__desc form__desc--top">
{/** TODO: Add internazionalization for "" */}
{defaultLocalPtrUpstreams?.length > 0 ? (
<Trans values={{ ip: defaultLocalPtrUpstreams.map((s) => `"${s}"`).join(', ') }}>local_ptr_default_resolver</Trans>
) : (
<Trans>local_ptr_no_default_resolver</Trans>
)}
</div> </s> remove // Get returns the slice of local resolvers' addresses.
// It should be safe for concurrent use.
</s> add // Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use. </s> add sysResolvers aghnet.SystemResolvers </s> add // TODO(e.burkov): Enable the refresher after the actual implementation
// passes the public testing.
s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
if err != nil {
return nil, fmt.Errorf("initializing system resolvers: %w", err)
}
| https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470 | openapi/openapi.yaml |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> go 1.14
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.33.0
<mask> github.com/AdguardTeam/golibs v0.4.2
<mask> github.com/AdguardTeam/urlfilter v0.12.3
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect
<mask> github.com/fsnotify/fsnotify v1.4.9
</s> Pull request: * all: update dnsproxy
Merge in DNS/adguard-home from update-dnsproxy to master
Squashed commit of the following:
commit 6ed03c2131b93e3882e8f820e110696a41223267
Author: Ainar Garipov <[email protected]>
Date: Mon Nov 9 13:13:36 2020 +0300
* all: update dnsproxy </s> remove github.com/AdguardTeam/dnsproxy v0.33.0 h1:bYNf20QgvkclPm+w5YSakFQbrrlcD3MpUwkQPLMwhwU=
github.com/AdguardTeam/dnsproxy v0.33.0/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA=
</s> add github.com/AdguardTeam/dnsproxy v0.33.1 h1:rEAS1fBEQ3JslzsfkcyMRV96OeBWFnKzXvksduI0ous=
github.com/AdguardTeam/dnsproxy v0.33.1/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA= </s> add github.com/joomcode/errorx v1.0.3 // indirect </s> remove golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 h1:a/mKvvZr9Jcc8oKfcmgzyp7OwF73JPWsQLvH1z2Kxck=
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf h1:kt3wY1Lu5MJAnKTfoMR52Cu4gwvna4VTzNOiT8tY73s=
golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> add github.com/joomcode/errorx v1.0.3 h1:3e1mi0u7/HTPNdg6d6DYyKGBhA5l9XpsfuVE29NxnWw=
github.com/joomcode/errorx v1.0.3/go.mod h1:eQzdtdlNyN7etw6YCS4W4+lu442waxZYw5yvz0ULrRo= </s> remove golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
</s> add golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf | https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39 | go.mod |
keep keep keep add keep keep keep keep keep | <mask> github.com/fsnotify/fsnotify v1.4.9
<mask> github.com/gobuffalo/packr v1.30.1
<mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
<mask> github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8
<mask> github.com/kardianos/service v1.1.0
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
<mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065
<mask> github.com/miekg/dns v1.1.35
<mask> github.com/rogpeppe/go-internal v1.5.2 // indirect
</s> Pull request: * all: update dnsproxy
Merge in DNS/adguard-home from update-dnsproxy to master
Squashed commit of the following:
commit 6ed03c2131b93e3882e8f820e110696a41223267
Author: Ainar Garipov <[email protected]>
Date: Mon Nov 9 13:13:36 2020 +0300
* all: update dnsproxy </s> add github.com/joomcode/errorx v1.0.3 h1:3e1mi0u7/HTPNdg6d6DYyKGBhA5l9XpsfuVE29NxnWw=
github.com/joomcode/errorx v1.0.3/go.mod h1:eQzdtdlNyN7etw6YCS4W4+lu442waxZYw5yvz0ULrRo= </s> remove github.com/AdguardTeam/dnsproxy v0.33.0
</s> add github.com/AdguardTeam/dnsproxy v0.33.1 </s> remove golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 h1:a/mKvvZr9Jcc8oKfcmgzyp7OwF73JPWsQLvH1z2Kxck=
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf h1:kt3wY1Lu5MJAnKTfoMR52Cu4gwvna4VTzNOiT8tY73s=
golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> remove github.com/AdguardTeam/dnsproxy v0.33.0 h1:bYNf20QgvkclPm+w5YSakFQbrrlcD3MpUwkQPLMwhwU=
github.com/AdguardTeam/dnsproxy v0.33.0/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA=
</s> add github.com/AdguardTeam/dnsproxy v0.33.1 h1:rEAS1fBEQ3JslzsfkcyMRV96OeBWFnKzXvksduI0ous=
github.com/AdguardTeam/dnsproxy v0.33.1/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA= </s> remove golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
</s> add golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf | https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39 | go.mod |
keep keep keep keep replace keep keep keep keep keep | <mask> go.etcd.io/bbolt v1.3.4
<mask> golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
<mask> golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
<mask> golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
<mask> golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
<mask> golang.org/x/text v0.3.4 // indirect
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0
<mask> gopkg.in/yaml.v2 v2.3.0
<mask> gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
</s> Pull request: * all: update dnsproxy
Merge in DNS/adguard-home from update-dnsproxy to master
Squashed commit of the following:
commit 6ed03c2131b93e3882e8f820e110696a41223267
Author: Ainar Garipov <[email protected]>
Date: Mon Nov 9 13:13:36 2020 +0300
* all: update dnsproxy </s> remove golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 h1:a/mKvvZr9Jcc8oKfcmgzyp7OwF73JPWsQLvH1z2Kxck=
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf h1:kt3wY1Lu5MJAnKTfoMR52Cu4gwvna4VTzNOiT8tY73s=
golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> add github.com/joomcode/errorx v1.0.3 h1:3e1mi0u7/HTPNdg6d6DYyKGBhA5l9XpsfuVE29NxnWw=
github.com/joomcode/errorx v1.0.3/go.mod h1:eQzdtdlNyN7etw6YCS4W4+lu442waxZYw5yvz0ULrRo= </s> remove github.com/AdguardTeam/dnsproxy v0.33.0 h1:bYNf20QgvkclPm+w5YSakFQbrrlcD3MpUwkQPLMwhwU=
github.com/AdguardTeam/dnsproxy v0.33.0/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA=
</s> add github.com/AdguardTeam/dnsproxy v0.33.1 h1:rEAS1fBEQ3JslzsfkcyMRV96OeBWFnKzXvksduI0ous=
github.com/AdguardTeam/dnsproxy v0.33.1/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA= </s> add github.com/joomcode/errorx v1.0.3 // indirect </s> remove github.com/AdguardTeam/dnsproxy v0.33.0
</s> add github.com/AdguardTeam/dnsproxy v0.33.1 | https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39 | 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.33.0 h1:bYNf20QgvkclPm+w5YSakFQbrrlcD3MpUwkQPLMwhwU=
<mask> github.com/AdguardTeam/dnsproxy v0.33.0/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA=
<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=
<mask> github.com/AdguardTeam/urlfilter v0.12.3 h1:FMjQG0eTgrr8xA3z2zaLVcCgGdpzoECPGWwgPjtwPNs=
</s> Pull request: * all: update dnsproxy
Merge in DNS/adguard-home from update-dnsproxy to master
Squashed commit of the following:
commit 6ed03c2131b93e3882e8f820e110696a41223267
Author: Ainar Garipov <[email protected]>
Date: Mon Nov 9 13:13:36 2020 +0300
* all: update dnsproxy </s> remove github.com/AdguardTeam/dnsproxy v0.33.0
</s> add github.com/AdguardTeam/dnsproxy v0.33.1 </s> remove golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 h1:a/mKvvZr9Jcc8oKfcmgzyp7OwF73JPWsQLvH1z2Kxck=
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf h1:kt3wY1Lu5MJAnKTfoMR52Cu4gwvna4VTzNOiT8tY73s=
golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> add github.com/joomcode/errorx v1.0.3 h1:3e1mi0u7/HTPNdg6d6DYyKGBhA5l9XpsfuVE29NxnWw=
github.com/joomcode/errorx v1.0.3/go.mod h1:eQzdtdlNyN7etw6YCS4W4+lu442waxZYw5yvz0ULrRo= </s> remove golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
</s> add golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf </s> add github.com/joomcode/errorx v1.0.3 // indirect | https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39 | go.sum |
keep add keep keep keep keep | <mask> github.com/joomcode/errorx v1.0.1 h1:CalpDWz14ZHd68fIqluJasJosAewpz2TFaJALrUxjrk=
<mask> github.com/joomcode/errorx v1.0.1/go.mod h1:kgco15ekB6cs+4Xjzo7SPeXzx38PbJzBwbnu9qfVNHQ=
<mask> github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
<mask> github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
<mask> github.com/kardianos/service v1.1.0 h1:QV2SiEeWK42P0aEmGcsAgjApw/lRxkwopvT+Gu6t1/0=
<mask> github.com/kardianos/service v1.1.0/go.mod h1:RrJI2xn5vve/r32U5suTbeaSGoMU6GbNPoj36CVYcHc=
</s> Pull request: * all: update dnsproxy
Merge in DNS/adguard-home from update-dnsproxy to master
Squashed commit of the following:
commit 6ed03c2131b93e3882e8f820e110696a41223267
Author: Ainar Garipov <[email protected]>
Date: Mon Nov 9 13:13:36 2020 +0300
* all: update dnsproxy </s> add github.com/joomcode/errorx v1.0.3 // indirect </s> remove golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 h1:a/mKvvZr9Jcc8oKfcmgzyp7OwF73JPWsQLvH1z2Kxck=
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf h1:kt3wY1Lu5MJAnKTfoMR52Cu4gwvna4VTzNOiT8tY73s=
golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> remove github.com/AdguardTeam/dnsproxy v0.33.0 h1:bYNf20QgvkclPm+w5YSakFQbrrlcD3MpUwkQPLMwhwU=
github.com/AdguardTeam/dnsproxy v0.33.0/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA=
</s> add github.com/AdguardTeam/dnsproxy v0.33.1 h1:rEAS1fBEQ3JslzsfkcyMRV96OeBWFnKzXvksduI0ous=
github.com/AdguardTeam/dnsproxy v0.33.1/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA= </s> remove golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
</s> add golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf </s> remove github.com/AdguardTeam/dnsproxy v0.33.0
</s> add github.com/AdguardTeam/dnsproxy v0.33.1 | https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39 | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4=
<mask> golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 h1:a/mKvvZr9Jcc8oKfcmgzyp7OwF73JPWsQLvH1z2Kxck=
<mask> golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
<mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
</s> Pull request: * all: update dnsproxy
Merge in DNS/adguard-home from update-dnsproxy to master
Squashed commit of the following:
commit 6ed03c2131b93e3882e8f820e110696a41223267
Author: Ainar Garipov <[email protected]>
Date: Mon Nov 9 13:13:36 2020 +0300
* all: update dnsproxy </s> remove golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
</s> add golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf </s> add github.com/joomcode/errorx v1.0.3 h1:3e1mi0u7/HTPNdg6d6DYyKGBhA5l9XpsfuVE29NxnWw=
github.com/joomcode/errorx v1.0.3/go.mod h1:eQzdtdlNyN7etw6YCS4W4+lu442waxZYw5yvz0ULrRo= </s> remove github.com/AdguardTeam/dnsproxy v0.33.0 h1:bYNf20QgvkclPm+w5YSakFQbrrlcD3MpUwkQPLMwhwU=
github.com/AdguardTeam/dnsproxy v0.33.0/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA=
</s> add github.com/AdguardTeam/dnsproxy v0.33.1 h1:rEAS1fBEQ3JslzsfkcyMRV96OeBWFnKzXvksduI0ous=
github.com/AdguardTeam/dnsproxy v0.33.1/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA= </s> add github.com/joomcode/errorx v1.0.3 // indirect </s> remove github.com/AdguardTeam/dnsproxy v0.33.0
</s> add github.com/AdguardTeam/dnsproxy v0.33.1 | https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39 | go.sum |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> return
<mask> }
<mask>
<mask> err := Context.updater.Update()
<mask> if err != nil {
<mask> aghhttp.Error(r, w, http.StatusInternalServerError, "%s", err)
<mask>
<mask> return
<mask> }
</s> Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <[email protected]>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding </s> remove func finishUpdate(ctx context.Context) {
log.Info("Stopping all tasks")
</s> add func finishUpdate(ctx context.Context, execPath string) {
var err error
log.Info("stopping all tasks")
</s> remove } else {
log.Info("Restarting: %v", os.Args)
err = syscall.Exec(curBinName, os.Args, os.Environ())
if err != nil {
log.Fatalf("syscall.Exec() failed: %s", err)
}
// Unreachable code
</s> add }
log.Info("restarting: %q %q", execPath, os.Args[1:])
err = syscall.Exec(execPath, os.Args, os.Environ())
if err != nil {
log.Fatalf("restarting: %s", err) </s> remove log.Fatalf("exec.Command() failed: %s", err)
</s> add log.Fatalf("restarting:: %s", err) </s> remove log.Fatalf("exec.Command() failed: %s", err)
</s> add log.Fatalf("restarting: stopping: %s", err) </s> remove cmd := exec.Command(curBinName, os.Args[1:]...)
log.Info("Restarting: %v", cmd.Args)
</s> add cmd := exec.Command(execPath, os.Args[1:]...)
log.Info("restarting: %q %q", execPath, os.Args[1:]) </s> remove curBinName, err := os.Executable()
if err != nil {
log.Fatalf("executable path request failed: %s", err)
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
keep keep keep keep replace replace replace replace replace replace replace keep keep keep keep keep | <mask> if f, ok := w.(http.Flusher); ok {
<mask> f.Flush()
<mask> }
<mask>
<mask> // The background context is used because the underlying functions wrap
<mask> // it with timeout and shut down the server, which handles current
<mask> // request. It also should be done in a separate goroutine due to the
<mask> // same reason.
<mask> go func() {
<mask> finishUpdate(context.Background())
<mask> }()
<mask> }
<mask>
<mask> // versionResponse is the response for /control/version.json endpoint.
<mask> type versionResponse struct {
<mask> updater.VersionInfo
</s> Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <[email protected]>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding </s> remove err := Context.updater.Update()
</s> add // Retain the current absolute path of the executable, since the updater is
// likely to change the position current one to the backup directory.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/4735.
execPath, err := os.Executable()
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "getting path: %s", err)
return
}
err = Context.updater.Update() </s> remove // Note:
// we can't restart the service via "kardianos/service" package - it kills the process first
// we can't start a new instance - Windows doesn't allow it
</s> add // NOTE: We can't restart the service via "kardianos/service"
// package, because it kills the process first we can't start a new
// instance, because Windows doesn't allow it.
//
// TODO(a.garipov): Recheck the claim above. </s> remove curBinName, err := os.Executable()
if err != nil {
log.Fatalf("executable path request failed: %s", err)
}
</s> add </s> remove } else {
log.Info("Restarting: %v", os.Args)
err = syscall.Exec(curBinName, os.Args, os.Environ())
if err != nil {
log.Fatalf("syscall.Exec() failed: %s", err)
}
// Unreachable code
</s> add }
log.Info("restarting: %q %q", execPath, os.Args[1:])
err = syscall.Exec(execPath, os.Args, os.Environ())
if err != nil {
log.Fatalf("restarting: %s", err) </s> remove log.Fatalf("exec.Command() failed: %s", err)
</s> add log.Fatalf("restarting: stopping: %s", err) </s> remove func finishUpdate(ctx context.Context) {
log.Info("Stopping all tasks")
</s> add func finishUpdate(ctx context.Context, execPath string) {
var err error
log.Info("stopping all tasks")
| https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
keep replace replace keep keep keep replace replace replace replace replace keep keep keep keep | <mask> // finishUpdate completes an update procedure.
<mask> func finishUpdate(ctx context.Context) {
<mask> log.Info("Stopping all tasks")
<mask> cleanup(ctx)
<mask> cleanupAlways()
<mask>
<mask> curBinName, err := os.Executable()
<mask> if err != nil {
<mask> log.Fatalf("executable path request failed: %s", err)
<mask> }
<mask>
<mask> if runtime.GOOS == "windows" {
<mask> if Context.runningAsService {
<mask> // Note:
<mask> // we can't restart the service via "kardianos/service" package - it kills the process first
</s> Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <[email protected]>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding </s> remove // Note:
// we can't restart the service via "kardianos/service" package - it kills the process first
// we can't start a new instance - Windows doesn't allow it
</s> add // NOTE: We can't restart the service via "kardianos/service"
// package, because it kills the process first we can't start a new
// instance, because Windows doesn't allow it.
//
// TODO(a.garipov): Recheck the claim above. </s> remove err := Context.updater.Update()
</s> add // Retain the current absolute path of the executable, since the updater is
// likely to change the position current one to the backup directory.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/4735.
execPath, err := os.Executable()
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "getting path: %s", err)
return
}
err = Context.updater.Update() </s> remove log.Fatalf("exec.Command() failed: %s", err)
</s> add log.Fatalf("restarting: stopping: %s", err) </s> remove } else {
log.Info("Restarting: %v", os.Args)
err = syscall.Exec(curBinName, os.Args, os.Environ())
if err != nil {
log.Fatalf("syscall.Exec() failed: %s", err)
}
// Unreachable code
</s> add }
log.Info("restarting: %q %q", execPath, os.Args[1:])
err = syscall.Exec(execPath, os.Args, os.Environ())
if err != nil {
log.Fatalf("restarting: %s", err) </s> remove log.Fatalf("exec.Command() failed: %s", err)
</s> add log.Fatalf("restarting:: %s", err) | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
keep keep replace replace replace keep keep keep replace keep | <mask> if runtime.GOOS == "windows" {
<mask> if Context.runningAsService {
<mask> // Note:
<mask> // we can't restart the service via "kardianos/service" package - it kills the process first
<mask> // we can't start a new instance - Windows doesn't allow it
<mask> cmd := exec.Command("cmd", "/c", "net stop AdGuardHome & net start AdGuardHome")
<mask> err = cmd.Start()
<mask> if err != nil {
<mask> log.Fatalf("exec.Command() failed: %s", err)
<mask> }
</s> Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <[email protected]>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding </s> remove curBinName, err := os.Executable()
if err != nil {
log.Fatalf("executable path request failed: %s", err)
}
</s> add </s> remove } else {
log.Info("Restarting: %v", os.Args)
err = syscall.Exec(curBinName, os.Args, os.Environ())
if err != nil {
log.Fatalf("syscall.Exec() failed: %s", err)
}
// Unreachable code
</s> add }
log.Info("restarting: %q %q", execPath, os.Args[1:])
err = syscall.Exec(execPath, os.Args, os.Environ())
if err != nil {
log.Fatalf("restarting: %s", err) </s> remove err := Context.updater.Update()
</s> add // Retain the current absolute path of the executable, since the updater is
// likely to change the position current one to the backup directory.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/4735.
execPath, err := os.Executable()
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "getting path: %s", err)
return
}
err = Context.updater.Update() </s> remove log.Fatalf("exec.Command() failed: %s", err)
</s> add log.Fatalf("restarting:: %s", err) </s> remove cmd := exec.Command(curBinName, os.Args[1:]...)
log.Info("Restarting: %v", cmd.Args)
</s> add cmd := exec.Command(execPath, os.Args[1:]...)
log.Info("restarting: %q %q", execPath, os.Args[1:]) | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> }
<mask> os.Exit(0)
<mask> }
<mask>
<mask> cmd := exec.Command(curBinName, os.Args[1:]...)
<mask> log.Info("Restarting: %v", cmd.Args)
<mask> cmd.Stdin = os.Stdin
<mask> cmd.Stdout = os.Stdout
<mask> cmd.Stderr = os.Stderr
<mask> err = cmd.Start()
<mask> if err != nil {
</s> Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <[email protected]>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding </s> remove log.Fatalf("exec.Command() failed: %s", err)
</s> add log.Fatalf("restarting:: %s", err) </s> remove log.Fatalf("exec.Command() failed: %s", err)
</s> add log.Fatalf("restarting: stopping: %s", err) </s> remove } else {
log.Info("Restarting: %v", os.Args)
err = syscall.Exec(curBinName, os.Args, os.Environ())
if err != nil {
log.Fatalf("syscall.Exec() failed: %s", err)
}
// Unreachable code
</s> add }
log.Info("restarting: %q %q", execPath, os.Args[1:])
err = syscall.Exec(execPath, os.Args, os.Environ())
if err != nil {
log.Fatalf("restarting: %s", err) </s> remove err := Context.updater.Update()
</s> add // Retain the current absolute path of the executable, since the updater is
// likely to change the position current one to the backup directory.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/4735.
execPath, err := os.Executable()
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "getting path: %s", err)
return
}
err = Context.updater.Update() </s> remove // Note:
// we can't restart the service via "kardianos/service" package - it kills the process first
// we can't start a new instance - Windows doesn't allow it
</s> add // NOTE: We can't restart the service via "kardianos/service"
// package, because it kills the process first we can't start a new
// instance, because Windows doesn't allow it.
//
// TODO(a.garipov): Recheck the claim above. </s> remove func finishUpdate(ctx context.Context) {
log.Info("Stopping all tasks")
</s> add func finishUpdate(ctx context.Context, execPath string) {
var err error
log.Info("stopping all tasks")
| https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
keep keep replace keep keep replace replace replace replace replace replace replace keep | <mask> err = cmd.Start()
<mask> if err != nil {
<mask> log.Fatalf("exec.Command() failed: %s", err)
<mask> }
<mask> os.Exit(0)
<mask> } else {
<mask> log.Info("Restarting: %v", os.Args)
<mask> err = syscall.Exec(curBinName, os.Args, os.Environ())
<mask> if err != nil {
<mask> log.Fatalf("syscall.Exec() failed: %s", err)
<mask> }
<mask> // Unreachable code
<mask> }
</s> Pull request: home: fix exe path finding
Closes #4735.
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <[email protected]>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding </s> remove log.Fatalf("exec.Command() failed: %s", err)
</s> add log.Fatalf("restarting: stopping: %s", err) </s> remove err := Context.updater.Update()
</s> add // Retain the current absolute path of the executable, since the updater is
// likely to change the position current one to the backup directory.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/4735.
execPath, err := os.Executable()
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "getting path: %s", err)
return
}
err = Context.updater.Update() </s> remove cmd := exec.Command(curBinName, os.Args[1:]...)
log.Info("Restarting: %v", cmd.Args)
</s> add cmd := exec.Command(execPath, os.Args[1:]...)
log.Info("restarting: %q %q", execPath, os.Args[1:]) </s> remove curBinName, err := os.Executable()
if err != nil {
log.Fatalf("executable path request failed: %s", err)
}
</s> add </s> remove // Note:
// we can't restart the service via "kardianos/service" package - it kills the process first
// we can't start a new instance - Windows doesn't allow it
</s> add // NOTE: We can't restart the service via "kardianos/service"
// package, because it kills the process first we can't start a new
// instance, because Windows doesn't allow it.
//
// TODO(a.garipov): Recheck the claim above. | https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43 | internal/home/controlupdate.go |
keep keep replace keep keep replace | <mask> // helper functions for stats
<mask> // --------------------------
<mask> func getSlice(input [statsHistoryElements]float64, start int, end int) []float64 {
<mask> output := make([]float64, 0)
<mask> for i := start; i <= end; i++ {
<mask> output = append(output, input[i])
</s> Fix invalid element order for historical stats -- in API declaration values are from oldest to newest, not other way around. </s> remove count := getSlice(stats.entries[processingTimeCount], start, end)
sum := getSlice(stats.entries[processingTimeSum], start, end)
</s> add count := getReversedSlice(stats.entries[processingTimeCount], start, end)
sum := getReversedSlice(stats.entries[processingTimeSum], start, end) </s> remove "dns_queries": getSlice(stats.entries[totalRequests], start, end),
"blocked_filtering": getSlice(stats.entries[filteredLists], start, end),
"replaced_safebrowsing": getSlice(stats.entries[filteredSafebrowsing], start, end),
"replaced_safesearch": getSlice(stats.entries[filteredSafesearch], start, end),
"replaced_parental": getSlice(stats.entries[filteredParental], start, end),
</s> add "dns_queries": getReversedSlice(stats.entries[totalRequests], start, end),
"blocked_filtering": getReversedSlice(stats.entries[filteredLists], start, end),
"replaced_safebrowsing": getReversedSlice(stats.entries[filteredSafebrowsing], start, end),
"replaced_safesearch": getReversedSlice(stats.entries[filteredSafesearch], start, end),
"replaced_parental": getReversedSlice(stats.entries[filteredParental], start, end), | https://github.com/AdguardTeam/AdGuardHome/commit/1f0fdef8d6b2ce324e7009bb3f95626d87438d61 | helpers.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> end = clamp(end, 0, statsHistoryElements)
<mask>
<mask> avgProcessingTime := make([]float64, 0)
<mask>
<mask> count := getSlice(stats.entries[processingTimeCount], start, end)
<mask> sum := getSlice(stats.entries[processingTimeSum], start, end)
<mask> for i := 0; i < len(count); i++ {
<mask> var avg float64
<mask> if count[i] != 0 {
<mask> avg = sum[i] / count[i]
<mask> avg *= 1000
</s> Fix invalid element order for historical stats -- in API declaration values are from oldest to newest, not other way around. </s> remove output = append(output, input[i])
</s> add output = append([]float64{input[i]}, output...) </s> remove func getSlice(input [statsHistoryElements]float64, start int, end int) []float64 {
</s> add func getReversedSlice(input [statsHistoryElements]float64, start int, end int) []float64 { </s> remove "dns_queries": getSlice(stats.entries[totalRequests], start, end),
"blocked_filtering": getSlice(stats.entries[filteredLists], start, end),
"replaced_safebrowsing": getSlice(stats.entries[filteredSafebrowsing], start, end),
"replaced_safesearch": getSlice(stats.entries[filteredSafesearch], start, end),
"replaced_parental": getSlice(stats.entries[filteredParental], start, end),
</s> add "dns_queries": getReversedSlice(stats.entries[totalRequests], start, end),
"blocked_filtering": getReversedSlice(stats.entries[filteredLists], start, end),
"replaced_safebrowsing": getReversedSlice(stats.entries[filteredSafebrowsing], start, end),
"replaced_safesearch": getReversedSlice(stats.entries[filteredSafesearch], start, end),
"replaced_parental": getReversedSlice(stats.entries[filteredParental], start, end), | https://github.com/AdguardTeam/AdGuardHome/commit/1f0fdef8d6b2ce324e7009bb3f95626d87438d61 | helpers.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> avgProcessingTime = append(avgProcessingTime, avg)
<mask> }
<mask>
<mask> result := map[string]interface{}{
<mask> "dns_queries": getSlice(stats.entries[totalRequests], start, end),
<mask> "blocked_filtering": getSlice(stats.entries[filteredLists], start, end),
<mask> "replaced_safebrowsing": getSlice(stats.entries[filteredSafebrowsing], start, end),
<mask> "replaced_safesearch": getSlice(stats.entries[filteredSafesearch], start, end),
<mask> "replaced_parental": getSlice(stats.entries[filteredParental], start, end),
<mask> "avg_processing_time": avgProcessingTime,
<mask> }
<mask> return result
<mask> }
<mask>
</s> Fix invalid element order for historical stats -- in API declaration values are from oldest to newest, not other way around. </s> remove output = append(output, input[i])
</s> add output = append([]float64{input[i]}, output...) </s> remove func getSlice(input [statsHistoryElements]float64, start int, end int) []float64 {
</s> add func getReversedSlice(input [statsHistoryElements]float64, start int, end int) []float64 { </s> remove count := getSlice(stats.entries[processingTimeCount], start, end)
sum := getSlice(stats.entries[processingTimeSum], start, end)
</s> add count := getReversedSlice(stats.entries[processingTimeCount], start, end)
sum := getReversedSlice(stats.entries[processingTimeSum], start, end) | https://github.com/AdguardTeam/AdGuardHome/commit/1f0fdef8d6b2ce324e7009bb3f95626d87438d61 | helpers.go |
keep keep keep keep replace keep replace keep keep keep | <mask> [actions.getVersionFailure]: state => ({ ...state, processingVersion: false }),
<mask> [actions.getVersionSuccess]: (state, { payload }) => {
<mask> const currentVersion = state.dnsVersion === 'undefined' ? 0 : state.dnsVersion;
<mask>
<mask> if (payload && versionCompare(currentVersion, payload.version) === -1) {
<mask> const {
<mask> version,
<mask> announcement_url: announcementUrl,
<mask> new_version: newVersion,
<mask> can_autoupdate: canAutoUpdate,
</s> - client: fix versions check </s> remove version,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/1f164c70059a8f2f8d6e33b805243dbcd6ce4702 | client/src/reducers/index.js |
keep keep keep keep replace keep keep keep keep keep | <mask> } = payload;
<mask>
<mask> const newState = {
<mask> ...state,
<mask> version,
<mask> announcementUrl,
<mask> newVersion,
<mask> canAutoUpdate,
<mask> isUpdateAvailable: true,
<mask> };
</s> - client: fix versions check </s> remove if (payload && versionCompare(currentVersion, payload.version) === -1) {
</s> add if (payload && versionCompare(currentVersion, payload.new_version) === -1) { </s> remove version,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/1f164c70059a8f2f8d6e33b805243dbcd6ce4702 | client/src/reducers/index.js |
keep keep add keep keep keep keep keep | <mask> log.Fatal(err)
<mask> }
<mask>
<mask> // override bind host/port from the console
<mask> if args.bindHost != "" {
<mask> config.BindHost = args.bindHost
<mask> }
<mask> if args.bindPort != 0 {
</s> + config: add "rlimit_nofile" setting - Maximum number of opened fd's per process </s> add // Set user-specified limit of how many fd's we can use
// https://github.com/AdguardTeam/AdGuardHome/issues/659
func setRlimit(val uint) {
var rlim syscall.Rlimit
rlim.Max = uint64(val)
rlim.Cur = uint64(val)
err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rlim)
if err != nil {
log.Error("Setrlimit() failed: %v", err)
}
}
</s> remove BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
AuthName string `yaml:"auth_name"` // AuthName is the basic auth username
AuthPass string `yaml:"auth_pass"` // AuthPass is the basic auth password
Language string `yaml:"language"` // two-letter ISO 639-1 language code
</s> add BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
AuthName string `yaml:"auth_name"` // AuthName is the basic auth username
AuthPass string `yaml:"auth_pass"` // AuthPass is the basic auth password
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
| https://github.com/AdguardTeam/AdGuardHome/commit/1f1e26f67b00ee4983c65e4e3aabf59a488f687b | app.go |
keep keep add keep keep keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> func cleanup() {
<mask> log.Info("Stopping AdGuard Home")
<mask>
<mask> err := stopDNSServer()
<mask> if err != nil {
<mask> log.Error("Couldn't stop DNS server: %s", err)
</s> + config: add "rlimit_nofile" setting - Maximum number of opened fd's per process </s> add if (runtime.GOOS == "linux" || runtime.GOOS == "darwin") &&
config.RlimitNoFile != 0 {
setRlimit(config.RlimitNoFile)
}
</s> remove BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
AuthName string `yaml:"auth_name"` // AuthName is the basic auth username
AuthPass string `yaml:"auth_pass"` // AuthPass is the basic auth password
Language string `yaml:"language"` // two-letter ISO 639-1 language code
</s> add BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
AuthName string `yaml:"auth_name"` // AuthName is the basic auth username
AuthPass string `yaml:"auth_pass"` // AuthPass is the basic auth password
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
| https://github.com/AdguardTeam/AdGuardHome/commit/1f1e26f67b00ee4983c65e4e3aabf59a488f687b | app.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> ourConfigFilename string // Config filename (can be overridden via the command line arguments)
<mask> ourWorkingDir string // Location of our directory, used to protect against CWD being somewhere else
<mask> firstRun bool // if set to true, don't run any services except HTTP web inteface, and serve only first-run html
<mask>
<mask> BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
<mask> BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
<mask> AuthName string `yaml:"auth_name"` // AuthName is the basic auth username
<mask> AuthPass string `yaml:"auth_pass"` // AuthPass is the basic auth password
<mask> Language string `yaml:"language"` // two-letter ISO 639-1 language code
<mask> DNS dnsConfig `yaml:"dns"`
<mask> TLS tlsConfig `yaml:"tls"`
<mask> Filters []filter `yaml:"filters"`
<mask> UserRules []string `yaml:"user_rules"`
<mask> DHCP dhcpd.ServerConfig `yaml:"dhcp"`
</s> + config: add "rlimit_nofile" setting - Maximum number of opened fd's per process </s> add if (runtime.GOOS == "linux" || runtime.GOOS == "darwin") &&
config.RlimitNoFile != 0 {
setRlimit(config.RlimitNoFile)
}
</s> add // Set user-specified limit of how many fd's we can use
// https://github.com/AdguardTeam/AdGuardHome/issues/659
func setRlimit(val uint) {
var rlim syscall.Rlimit
rlim.Max = uint64(val)
rlim.Cur = uint64(val)
err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rlim)
if err != nil {
log.Error("Setrlimit() failed: %v", err)
}
}
| https://github.com/AdguardTeam/AdGuardHome/commit/1f1e26f67b00ee4983c65e4e3aabf59a488f687b | config.go |
keep keep keep add | <mask>
<mask> .hidden {
<mask> display: none;
<mask> }
</s> Merge: + client: Use monospace font in coding-like inputs
Close #1650
Squashed commit of the following:
commit 0956b77d2675bf569ab8413bf1a905167f068fbd
Author: ArtemBaskal <[email protected]>
Date: Tue May 12 18:22:55 2020 +0300
Replace css variable
commit 7c65954e3727c09404999d4d029276f78a8d0ffe
Author: ArtemBaskal <[email protected]>
Date: Tue May 12 18:06:31 2020 +0300
+ client: Use monospace font in coding-like inputs </s> remove className: 'form-control form-control--textarea',
</s> add className: 'form-control form-control--textarea font-monospace', </s> remove <div className="form__group mb-5">
<label className="form__label form__label--with-desc" htmlFor="allowed_clients">
<Trans>access_allowed_title</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>access_allowed_desc</Trans>
</div>
<Field
id="allowed_clients"
name="allowed_clients"
component={renderTextareaField}
type="text"
className="form-control form-control--textarea"
disabled={processingSet}
/>
</div>
<div className="form__group mb-5">
<label className="form__label form__label--with-desc" htmlFor="disallowed_clients">
<Trans>access_disallowed_title</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>access_disallowed_desc</Trans>
</div>
<Field
id="disallowed_clients"
name="disallowed_clients"
component={renderTextareaField}
type="text"
className="form-control form-control--textarea"
disabled={processingSet}
/>
</div>
<div className="form__group mb-5">
<label className="form__label form__label--with-desc" htmlFor="blocked_hosts">
<Trans>access_blocked_title</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>access_blocked_desc</Trans>
</div>
<Field
id="blocked_hosts"
name="blocked_hosts"
component={renderTextareaField}
type="text"
className="form-control form-control--textarea"
disabled={processingSet}
/>
</div>
</s> add {fields.map(renderField)} </s> remove className="form-control form-control--textarea form-control--textarea-small"
</s> add className="form-control form-control--textarea form-control--textarea-small font-monospace" </s> remove className="form-control form-control--textarea-large"
</s> add className="form-control form-control--textarea-large font-monospace" | https://github.com/AdguardTeam/AdGuardHome/commit/1f954ab67342a4961f78fcf700bf0ddc6bcdb9f2 | client/src/components/App/index.css |
keep keep keep keep replace keep keep keep keep keep | <mask> subtitle={t('custom_filter_rules_hint')}
<mask> >
<mask> <form onSubmit={this.handleSubmit}>
<mask> <textarea
<mask> className="form-control form-control--textarea-large"
<mask> value={userRules}
<mask> onChange={this.handleChange}
<mask> />
<mask> <div className="card-actions">
<mask> <button
</s> Merge: + client: Use monospace font in coding-like inputs
Close #1650
Squashed commit of the following:
commit 0956b77d2675bf569ab8413bf1a905167f068fbd
Author: ArtemBaskal <[email protected]>
Date: Tue May 12 18:22:55 2020 +0300
Replace css variable
commit 7c65954e3727c09404999d4d029276f78a8d0ffe
Author: ArtemBaskal <[email protected]>
Date: Tue May 12 18:06:31 2020 +0300
+ client: Use monospace font in coding-like inputs </s> remove <div className="form__group mb-5">
<label className="form__label form__label--with-desc" htmlFor="allowed_clients">
<Trans>access_allowed_title</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>access_allowed_desc</Trans>
</div>
<Field
id="allowed_clients"
name="allowed_clients"
component={renderTextareaField}
type="text"
className="form-control form-control--textarea"
disabled={processingSet}
/>
</div>
<div className="form__group mb-5">
<label className="form__label form__label--with-desc" htmlFor="disallowed_clients">
<Trans>access_disallowed_title</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>access_disallowed_desc</Trans>
</div>
<Field
id="disallowed_clients"
name="disallowed_clients"
component={renderTextareaField}
type="text"
className="form-control form-control--textarea"
disabled={processingSet}
/>
</div>
<div className="form__group mb-5">
<label className="form__label form__label--with-desc" htmlFor="blocked_hosts">
<Trans>access_blocked_title</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>access_blocked_desc</Trans>
</div>
<Field
id="blocked_hosts"
name="blocked_hosts"
component={renderTextareaField}
type="text"
className="form-control form-control--textarea"
disabled={processingSet}
/>
</div>
</s> add {fields.map(renderField)} </s> remove className="form-control form-control--textarea form-control--textarea-small"
</s> add className="form-control form-control--textarea form-control--textarea-small font-monospace" </s> remove className: 'form-control form-control--textarea',
</s> add className: 'form-control form-control--textarea font-monospace', </s> add .font-monospace {
font-family: var(--font-family-monospace);
} | https://github.com/AdguardTeam/AdGuardHome/commit/1f954ab67342a4961f78fcf700bf0ddc6bcdb9f2 | client/src/components/Filters/CustomRules.js |
keep 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 keep keep keep keep keep | <mask> } = props;
<mask>
<mask> return (
<mask> <form onSubmit={handleSubmit}>
<mask> <div className="form__group mb-5">
<mask> <label className="form__label form__label--with-desc" htmlFor="allowed_clients">
<mask> <Trans>access_allowed_title</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> <Trans>access_allowed_desc</Trans>
<mask> </div>
<mask> <Field
<mask> id="allowed_clients"
<mask> name="allowed_clients"
<mask> component={renderTextareaField}
<mask> type="text"
<mask> className="form-control form-control--textarea"
<mask> disabled={processingSet}
<mask> />
<mask> </div>
<mask> <div className="form__group mb-5">
<mask> <label className="form__label form__label--with-desc" htmlFor="disallowed_clients">
<mask> <Trans>access_disallowed_title</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> <Trans>access_disallowed_desc</Trans>
<mask> </div>
<mask> <Field
<mask> id="disallowed_clients"
<mask> name="disallowed_clients"
<mask> component={renderTextareaField}
<mask> type="text"
<mask> className="form-control form-control--textarea"
<mask> disabled={processingSet}
<mask> />
<mask> </div>
<mask> <div className="form__group mb-5">
<mask> <label className="form__label form__label--with-desc" htmlFor="blocked_hosts">
<mask> <Trans>access_blocked_title</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> <Trans>access_blocked_desc</Trans>
<mask> </div>
<mask> <Field
<mask> id="blocked_hosts"
<mask> name="blocked_hosts"
<mask> component={renderTextareaField}
<mask> type="text"
<mask> className="form-control form-control--textarea"
<mask> disabled={processingSet}
<mask> />
<mask> </div>
<mask> <div className="card-actions">
<mask> <div className="btn-list">
<mask> <button
<mask> type="submit"
<mask> className="btn btn-success btn-standard"
</s> Merge: + client: Use monospace font in coding-like inputs
Close #1650
Squashed commit of the following:
commit 0956b77d2675bf569ab8413bf1a905167f068fbd
Author: ArtemBaskal <[email protected]>
Date: Tue May 12 18:22:55 2020 +0300
Replace css variable
commit 7c65954e3727c09404999d4d029276f78a8d0ffe
Author: ArtemBaskal <[email protected]>
Date: Tue May 12 18:06:31 2020 +0300
+ client: Use monospace font in coding-like inputs </s> remove className="form-control form-control--textarea-large"
</s> add className="form-control form-control--textarea-large font-monospace" </s> remove className="form-control form-control--textarea form-control--textarea-small"
</s> add className="form-control form-control--textarea form-control--textarea-small font-monospace" </s> add .font-monospace {
font-family: var(--font-family-monospace);
} </s> remove className: 'form-control form-control--textarea',
</s> add className: 'form-control form-control--textarea font-monospace', | https://github.com/AdguardTeam/AdGuardHome/commit/1f954ab67342a4961f78fcf700bf0ddc6bcdb9f2 | client/src/components/Settings/Dns/Access/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> </label>,
<mask> name: 'upstream_dns',
<mask> type: 'text',
<mask> component: 'textarea',
<mask> className: 'form-control form-control--textarea',
<mask> placeholder: 'upstream_dns',
<mask> },
<mask> {
<mask> name: 'parallel_requests',
<mask> placeholder: 'parallel_requests',
</s> Merge: + client: Use monospace font in coding-like inputs
Close #1650
Squashed commit of the following:
commit 0956b77d2675bf569ab8413bf1a905167f068fbd
Author: ArtemBaskal <[email protected]>
Date: Tue May 12 18:22:55 2020 +0300
Replace css variable
commit 7c65954e3727c09404999d4d029276f78a8d0ffe
Author: ArtemBaskal <[email protected]>
Date: Tue May 12 18:06:31 2020 +0300
+ client: Use monospace font in coding-like inputs </s> add .font-monospace {
font-family: var(--font-family-monospace);
} </s> remove className="form-control form-control--textarea form-control--textarea-small"
</s> add className="form-control form-control--textarea form-control--textarea-small font-monospace" </s> remove <div className="form__group mb-5">
<label className="form__label form__label--with-desc" htmlFor="allowed_clients">
<Trans>access_allowed_title</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>access_allowed_desc</Trans>
</div>
<Field
id="allowed_clients"
name="allowed_clients"
component={renderTextareaField}
type="text"
className="form-control form-control--textarea"
disabled={processingSet}
/>
</div>
<div className="form__group mb-5">
<label className="form__label form__label--with-desc" htmlFor="disallowed_clients">
<Trans>access_disallowed_title</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>access_disallowed_desc</Trans>
</div>
<Field
id="disallowed_clients"
name="disallowed_clients"
component={renderTextareaField}
type="text"
className="form-control form-control--textarea"
disabled={processingSet}
/>
</div>
<div className="form__group mb-5">
<label className="form__label form__label--with-desc" htmlFor="blocked_hosts">
<Trans>access_blocked_title</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>access_blocked_desc</Trans>
</div>
<Field
id="blocked_hosts"
name="blocked_hosts"
component={renderTextareaField}
type="text"
className="form-control form-control--textarea"
disabled={processingSet}
/>
</div>
</s> add {fields.map(renderField)} </s> remove className="form-control form-control--textarea-large"
</s> add className="form-control form-control--textarea-large font-monospace" | https://github.com/AdguardTeam/AdGuardHome/commit/1f954ab67342a4961f78fcf700bf0ddc6bcdb9f2 | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> id="bootstrap_dns"
<mask> name="bootstrap_dns"
<mask> component="textarea"
<mask> type="text"
<mask> className="form-control form-control--textarea form-control--textarea-small"
<mask> placeholder={t('bootstrap_dns')}
<mask> disabled={processingSetConfig}
<mask> />
<mask> </div>
<mask> </div>
</s> Merge: + client: Use monospace font in coding-like inputs
Close #1650
Squashed commit of the following:
commit 0956b77d2675bf569ab8413bf1a905167f068fbd
Author: ArtemBaskal <[email protected]>
Date: Tue May 12 18:22:55 2020 +0300
Replace css variable
commit 7c65954e3727c09404999d4d029276f78a8d0ffe
Author: ArtemBaskal <[email protected]>
Date: Tue May 12 18:06:31 2020 +0300
+ client: Use monospace font in coding-like inputs </s> remove <div className="form__group mb-5">
<label className="form__label form__label--with-desc" htmlFor="allowed_clients">
<Trans>access_allowed_title</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>access_allowed_desc</Trans>
</div>
<Field
id="allowed_clients"
name="allowed_clients"
component={renderTextareaField}
type="text"
className="form-control form-control--textarea"
disabled={processingSet}
/>
</div>
<div className="form__group mb-5">
<label className="form__label form__label--with-desc" htmlFor="disallowed_clients">
<Trans>access_disallowed_title</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>access_disallowed_desc</Trans>
</div>
<Field
id="disallowed_clients"
name="disallowed_clients"
component={renderTextareaField}
type="text"
className="form-control form-control--textarea"
disabled={processingSet}
/>
</div>
<div className="form__group mb-5">
<label className="form__label form__label--with-desc" htmlFor="blocked_hosts">
<Trans>access_blocked_title</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>access_blocked_desc</Trans>
</div>
<Field
id="blocked_hosts"
name="blocked_hosts"
component={renderTextareaField}
type="text"
className="form-control form-control--textarea"
disabled={processingSet}
/>
</div>
</s> add {fields.map(renderField)} </s> remove className="form-control form-control--textarea-large"
</s> add className="form-control form-control--textarea-large font-monospace" </s> remove className: 'form-control form-control--textarea',
</s> add className: 'form-control form-control--textarea font-monospace', </s> add .font-monospace {
font-family: var(--font-family-monospace);
} | https://github.com/AdguardTeam/AdGuardHome/commit/1f954ab67342a4961f78fcf700bf0ddc6bcdb9f2 | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep add keep keep keep keep | <mask> 200:
<mask> description: OK
<mask>
<mask>
<mask> /blocked_services/list:
<mask> get:
<mask> tags:
</s> * openapi: update 'Client' object; add /clients/find </s> remove ip:
type: "string"
description: "IP address"
example: "127.0.0.1"
</s> add </s> remove mac:
type: "string"
</s> add ids:
type: "array"
description: "IP, CIDR or MAC address"
items:
type: "string" </s> add ClientsFindResponse:
type: "array"
description: "Response to clients find operation"
items:
$ref: "#/definitions/ClientsFindEntry"
ClientsFindEntry:
type: "object"
properties:
"1.2.3.4":
items:
$ref: "#/definitions/Client"
| https://github.com/AdguardTeam/AdGuardHome/commit/1fc70cbc08736d71c19dab8fb713c9b016314fdb | openapi/openapi.yaml |
keep keep keep replace replace replace replace keep keep keep keep replace replace keep | <mask> type: "object"
<mask> description: "Client information"
<mask> properties:
<mask> ip:
<mask> type: "string"
<mask> description: "IP address"
<mask> example: "127.0.0.1"
<mask> name:
<mask> type: "string"
<mask> description: "Name"
<mask> example: "localhost"
<mask> mac:
<mask> type: "string"
<mask> use_global_settings:
</s> * openapi: update 'Client' object; add /clients/find </s> add ClientsFindResponse:
type: "array"
description: "Response to clients find operation"
items:
$ref: "#/definitions/ClientsFindEntry"
ClientsFindEntry:
type: "object"
properties:
"1.2.3.4":
items:
$ref: "#/definitions/Client"
</s> add /clients/find:
get:
tags:
- clients
operationId: clientsFind
summary: 'Get information about selected clients by their IP address'
parameters:
- name: ip0
in: query
type: string
responses:
200:
description: OK
schema:
$ref: "#/definitions/ClientsFindResponse"
| https://github.com/AdguardTeam/AdGuardHome/commit/1fc70cbc08736d71c19dab8fb713c9b016314fdb | openapi/openapi.yaml |
keep keep add keep keep keep keep | <mask> properties:
<mask> name:
<mask> type: "string"
<mask> Clients:
<mask> type: "object"
<mask> properties:
<mask> clients:
</s> * openapi: update 'Client' object; add /clients/find </s> remove mac:
type: "string"
</s> add ids:
type: "array"
description: "IP, CIDR or MAC address"
items:
type: "string" </s> remove ip:
type: "string"
description: "IP address"
example: "127.0.0.1"
</s> add </s> add /clients/find:
get:
tags:
- clients
operationId: clientsFind
summary: 'Get information about selected clients by their IP address'
parameters:
- name: ip0
in: query
type: string
responses:
200:
description: OK
schema:
$ref: "#/definitions/ClientsFindResponse"
| https://github.com/AdguardTeam/AdGuardHome/commit/1fc70cbc08736d71c19dab8fb713c9b016314fdb | openapi/openapi.yaml |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> parental,
<mask> safesearch,
<mask> } = settingsList;
<mask> const newSettingsList = {
<mask> safebrowsing: { ...safebrowsing, enabled: safebrowsingStatus.enabled },
<mask> parental: { ...parental, enabled: parentalStatus.enabled },
<mask> safesearch: { ...safesearch, enabled: safesearchStatus.enabled },
<mask> };
<mask> dispatch(initSettingsSuccess({ settingsList: newSettingsList }));
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(initSettingsFailure());
</s> - client: Make language tag in HTML same as setting language
Close #1797
Squashed commit of the following:
commit b822a83cb05cc5ba92000cdb7d1c12629471bc57
Merge: e2fa24fb 72ce5f57
Author: ArtemBaskal <[email protected]>
Date: Fri Jul 3 11:02:56 2020 +0300
Merge branch 'master' into fix/1797
commit e2fa24fb9fa0c15f8411e186e90e0ffb1c705fb2
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 18:21:30 2020 +0300
Extract helper
commit ba8473e7b16ab8b1abbee4b42a4ef2b0de8c136b
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 15:31:42 2020 +0300
- client: Make language tag in HTML same as setting language </s> remove config = { ...values, enabled: true };
</s> add config = {
...values,
enabled: true,
}; </s> remove }, () => {
</s> add },
() => { </s> remove const testMessages = Object.keys(upstreamResponse).map((key) => {
const message = upstreamResponse[key];
if (message !== 'OK') {
dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
}
return message;
});
</s> add const testMessages = Object.keys(upstreamResponse)
.map((key) => {
const message = upstreamResponse[key];
if (message !== 'OK') {
dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
}
return message;
}); </s> remove let config = { ...values, enabled: false };
</s> add let config = {
...values,
enabled: false,
}; </s> remove class Footer extends Component {
getYear = () => {
</s> add const Footer = (props) => {
const { t } = useTranslation();
const getYear = () => { </s> remove render() {
const {
dnsVersion, processingVersion, getVersion, checkUpdateFlag,
} = this.props;
</s> add const {
dnsVersion, processingVersion, getVersion, checkUpdateFlag,
} = props; | https://github.com/AdguardTeam/AdGuardHome/commit/205680b71b10dd618c5a45a98f56f951db7a59f6 | client/src/actions/index.js |
keep keep keep keep replace replace replace replace replace replace replace keep keep keep keep keep | <mask> values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
<mask> values.upstream_dns = normalizeTextarea(values.upstream_dns);
<mask>
<mask> const upstreamResponse = await apiClient.testUpstream(values);
<mask> const testMessages = Object.keys(upstreamResponse).map((key) => {
<mask> const message = upstreamResponse[key];
<mask> if (message !== 'OK') {
<mask> dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
<mask> }
<mask> return message;
<mask> });
<mask>
<mask> if (testMessages.every((message) => message === 'OK')) {
<mask> dispatch(addSuccessToast('dns_test_ok_toast'));
<mask> }
<mask>
</s> - client: Make language tag in HTML same as setting language
Close #1797
Squashed commit of the following:
commit b822a83cb05cc5ba92000cdb7d1c12629471bc57
Merge: e2fa24fb 72ce5f57
Author: ArtemBaskal <[email protected]>
Date: Fri Jul 3 11:02:56 2020 +0300
Merge branch 'master' into fix/1797
commit e2fa24fb9fa0c15f8411e186e90e0ffb1c705fb2
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 18:21:30 2020 +0300
Extract helper
commit ba8473e7b16ab8b1abbee4b42a4ef2b0de8c136b
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 15:31:42 2020 +0300
- client: Make language tag in HTML same as setting language </s> remove class Footer extends Component {
getYear = () => {
</s> add const Footer = (props) => {
const { t } = useTranslation();
const getYear = () => { </s> remove safebrowsing: { ...safebrowsing, enabled: safebrowsingStatus.enabled },
parental: { ...parental, enabled: parentalStatus.enabled },
safesearch: { ...safesearch, enabled: safesearchStatus.enabled },
</s> add safebrowsing: {
...safebrowsing,
enabled: safebrowsingStatus.enabled,
},
parental: {
...parental,
enabled: parentalStatus.enabled,
},
safesearch: {
...safesearch,
enabled: safesearchStatus.enabled,
}, </s> remove let config = { ...values, enabled: false };
</s> add let config = {
...values,
enabled: false,
}; </s> remove changeLanguage = (event) => {
i18n.changeLanguage(event.target.value);
</s> add const changeLanguage = (event) => {
const { value } = event.target;
i18n.changeLanguage(value);
setHtmlLangAttr(value); </s> remove render() {
const {
dnsVersion, processingVersion, getVersion, checkUpdateFlag,
} = this.props;
</s> add const {
dnsVersion, processingVersion, getVersion, checkUpdateFlag,
} = props; </s> remove config = { ...values, enabled: true };
</s> add config = {
...values,
enabled: true,
}; | https://github.com/AdguardTeam/AdGuardHome/commit/205680b71b10dd618c5a45a98f56f951db7a59f6 | client/src/actions/index.js |
keep keep keep replace keep keep keep replace | <mask>
<mask> export const toggleDhcp = (values) => async (dispatch) => {
<mask> dispatch(toggleDhcpRequest());
<mask> let config = { ...values, enabled: false };
<mask> let successMessage = 'disabled_dhcp';
<mask>
<mask> if (!values.enabled) {
<mask> config = { ...values, enabled: true };
</s> - client: Make language tag in HTML same as setting language
Close #1797
Squashed commit of the following:
commit b822a83cb05cc5ba92000cdb7d1c12629471bc57
Merge: e2fa24fb 72ce5f57
Author: ArtemBaskal <[email protected]>
Date: Fri Jul 3 11:02:56 2020 +0300
Merge branch 'master' into fix/1797
commit e2fa24fb9fa0c15f8411e186e90e0ffb1c705fb2
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 18:21:30 2020 +0300
Extract helper
commit ba8473e7b16ab8b1abbee4b42a4ef2b0de8c136b
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 15:31:42 2020 +0300
- client: Make language tag in HTML same as setting language </s> remove safebrowsing: { ...safebrowsing, enabled: safebrowsingStatus.enabled },
parental: { ...parental, enabled: parentalStatus.enabled },
safesearch: { ...safesearch, enabled: safesearchStatus.enabled },
</s> add safebrowsing: {
...safebrowsing,
enabled: safebrowsingStatus.enabled,
},
parental: {
...parental,
enabled: parentalStatus.enabled,
},
safesearch: {
...safesearch,
enabled: safesearchStatus.enabled,
}, </s> remove const testMessages = Object.keys(upstreamResponse).map((key) => {
const message = upstreamResponse[key];
if (message !== 'OK') {
dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
}
return message;
});
</s> add const testMessages = Object.keys(upstreamResponse)
.map((key) => {
const message = upstreamResponse[key];
if (message !== 'OK') {
dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
}
return message;
}); </s> remove class Footer extends Component {
getYear = () => {
</s> add const Footer = (props) => {
const { t } = useTranslation();
const getYear = () => { </s> add /**
* @param language {string}
*/
export const setHtmlLangAttr = (language) => {
window.document.documentElement.lang = language;
}; </s> remove changeLanguage = (event) => {
i18n.changeLanguage(event.target.value);
</s> add const changeLanguage = (event) => {
const { value } = event.target;
i18n.changeLanguage(value);
setHtmlLangAttr(value); | https://github.com/AdguardTeam/AdGuardHome/commit/205680b71b10dd618c5a45a98f56f951db7a59f6 | client/src/actions/index.js |
keep keep keep add keep keep keep keep keep keep | <mask> import i18n from '../../i18n';
<mask> import Loading from '../ui/Loading';
<mask> import { FILTERS_URLS, MENU_URLS, SETTINGS_URLS } from '../../helpers/constants';
<mask> import Services from '../Filters/Services';
<mask>
<mask> class App extends Component {
<mask> componentDidMount() {
<mask> this.props.getDnsStatus();
<mask> }
<mask>
</s> - client: Make language tag in HTML same as setting language
Close #1797
Squashed commit of the following:
commit b822a83cb05cc5ba92000cdb7d1c12629471bc57
Merge: e2fa24fb 72ce5f57
Author: ArtemBaskal <[email protected]>
Date: Fri Jul 3 11:02:56 2020 +0300
Merge branch 'master' into fix/1797
commit e2fa24fb9fa0c15f8411e186e90e0ffb1c705fb2
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 18:21:30 2020 +0300
Extract helper
commit ba8473e7b16ab8b1abbee4b42a4ef2b0de8c136b
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 15:31:42 2020 +0300
- client: Make language tag in HTML same as setting language </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { useTranslation } from 'react-i18next'; </s> remove import React, { Component, Fragment } from 'react';
</s> add import React from 'react'; </s> add import { setHtmlLangAttr } from './helpers/helpers'; </s> add import { setHtmlLangAttr } from '../../helpers/helpers'; </s> remove class Footer extends Component {
getYear = () => {
</s> add const Footer = (props) => {
const { t } = useTranslation();
const getYear = () => { </s> add setHtmlLangAttr(language); | https://github.com/AdguardTeam/AdGuardHome/commit/205680b71b10dd618c5a45a98f56f951db7a59f6 | client/src/components/App/index.js |
keep keep keep add keep keep keep keep | <mask>
<mask> if (!processing) {
<mask> if (language) {
<mask> i18n.changeLanguage(language);
<mask> }
<mask> }
<mask>
<mask> i18n.on('languageChanged', (lang) => {
</s> - client: Make language tag in HTML same as setting language
Close #1797
Squashed commit of the following:
commit b822a83cb05cc5ba92000cdb7d1c12629471bc57
Merge: e2fa24fb 72ce5f57
Author: ArtemBaskal <[email protected]>
Date: Fri Jul 3 11:02:56 2020 +0300
Merge branch 'master' into fix/1797
commit e2fa24fb9fa0c15f8411e186e90e0ffb1c705fb2
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 18:21:30 2020 +0300
Extract helper
commit ba8473e7b16ab8b1abbee4b42a4ef2b0de8c136b
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 15:31:42 2020 +0300
- client: Make language tag in HTML same as setting language </s> remove const testMessages = Object.keys(upstreamResponse).map((key) => {
const message = upstreamResponse[key];
if (message !== 'OK') {
dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
}
return message;
});
</s> add const testMessages = Object.keys(upstreamResponse)
.map((key) => {
const message = upstreamResponse[key];
if (message !== 'OK') {
dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
}
return message;
}); </s> remove }, () => {
</s> add },
() => { </s> remove config = { ...values, enabled: true };
</s> add config = {
...values,
enabled: true,
}; </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { useTranslation } from 'react-i18next'; </s> remove let config = { ...values, enabled: false };
</s> add let config = {
...values,
enabled: false,
}; </s> add import { setHtmlLangAttr } from '../../helpers/helpers'; | https://github.com/AdguardTeam/AdGuardHome/commit/205680b71b10dd618c5a45a98f56f951db7a59f6 | client/src/components/App/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 { Trans, withTranslation } from 'react-i18next';
<mask> import classNames from 'classnames';
<mask>
<mask> import { REPOSITORY, PRIVACY_POLICY_LINK } from '../../helpers/constants';
<mask> import { LANGUAGES } from '../../helpers/twosky';
<mask> import i18n from '../../i18n';
</s> - client: Make language tag in HTML same as setting language
Close #1797
Squashed commit of the following:
commit b822a83cb05cc5ba92000cdb7d1c12629471bc57
Merge: e2fa24fb 72ce5f57
Author: ArtemBaskal <[email protected]>
Date: Fri Jul 3 11:02:56 2020 +0300
Merge branch 'master' into fix/1797
commit e2fa24fb9fa0c15f8411e186e90e0ffb1c705fb2
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 18:21:30 2020 +0300
Extract helper
commit ba8473e7b16ab8b1abbee4b42a4ef2b0de8c136b
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 15:31:42 2020 +0300
- client: Make language tag in HTML same as setting language </s> add import { setHtmlLangAttr } from '../../helpers/helpers'; </s> add import { setHtmlLangAttr } from './helpers/helpers'; </s> add import { setHtmlLangAttr } from '../../helpers/helpers'; </s> add setHtmlLangAttr(language); </s> remove render() {
const {
dnsVersion, processingVersion, getVersion, checkUpdateFlag,
} = this.props;
</s> add const {
dnsVersion, processingVersion, getVersion, checkUpdateFlag,
} = props; | https://github.com/AdguardTeam/AdGuardHome/commit/205680b71b10dd618c5a45a98f56f951db7a59f6 | client/src/components/ui/Footer.js |
keep keep keep add keep keep keep keep | <mask>
<mask> import Version from './Version';
<mask> import './Footer.css';
<mask> import './Select.css';
<mask>
<mask> const linksData = [
<mask> {
<mask> href: REPOSITORY.URL,
</s> - client: Make language tag in HTML same as setting language
Close #1797
Squashed commit of the following:
commit b822a83cb05cc5ba92000cdb7d1c12629471bc57
Merge: e2fa24fb 72ce5f57
Author: ArtemBaskal <[email protected]>
Date: Fri Jul 3 11:02:56 2020 +0300
Merge branch 'master' into fix/1797
commit e2fa24fb9fa0c15f8411e186e90e0ffb1c705fb2
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 18:21:30 2020 +0300
Extract helper
commit ba8473e7b16ab8b1abbee4b42a4ef2b0de8c136b
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 15:31:42 2020 +0300
- client: Make language tag in HTML same as setting language </s> add import { setHtmlLangAttr } from './helpers/helpers'; </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { useTranslation } from 'react-i18next'; </s> remove import React, { Component, Fragment } from 'react';
</s> add import React from 'react'; </s> add import { setHtmlLangAttr } from '../../helpers/helpers'; </s> remove class Footer extends Component {
getYear = () => {
</s> add const Footer = (props) => {
const { t } = useTranslation();
const getYear = () => { </s> remove const testMessages = Object.keys(upstreamResponse).map((key) => {
const message = upstreamResponse[key];
if (message !== 'OK') {
dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
}
return message;
});
</s> add const testMessages = Object.keys(upstreamResponse)
.map((key) => {
const message = upstreamResponse[key];
if (message !== 'OK') {
dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
}
return message;
}); | https://github.com/AdguardTeam/AdGuardHome/commit/205680b71b10dd618c5a45a98f56f951db7a59f6 | client/src/components/ui/Footer.js |
keep replace replace keep keep keep keep replace replace keep keep keep | <mask>
<mask> class Footer extends Component {
<mask> getYear = () => {
<mask> const today = new Date();
<mask> return today.getFullYear();
<mask> };
<mask>
<mask> changeLanguage = (event) => {
<mask> i18n.changeLanguage(event.target.value);
<mask> };
<mask>
<mask> renderCopyright = () => <div className="footer__column">
</s> - client: Make language tag in HTML same as setting language
Close #1797
Squashed commit of the following:
commit b822a83cb05cc5ba92000cdb7d1c12629471bc57
Merge: e2fa24fb 72ce5f57
Author: ArtemBaskal <[email protected]>
Date: Fri Jul 3 11:02:56 2020 +0300
Merge branch 'master' into fix/1797
commit e2fa24fb9fa0c15f8411e186e90e0ffb1c705fb2
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 18:21:30 2020 +0300
Extract helper
commit ba8473e7b16ab8b1abbee4b42a4ef2b0de8c136b
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 15:31:42 2020 +0300
- client: Make language tag in HTML same as setting language </s> remove renderCopyright = () => <div className="footer__column">
</s> add const renderCopyright = () => <div className="footer__column"> </s> remove <Trans>copyright</Trans> © {this.getYear()}{' '}
</s> add {t('copyright')} © {getYear()}{' '} </s> remove const testMessages = Object.keys(upstreamResponse).map((key) => {
const message = upstreamResponse[key];
if (message !== 'OK') {
dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
}
return message;
});
</s> add const testMessages = Object.keys(upstreamResponse)
.map((key) => {
const message = upstreamResponse[key];
if (message !== 'OK') {
dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
}
return message;
}); </s> add import { setHtmlLangAttr } from '../../helpers/helpers'; </s> remove render() {
const {
dnsVersion, processingVersion, getVersion, checkUpdateFlag,
} = this.props;
</s> add const {
dnsVersion, processingVersion, getVersion, checkUpdateFlag,
} = props; | https://github.com/AdguardTeam/AdGuardHome/commit/205680b71b10dd618c5a45a98f56f951db7a59f6 | client/src/components/ui/Footer.js |
keep keep keep keep replace keep replace keep keep keep | <mask> changeLanguage = (event) => {
<mask> i18n.changeLanguage(event.target.value);
<mask> };
<mask>
<mask> renderCopyright = () => <div className="footer__column">
<mask> <div className="footer__copyright">
<mask> <Trans>copyright</Trans> © {this.getYear()}{' '}
<mask> <a target="_blank" rel="noopener noreferrer" href="https://adguard.com/">AdGuard</a>
<mask> </div>
<mask> </div>;
</s> - client: Make language tag in HTML same as setting language
Close #1797
Squashed commit of the following:
commit b822a83cb05cc5ba92000cdb7d1c12629471bc57
Merge: e2fa24fb 72ce5f57
Author: ArtemBaskal <[email protected]>
Date: Fri Jul 3 11:02:56 2020 +0300
Merge branch 'master' into fix/1797
commit e2fa24fb9fa0c15f8411e186e90e0ffb1c705fb2
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 18:21:30 2020 +0300
Extract helper
commit ba8473e7b16ab8b1abbee4b42a4ef2b0de8c136b
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 15:31:42 2020 +0300
- client: Make language tag in HTML same as setting language </s> remove changeLanguage = (event) => {
i18n.changeLanguage(event.target.value);
</s> add const changeLanguage = (event) => {
const { value } = event.target;
i18n.changeLanguage(value);
setHtmlLangAttr(value); </s> remove renderLinks = (linksData) => linksData.map(({ name, href, className = '' }) => <a
key={name}
href={href}
className={classNames('footer__link', className)}
target="_blank"
rel="noopener noreferrer"
>
<Trans>{name}</Trans>
</a>);
</s> add const renderLinks = (linksData) => linksData.map(({ name, href, className = '' }) => <a
key={name}
href={href}
className={classNames('footer__link', className)}
target="_blank"
rel="noopener noreferrer"
>
{t(name)}
</a>); </s> remove class Footer extends Component {
getYear = () => {
</s> add const Footer = (props) => {
const { t } = useTranslation();
const getYear = () => { </s> remove return (
<Fragment>
<footer className="footer">
<div className="container">
<div className="footer__row">
<div className="footer__column footer__column--links">
{this.renderLinks(linksData)}
</div>
<div className="footer__column footer__column--language">
<select
className="form-control select select--language"
value={i18n.language}
onChange={this.changeLanguage}
>
{Object.keys(LANGUAGES)
.map((lang) => (
<option key={lang} value={lang}>
{LANGUAGES[lang]}
</option>
))}
</select>
</div>
</s> add return (
<>
<footer className="footer">
<div className="container">
<div className="footer__row">
<div className="footer__column footer__column--links">
{renderLinks(linksData)}
</div>
<div className="footer__column footer__column--language">
<select
className="form-control select select--language"
value={i18n.language}
onChange={changeLanguage}
>
{Object.keys(LANGUAGES)
.map((lang) => (
<option key={lang} value={lang}>
{LANGUAGES[lang]}
</option>
))}
</select> </s> remove </footer>
<div className="footer">
<div className="container">
<div className="footer__row">
{this.renderCopyright()}
<div className="footer__column footer__column--language">
<Version
dnsVersion={dnsVersion}
processingVersion={processingVersion}
getVersion={getVersion}
checkUpdateFlag={checkUpdateFlag}
/>
</div>
</s> add </div>
</footer>
<div className="footer">
<div className="container">
<div className="footer__row">
{renderCopyright()}
<div className="footer__column footer__column--language">
<Version
dnsVersion={dnsVersion}
processingVersion={processingVersion}
getVersion={getVersion}
checkUpdateFlag={checkUpdateFlag}
/> | https://github.com/AdguardTeam/AdGuardHome/commit/205680b71b10dd618c5a45a98f56f951db7a59f6 | client/src/components/ui/Footer.js |
keep keep replace replace replace replace replace replace replace replace replace keep keep replace replace replace replace keep | <mask> </div>;
<mask>
<mask> renderLinks = (linksData) => linksData.map(({ name, href, className = '' }) => <a
<mask> key={name}
<mask> href={href}
<mask> className={classNames('footer__link', className)}
<mask> target="_blank"
<mask> rel="noopener noreferrer"
<mask> >
<mask> <Trans>{name}</Trans>
<mask> </a>);
<mask>
<mask>
<mask> render() {
<mask> const {
<mask> dnsVersion, processingVersion, getVersion, checkUpdateFlag,
<mask> } = this.props;
<mask>
</s> - client: Make language tag in HTML same as setting language
Close #1797
Squashed commit of the following:
commit b822a83cb05cc5ba92000cdb7d1c12629471bc57
Merge: e2fa24fb 72ce5f57
Author: ArtemBaskal <[email protected]>
Date: Fri Jul 3 11:02:56 2020 +0300
Merge branch 'master' into fix/1797
commit e2fa24fb9fa0c15f8411e186e90e0ffb1c705fb2
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 18:21:30 2020 +0300
Extract helper
commit ba8473e7b16ab8b1abbee4b42a4ef2b0de8c136b
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 15:31:42 2020 +0300
- client: Make language tag in HTML same as setting language </s> remove <Trans>copyright</Trans> © {this.getYear()}{' '}
</s> add {t('copyright')} © {getYear()}{' '} </s> remove renderCopyright = () => <div className="footer__column">
</s> add const renderCopyright = () => <div className="footer__column"> </s> remove return (
<Fragment>
<footer className="footer">
<div className="container">
<div className="footer__row">
<div className="footer__column footer__column--links">
{this.renderLinks(linksData)}
</div>
<div className="footer__column footer__column--language">
<select
className="form-control select select--language"
value={i18n.language}
onChange={this.changeLanguage}
>
{Object.keys(LANGUAGES)
.map((lang) => (
<option key={lang} value={lang}>
{LANGUAGES[lang]}
</option>
))}
</select>
</div>
</s> add return (
<>
<footer className="footer">
<div className="container">
<div className="footer__row">
<div className="footer__column footer__column--links">
{renderLinks(linksData)}
</div>
<div className="footer__column footer__column--language">
<select
className="form-control select select--language"
value={i18n.language}
onChange={changeLanguage}
>
{Object.keys(LANGUAGES)
.map((lang) => (
<option key={lang} value={lang}>
{LANGUAGES[lang]}
</option>
))}
</select> </s> remove const testMessages = Object.keys(upstreamResponse).map((key) => {
const message = upstreamResponse[key];
if (message !== 'OK') {
dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
}
return message;
});
</s> add const testMessages = Object.keys(upstreamResponse)
.map((key) => {
const message = upstreamResponse[key];
if (message !== 'OK') {
dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
}
return message;
}); </s> remove class Footer extends Component {
getYear = () => {
</s> add const Footer = (props) => {
const { t } = useTranslation();
const getYear = () => { | https://github.com/AdguardTeam/AdGuardHome/commit/205680b71b10dd618c5a45a98f56f951db7a59f6 | client/src/components/ui/Footer.js |
keep 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 keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep | <mask> const {
<mask> dnsVersion, processingVersion, getVersion, checkUpdateFlag,
<mask> } = this.props;
<mask>
<mask> return (
<mask> <Fragment>
<mask> <footer className="footer">
<mask> <div className="container">
<mask> <div className="footer__row">
<mask> <div className="footer__column footer__column--links">
<mask> {this.renderLinks(linksData)}
<mask> </div>
<mask> <div className="footer__column footer__column--language">
<mask> <select
<mask> className="form-control select select--language"
<mask> value={i18n.language}
<mask> onChange={this.changeLanguage}
<mask> >
<mask> {Object.keys(LANGUAGES)
<mask> .map((lang) => (
<mask> <option key={lang} value={lang}>
<mask> {LANGUAGES[lang]}
<mask> </option>
<mask> ))}
<mask> </select>
<mask> </div>
<mask> </div>
<mask> </div>
<mask> </footer>
<mask> <div className="footer">
<mask> <div className="container">
<mask> <div className="footer__row">
<mask> {this.renderCopyright()}
<mask> <div className="footer__column footer__column--language">
<mask> <Version
<mask> dnsVersion={dnsVersion}
<mask> processingVersion={processingVersion}
<mask> getVersion={getVersion}
<mask> checkUpdateFlag={checkUpdateFlag}
<mask> />
<mask> </div>
<mask> </div>
<mask> </div>
<mask> </div>
</s> - client: Make language tag in HTML same as setting language
Close #1797
Squashed commit of the following:
commit b822a83cb05cc5ba92000cdb7d1c12629471bc57
Merge: e2fa24fb 72ce5f57
Author: ArtemBaskal <[email protected]>
Date: Fri Jul 3 11:02:56 2020 +0300
Merge branch 'master' into fix/1797
commit e2fa24fb9fa0c15f8411e186e90e0ffb1c705fb2
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 18:21:30 2020 +0300
Extract helper
commit ba8473e7b16ab8b1abbee4b42a4ef2b0de8c136b
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 15:31:42 2020 +0300
- client: Make language tag in HTML same as setting language </s> remove render() {
const {
dnsVersion, processingVersion, getVersion, checkUpdateFlag,
} = this.props;
</s> add const {
dnsVersion, processingVersion, getVersion, checkUpdateFlag,
} = props; </s> remove renderCopyright = () => <div className="footer__column">
</s> add const renderCopyright = () => <div className="footer__column"> </s> remove <Trans>copyright</Trans> © {this.getYear()}{' '}
</s> add {t('copyright')} © {getYear()}{' '} </s> remove </Fragment>
);
}
}
</s> add </div>
</>
);
}; </s> remove renderLinks = (linksData) => linksData.map(({ name, href, className = '' }) => <a
key={name}
href={href}
className={classNames('footer__link', className)}
target="_blank"
rel="noopener noreferrer"
>
<Trans>{name}</Trans>
</a>);
</s> add const renderLinks = (linksData) => linksData.map(({ name, href, className = '' }) => <a
key={name}
href={href}
className={classNames('footer__link', className)}
target="_blank"
rel="noopener noreferrer"
>
{t(name)}
</a>); | https://github.com/AdguardTeam/AdGuardHome/commit/205680b71b10dd618c5a45a98f56f951db7a59f6 | client/src/components/ui/Footer.js |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask> </div>
<mask> </div>
<mask> </div>
<mask> </div>
<mask> </Fragment>
<mask> );
<mask> }
<mask> }
<mask>
<mask> Footer.propTypes = {
<mask> dnsVersion: PropTypes.string,
<mask> processingVersion: PropTypes.bool,
<mask> getVersion: PropTypes.func,
</s> - client: Make language tag in HTML same as setting language
Close #1797
Squashed commit of the following:
commit b822a83cb05cc5ba92000cdb7d1c12629471bc57
Merge: e2fa24fb 72ce5f57
Author: ArtemBaskal <[email protected]>
Date: Fri Jul 3 11:02:56 2020 +0300
Merge branch 'master' into fix/1797
commit e2fa24fb9fa0c15f8411e186e90e0ffb1c705fb2
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 18:21:30 2020 +0300
Extract helper
commit ba8473e7b16ab8b1abbee4b42a4ef2b0de8c136b
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 15:31:42 2020 +0300
- client: Make language tag in HTML same as setting language </s> remove </footer>
<div className="footer">
<div className="container">
<div className="footer__row">
{this.renderCopyright()}
<div className="footer__column footer__column--language">
<Version
dnsVersion={dnsVersion}
processingVersion={processingVersion}
getVersion={getVersion}
checkUpdateFlag={checkUpdateFlag}
/>
</div>
</s> add </div>
</footer>
<div className="footer">
<div className="container">
<div className="footer__row">
{renderCopyright()}
<div className="footer__column footer__column--language">
<Version
dnsVersion={dnsVersion}
processingVersion={processingVersion}
getVersion={getVersion}
checkUpdateFlag={checkUpdateFlag}
/> </s> remove export default withTranslation()(Footer);
</s> add export default Footer; </s> remove return (
<Fragment>
<footer className="footer">
<div className="container">
<div className="footer__row">
<div className="footer__column footer__column--links">
{this.renderLinks(linksData)}
</div>
<div className="footer__column footer__column--language">
<select
className="form-control select select--language"
value={i18n.language}
onChange={this.changeLanguage}
>
{Object.keys(LANGUAGES)
.map((lang) => (
<option key={lang} value={lang}>
{LANGUAGES[lang]}
</option>
))}
</select>
</div>
</s> add return (
<>
<footer className="footer">
<div className="container">
<div className="footer__row">
<div className="footer__column footer__column--links">
{renderLinks(linksData)}
</div>
<div className="footer__column footer__column--language">
<select
className="form-control select select--language"
value={i18n.language}
onChange={changeLanguage}
>
{Object.keys(LANGUAGES)
.map((lang) => (
<option key={lang} value={lang}>
{LANGUAGES[lang]}
</option>
))}
</select> </s> remove renderCopyright = () => <div className="footer__column">
</s> add const renderCopyright = () => <div className="footer__column"> </s> remove <Trans>copyright</Trans> © {this.getYear()}{' '}
</s> add {t('copyright')} © {getYear()}{' '} </s> remove renderLinks = (linksData) => linksData.map(({ name, href, className = '' }) => <a
key={name}
href={href}
className={classNames('footer__link', className)}
target="_blank"
rel="noopener noreferrer"
>
<Trans>{name}</Trans>
</a>);
</s> add const renderLinks = (linksData) => linksData.map(({ name, href, className = '' }) => <a
key={name}
href={href}
className={classNames('footer__link', className)}
target="_blank"
rel="noopener noreferrer"
>
{t(name)}
</a>); | https://github.com/AdguardTeam/AdGuardHome/commit/205680b71b10dd618c5a45a98f56f951db7a59f6 | client/src/components/ui/Footer.js |
keep keep keep keep replace | <mask> getVersion: PropTypes.func,
<mask> checkUpdateFlag: PropTypes.bool,
<mask> };
<mask>
<mask> export default withTranslation()(Footer);
</s> - client: Make language tag in HTML same as setting language
Close #1797
Squashed commit of the following:
commit b822a83cb05cc5ba92000cdb7d1c12629471bc57
Merge: e2fa24fb 72ce5f57
Author: ArtemBaskal <[email protected]>
Date: Fri Jul 3 11:02:56 2020 +0300
Merge branch 'master' into fix/1797
commit e2fa24fb9fa0c15f8411e186e90e0ffb1c705fb2
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 18:21:30 2020 +0300
Extract helper
commit ba8473e7b16ab8b1abbee4b42a4ef2b0de8c136b
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 15:31:42 2020 +0300
- client: Make language tag in HTML same as setting language </s> remove </Fragment>
);
}
}
</s> add </div>
</>
);
}; </s> add setHtmlLangAttr(i18n.language); </s> remove let config = { ...values, enabled: false };
</s> add let config = {
...values,
enabled: false,
}; </s> add /**
* @param language {string}
*/
export const setHtmlLangAttr = (language) => {
window.document.documentElement.lang = language;
}; </s> remove config = { ...values, enabled: true };
</s> add config = {
...values,
enabled: true,
}; </s> remove changeLanguage = (event) => {
i18n.changeLanguage(event.target.value);
</s> add const changeLanguage = (event) => {
const { value } = event.target;
i18n.changeLanguage(value);
setHtmlLangAttr(value); | https://github.com/AdguardTeam/AdGuardHome/commit/205680b71b10dd618c5a45a98f56f951db7a59f6 | client/src/components/ui/Footer.js |
keep keep keep add | <mask> const formattedElapsedMs = parseInt(elapsedMs, 10) || parseFloat(elapsedMs)
<mask> .toFixed(2);
<mask> return `${formattedElapsedMs} ${t('milliseconds_abbreviation')}`;
<mask> };
</s> - client: Make language tag in HTML same as setting language
Close #1797
Squashed commit of the following:
commit b822a83cb05cc5ba92000cdb7d1c12629471bc57
Merge: e2fa24fb 72ce5f57
Author: ArtemBaskal <[email protected]>
Date: Fri Jul 3 11:02:56 2020 +0300
Merge branch 'master' into fix/1797
commit e2fa24fb9fa0c15f8411e186e90e0ffb1c705fb2
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 18:21:30 2020 +0300
Extract helper
commit ba8473e7b16ab8b1abbee4b42a4ef2b0de8c136b
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 15:31:42 2020 +0300
- client: Make language tag in HTML same as setting language </s> remove changeLanguage = (event) => {
i18n.changeLanguage(event.target.value);
</s> add const changeLanguage = (event) => {
const { value } = event.target;
i18n.changeLanguage(value);
setHtmlLangAttr(value); </s> remove class Footer extends Component {
getYear = () => {
</s> add const Footer = (props) => {
const { t } = useTranslation();
const getYear = () => { </s> remove const testMessages = Object.keys(upstreamResponse).map((key) => {
const message = upstreamResponse[key];
if (message !== 'OK') {
dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
}
return message;
});
</s> add const testMessages = Object.keys(upstreamResponse)
.map((key) => {
const message = upstreamResponse[key];
if (message !== 'OK') {
dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
}
return message;
}); </s> remove render() {
const {
dnsVersion, processingVersion, getVersion, checkUpdateFlag,
} = this.props;
</s> add const {
dnsVersion, processingVersion, getVersion, checkUpdateFlag,
} = props; </s> remove let config = { ...values, enabled: false };
</s> add let config = {
...values,
enabled: false,
}; </s> remove renderCopyright = () => <div className="footer__column">
</s> add const renderCopyright = () => <div className="footer__column"> | https://github.com/AdguardTeam/AdGuardHome/commit/205680b71b10dd618c5a45a98f56f951db7a59f6 | client/src/helpers/helpers.js |
keep add keep keep keep keep | <mask> import th from './__locales/th.json';
<mask> import ro from './__locales/ro.json';
<mask>
<mask> const resources = {
<mask> en: {
<mask> translation: en,
</s> - client: Make language tag in HTML same as setting language
Close #1797
Squashed commit of the following:
commit b822a83cb05cc5ba92000cdb7d1c12629471bc57
Merge: e2fa24fb 72ce5f57
Author: ArtemBaskal <[email protected]>
Date: Fri Jul 3 11:02:56 2020 +0300
Merge branch 'master' into fix/1797
commit e2fa24fb9fa0c15f8411e186e90e0ffb1c705fb2
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 18:21:30 2020 +0300
Extract helper
commit ba8473e7b16ab8b1abbee4b42a4ef2b0de8c136b
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 15:31:42 2020 +0300
- client: Make language tag in HTML same as setting language </s> add import { setHtmlLangAttr } from '../../helpers/helpers'; </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { useTranslation } from 'react-i18next'; </s> remove import React, { Component, Fragment } from 'react';
</s> add import React from 'react'; </s> add import { setHtmlLangAttr } from '../../helpers/helpers'; </s> remove class Footer extends Component {
getYear = () => {
</s> add const Footer = (props) => {
const { t } = useTranslation();
const getYear = () => { </s> remove const testMessages = Object.keys(upstreamResponse).map((key) => {
const message = upstreamResponse[key];
if (message !== 'OK') {
dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
}
return message;
});
</s> add const testMessages = Object.keys(upstreamResponse)
.map((key) => {
const message = upstreamResponse[key];
if (message !== 'OK') {
dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
}
return message;
}); | https://github.com/AdguardTeam/AdGuardHome/commit/205680b71b10dd618c5a45a98f56f951db7a59f6 | client/src/i18n.js |
keep keep keep keep replace keep keep keep keep keep | <mask> react: {
<mask> wait: true,
<mask> },
<mask> whitelist: availableLanguages,
<mask> }, () => {
<mask> if (!availableLanguages.includes(i18n.language)) {
<mask> i18n.changeLanguage(BASE_LOCALE);
<mask> }
<mask> });
<mask>
</s> - client: Make language tag in HTML same as setting language
Close #1797
Squashed commit of the following:
commit b822a83cb05cc5ba92000cdb7d1c12629471bc57
Merge: e2fa24fb 72ce5f57
Author: ArtemBaskal <[email protected]>
Date: Fri Jul 3 11:02:56 2020 +0300
Merge branch 'master' into fix/1797
commit e2fa24fb9fa0c15f8411e186e90e0ffb1c705fb2
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 18:21:30 2020 +0300
Extract helper
commit ba8473e7b16ab8b1abbee4b42a4ef2b0de8c136b
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 15:31:42 2020 +0300
- client: Make language tag in HTML same as setting language </s> remove safebrowsing: { ...safebrowsing, enabled: safebrowsingStatus.enabled },
parental: { ...parental, enabled: parentalStatus.enabled },
safesearch: { ...safesearch, enabled: safesearchStatus.enabled },
</s> add safebrowsing: {
...safebrowsing,
enabled: safebrowsingStatus.enabled,
},
parental: {
...parental,
enabled: parentalStatus.enabled,
},
safesearch: {
...safesearch,
enabled: safesearchStatus.enabled,
}, </s> remove class Footer extends Component {
getYear = () => {
</s> add const Footer = (props) => {
const { t } = useTranslation();
const getYear = () => { </s> remove const testMessages = Object.keys(upstreamResponse).map((key) => {
const message = upstreamResponse[key];
if (message !== 'OK') {
dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
}
return message;
});
</s> add const testMessages = Object.keys(upstreamResponse)
.map((key) => {
const message = upstreamResponse[key];
if (message !== 'OK') {
dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
}
return message;
}); </s> remove config = { ...values, enabled: true };
</s> add config = {
...values,
enabled: true,
}; </s> add setHtmlLangAttr(i18n.language); </s> add setHtmlLangAttr(language); | https://github.com/AdguardTeam/AdGuardHome/commit/205680b71b10dd618c5a45a98f56f951db7a59f6 | client/src/i18n.js |
keep add keep keep keep | <mask> i18n.changeLanguage(BASE_LOCALE);
<mask> }
<mask> });
<mask>
<mask> export default i18n;
</s> - client: Make language tag in HTML same as setting language
Close #1797
Squashed commit of the following:
commit b822a83cb05cc5ba92000cdb7d1c12629471bc57
Merge: e2fa24fb 72ce5f57
Author: ArtemBaskal <[email protected]>
Date: Fri Jul 3 11:02:56 2020 +0300
Merge branch 'master' into fix/1797
commit e2fa24fb9fa0c15f8411e186e90e0ffb1c705fb2
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 18:21:30 2020 +0300
Extract helper
commit ba8473e7b16ab8b1abbee4b42a4ef2b0de8c136b
Author: ArtemBaskal <[email protected]>
Date: Thu Jul 2 15:31:42 2020 +0300
- client: Make language tag in HTML same as setting language </s> remove export default withTranslation()(Footer);
</s> add export default Footer; </s> remove }, () => {
</s> add },
() => { </s> remove const testMessages = Object.keys(upstreamResponse).map((key) => {
const message = upstreamResponse[key];
if (message !== 'OK') {
dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
}
return message;
});
</s> add const testMessages = Object.keys(upstreamResponse)
.map((key) => {
const message = upstreamResponse[key];
if (message !== 'OK') {
dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
}
return message;
}); </s> remove let config = { ...values, enabled: false };
</s> add let config = {
...values,
enabled: false,
}; </s> add /**
* @param language {string}
*/
export const setHtmlLangAttr = (language) => {
window.document.documentElement.lang = language;
}; </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { useTranslation } from 'react-i18next'; | https://github.com/AdguardTeam/AdGuardHome/commit/205680b71b10dd618c5a45a98f56f951db7a59f6 | client/src/i18n.js |
keep keep add keep keep keep keep | <mask> # Building releases:
<mask> #
<mask> # * release -- builds AdGuard Home distros. CHANNEL must be specified (edge, release or beta).
<mask> # * docker-multi-arch -- builds a multi-arch image. If you want it to be pushed to docker hub,
<mask> # you must specify:
<mask> # * DOCKER_IMAGE_NAME - adguard/adguard-home
<mask> # * DOCKER_OUTPUT - type=image,name=adguard/adguard-home,push=true
</s> + Makefile: sign release binaries with gpg
.tar.gz and .zip archives now contain one more file - .sig
UNIX:
./AdGuardHome/:
./AdGuardHome/AdGuardHome
./AdGuardHome/AdGuardHome.sig
...
Windows:
./AdGuardHome/:
./AdGuardHome/AdGuardHome.exe
./AdGuardHome/AdGuardHome.exe.sig
... </s> add GPG_KEY := [email protected]
GPG_KEY_PASSPHRASE :=
GPG_CMD := gpg --detach-sig --default-key $(GPG_KEY) --pinentry-mode loopback --passphrase $(GPG_KEY_PASSPHRASE) </s> add # Windows builds
$(call zip_repack_windows,AdGuardHome_windows_amd64.zip)
$(call zip_repack_windows,AdGuardHome_windows_386.zip)
# MacOS builds
$(call zip_repack,AdGuardHome_darwin_amd64.zip)
$(call zip_repack,AdGuardHome_darwin_386.zip)
</s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_linux_amd64.tar.gz && tar czf AdGuardHome_linux_amd64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_386.tar.gz && tar czf AdGuardHome_linux_386.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_linux_amd64.tar.gz)
$(call tar_repack,AdGuardHome_linux_386.tar.gz) </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_386.tar.gz && tar czf AdGuardHome_freebsd_386.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_amd64.tar.gz && tar czf AdGuardHome_freebsd_amd64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_freebsd_386.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_amd64.tar.gz) </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips_softfloat.tar.gz && tar czf AdGuardHome_linux_mips_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mipsle_softfloat.tar.gz && tar czf AdGuardHome_linux_mipsle_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips64_softfloat.tar.gz && tar czf AdGuardHome_linux_mips64_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips64le_softfloat.tar.gz && tar czf AdGuardHome_linux_mips64le_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_linux_mips_softfloat.tar.gz)
$(call tar_repack,AdGuardHome_linux_mipsle_softfloat.tar.gz)
$(call tar_repack,AdGuardHome_linux_mips64_softfloat.tar.gz)
$(call tar_repack,AdGuardHome_linux_mips64le_softfloat.tar.gz) </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv5.tar.gz && tar czf AdGuardHome_linux_armv5.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv6.tar.gz && tar czf AdGuardHome_linux_armv6.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv7.tar.gz && tar czf AdGuardHome_linux_armv7.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_arm64.tar.gz && tar czf AdGuardHome_linux_arm64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_linux_armv5.tar.gz)
$(call tar_repack,AdGuardHome_linux_armv6.tar.gz)
$(call tar_repack,AdGuardHome_linux_armv7.tar.gz)
$(call tar_repack,AdGuardHome_linux_arm64.tar.gz) | https://github.com/AdguardTeam/AdGuardHome/commit/20a0ba5f608c18eff4022279d8ce2791aca97d1b | Makefile |
keep keep add keep keep keep keep keep keep | <mask> PWD := $(shell pwd)
<mask> TARGET=AdGuardHome
<mask> BASE_URL="https://static.adguard.com/adguardhome/$(CHANNEL)"
<mask>
<mask> # See release target
<mask> DIST_DIR=dist
<mask>
<mask> # Update channel. Can be release, beta or edge. Uses edge by default.
<mask> CHANNEL ?= edge
</s> + Makefile: sign release binaries with gpg
.tar.gz and .zip archives now contain one more file - .sig
UNIX:
./AdGuardHome/:
./AdGuardHome/AdGuardHome
./AdGuardHome/AdGuardHome.sig
...
Windows:
./AdGuardHome/:
./AdGuardHome/AdGuardHome.exe
./AdGuardHome/AdGuardHome.exe.sig
... </s> add # * release_and_sign -- builds AdGuard Home distros and signs the binary files.
# CHANNEL must be specified (edge, release or beta).
# * sign -- Repacks all release archive files and signs the binary files inside them.
# For signing to work, the public+private key pair for $(GPG_KEY) must be imported:
# gpg --import public.txt
# gpg --import private.txt
# GPG_KEY_PASSPHRASE must contain the GPG key passphrase </s> add # Windows builds
$(call zip_repack_windows,AdGuardHome_windows_amd64.zip)
$(call zip_repack_windows,AdGuardHome_windows_386.zip)
# MacOS builds
$(call zip_repack,AdGuardHome_darwin_amd64.zip)
$(call zip_repack,AdGuardHome_darwin_386.zip)
</s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_linux_amd64.tar.gz && tar czf AdGuardHome_linux_amd64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_386.tar.gz && tar czf AdGuardHome_linux_386.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_linux_amd64.tar.gz)
$(call tar_repack,AdGuardHome_linux_386.tar.gz) </s> add release_and_sign: client_with_deps
$(MAKE) release
$(call repack_dist)
sign:
$(call repack_dist)
</s> remove $(call repack_dist)
</s> add </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv5.tar.gz && tar czf AdGuardHome_freebsd_armv5.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv6.tar.gz && tar czf AdGuardHome_freebsd_armv6.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv7.tar.gz && tar czf AdGuardHome_freebsd_armv7.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_arm64.tar.gz && tar czf AdGuardHome_freebsd_arm64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_freebsd_armv5.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_armv6.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_armv7.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_arm64.tar.gz)
endef
define zip_repack_windows
$(eval ARC := $(1))
cd $(DIST_DIR) && \
unzip $(ARC) && \
$(GPG_CMD) AdGuardHome/AdGuardHome.exe && \
zip -r $(ARC) AdGuardHome/ && \
rm -rf AdGuardHome
endef
define zip_repack
$(eval ARC := $(1))
cd $(DIST_DIR) && \
unzip $(ARC) && \
$(GPG_CMD) AdGuardHome/AdGuardHome && \
zip -r $(ARC) AdGuardHome/ && \
rm -rf AdGuardHome
endef
define tar_repack
$(eval ARC := $(1))
cd $(DIST_DIR) && \
tar xzf $(ARC) && \
$(GPG_CMD) AdGuardHome/AdGuardHome && \
tar czf $(ARC) AdGuardHome/ && \
rm -rf AdGuardHome | https://github.com/AdguardTeam/AdGuardHome/commit/20a0ba5f608c18eff4022279d8ce2791aca97d1b | Makefile |
keep keep keep keep replace keep keep keep keep keep | <mask> release: client_with_deps
<mask> go mod download
<mask> @echo Starting release build: version $(VERSION), channel $(CHANNEL)
<mask> CHANNEL=$(CHANNEL) $(GORELEASER_COMMAND)
<mask> $(call repack_dist)
<mask> $(call write_version_file,$(VERSION))
<mask> PATH=$(GOPATH)/bin:$(PATH) packr clean
<mask>
<mask> define write_version_file
<mask> $(eval version := $(1))
</s> + Makefile: sign release binaries with gpg
.tar.gz and .zip archives now contain one more file - .sig
UNIX:
./AdGuardHome/:
./AdGuardHome/AdGuardHome
./AdGuardHome/AdGuardHome.sig
...
Windows:
./AdGuardHome/:
./AdGuardHome/AdGuardHome.exe
./AdGuardHome/AdGuardHome.exe.sig
... </s> add release_and_sign: client_with_deps
$(MAKE) release
$(call repack_dist)
sign:
$(call repack_dist)
</s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv5.tar.gz && tar czf AdGuardHome_freebsd_armv5.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv6.tar.gz && tar czf AdGuardHome_freebsd_armv6.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv7.tar.gz && tar czf AdGuardHome_freebsd_armv7.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_arm64.tar.gz && tar czf AdGuardHome_freebsd_arm64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_freebsd_armv5.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_armv6.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_armv7.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_arm64.tar.gz)
endef
define zip_repack_windows
$(eval ARC := $(1))
cd $(DIST_DIR) && \
unzip $(ARC) && \
$(GPG_CMD) AdGuardHome/AdGuardHome.exe && \
zip -r $(ARC) AdGuardHome/ && \
rm -rf AdGuardHome
endef
define zip_repack
$(eval ARC := $(1))
cd $(DIST_DIR) && \
unzip $(ARC) && \
$(GPG_CMD) AdGuardHome/AdGuardHome && \
zip -r $(ARC) AdGuardHome/ && \
rm -rf AdGuardHome
endef
define tar_repack
$(eval ARC := $(1))
cd $(DIST_DIR) && \
tar xzf $(ARC) && \
$(GPG_CMD) AdGuardHome/AdGuardHome && \
tar czf $(ARC) AdGuardHome/ && \
rm -rf AdGuardHome </s> add # Windows builds
$(call zip_repack_windows,AdGuardHome_windows_amd64.zip)
$(call zip_repack_windows,AdGuardHome_windows_386.zip)
# MacOS builds
$(call zip_repack,AdGuardHome_darwin_amd64.zip)
$(call zip_repack,AdGuardHome_darwin_386.zip)
</s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips_softfloat.tar.gz && tar czf AdGuardHome_linux_mips_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mipsle_softfloat.tar.gz && tar czf AdGuardHome_linux_mipsle_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips64_softfloat.tar.gz && tar czf AdGuardHome_linux_mips64_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips64le_softfloat.tar.gz && tar czf AdGuardHome_linux_mips64le_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_linux_mips_softfloat.tar.gz)
$(call tar_repack,AdGuardHome_linux_mipsle_softfloat.tar.gz)
$(call tar_repack,AdGuardHome_linux_mips64_softfloat.tar.gz)
$(call tar_repack,AdGuardHome_linux_mips64le_softfloat.tar.gz) </s> add GPG_KEY := [email protected]
GPG_KEY_PASSPHRASE :=
GPG_CMD := gpg --detach-sig --default-key $(GPG_KEY) --pinentry-mode loopback --passphrase $(GPG_KEY_PASSPHRASE) </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv5.tar.gz && tar czf AdGuardHome_linux_armv5.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv6.tar.gz && tar czf AdGuardHome_linux_armv6.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv7.tar.gz && tar czf AdGuardHome_linux_armv7.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_arm64.tar.gz && tar czf AdGuardHome_linux_arm64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_linux_armv5.tar.gz)
$(call tar_repack,AdGuardHome_linux_armv6.tar.gz)
$(call tar_repack,AdGuardHome_linux_armv7.tar.gz)
$(call tar_repack,AdGuardHome_linux_arm64.tar.gz) | https://github.com/AdguardTeam/AdGuardHome/commit/20a0ba5f608c18eff4022279d8ce2791aca97d1b | Makefile |
keep keep keep add keep keep keep keep | <mask> CHANNEL=$(CHANNEL) $(GORELEASER_COMMAND)
<mask> $(call write_version_file,$(VERSION))
<mask> PATH=$(GOPATH)/bin:$(PATH) packr clean
<mask>
<mask> define write_version_file
<mask> $(eval version := $(1))
<mask>
<mask> @echo Writing version file: $(version)
</s> + Makefile: sign release binaries with gpg
.tar.gz and .zip archives now contain one more file - .sig
UNIX:
./AdGuardHome/:
./AdGuardHome/AdGuardHome
./AdGuardHome/AdGuardHome.sig
...
Windows:
./AdGuardHome/:
./AdGuardHome/AdGuardHome.exe
./AdGuardHome/AdGuardHome.exe.sig
... </s> remove $(call repack_dist)
</s> add </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv5.tar.gz && tar czf AdGuardHome_freebsd_armv5.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv6.tar.gz && tar czf AdGuardHome_freebsd_armv6.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv7.tar.gz && tar czf AdGuardHome_freebsd_armv7.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_arm64.tar.gz && tar czf AdGuardHome_freebsd_arm64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_freebsd_armv5.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_armv6.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_armv7.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_arm64.tar.gz)
endef
define zip_repack_windows
$(eval ARC := $(1))
cd $(DIST_DIR) && \
unzip $(ARC) && \
$(GPG_CMD) AdGuardHome/AdGuardHome.exe && \
zip -r $(ARC) AdGuardHome/ && \
rm -rf AdGuardHome
endef
define zip_repack
$(eval ARC := $(1))
cd $(DIST_DIR) && \
unzip $(ARC) && \
$(GPG_CMD) AdGuardHome/AdGuardHome && \
zip -r $(ARC) AdGuardHome/ && \
rm -rf AdGuardHome
endef
define tar_repack
$(eval ARC := $(1))
cd $(DIST_DIR) && \
tar xzf $(ARC) && \
$(GPG_CMD) AdGuardHome/AdGuardHome && \
tar czf $(ARC) AdGuardHome/ && \
rm -rf AdGuardHome </s> add # Windows builds
$(call zip_repack_windows,AdGuardHome_windows_amd64.zip)
$(call zip_repack_windows,AdGuardHome_windows_386.zip)
# MacOS builds
$(call zip_repack,AdGuardHome_darwin_amd64.zip)
$(call zip_repack,AdGuardHome_darwin_386.zip)
</s> add GPG_KEY := [email protected]
GPG_KEY_PASSPHRASE :=
GPG_CMD := gpg --detach-sig --default-key $(GPG_KEY) --pinentry-mode loopback --passphrase $(GPG_KEY_PASSPHRASE) </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips_softfloat.tar.gz && tar czf AdGuardHome_linux_mips_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mipsle_softfloat.tar.gz && tar czf AdGuardHome_linux_mipsle_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips64_softfloat.tar.gz && tar czf AdGuardHome_linux_mips64_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips64le_softfloat.tar.gz && tar czf AdGuardHome_linux_mips64le_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_linux_mips_softfloat.tar.gz)
$(call tar_repack,AdGuardHome_linux_mipsle_softfloat.tar.gz)
$(call tar_repack,AdGuardHome_linux_mips64_softfloat.tar.gz)
$(call tar_repack,AdGuardHome_linux_mips64le_softfloat.tar.gz) </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv5.tar.gz && tar czf AdGuardHome_linux_armv5.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv6.tar.gz && tar czf AdGuardHome_linux_armv6.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv7.tar.gz && tar czf AdGuardHome_linux_armv7.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_arm64.tar.gz && tar czf AdGuardHome_linux_arm64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_linux_armv5.tar.gz)
$(call tar_repack,AdGuardHome_linux_armv6.tar.gz)
$(call tar_repack,AdGuardHome_linux_armv7.tar.gz)
$(call tar_repack,AdGuardHome_linux_arm64.tar.gz) | https://github.com/AdguardTeam/AdGuardHome/commit/20a0ba5f608c18eff4022279d8ce2791aca97d1b | Makefile |
keep add keep keep keep keep keep | <mask> rm -rf $(DIST_DIR)/AdGuardHome
<mask>
<mask> # Linux
<mask> $(call tar_repack,AdGuardHome_linux_amd64.tar.gz)
<mask> $(call tar_repack,AdGuardHome_linux_386.tar.gz)
<mask>
<mask> # Linux, all kinds of ARM
</s> + Makefile: sign release binaries with gpg
.tar.gz and .zip archives now contain one more file - .sig
UNIX:
./AdGuardHome/:
./AdGuardHome/AdGuardHome
./AdGuardHome/AdGuardHome.sig
...
Windows:
./AdGuardHome/:
./AdGuardHome/AdGuardHome.exe
./AdGuardHome/AdGuardHome.exe.sig
... </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_linux_amd64.tar.gz && tar czf AdGuardHome_linux_amd64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_386.tar.gz && tar czf AdGuardHome_linux_386.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_linux_amd64.tar.gz)
$(call tar_repack,AdGuardHome_linux_386.tar.gz) </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv5.tar.gz && tar czf AdGuardHome_linux_armv5.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv6.tar.gz && tar czf AdGuardHome_linux_armv6.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv7.tar.gz && tar czf AdGuardHome_linux_armv7.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_arm64.tar.gz && tar czf AdGuardHome_linux_arm64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_linux_armv5.tar.gz)
$(call tar_repack,AdGuardHome_linux_armv6.tar.gz)
$(call tar_repack,AdGuardHome_linux_armv7.tar.gz)
$(call tar_repack,AdGuardHome_linux_arm64.tar.gz) </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips_softfloat.tar.gz && tar czf AdGuardHome_linux_mips_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mipsle_softfloat.tar.gz && tar czf AdGuardHome_linux_mipsle_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips64_softfloat.tar.gz && tar czf AdGuardHome_linux_mips64_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips64le_softfloat.tar.gz && tar czf AdGuardHome_linux_mips64le_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_linux_mips_softfloat.tar.gz)
$(call tar_repack,AdGuardHome_linux_mipsle_softfloat.tar.gz)
$(call tar_repack,AdGuardHome_linux_mips64_softfloat.tar.gz)
$(call tar_repack,AdGuardHome_linux_mips64le_softfloat.tar.gz) </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_386.tar.gz && tar czf AdGuardHome_freebsd_386.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_amd64.tar.gz && tar czf AdGuardHome_freebsd_amd64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_freebsd_386.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_amd64.tar.gz) </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv5.tar.gz && tar czf AdGuardHome_freebsd_armv5.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv6.tar.gz && tar czf AdGuardHome_freebsd_armv6.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv7.tar.gz && tar czf AdGuardHome_freebsd_armv7.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_arm64.tar.gz && tar czf AdGuardHome_freebsd_arm64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_freebsd_armv5.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_armv6.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_armv7.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_arm64.tar.gz)
endef
define zip_repack_windows
$(eval ARC := $(1))
cd $(DIST_DIR) && \
unzip $(ARC) && \
$(GPG_CMD) AdGuardHome/AdGuardHome.exe && \
zip -r $(ARC) AdGuardHome/ && \
rm -rf AdGuardHome
endef
define zip_repack
$(eval ARC := $(1))
cd $(DIST_DIR) && \
unzip $(ARC) && \
$(GPG_CMD) AdGuardHome/AdGuardHome && \
zip -r $(ARC) AdGuardHome/ && \
rm -rf AdGuardHome
endef
define tar_repack
$(eval ARC := $(1))
cd $(DIST_DIR) && \
tar xzf $(ARC) && \
$(GPG_CMD) AdGuardHome/AdGuardHome && \
tar czf $(ARC) AdGuardHome/ && \
rm -rf AdGuardHome </s> add # * release_and_sign -- builds AdGuard Home distros and signs the binary files.
# CHANNEL must be specified (edge, release or beta).
# * sign -- Repacks all release archive files and signs the binary files inside them.
# For signing to work, the public+private key pair for $(GPG_KEY) must be imported:
# gpg --import public.txt
# gpg --import private.txt
# GPG_KEY_PASSPHRASE must contain the GPG key passphrase | https://github.com/AdguardTeam/AdGuardHome/commit/20a0ba5f608c18eff4022279d8ce2791aca97d1b | Makefile |
keep keep replace replace keep keep replace replace replace replace keep keep keep | <mask>
<mask> # Linux
<mask> cd $(DIST_DIR) && tar xzf AdGuardHome_linux_amd64.tar.gz && tar czf AdGuardHome_linux_amd64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
<mask> cd $(DIST_DIR) && tar xzf AdGuardHome_linux_386.tar.gz && tar czf AdGuardHome_linux_386.tar.gz AdGuardHome/ && rm -rf AdGuardHome
<mask>
<mask> # Linux, all kinds of ARM
<mask> cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv5.tar.gz && tar czf AdGuardHome_linux_armv5.tar.gz AdGuardHome/ && rm -rf AdGuardHome
<mask> cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv6.tar.gz && tar czf AdGuardHome_linux_armv6.tar.gz AdGuardHome/ && rm -rf AdGuardHome
<mask> cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv7.tar.gz && tar czf AdGuardHome_linux_armv7.tar.gz AdGuardHome/ && rm -rf AdGuardHome
<mask> cd $(DIST_DIR) && tar xzf AdGuardHome_linux_arm64.tar.gz && tar czf AdGuardHome_linux_arm64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
<mask>
<mask> # Linux, MIPS
<mask> cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips_softfloat.tar.gz && tar czf AdGuardHome_linux_mips_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> + Makefile: sign release binaries with gpg
.tar.gz and .zip archives now contain one more file - .sig
UNIX:
./AdGuardHome/:
./AdGuardHome/AdGuardHome
./AdGuardHome/AdGuardHome.sig
...
Windows:
./AdGuardHome/:
./AdGuardHome/AdGuardHome.exe
./AdGuardHome/AdGuardHome.exe.sig
... </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips_softfloat.tar.gz && tar czf AdGuardHome_linux_mips_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mipsle_softfloat.tar.gz && tar czf AdGuardHome_linux_mipsle_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips64_softfloat.tar.gz && tar czf AdGuardHome_linux_mips64_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips64le_softfloat.tar.gz && tar czf AdGuardHome_linux_mips64le_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_linux_mips_softfloat.tar.gz)
$(call tar_repack,AdGuardHome_linux_mipsle_softfloat.tar.gz)
$(call tar_repack,AdGuardHome_linux_mips64_softfloat.tar.gz)
$(call tar_repack,AdGuardHome_linux_mips64le_softfloat.tar.gz) </s> add # Windows builds
$(call zip_repack_windows,AdGuardHome_windows_amd64.zip)
$(call zip_repack_windows,AdGuardHome_windows_386.zip)
# MacOS builds
$(call zip_repack,AdGuardHome_darwin_amd64.zip)
$(call zip_repack,AdGuardHome_darwin_386.zip)
</s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_386.tar.gz && tar czf AdGuardHome_freebsd_386.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_amd64.tar.gz && tar czf AdGuardHome_freebsd_amd64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_freebsd_386.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_amd64.tar.gz) </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv5.tar.gz && tar czf AdGuardHome_freebsd_armv5.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv6.tar.gz && tar czf AdGuardHome_freebsd_armv6.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv7.tar.gz && tar czf AdGuardHome_freebsd_armv7.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_arm64.tar.gz && tar czf AdGuardHome_freebsd_arm64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_freebsd_armv5.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_armv6.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_armv7.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_arm64.tar.gz)
endef
define zip_repack_windows
$(eval ARC := $(1))
cd $(DIST_DIR) && \
unzip $(ARC) && \
$(GPG_CMD) AdGuardHome/AdGuardHome.exe && \
zip -r $(ARC) AdGuardHome/ && \
rm -rf AdGuardHome
endef
define zip_repack
$(eval ARC := $(1))
cd $(DIST_DIR) && \
unzip $(ARC) && \
$(GPG_CMD) AdGuardHome/AdGuardHome && \
zip -r $(ARC) AdGuardHome/ && \
rm -rf AdGuardHome
endef
define tar_repack
$(eval ARC := $(1))
cd $(DIST_DIR) && \
tar xzf $(ARC) && \
$(GPG_CMD) AdGuardHome/AdGuardHome && \
tar czf $(ARC) AdGuardHome/ && \
rm -rf AdGuardHome </s> add # * release_and_sign -- builds AdGuard Home distros and signs the binary files.
# CHANNEL must be specified (edge, release or beta).
# * sign -- Repacks all release archive files and signs the binary files inside them.
# For signing to work, the public+private key pair for $(GPG_KEY) must be imported:
# gpg --import public.txt
# gpg --import private.txt
# GPG_KEY_PASSPHRASE must contain the GPG key passphrase | https://github.com/AdguardTeam/AdGuardHome/commit/20a0ba5f608c18eff4022279d8ce2791aca97d1b | Makefile |
keep keep replace replace replace replace keep keep replace replace | <mask>
<mask> # Linux, MIPS
<mask> cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips_softfloat.tar.gz && tar czf AdGuardHome_linux_mips_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
<mask> cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mipsle_softfloat.tar.gz && tar czf AdGuardHome_linux_mipsle_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
<mask> cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips64_softfloat.tar.gz && tar czf AdGuardHome_linux_mips64_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
<mask> cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips64le_softfloat.tar.gz && tar czf AdGuardHome_linux_mips64le_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
<mask>
<mask> # FreeBSD
<mask> cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_386.tar.gz && tar czf AdGuardHome_freebsd_386.tar.gz AdGuardHome/ && rm -rf AdGuardHome
<mask> cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_amd64.tar.gz && tar czf AdGuardHome_freebsd_amd64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> + Makefile: sign release binaries with gpg
.tar.gz and .zip archives now contain one more file - .sig
UNIX:
./AdGuardHome/:
./AdGuardHome/AdGuardHome
./AdGuardHome/AdGuardHome.sig
...
Windows:
./AdGuardHome/:
./AdGuardHome/AdGuardHome.exe
./AdGuardHome/AdGuardHome.exe.sig
... </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv5.tar.gz && tar czf AdGuardHome_linux_armv5.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv6.tar.gz && tar czf AdGuardHome_linux_armv6.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv7.tar.gz && tar czf AdGuardHome_linux_armv7.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_arm64.tar.gz && tar czf AdGuardHome_linux_arm64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_linux_armv5.tar.gz)
$(call tar_repack,AdGuardHome_linux_armv6.tar.gz)
$(call tar_repack,AdGuardHome_linux_armv7.tar.gz)
$(call tar_repack,AdGuardHome_linux_arm64.tar.gz) </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv5.tar.gz && tar czf AdGuardHome_freebsd_armv5.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv6.tar.gz && tar czf AdGuardHome_freebsd_armv6.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv7.tar.gz && tar czf AdGuardHome_freebsd_armv7.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_arm64.tar.gz && tar czf AdGuardHome_freebsd_arm64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_freebsd_armv5.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_armv6.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_armv7.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_arm64.tar.gz)
endef
define zip_repack_windows
$(eval ARC := $(1))
cd $(DIST_DIR) && \
unzip $(ARC) && \
$(GPG_CMD) AdGuardHome/AdGuardHome.exe && \
zip -r $(ARC) AdGuardHome/ && \
rm -rf AdGuardHome
endef
define zip_repack
$(eval ARC := $(1))
cd $(DIST_DIR) && \
unzip $(ARC) && \
$(GPG_CMD) AdGuardHome/AdGuardHome && \
zip -r $(ARC) AdGuardHome/ && \
rm -rf AdGuardHome
endef
define tar_repack
$(eval ARC := $(1))
cd $(DIST_DIR) && \
tar xzf $(ARC) && \
$(GPG_CMD) AdGuardHome/AdGuardHome && \
tar czf $(ARC) AdGuardHome/ && \
rm -rf AdGuardHome </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_linux_amd64.tar.gz && tar czf AdGuardHome_linux_amd64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_386.tar.gz && tar czf AdGuardHome_linux_386.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_linux_amd64.tar.gz)
$(call tar_repack,AdGuardHome_linux_386.tar.gz) </s> add # Windows builds
$(call zip_repack_windows,AdGuardHome_windows_amd64.zip)
$(call zip_repack_windows,AdGuardHome_windows_386.zip)
# MacOS builds
$(call zip_repack,AdGuardHome_darwin_amd64.zip)
$(call zip_repack,AdGuardHome_darwin_386.zip)
</s> add # * release_and_sign -- builds AdGuard Home distros and signs the binary files.
# CHANNEL must be specified (edge, release or beta).
# * sign -- Repacks all release archive files and signs the binary files inside them.
# For signing to work, the public+private key pair for $(GPG_KEY) must be imported:
# gpg --import public.txt
# gpg --import private.txt
# GPG_KEY_PASSPHRASE must contain the GPG key passphrase | https://github.com/AdguardTeam/AdGuardHome/commit/20a0ba5f608c18eff4022279d8ce2791aca97d1b | Makefile |
keep keep keep keep replace replace replace replace keep | <mask> cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_386.tar.gz && tar czf AdGuardHome_freebsd_386.tar.gz AdGuardHome/ && rm -rf AdGuardHome
<mask> cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_amd64.tar.gz && tar czf AdGuardHome_freebsd_amd64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
<mask>
<mask> # FreeBSD, all kinds of ARM
<mask> cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv5.tar.gz && tar czf AdGuardHome_freebsd_armv5.tar.gz AdGuardHome/ && rm -rf AdGuardHome
<mask> cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv6.tar.gz && tar czf AdGuardHome_freebsd_armv6.tar.gz AdGuardHome/ && rm -rf AdGuardHome
<mask> cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_armv7.tar.gz && tar czf AdGuardHome_freebsd_armv7.tar.gz AdGuardHome/ && rm -rf AdGuardHome
<mask> cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_arm64.tar.gz && tar czf AdGuardHome_freebsd_arm64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
<mask> endef
</s> + Makefile: sign release binaries with gpg
.tar.gz and .zip archives now contain one more file - .sig
UNIX:
./AdGuardHome/:
./AdGuardHome/AdGuardHome
./AdGuardHome/AdGuardHome.sig
...
Windows:
./AdGuardHome/:
./AdGuardHome/AdGuardHome.exe
./AdGuardHome/AdGuardHome.exe.sig
... </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_386.tar.gz && tar czf AdGuardHome_freebsd_386.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_freebsd_amd64.tar.gz && tar czf AdGuardHome_freebsd_amd64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_freebsd_386.tar.gz)
$(call tar_repack,AdGuardHome_freebsd_amd64.tar.gz) </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips_softfloat.tar.gz && tar czf AdGuardHome_linux_mips_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mipsle_softfloat.tar.gz && tar czf AdGuardHome_linux_mipsle_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips64_softfloat.tar.gz && tar czf AdGuardHome_linux_mips64_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_mips64le_softfloat.tar.gz && tar czf AdGuardHome_linux_mips64le_softfloat.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_linux_mips_softfloat.tar.gz)
$(call tar_repack,AdGuardHome_linux_mipsle_softfloat.tar.gz)
$(call tar_repack,AdGuardHome_linux_mips64_softfloat.tar.gz)
$(call tar_repack,AdGuardHome_linux_mips64le_softfloat.tar.gz) </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_linux_amd64.tar.gz && tar czf AdGuardHome_linux_amd64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_386.tar.gz && tar czf AdGuardHome_linux_386.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_linux_amd64.tar.gz)
$(call tar_repack,AdGuardHome_linux_386.tar.gz) </s> remove cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv5.tar.gz && tar czf AdGuardHome_linux_armv5.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv6.tar.gz && tar czf AdGuardHome_linux_armv6.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_armv7.tar.gz && tar czf AdGuardHome_linux_armv7.tar.gz AdGuardHome/ && rm -rf AdGuardHome
cd $(DIST_DIR) && tar xzf AdGuardHome_linux_arm64.tar.gz && tar czf AdGuardHome_linux_arm64.tar.gz AdGuardHome/ && rm -rf AdGuardHome
</s> add $(call tar_repack,AdGuardHome_linux_armv5.tar.gz)
$(call tar_repack,AdGuardHome_linux_armv6.tar.gz)
$(call tar_repack,AdGuardHome_linux_armv7.tar.gz)
$(call tar_repack,AdGuardHome_linux_arm64.tar.gz) </s> add # Windows builds
$(call zip_repack_windows,AdGuardHome_windows_amd64.zip)
$(call zip_repack_windows,AdGuardHome_windows_386.zip)
# MacOS builds
$(call zip_repack,AdGuardHome_darwin_amd64.zip)
$(call zip_repack,AdGuardHome_darwin_386.zip)
</s> add # * release_and_sign -- builds AdGuard Home distros and signs the binary files.
# CHANNEL must be specified (edge, release or beta).
# * sign -- Repacks all release archive files and signs the binary files inside them.
# For signing to work, the public+private key pair for $(GPG_KEY) must be imported:
# gpg --import public.txt
# gpg --import private.txt
# GPG_KEY_PASSPHRASE must contain the GPG key passphrase | https://github.com/AdguardTeam/AdGuardHome/commit/20a0ba5f608c18eff4022279d8ce2791aca97d1b | Makefile |
keep add keep keep keep keep keep | <mask> Filters []filter `yaml:"filters"`
<mask> UserRules []string `yaml:"user_rules"`
<mask>
<mask> sync.RWMutex `yaml:"-"`
<mask> }
<mask>
<mask> type coreDnsFilter struct {
</s> Allow querying and changeing i18n language via API. </s> add language: "en" </s> add http.HandleFunc("/control/i18n/change_language", optionalAuth(ensurePOST(handleI18nChangeLanguage)))
http.HandleFunc("/control/i18n/current_language", optionalAuth(ensureGET(handleI18nCurrentLanguage))) </s> add "language": config.Language, | https://github.com/AdguardTeam/AdGuardHome/commit/2139bb9c795ed1d698ab6d80efb9856cfe1afe81 | config.go |
keep add keep keep keep keep | <mask> "upstream_dns": config.CoreDNS.UpstreamDNS,
<mask> "version": VersionString,
<mask> }
<mask>
<mask> jsonVal, err := json.Marshal(data)
<mask> if err != nil {
</s> Allow querying and changeing i18n language via API. </s> add language: "en" </s> add http.HandleFunc("/control/i18n/change_language", optionalAuth(ensurePOST(handleI18nChangeLanguage)))
http.HandleFunc("/control/i18n/current_language", optionalAuth(ensureGET(handleI18nCurrentLanguage))) </s> add Language string `yaml:"language"` // two-letter ISO 639-1 language code | https://github.com/AdguardTeam/AdGuardHome/commit/2139bb9c795ed1d698ab6d80efb9856cfe1afe81 | control.go |
keep keep keep add keep keep keep keep keep | <mask> http.HandleFunc("/control/querylog_enable", optionalAuth(ensurePOST(handleQueryLogEnable)))
<mask> http.HandleFunc("/control/querylog_disable", optionalAuth(ensurePOST(handleQueryLogDisable)))
<mask> http.HandleFunc("/control/set_upstream_dns", optionalAuth(ensurePOST(handleSetUpstreamDNS)))
<mask> http.HandleFunc("/control/test_upstream_dns", optionalAuth(ensurePOST(handleTestUpstreamDNS)))
<mask> http.HandleFunc("/control/stats_top", optionalAuth(ensureGET(corednsplugin.HandleStatsTop)))
<mask> http.HandleFunc("/control/stats", optionalAuth(ensureGET(corednsplugin.HandleStats)))
<mask> http.HandleFunc("/control/stats_history", optionalAuth(ensureGET(corednsplugin.HandleStatsHistory)))
<mask> http.HandleFunc("/control/stats_reset", optionalAuth(ensurePOST(corednsplugin.HandleStatsReset)))
<mask> http.HandleFunc("/control/version.json", optionalAuth(handleGetVersionJSON))
</s> Allow querying and changeing i18n language via API. </s> add language: "en" </s> add "language": config.Language, </s> add Language string `yaml:"language"` // two-letter ISO 639-1 language code | https://github.com/AdguardTeam/AdGuardHome/commit/2139bb9c795ed1d698ab6d80efb9856cfe1afe81 | control.go |
keep keep add keep keep keep keep keep keep | <mask> - 1.1.1.1
<mask> - 1.0.0.1
<mask> version: "v0.1"
<mask> /enable_protection:
<mask> post:
<mask> tags:
<mask> -global
<mask> operationId: enableProtection
<mask> summary: "Enable protection (turns on dnsfilter module in coredns)"
</s> Allow querying and changeing i18n language via API. </s> add http.HandleFunc("/control/i18n/change_language", optionalAuth(ensurePOST(handleI18nChangeLanguage)))
http.HandleFunc("/control/i18n/current_language", optionalAuth(ensureGET(handleI18nCurrentLanguage))) </s> add "language": config.Language, </s> add Language string `yaml:"language"` // two-letter ISO 639-1 language code | https://github.com/AdguardTeam/AdGuardHome/commit/2139bb9c795ed1d698ab6d80efb9856cfe1afe81 | openapi.yaml |
keep keep keep keep replace keep keep keep keep keep | <mask> 'name': 'AdGuard Home - Build and publish release'
<mask> # Make sure to sync any changes with the branch overrides below.
<mask> 'variables':
<mask> 'channel': 'edge'
<mask> 'dockerGo': 'adguard/golang-ubuntu:4.2'
<mask>
<mask> 'stages':
<mask> - 'Make release':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request: all: upd go, tools
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 26cd13146df705ead5e1c39c27e73252c71fa64d
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 13 17:46:24 2022 +0300
all: upd go, tools </s> remove 'dockerGo': 'adguard/golang-ubuntu:4.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:4.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:4.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.3' </s> remove res, ok := hc.MatchRequest(urlfilter.DNSRequest{
</s> add res, ok := hc.MatchRequest(&urlfilter.DNSRequest{ </s> remove res, ok := hc.MatchRequest(urlfilter.DNSRequest{
</s> add res, ok := hc.MatchRequest(&urlfilter.DNSRequest{ </s> remove honnef.co/go/tools v0.2.2 // indirect
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/21a1187ed2d18e316d8af33c5d8bdd19034fea9f | bamboo-specs/release.yaml |
keep keep keep keep replace keep keep keep keep keep | <mask> # Set the default release channel on the release branch to beta, as we may
<mask> # need to build a few of these.
<mask> 'variables':
<mask> 'channel': 'beta'
<mask> 'dockerGo': 'adguard/golang-ubuntu:4.2'
<mask> # release-vX.Y.Z branches are the branches from which the actual final release
<mask> # is built.
<mask> - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
<mask> # Disable integration branches for release branches.
<mask> 'branch-config':
</s> Pull request: all: upd go, tools
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 26cd13146df705ead5e1c39c27e73252c71fa64d
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 13 17:46:24 2022 +0300
all: upd go, tools </s> remove 'dockerGo': 'adguard/golang-ubuntu:4.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:4.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.3' </s> remove honnef.co/go/tools v0.2.2 // indirect
</s> add </s> remove 'dockerGo': 'adguard/golang-ubuntu:4.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.3' </s> remove res, ok := hc.MatchRequest(urlfilter.DNSRequest{
</s> add res, ok := hc.MatchRequest(&urlfilter.DNSRequest{ </s> remove res, ok := hc.MatchRequest(urlfilter.DNSRequest{
</s> add res, ok := hc.MatchRequest(&urlfilter.DNSRequest{ | https://github.com/AdguardTeam/AdGuardHome/commit/21a1187ed2d18e316d8af33c5d8bdd19034fea9f | bamboo-specs/release.yaml |
keep keep keep keep replace | <mask> # Set the default release channel on the final branch to release, as these
<mask> # are the ones that actually get released.
<mask> 'variables':
<mask> 'channel': 'release'
<mask> 'dockerGo': 'adguard/golang-ubuntu:4.2'
</s> Pull request: all: upd go, tools
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 26cd13146df705ead5e1c39c27e73252c71fa64d
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 13 17:46:24 2022 +0300
all: upd go, tools </s> remove 'dockerGo': 'adguard/golang-ubuntu:4.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:4.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:4.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.3' </s> remove res, ok := hc.MatchRequest(urlfilter.DNSRequest{
</s> add res, ok := hc.MatchRequest(&urlfilter.DNSRequest{ </s> remove res, ok := hc.MatchRequest(urlfilter.DNSRequest{
</s> add res, ok := hc.MatchRequest(&urlfilter.DNSRequest{ </s> remove honnef.co/go/tools v0.2.2 // indirect
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/21a1187ed2d18e316d8af33c5d8bdd19034fea9f | bamboo-specs/release.yaml |
keep keep keep keep replace keep keep keep keep keep | <mask> 'project-key': 'AGH'
<mask> 'key': 'AHBRTSPECS'
<mask> 'name': 'AdGuard Home - Build and run tests'
<mask> 'variables':
<mask> 'dockerGo': 'adguard/golang-ubuntu:4.2'
<mask>
<mask> 'stages':
<mask> - 'Tests':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request: all: upd go, tools
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 26cd13146df705ead5e1c39c27e73252c71fa64d
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 13 17:46:24 2022 +0300
all: upd go, tools </s> remove 'dockerGo': 'adguard/golang-ubuntu:4.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:4.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:4.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.3' </s> remove github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43/go.mod h1:+t7E0lkKfbBsebllff1xdTmyJt8lH37niI6kwFk9OTo=
github.com/mdlayher/ethtool v0.0.0-20211028163843-288d040e9d60 h1:tHdB+hQRHU10CfcK0furo6rSNgZ38JT8uPh70c/pFD8=
github.com/mdlayher/ethtool v0.0.0-20211028163843-288d040e9d60/go.mod h1:aYbhishWc4Ai3I2U4Gaa2n3kHWSwzme6EsG/46HRQbE=
github.com/mdlayher/genetlink v1.0.0 h1:OoHN1OdyEIkScEmRgxLEe2M9U8ClMytqA5niynLtfj0=
github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc=
</s> add github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 h1:2oDp6OOhLxQ9JBoUuysVz9UZ9uI6oLUbvAZu0x8o+vE=
github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118/go.mod h1:ZFUnHIVchZ9lJoWoEGUg8Q3M4U8aNNWA3CVSUTkW4og= </s> remove github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 h1:XMAtQHwKjWHIRwg+8Nj/rzUomQY1q6cM3ncA0wP8GU4=
github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
</s> add github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 h1:hl6sK6aFgTLISijk6xIzeqnPzQcsLqqvL6vEfTPinME=
github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA= </s> remove github.com/miekg/dns v1.1.40/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
github.com/miekg/dns v1.1.44/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
github.com/miekg/dns v1.1.48 h1:Ucfr7IIVyMBz4lRE8qmGUuZ4Wt3/ZGu9hmcMT3Uu4tQ=
github.com/miekg/dns v1.1.48/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/21a1187ed2d18e316d8af33c5d8bdd19034fea9f | bamboo-specs/test.yaml |
keep keep keep keep replace keep replace | <mask>
<mask> go 1.17
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.41.4
<mask> github.com/AdguardTeam/golibs v0.10.8
<mask> github.com/AdguardTeam/urlfilter v0.15.2
</s> Pull request: all: upd go, tools
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 26cd13146df705ead5e1c39c27e73252c71fa64d
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 13 17:46:24 2022 +0300
all: upd go, tools </s> remove github.com/AdguardTeam/golibs v0.10.6/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
</s> add </s> remove github.com/AdguardTeam/dnsproxy v0.41.4 h1:zA8BJmWBkSL5kp4b8CblQRgIrLGzJ4IUGQ7tA1255Cw=
github.com/AdguardTeam/dnsproxy v0.41.4/go.mod h1:GCdEbTw683vBqksJIccPSYzBg2yIFbRiDnXltyIinug=
</s> add github.com/AdguardTeam/dnsproxy v0.42.1 h1:RZAtW75cvMX1d9Mibg0CA343V7VWV5PLrXsLhBZfdYc=
github.com/AdguardTeam/dnsproxy v0.42.1/go.mod h1:thHuk3599mgmucsv5J9HR9lBVQHnf4YleE08EbxNrN0= </s> remove github.com/fzipp/gocyclo v0.4.0
</s> add github.com/fzipp/gocyclo v0.5.1 </s> remove github.com/AdguardTeam/urlfilter v0.15.2 h1:LZGgrm4l4Ys9eAqB+UUmZfiC6vHlDlYFhx0WXqo6LtQ=
github.com/AdguardTeam/urlfilter v0.15.2/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI=
</s> add github.com/AdguardTeam/urlfilter v0.16.0 h1:IO29m+ZyQuuOnPLTzHuXj35V1DZOp1Dcryl576P2syg=
github.com/AdguardTeam/urlfilter v0.16.0/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI= </s> remove github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw=
github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
</s> add github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= | https://github.com/AdguardTeam/AdGuardHome/commit/21a1187ed2d18e316d8af33c5d8bdd19034fea9f | go.mod |
keep keep keep replace keep keep replace replace replace replace replace keep | <mask> github.com/digineo/go-ipset/v2 v2.2.1
<mask> github.com/fsnotify/fsnotify v1.5.1
<mask> github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534
<mask> github.com/google/go-cmp v0.5.6
<mask> github.com/google/gopacket v1.1.19
<mask> github.com/google/renameio v1.0.1
<mask> github.com/insomniacslk/dhcp v0.0.0-20211214070828-5297eed8f489
<mask> github.com/kardianos/service v1.2.0
<mask> github.com/lucas-clemente/quic-go v0.25.0
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
<mask> github.com/mdlayher/netlink v1.5.0
<mask> github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b
</s> Pull request: all: upd go, tools
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 26cd13146df705ead5e1c39c27e73252c71fa64d
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 13 17:46:24 2022 +0300
all: upd go, tools </s> remove github.com/AdguardTeam/urlfilter v0.15.2
</s> add github.com/AdguardTeam/urlfilter v0.16.0 </s> remove github.com/mdlayher/netlink v1.2.0/go.mod h1:kwVW1io0AZy9A1E2YYgaD4Cj+C+GPkU6klXCMzIJ9p8=
github.com/mdlayher/netlink v1.2.1/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU=
github.com/mdlayher/netlink v1.2.2-0.20210123213345-5cc92139ae3e/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU=
github.com/mdlayher/netlink v1.3.0/go.mod h1:xK/BssKuwcRXHrtN04UBkwQ6dY9VviGGuriDdoPSWys=
github.com/mdlayher/netlink v1.4.0/go.mod h1:dRJi5IABcZpBD2A3D0Mv/AiX8I9uDEu5oGkAVrekmf8=
github.com/mdlayher/netlink v1.4.1/go.mod h1:e4/KuJ+s8UhfUpO9z00/fDZZmhSrs+oxyqAS9cNgn6Q=
github.com/mdlayher/netlink v1.5.0 h1:r4fa439+SsMarM0rMONU3iSshSV3ArVqJl6H/zjrhh4=
github.com/mdlayher/netlink v1.5.0/go.mod h1:1Kr8BBFxGyUyNmztC9WLOayqYVAd2wsgOZm18nqGuzQ=
</s> add github.com/mdlayher/netlink v1.6.0 h1:rOHX5yl7qnlpiVkFWoqccueppMtXzeziFjWAjLg6sz0=
github.com/mdlayher/netlink v1.6.0/go.mod h1:0o3PlBmGst1xve7wQ7j/hwpNaFaH4qCRyWCdcZk8/vA=
github.com/mdlayher/packet v1.0.0/go.mod h1:eE7/ctqDhoiRhQ44ko5JZU2zxB88g+JH/6jmnjzPjOU= </s> remove github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
</s> add </s> remove github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43/go.mod h1:+t7E0lkKfbBsebllff1xdTmyJt8lH37niI6kwFk9OTo=
github.com/mdlayher/ethtool v0.0.0-20211028163843-288d040e9d60 h1:tHdB+hQRHU10CfcK0furo6rSNgZ38JT8uPh70c/pFD8=
github.com/mdlayher/ethtool v0.0.0-20211028163843-288d040e9d60/go.mod h1:aYbhishWc4Ai3I2U4Gaa2n3kHWSwzme6EsG/46HRQbE=
github.com/mdlayher/genetlink v1.0.0 h1:OoHN1OdyEIkScEmRgxLEe2M9U8ClMytqA5niynLtfj0=
github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc=
</s> add github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 h1:2oDp6OOhLxQ9JBoUuysVz9UZ9uI6oLUbvAZu0x8o+vE=
github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118/go.mod h1:ZFUnHIVchZ9lJoWoEGUg8Q3M4U8aNNWA3CVSUTkW4og= </s> add github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= | https://github.com/AdguardTeam/AdGuardHome/commit/21a1187ed2d18e316d8af33c5d8bdd19034fea9f | go.mod |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> github.com/satori/go.uuid v1.2.0
<mask> github.com/stretchr/testify v1.7.0
<mask> github.com/ti-mo/netfilter v0.4.0
<mask> go.etcd.io/bbolt v1.3.6
<mask> golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
<mask> golang.org/x/net v0.0.0-20220403103023-749bd193bc2b
<mask> golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0
<mask> gopkg.in/yaml.v2 v2.4.0
<mask> howett.net/plist v1.0.0
<mask> )
<mask>
</s> Pull request: all: upd go, tools
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 26cd13146df705ead5e1c39c27e73252c71fa64d
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 13 17:46:24 2022 +0300
all: upd go, tools </s> remove github.com/insomniacslk/dhcp v0.0.0-20211214070828-5297eed8f489
github.com/kardianos/service v1.2.0
github.com/lucas-clemente/quic-go v0.25.0
github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
github.com/mdlayher/netlink v1.5.0
</s> add github.com/insomniacslk/dhcp v0.0.0-20220405050111-12fbdcb11b41
github.com/kardianos/service v1.2.1
github.com/lucas-clemente/quic-go v0.26.0
github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118
github.com/mdlayher/netlink v1.6.0
// TODO(a.garipov): This package is deprecated; find a new one or use
// our own code for that. </s> remove golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M=
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
</s> add golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA=
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= </s> remove golang.org/x/mod v0.5.1 // indirect
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
</s> add golang.org/x/exp/typeparams v0.0.0-20220407100705-7b9b53b0aca4 // indirect
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect </s> remove github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
</s> add </s> remove github.com/BurntSushi/toml v0.4.1 // indirect
</s> add github.com/BurntSushi/toml v1.1.0 // indirect </s> remove golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/21a1187ed2d18e316d8af33c5d8bdd19034fea9f | go.mod |
keep replace keep keep keep replace | <mask> require (
<mask> github.com/BurntSushi/toml v0.4.1 // indirect
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
<mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect
<mask> github.com/ameshkov/dnsstamps v1.0.3 // indirect
<mask> github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect
</s> Pull request: all: upd go, tools
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 26cd13146df705ead5e1c39c27e73252c71fa64d
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 13 17:46:24 2022 +0300
all: upd go, tools </s> remove github.com/BurntSushi/toml v0.4.1 // indirect
</s> add github.com/BurntSushi/toml v1.1.0 // indirect </s> remove github.com/google/go-cmp v0.5.6 // indirect
</s> add github.com/google/go-cmp v0.5.7 // indirect </s> remove github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 // indirect
github.com/mdlayher/socket v0.1.1 // indirect
</s> add github.com/josharian/native v1.0.0 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.1 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect
github.com/mdlayher/socket v0.2.3 // indirect </s> remove golang.org/x/mod v0.5.1 // indirect
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
</s> add golang.org/x/exp/typeparams v0.0.0-20220407100705-7b9b53b0aca4 // indirect
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect </s> remove github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 // indirect
</s> add github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect | https://github.com/AdguardTeam/AdGuardHome/commit/21a1187ed2d18e316d8af33c5d8bdd19034fea9f | go.mod |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> github.com/cheekybits/genny v1.0.0 // indirect
<mask> github.com/davecgh/go-spew v1.1.1 // indirect
<mask> github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
<mask> github.com/google/uuid v1.3.0 // indirect
<mask> github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
<mask> github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect
<mask> github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 // indirect
<mask> github.com/mdlayher/socket v0.1.1 // indirect
<mask> github.com/nxadm/tail v1.4.8 // indirect
<mask> github.com/onsi/ginkgo v1.16.5 // indirect
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
<mask> github.com/pkg/errors v0.9.1 // indirect
<mask> github.com/pmezard/go-difflib v1.0.0 // indirect
</s> Pull request: all: upd go, tools
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 26cd13146df705ead5e1c39c27e73252c71fa64d
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 13 17:46:24 2022 +0300
all: upd go, tools </s> remove github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect
</s> add github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0 // indirect </s> remove github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 // indirect
</s> add github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect </s> remove github.com/BurntSushi/toml v0.4.1 // indirect
</s> add github.com/BurntSushi/toml v1.1.0 // indirect </s> remove github.com/google/go-cmp v0.5.6 // indirect
</s> add github.com/google/go-cmp v0.5.7 // indirect </s> remove github.com/BurntSushi/toml v0.4.1 // indirect
</s> add github.com/BurntSushi/toml v1.1.0 // indirect </s> remove golang.org/x/mod v0.5.1 // indirect
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
</s> add golang.org/x/exp/typeparams v0.0.0-20220407100705-7b9b53b0aca4 // indirect
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect | https://github.com/AdguardTeam/AdGuardHome/commit/21a1187ed2d18e316d8af33c5d8bdd19034fea9f | go.mod |
keep keep replace keep keep keep replace replace | <mask> github.com/pmezard/go-difflib v1.0.0 // indirect
<mask> github.com/stretchr/objx v0.1.1 // indirect
<mask> github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 // indirect
<mask> golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
<mask> golang.org/x/text v0.3.7 // indirect
<mask> golang.org/x/tools v0.1.10 // indirect
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
</s> Pull request: all: upd go, tools
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 26cd13146df705ead5e1c39c27e73252c71fa64d
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 13 17:46:24 2022 +0300
all: upd go, tools </s> remove golang.org/x/mod v0.5.1 // indirect
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
</s> add golang.org/x/exp/typeparams v0.0.0-20220407100705-7b9b53b0aca4 // indirect
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect </s> remove github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 // indirect
github.com/mdlayher/socket v0.1.1 // indirect
</s> add github.com/josharian/native v1.0.0 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.1 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect
github.com/mdlayher/socket v0.2.3 // indirect </s> remove honnef.co/go/tools v0.2.2 // indirect
</s> add </s> remove github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect
</s> add github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0 // indirect </s> remove github.com/BurntSushi/toml v0.4.1 // indirect
</s> add github.com/BurntSushi/toml v1.1.0 // indirect | https://github.com/AdguardTeam/AdGuardHome/commit/21a1187ed2d18e316d8af33c5d8bdd19034fea9f | go.mod |
keep keep keep keep replace keep keep keep keep | <mask> golang.org/x/tools v0.1.10 // indirect
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
<mask> gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
<mask> gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
<mask> honnef.co/go/tools v0.2.2 // indirect
<mask> )
<mask>
<mask> // TODO(a.garipov): Return to the main repo once miekg/dns#1359 is merged.
<mask> replace github.com/miekg/dns => github.com/ainar-g/dns v1.1.49-0.20220411125901-8a162bbc18d8
</s> Pull request: all: upd go, tools
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 26cd13146df705ead5e1c39c27e73252c71fa64d
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 13 17:46:24 2022 +0300
all: upd go, tools </s> remove golang.org/x/tools v0.1.10 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
</s> add golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a // indirect
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect </s> remove github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 // indirect
</s> add github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect </s> remove golang.org/x/mod v0.5.1 // indirect
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
</s> add golang.org/x/exp/typeparams v0.0.0-20220407100705-7b9b53b0aca4 // indirect
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect </s> remove github.com/BurntSushi/toml v0.4.1 // indirect
</s> add github.com/BurntSushi/toml v1.1.0 // indirect </s> remove github.com/BurntSushi/toml v0.4.1 // indirect
</s> add github.com/BurntSushi/toml v1.1.0 // indirect </s> remove github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 // indirect
github.com/mdlayher/socket v0.1.1 // indirect
</s> add github.com/josharian/native v1.0.0 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.1 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect
github.com/mdlayher/socket v0.2.3 // indirect | https://github.com/AdguardTeam/AdGuardHome/commit/21a1187ed2d18e316d8af33c5d8bdd19034fea9f | go.mod |
keep keep keep keep replace replace keep keep keep replace 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.41.4 h1:zA8BJmWBkSL5kp4b8CblQRgIrLGzJ4IUGQ7tA1255Cw=
<mask> github.com/AdguardTeam/dnsproxy v0.41.4/go.mod h1:GCdEbTw683vBqksJIccPSYzBg2yIFbRiDnXltyIinug=
<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.6/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 go, tools
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 26cd13146df705ead5e1c39c27e73252c71fa64d
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 13 17:46:24 2022 +0300
all: upd go, tools </s> remove github.com/AdguardTeam/urlfilter v0.15.2 h1:LZGgrm4l4Ys9eAqB+UUmZfiC6vHlDlYFhx0WXqo6LtQ=
github.com/AdguardTeam/urlfilter v0.15.2/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI=
</s> add github.com/AdguardTeam/urlfilter v0.16.0 h1:IO29m+ZyQuuOnPLTzHuXj35V1DZOp1Dcryl576P2syg=
github.com/AdguardTeam/urlfilter v0.16.0/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI= </s> remove github.com/AdguardTeam/dnsproxy v0.41.4
</s> add github.com/AdguardTeam/dnsproxy v0.42.1 </s> remove github.com/AdguardTeam/urlfilter v0.15.2
</s> add github.com/AdguardTeam/urlfilter v0.16.0 </s> remove golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38=
</s> add </s> add golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= | https://github.com/AdguardTeam/AdGuardHome/commit/21a1187ed2d18e316d8af33c5d8bdd19034fea9f | go.sum |
keep keep replace replace keep replace replace keep keep keep | <mask> github.com/AdguardTeam/golibs v0.10.8/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
<mask> github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
<mask> github.com/AdguardTeam/urlfilter v0.15.2 h1:LZGgrm4l4Ys9eAqB+UUmZfiC6vHlDlYFhx0WXqo6LtQ=
<mask> github.com/AdguardTeam/urlfilter v0.15.2/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI=
<mask> github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
<mask> github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw=
<mask> github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
<mask> github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
<mask> github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
<mask> github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA=
</s> Pull request: all: upd go, tools
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 26cd13146df705ead5e1c39c27e73252c71fa64d
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 13 17:46:24 2022 +0300
all: upd go, tools </s> remove github.com/AdguardTeam/golibs v0.10.6/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
</s> add </s> remove github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw=
</s> add </s> remove github.com/AdguardTeam/urlfilter v0.15.2
</s> add github.com/AdguardTeam/urlfilter v0.16.0 </s> remove github.com/AdguardTeam/dnsproxy v0.41.4
</s> add github.com/AdguardTeam/dnsproxy v0.42.1 </s> add github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= | https://github.com/AdguardTeam/AdGuardHome/commit/21a1187ed2d18e316d8af33c5d8bdd19034fea9f | go.sum |
keep keep keep keep replace keep keep keep keep keep | <mask> github.com/ameshkov/dnsstamps v1.0.1/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
<mask> github.com/ameshkov/dnsstamps v1.0.3 h1:Srzik+J9mivH1alRACTbys2xOxs0lRH9qnTA7Y1OYVo=
<mask> github.com/ameshkov/dnsstamps v1.0.3/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
<mask> github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
<mask> github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 h1:M57m0xQqZIhx7CEJgeLSvRFKEK1RjzRuIXiA3HfYU7g=
<mask> github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA=
<mask> github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
<mask> github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
<mask> github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
<mask> github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
</s> Pull request: all: upd go, tools
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 26cd13146df705ead5e1c39c27e73252c71fa64d
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 13 17:46:24 2022 +0300
all: upd go, tools </s> add github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0 h1:0b2vaepXIfMsG++IsjHiI2p4bxALD1Y2nQKGMR5zDQM=
github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA= </s> remove github.com/cilium/ebpf v0.5.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA=
</s> add </s> remove github.com/BurntSushi/toml v0.4.1 // indirect
</s> add github.com/BurntSushi/toml v1.1.0 // indirect </s> remove github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect
</s> add github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0 // indirect </s> remove github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 h1:lez6TS6aAau+8wXUP3G9I3TGlmPFEq2CTxBaRqY6AGE=
</s> add </s> remove github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 // indirect
github.com/mdlayher/socket v0.1.1 // indirect
</s> add github.com/josharian/native v1.0.0 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.1 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect
github.com/mdlayher/socket v0.2.3 // indirect | https://github.com/AdguardTeam/AdGuardHome/commit/21a1187ed2d18e316d8af33c5d8bdd19034fea9f | go.sum |
keep add keep keep keep keep | <mask> github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
<mask> github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA=
<mask> github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
<mask> github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
<mask> github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
<mask> github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
</s> Pull request: all: upd go, tools
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 26cd13146df705ead5e1c39c27e73252c71fa64d
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 13 17:46:24 2022 +0300
all: upd go, tools </s> remove github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 h1:M57m0xQqZIhx7CEJgeLSvRFKEK1RjzRuIXiA3HfYU7g=
</s> add </s> remove github.com/cilium/ebpf v0.5.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA=
</s> add </s> remove github.com/BurntSushi/toml v0.4.1 // indirect
</s> add github.com/BurntSushi/toml v1.1.0 // indirect </s> remove github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect
</s> add github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0 // indirect </s> remove github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 // indirect
github.com/mdlayher/socket v0.1.1 // indirect
</s> add github.com/josharian/native v1.0.0 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.1 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect
github.com/mdlayher/socket v0.2.3 // indirect </s> remove golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
golang.org/x/net v0.0.0-20220403103023-749bd193bc2b
golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12
</s> add golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
golang.org/x/net v0.0.0-20220412020605-290c469a71a5
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad | https://github.com/AdguardTeam/AdGuardHome/commit/21a1187ed2d18e316d8af33c5d8bdd19034fea9f | go.sum |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.