docstring_tokens
stringlengths 0
76.5k
| code_tokens
stringlengths 75
1.81M
| label_window
sequencelengths 4
2.12k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|
dns_addresses: dnsAddresses, | <mask> const {
<mask> version,
<mask> running,
<mask> dns_port: dnsPort,
<mask> dns_address: dnsAddress,
<mask> querylog_enabled: queryLogEnabled,
<mask> upstream_dns: upstreamDns,
<mask> bootstrap_dns: bootstrapDns,
<mask> all_servers: allServers,
<mask> protection_enabled: protectionEnabled,
</s> + client: added setup guide page and DNS addresses popover
Closes #605 </s> remove dnsAddress,
</s> add dnsAddresses, </s> remove const { dnsVersion, dnsAddress, dnsPort } = props;
</s> add const { dnsVersion, dnsAddresses, dnsPort } = props; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/756c5ac0d3c9b685f95cc755ad098cef74e0c517 | client/src/reducers/index.js |
dnsAddresses, | <mask> isCoreRunning: running,
<mask> processing: false,
<mask> dnsVersion: version,
<mask> dnsPort,
<mask> dnsAddress,
<mask> queryLogEnabled,
<mask> upstreamDns: upstreamDns.join('\n'),
<mask> bootstrapDns: bootstrapDns.join('\n'),
<mask> allServers,
<mask> protectionEnabled,
</s> + client: added setup guide page and DNS addresses popover
Closes #605 </s> remove dns_address: dnsAddress,
</s> add dns_addresses: dnsAddresses, </s> remove dnsVersion: PropTypes.string,
dnsAddress: PropTypes.string,
dnsPort: PropTypes.number,
</s> add dnsVersion: PropTypes.string.isRequired,
dnsAddresses: PropTypes.array.isRequired,
dnsPort: PropTypes.number.isRequired, </s> remove const { dnsVersion, dnsAddress, dnsPort } = props;
</s> add const { dnsVersion, dnsAddresses, dnsPort } = props; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/756c5ac0d3c9b685f95cc755ad098cef74e0c517 | client/src/reducers/index.js |
dnsPort: 53,
dnsAddresses: [],
dnsVersion: '', | <mask> processingProtection: false,
<mask> httpPort: 80,
<mask> });
<mask>
<mask> const queryLogs = handleActions({
<mask> [actions.getLogsRequest]: state => ({ ...state, getLogsProcessing: true }),
<mask> [actions.getLogsFailure]: state => ({ ...state, getLogsProcessing: false }),
<mask> [actions.getLogsSuccess]: (state, { payload }) => {
</s> + client: added setup guide page and DNS addresses popover
Closes #605 </s> remove import { REPOSITORY } from '../../helpers/constants';
</s> add </s> remove import Tabs from '../../components/ui/Tabs';
import Icons from '../../components/ui/Icons';
</s> add import Guide from '../../components/ui/Guide'; </s> remove const { dnsVersion, dnsAddress, dnsPort } = props;
</s> add const { dnsVersion, dnsAddresses, dnsPort } = props; </s> remove <div className="nav-version__text">
<Trans>address</Trans>: <span className="nav-version__value">{dnsAddress}:{dnsPort}</span>
</s> add <div className="nav-version__link">
<div className="popover__trigger popover__trigger--address">
<Trans>dns_addresses</Trans>
</div>
<div className="popover__body popover__body--address">
<div className="popover__list">
{dnsAddresses
.map(ip => <li key={ip}>{getDnsAddress(ip, dnsPort)}</li>)
}
</div>
</div> | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/756c5ac0d3c9b685f95cc755ad098cef74e0c517 | client/src/reducers/index.js |
const {
t,
dashboard,
clients,
addClient,
updateClient,
deleteClient,
toggleClientModal,
} = this.props; | <mask> import Loading from '../../ui/Loading';
<mask>
<mask> class Clients extends Component {
<mask> render() {
<mask> const { dashboard, clients, t } = this.props;
<mask>
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title={t('clients_settings')} />
<mask> {!dashboard.processingTopStats || (!dashboard.processingClients && <Loading />)}
</s> * client: move access settings to DNS settings page </s> remove {!dashboard.processingTopStats || (!dashboard.processingClients && <Loading />)}
</s> add {(dashboard.processingTopStats || dashboard.processingClients) && <Loading />} </s> remove return (
<Fragment>
<PageTitle title={t('dns_settings')} />
<Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
setUpstream={props.setUpstream}
testUpstream={props.testUpstream}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
/>
</Fragment>
);
};
</s> add render() {
const {
t,
dashboard,
settings,
access,
setAccessList,
testUpstream,
setUpstream,
} = this.props;
return (
<Fragment>
<PageTitle title={t('dns_settings')} />
{(dashboard.processing || access.processing) && <Loading />}
{!dashboard.processing && !access.processing && (
<Fragment>
<Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
setUpstream={setUpstream}
testUpstream={testUpstream}
/>
<Access access={access} setAccessList={setAccessList} />
</Fragment>
)}
</Fragment>
);
}
} </s> remove const Dns = (props) => {
const { dashboard, settings, t } = props;
</s> add class Dns extends Component {
componentDidMount() {
this.props.getAccessList();
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/757bb7285a0afd804d5e26eee29aeecc09d8662e | client/src/components/Settings/Clients/index.js |
{(dashboard.processingTopStats || dashboard.processingClients) && <Loading />} | <mask>
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title={t('clients_settings')} />
<mask> {!dashboard.processingTopStats || (!dashboard.processingClients && <Loading />)}
<mask> {!dashboard.processingTopStats && !dashboard.processingClients && (
<mask> <Fragment>
<mask> <ClientsTable
<mask> clients={dashboard.clients}
<mask> topStats={dashboard.topStats}
</s> * client: move access settings to DNS settings page </s> remove const { dashboard, clients, t } = this.props;
</s> add const {
t,
dashboard,
clients,
addClient,
updateClient,
deleteClient,
toggleClientModal,
} = this.props; </s> remove return (
<Fragment>
<PageTitle title={t('dns_settings')} />
<Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
setUpstream={props.setUpstream}
testUpstream={props.testUpstream}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
/>
</Fragment>
);
};
</s> add render() {
const {
t,
dashboard,
settings,
access,
setAccessList,
testUpstream,
setUpstream,
} = this.props;
return (
<Fragment>
<PageTitle title={t('dns_settings')} />
{(dashboard.processing || access.processing) && <Loading />}
{!dashboard.processing && !access.processing && (
<Fragment>
<Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
setUpstream={setUpstream}
testUpstream={testUpstream}
/>
<Access access={access} setAccessList={setAccessList} />
</Fragment>
)}
</Fragment>
);
}
} </s> remove const Dns = (props) => {
const { dashboard, settings, t } = props;
</s> add class Dns extends Component {
componentDidMount() {
this.props.getAccessList();
} </s> remove addClient={this.props.addClient}
updateClient={this.props.updateClient}
deleteClient={this.props.deleteClient}
toggleClientModal={this.props.toggleClientModal}
</s> add addClient={addClient}
updateClient={updateClient}
deleteClient={deleteClient}
toggleClientModal={toggleClientModal} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/757bb7285a0afd804d5e26eee29aeecc09d8662e | client/src/components/Settings/Clients/index.js |
addClient={addClient}
updateClient={updateClient}
deleteClient={deleteClient}
toggleClientModal={toggleClientModal} | <mask> topStats={dashboard.topStats}
<mask> isModalOpen={clients.isModalOpen}
<mask> modalClientName={clients.modalClientName}
<mask> modalType={clients.modalType}
<mask> addClient={this.props.addClient}
<mask> updateClient={this.props.updateClient}
<mask> deleteClient={this.props.deleteClient}
<mask> toggleClientModal={this.props.toggleClientModal}
<mask> processingAdding={clients.processingAdding}
<mask> processingDeleting={clients.processingDeleting}
<mask> processingUpdating={clients.processingUpdating}
<mask> />
<mask> <AutoClients
</s> * client: move access settings to DNS settings page </s> remove {!dashboard.processingTopStats || (!dashboard.processingClients && <Loading />)}
</s> add {(dashboard.processingTopStats || dashboard.processingClients) && <Loading />} </s> remove return (
<Fragment>
<PageTitle title={t('dns_settings')} />
<Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
setUpstream={props.setUpstream}
testUpstream={props.testUpstream}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
/>
</Fragment>
);
};
</s> add render() {
const {
t,
dashboard,
settings,
access,
setAccessList,
testUpstream,
setUpstream,
} = this.props;
return (
<Fragment>
<PageTitle title={t('dns_settings')} />
{(dashboard.processing || access.processing) && <Loading />}
{!dashboard.processing && !access.processing && (
<Fragment>
<Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
setUpstream={setUpstream}
testUpstream={testUpstream}
/>
<Access access={access} setAccessList={setAccessList} />
</Fragment>
)}
</Fragment>
);
}
} </s> remove const Dns = (props) => {
const { dashboard, settings, t } = props;
</s> add class Dns extends Component {
componentDidMount() {
this.props.getAccessList();
} </s> remove const { dashboard, clients, t } = this.props;
</s> add const {
t,
dashboard,
clients,
addClient,
updateClient,
deleteClient,
toggleClientModal,
} = this.props; </s> remove clients: PropTypes.array.isRequired,
topStats: PropTypes.object.isRequired,
</s> add clients: PropTypes.object.isRequired, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/757bb7285a0afd804d5e26eee29aeecc09d8662e | client/src/components/Settings/Clients/index.js |
clients: PropTypes.object.isRequired, | <mask>
<mask> Clients.propTypes = {
<mask> t: PropTypes.func.isRequired,
<mask> dashboard: PropTypes.object.isRequired,
<mask> clients: PropTypes.array.isRequired,
<mask> topStats: PropTypes.object.isRequired,
<mask> toggleClientModal: PropTypes.func.isRequired,
<mask> deleteClient: PropTypes.func.isRequired,
<mask> addClient: PropTypes.func.isRequired,
<mask> updateClient: PropTypes.func.isRequired,
<mask> isModalOpen: PropTypes.bool.isRequired,
</s> * client: move access settings to DNS settings page </s> remove isModalOpen: PropTypes.bool.isRequired,
modalType: PropTypes.string.isRequired,
modalClientName: PropTypes.string.isRequired,
processingAdding: PropTypes.bool.isRequired,
processingDeleting: PropTypes.bool.isRequired,
processingUpdating: PropTypes.bool.isRequired,
</s> add topStats: PropTypes.object, </s> remove return (
<Fragment>
<PageTitle title={t('dns_settings')} />
<Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
setUpstream={props.setUpstream}
testUpstream={props.testUpstream}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
/>
</Fragment>
);
};
</s> add render() {
const {
t,
dashboard,
settings,
access,
setAccessList,
testUpstream,
setUpstream,
} = this.props;
return (
<Fragment>
<PageTitle title={t('dns_settings')} />
{(dashboard.processing || access.processing) && <Loading />}
{!dashboard.processing && !access.processing && (
<Fragment>
<Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
setUpstream={setUpstream}
testUpstream={testUpstream}
/>
<Access access={access} setAccessList={setAccessList} />
</Fragment>
)}
</Fragment>
);
}
} </s> remove const { dashboard, settings } = state;
</s> add const { dashboard, settings, access } = state; </s> remove const {
settings,
dashboard,
dhcp,
encryption,
clients,
access,
} = state;
</s> add const { settings } = state; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/757bb7285a0afd804d5e26eee29aeecc09d8662e | client/src/components/Settings/Clients/index.js |
topStats: PropTypes.object, | <mask> toggleClientModal: PropTypes.func.isRequired,
<mask> deleteClient: PropTypes.func.isRequired,
<mask> addClient: PropTypes.func.isRequired,
<mask> updateClient: PropTypes.func.isRequired,
<mask> isModalOpen: PropTypes.bool.isRequired,
<mask> modalType: PropTypes.string.isRequired,
<mask> modalClientName: PropTypes.string.isRequired,
<mask> processingAdding: PropTypes.bool.isRequired,
<mask> processingDeleting: PropTypes.bool.isRequired,
<mask> processingUpdating: PropTypes.bool.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Clients);
</s> * client: move access settings to DNS settings page </s> remove clients: PropTypes.array.isRequired,
topStats: PropTypes.object.isRequired,
</s> add clients: PropTypes.object.isRequired, </s> remove toggleDhcp,
getDhcpStatus,
getDhcpInterfaces,
setDhcpConfig,
findActiveDhcp,
getTlsStatus,
setTlsConfig,
validateTlsConfig,
addClient,
updateClient,
deleteClient,
toggleClientModal,
addStaticLease,
removeStaticLease,
toggleLeaseModal,
getAccessList,
setAccessList,
</s> add </s> remove return (
<Fragment>
<PageTitle title={t('dns_settings')} />
<Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
setUpstream={props.setUpstream}
testUpstream={props.testUpstream}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
/>
</Fragment>
);
};
</s> add render() {
const {
t,
dashboard,
settings,
access,
setAccessList,
testUpstream,
setUpstream,
} = this.props;
return (
<Fragment>
<PageTitle title={t('dns_settings')} />
{(dashboard.processing || access.processing) && <Loading />}
{!dashboard.processing && !access.processing && (
<Fragment>
<Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
setUpstream={setUpstream}
testUpstream={testUpstream}
/>
<Access access={access} setAccessList={setAccessList} />
</Fragment>
)}
</Fragment>
);
}
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/757bb7285a0afd804d5e26eee29aeecc09d8662e | client/src/components/Settings/Clients/index.js |
import React, { Component, Fragment } from 'react'; | <mask> import React, { Fragment } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { withNamespaces } from 'react-i18next';
<mask>
<mask> import Upstream from './Upstream';
<mask> import PageTitle from '../../ui/PageTitle';
</s> * client: move access settings to DNS settings page </s> remove const Dns = (props) => {
const { dashboard, settings, t } = props;
</s> add class Dns extends Component {
componentDidMount() {
this.props.getAccessList();
} </s> remove import {
initSettings,
toggleSetting,
handleUpstreamChange,
setUpstream,
testUpstream,
addErrorToast,
toggleDhcp,
getDhcpStatus,
getDhcpInterfaces,
setDhcpConfig,
findActiveDhcp,
addStaticLease,
removeStaticLease,
toggleLeaseModal,
} from '../actions';
import {
getTlsStatus,
setTlsConfig,
validateTlsConfig,
} from '../actions/encryption';
import {
addClient,
updateClient,
deleteClient,
toggleClientModal,
} from '../actions/clients';
import {
getAccessList,
setAccessList,
} from '../actions/access';
</s> add import { initSettings, toggleSetting, addErrorToast } from '../actions'; | [
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/757bb7285a0afd804d5e26eee29aeecc09d8662e | client/src/components/Settings/Dns/index.js |
import Access from './Access'; | <mask> import PropTypes from 'prop-types';
<mask> import { withNamespaces } from 'react-i18next';
<mask>
<mask> import Upstream from './Upstream';
<mask> import PageTitle from '../../ui/PageTitle';
<mask> import Loading from '../../ui/Loading';
<mask>
<mask> class Dns extends Component {
<mask> componentDidMount() {
</s> * client: move access settings to DNS settings page </s> remove import React, { Fragment } from 'react';
</s> add import React, { Component, Fragment } from 'react'; </s> remove const Dns = (props) => {
const { dashboard, settings, t } = props;
</s> add class Dns extends Component {
componentDidMount() {
this.props.getAccessList();
} </s> remove const { dashboard, clients, t } = this.props;
</s> add const {
t,
dashboard,
clients,
addClient,
updateClient,
deleteClient,
toggleClientModal,
} = this.props; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/757bb7285a0afd804d5e26eee29aeecc09d8662e | client/src/components/Settings/Dns/index.js |
import Loading from '../../ui/Loading'; | <mask> import Upstream from './Upstream';
<mask> import Access from './Access';
<mask> import PageTitle from '../../ui/PageTitle';
<mask>
<mask> class Dns extends Component {
<mask> componentDidMount() {
<mask> this.props.getAccessList();
</s> * client: move access settings to DNS settings page </s> remove const Dns = (props) => {
const { dashboard, settings, t } = props;
</s> add class Dns extends Component {
componentDidMount() {
this.props.getAccessList();
} </s> remove import React, { Fragment } from 'react';
</s> add import React, { Component, Fragment } from 'react'; </s> remove const { dashboard, clients, t } = this.props;
</s> add const {
t,
dashboard,
clients,
addClient,
updateClient,
deleteClient,
toggleClientModal,
} = this.props; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/757bb7285a0afd804d5e26eee29aeecc09d8662e | client/src/components/Settings/Dns/index.js |
class Dns extends Component {
componentDidMount() {
this.props.getAccessList();
} | <mask>
<mask> import Upstream from './Upstream';
<mask> import PageTitle from '../../ui/PageTitle';
<mask>
<mask> const Dns = (props) => {
<mask> const { dashboard, settings, t } = props;
<mask>
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title={t('dns_settings')} />
<mask> <Upstream
</s> * client: move access settings to DNS settings page </s> remove return (
<Fragment>
<PageTitle title={t('dns_settings')} />
<Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
setUpstream={props.setUpstream}
testUpstream={props.testUpstream}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
/>
</Fragment>
);
};
</s> add render() {
const {
t,
dashboard,
settings,
access,
setAccessList,
testUpstream,
setUpstream,
} = this.props;
return (
<Fragment>
<PageTitle title={t('dns_settings')} />
{(dashboard.processing || access.processing) && <Loading />}
{!dashboard.processing && !access.processing && (
<Fragment>
<Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
setUpstream={setUpstream}
testUpstream={testUpstream}
/>
<Access access={access} setAccessList={setAccessList} />
</Fragment>
)}
</Fragment>
);
}
} </s> remove const { dashboard, clients, t } = this.props;
</s> add const {
t,
dashboard,
clients,
addClient,
updateClient,
deleteClient,
toggleClientModal,
} = this.props; </s> remove const { dashboard, settings } = state;
</s> add const { dashboard, settings, access } = state; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/757bb7285a0afd804d5e26eee29aeecc09d8662e | client/src/components/Settings/Dns/index.js |
render() {
const {
t,
dashboard,
settings,
access,
setAccessList,
testUpstream,
setUpstream,
} = this.props;
return (
<Fragment>
<PageTitle title={t('dns_settings')} />
{(dashboard.processing || access.processing) && <Loading />}
{!dashboard.processing && !access.processing && (
<Fragment>
<Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
setUpstream={setUpstream}
testUpstream={testUpstream}
/>
<Access access={access} setAccessList={setAccessList} />
</Fragment>
)}
</Fragment>
);
}
} | <mask>
<mask> const Dns = (props) => {
<mask> const { dashboard, settings, t } = props;
<mask>
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title={t('dns_settings')} />
<mask> <Upstream
<mask> upstreamDns={dashboard.upstreamDns}
<mask> bootstrapDns={dashboard.bootstrapDns}
<mask> allServers={dashboard.allServers}
<mask> setUpstream={props.setUpstream}
<mask> testUpstream={props.testUpstream}
<mask> processingTestUpstream={settings.processingTestUpstream}
<mask> processingSetUpstream={settings.processingSetUpstream}
<mask> />
<mask> </Fragment>
<mask> );
<mask> };
<mask>
<mask> Dns.propTypes = {
<mask> dashboard: PropTypes.object.isRequired,
<mask> settings: PropTypes.object.isRequired,
<mask> setUpstream: PropTypes.func.isRequired,
</s> * client: move access settings to DNS settings page </s> remove const Dns = (props) => {
const { dashboard, settings, t } = props;
</s> add class Dns extends Component {
componentDidMount() {
this.props.getAccessList();
} </s> remove clients: PropTypes.array.isRequired,
topStats: PropTypes.object.isRequired,
</s> add clients: PropTypes.object.isRequired, </s> remove const { dashboard, clients, t } = this.props;
</s> add const {
t,
dashboard,
clients,
addClient,
updateClient,
deleteClient,
toggleClientModal,
} = this.props; </s> remove const { dashboard, settings } = state;
</s> add const { dashboard, settings, access } = state; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/757bb7285a0afd804d5e26eee29aeecc09d8662e | client/src/components/Settings/Dns/index.js |
getAccessList: PropTypes.func.isRequired,
setAccessList: PropTypes.func.isRequired,
access: PropTypes.object.isRequired, | <mask> setUpstream: PropTypes.func.isRequired,
<mask> testUpstream: PropTypes.func.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Dns);
</s> * client: move access settings to DNS settings page </s> remove isModalOpen: PropTypes.bool.isRequired,
modalType: PropTypes.string.isRequired,
modalClientName: PropTypes.string.isRequired,
processingAdding: PropTypes.bool.isRequired,
processingDeleting: PropTypes.bool.isRequired,
processingUpdating: PropTypes.bool.isRequired,
</s> add topStats: PropTypes.object, </s> remove clients: PropTypes.array.isRequired,
topStats: PropTypes.object.isRequired,
</s> add clients: PropTypes.object.isRequired, </s> remove return (
<Fragment>
<PageTitle title={t('dns_settings')} />
<Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
setUpstream={props.setUpstream}
testUpstream={props.testUpstream}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
/>
</Fragment>
);
};
</s> add render() {
const {
t,
dashboard,
settings,
access,
setAccessList,
testUpstream,
setUpstream,
} = this.props;
return (
<Fragment>
<PageTitle title={t('dns_settings')} />
{(dashboard.processing || access.processing) && <Loading />}
{!dashboard.processing && !access.processing && (
<Fragment>
<Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
setUpstream={setUpstream}
testUpstream={testUpstream}
/>
<Access access={access} setAccessList={setAccessList} />
</Fragment>
)}
</Fragment>
);
}
} </s> remove toggleDhcp,
getDhcpStatus,
getDhcpInterfaces,
setDhcpConfig,
findActiveDhcp,
getTlsStatus,
setTlsConfig,
validateTlsConfig,
addClient,
updateClient,
deleteClient,
toggleClientModal,
addStaticLease,
removeStaticLease,
toggleLeaseModal,
getAccessList,
setAccessList,
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/757bb7285a0afd804d5e26eee29aeecc09d8662e | client/src/components/Settings/Dns/index.js |
import { getAccessList, setAccessList } from '../actions/access'; | <mask> import { connect } from 'react-redux';
<mask> import { handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions';
<mask> import Dns from '../components/Settings/Dns';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const { dashboard, settings, access } = state;
</s> * client: move access settings to DNS settings page </s> remove const { dashboard, settings } = state;
</s> add const { dashboard, settings, access } = state; </s> remove import {
initSettings,
toggleSetting,
handleUpstreamChange,
setUpstream,
testUpstream,
addErrorToast,
toggleDhcp,
getDhcpStatus,
getDhcpInterfaces,
setDhcpConfig,
findActiveDhcp,
addStaticLease,
removeStaticLease,
toggleLeaseModal,
} from '../actions';
import {
getTlsStatus,
setTlsConfig,
validateTlsConfig,
} from '../actions/encryption';
import {
addClient,
updateClient,
deleteClient,
toggleClientModal,
} from '../actions/clients';
import {
getAccessList,
setAccessList,
} from '../actions/access';
</s> add import { initSettings, toggleSetting, addErrorToast } from '../actions'; </s> remove const {
settings,
dashboard,
dhcp,
encryption,
clients,
access,
} = state;
</s> add const { settings } = state; </s> remove const Dns = (props) => {
const { dashboard, settings, t } = props;
</s> add class Dns extends Component {
componentDidMount() {
this.props.getAccessList();
} </s> remove dashboard,
dhcp,
encryption,
clients,
access,
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/757bb7285a0afd804d5e26eee29aeecc09d8662e | client/src/containers/Dns.js |
const { dashboard, settings, access } = state; | <mask> import { handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions';
<mask> import Dns from '../components/Settings/Dns';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const { dashboard, settings } = state;
<mask> const props = {
<mask> dashboard,
<mask> settings,
<mask> };
<mask> return props;
</s> * client: move access settings to DNS settings page </s> remove const {
settings,
dashboard,
dhcp,
encryption,
clients,
access,
} = state;
</s> add const { settings } = state; </s> remove import {
initSettings,
toggleSetting,
handleUpstreamChange,
setUpstream,
testUpstream,
addErrorToast,
toggleDhcp,
getDhcpStatus,
getDhcpInterfaces,
setDhcpConfig,
findActiveDhcp,
addStaticLease,
removeStaticLease,
toggleLeaseModal,
} from '../actions';
import {
getTlsStatus,
setTlsConfig,
validateTlsConfig,
} from '../actions/encryption';
import {
addClient,
updateClient,
deleteClient,
toggleClientModal,
} from '../actions/clients';
import {
getAccessList,
setAccessList,
} from '../actions/access';
</s> add import { initSettings, toggleSetting, addErrorToast } from '../actions'; </s> remove dashboard,
dhcp,
encryption,
clients,
access,
</s> add </s> remove const Dns = (props) => {
const { dashboard, settings, t } = props;
</s> add class Dns extends Component {
componentDidMount() {
this.props.getAccessList();
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/757bb7285a0afd804d5e26eee29aeecc09d8662e | client/src/containers/Dns.js |
access, | <mask> dashboard,
<mask> settings,
<mask> };
<mask> return props;
<mask> };
<mask>
<mask> const mapDispatchToProps = {
<mask> handleUpstreamChange,
</s> * client: move access settings to DNS settings page </s> remove dashboard,
dhcp,
encryption,
clients,
access,
</s> add </s> remove const { dashboard, settings } = state;
</s> add const { dashboard, settings, access } = state; </s> remove handleUpstreamChange,
setUpstream,
testUpstream,
</s> add </s> remove const Dns = (props) => {
const { dashboard, settings, t } = props;
</s> add class Dns extends Component {
componentDidMount() {
this.props.getAccessList();
} </s> remove return (
<Fragment>
<PageTitle title={t('dns_settings')} />
<Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
setUpstream={props.setUpstream}
testUpstream={props.testUpstream}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
/>
</Fragment>
);
};
</s> add render() {
const {
t,
dashboard,
settings,
access,
setAccessList,
testUpstream,
setUpstream,
} = this.props;
return (
<Fragment>
<PageTitle title={t('dns_settings')} />
{(dashboard.processing || access.processing) && <Loading />}
{!dashboard.processing && !access.processing && (
<Fragment>
<Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
setUpstream={setUpstream}
testUpstream={testUpstream}
/>
<Access access={access} setAccessList={setAccessList} />
</Fragment>
)}
</Fragment>
);
}
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/757bb7285a0afd804d5e26eee29aeecc09d8662e | client/src/containers/Dns.js |
getAccessList,
setAccessList, | <mask> setUpstream,
<mask> testUpstream,
<mask> addErrorToast,
<mask> };
<mask>
<mask> export default connect(
<mask> mapStateToProps,
</s> * client: move access settings to DNS settings page </s> remove toggleDhcp,
getDhcpStatus,
getDhcpInterfaces,
setDhcpConfig,
findActiveDhcp,
getTlsStatus,
setTlsConfig,
validateTlsConfig,
addClient,
updateClient,
deleteClient,
toggleClientModal,
addStaticLease,
removeStaticLease,
toggleLeaseModal,
getAccessList,
setAccessList,
</s> add </s> remove handleUpstreamChange,
setUpstream,
testUpstream,
</s> add </s> remove isModalOpen: PropTypes.bool.isRequired,
modalType: PropTypes.string.isRequired,
modalClientName: PropTypes.string.isRequired,
processingAdding: PropTypes.bool.isRequired,
processingDeleting: PropTypes.bool.isRequired,
processingUpdating: PropTypes.bool.isRequired,
</s> add topStats: PropTypes.object, </s> remove import {
initSettings,
toggleSetting,
handleUpstreamChange,
setUpstream,
testUpstream,
addErrorToast,
toggleDhcp,
getDhcpStatus,
getDhcpInterfaces,
setDhcpConfig,
findActiveDhcp,
addStaticLease,
removeStaticLease,
toggleLeaseModal,
} from '../actions';
import {
getTlsStatus,
setTlsConfig,
validateTlsConfig,
} from '../actions/encryption';
import {
addClient,
updateClient,
deleteClient,
toggleClientModal,
} from '../actions/clients';
import {
getAccessList,
setAccessList,
} from '../actions/access';
</s> add import { initSettings, toggleSetting, addErrorToast } from '../actions'; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/757bb7285a0afd804d5e26eee29aeecc09d8662e | client/src/containers/Dns.js |
import { initSettings, toggleSetting, addErrorToast } from '../actions'; | <mask> import { connect } from 'react-redux';
<mask> import {
<mask> initSettings,
<mask> toggleSetting,
<mask> handleUpstreamChange,
<mask> setUpstream,
<mask> testUpstream,
<mask> addErrorToast,
<mask> toggleDhcp,
<mask> getDhcpStatus,
<mask> getDhcpInterfaces,
<mask> setDhcpConfig,
<mask> findActiveDhcp,
<mask> addStaticLease,
<mask> removeStaticLease,
<mask> toggleLeaseModal,
<mask> } from '../actions';
<mask> import {
<mask> getTlsStatus,
<mask> setTlsConfig,
<mask> validateTlsConfig,
<mask> } from '../actions/encryption';
<mask> import {
<mask> addClient,
<mask> updateClient,
<mask> deleteClient,
<mask> toggleClientModal,
<mask> } from '../actions/clients';
<mask> import {
<mask> getAccessList,
<mask> setAccessList,
<mask> } from '../actions/access';
<mask> import Settings from '../components/Settings';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const {
<mask> settings,
</s> * client: move access settings to DNS settings page </s> remove toggleDhcp,
getDhcpStatus,
getDhcpInterfaces,
setDhcpConfig,
findActiveDhcp,
getTlsStatus,
setTlsConfig,
validateTlsConfig,
addClient,
updateClient,
deleteClient,
toggleClientModal,
addStaticLease,
removeStaticLease,
toggleLeaseModal,
getAccessList,
setAccessList,
</s> add </s> remove handleUpstreamChange,
setUpstream,
testUpstream,
</s> add </s> remove const {
settings,
dashboard,
dhcp,
encryption,
clients,
access,
} = state;
</s> add const { settings } = state; </s> remove const { dashboard, settings } = state;
</s> add const { dashboard, settings, access } = state; | [
"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",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/757bb7285a0afd804d5e26eee29aeecc09d8662e | client/src/containers/Settings.js |
const { settings } = state; | <mask> } from '../actions/access';
<mask> import Settings from '../components/Settings';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const {
<mask> settings,
<mask> dashboard,
<mask> dhcp,
<mask> encryption,
<mask> clients,
<mask> access,
<mask> } = state;
<mask> const props = {
<mask> settings,
<mask> dashboard,
<mask> dhcp,
<mask> encryption,
</s> * client: move access settings to DNS settings page </s> remove dashboard,
dhcp,
encryption,
clients,
access,
</s> add </s> remove const { dashboard, settings } = state;
</s> add const { dashboard, settings, access } = state; </s> remove import {
initSettings,
toggleSetting,
handleUpstreamChange,
setUpstream,
testUpstream,
addErrorToast,
toggleDhcp,
getDhcpStatus,
getDhcpInterfaces,
setDhcpConfig,
findActiveDhcp,
addStaticLease,
removeStaticLease,
toggleLeaseModal,
} from '../actions';
import {
getTlsStatus,
setTlsConfig,
validateTlsConfig,
} from '../actions/encryption';
import {
addClient,
updateClient,
deleteClient,
toggleClientModal,
} from '../actions/clients';
import {
getAccessList,
setAccessList,
} from '../actions/access';
</s> add import { initSettings, toggleSetting, addErrorToast } from '../actions'; </s> remove const { dashboard, clients, t } = this.props;
</s> add const {
t,
dashboard,
clients,
addClient,
updateClient,
deleteClient,
toggleClientModal,
} = this.props; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/757bb7285a0afd804d5e26eee29aeecc09d8662e | client/src/containers/Settings.js |
<mask> access,
<mask> } = state;
<mask> const props = {
<mask> settings,
<mask> dashboard,
<mask> dhcp,
<mask> encryption,
<mask> clients,
<mask> access,
<mask> };
<mask> return props;
<mask> };
<mask>
<mask> const mapDispatchToProps = {
</s> * client: move access settings to DNS settings page </s> remove const {
settings,
dashboard,
dhcp,
encryption,
clients,
access,
} = state;
</s> add const { settings } = state; </s> remove const { dashboard, settings } = state;
</s> add const { dashboard, settings, access } = state; </s> remove return (
<Fragment>
<PageTitle title={t('dns_settings')} />
<Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
setUpstream={props.setUpstream}
testUpstream={props.testUpstream}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
/>
</Fragment>
);
};
</s> add render() {
const {
t,
dashboard,
settings,
access,
setAccessList,
testUpstream,
setUpstream,
} = this.props;
return (
<Fragment>
<PageTitle title={t('dns_settings')} />
{(dashboard.processing || access.processing) && <Loading />}
{!dashboard.processing && !access.processing && (
<Fragment>
<Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
setUpstream={setUpstream}
testUpstream={testUpstream}
/>
<Access access={access} setAccessList={setAccessList} />
</Fragment>
)}
</Fragment>
);
}
} </s> remove const { dashboard, clients, t } = this.props;
</s> add const {
t,
dashboard,
clients,
addClient,
updateClient,
deleteClient,
toggleClientModal,
} = this.props; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/757bb7285a0afd804d5e26eee29aeecc09d8662e | client/src/containers/Settings.js |
|
<mask>
<mask> const mapDispatchToProps = {
<mask> initSettings,
<mask> toggleSetting,
<mask> handleUpstreamChange,
<mask> setUpstream,
<mask> testUpstream,
<mask> addErrorToast,
<mask> toggleDhcp,
<mask> getDhcpStatus,
<mask> getDhcpInterfaces,
<mask> setDhcpConfig,
</s> * client: move access settings to DNS settings page </s> remove import {
initSettings,
toggleSetting,
handleUpstreamChange,
setUpstream,
testUpstream,
addErrorToast,
toggleDhcp,
getDhcpStatus,
getDhcpInterfaces,
setDhcpConfig,
findActiveDhcp,
addStaticLease,
removeStaticLease,
toggleLeaseModal,
} from '../actions';
import {
getTlsStatus,
setTlsConfig,
validateTlsConfig,
} from '../actions/encryption';
import {
addClient,
updateClient,
deleteClient,
toggleClientModal,
} from '../actions/clients';
import {
getAccessList,
setAccessList,
} from '../actions/access';
</s> add import { initSettings, toggleSetting, addErrorToast } from '../actions'; </s> remove toggleDhcp,
getDhcpStatus,
getDhcpInterfaces,
setDhcpConfig,
findActiveDhcp,
getTlsStatus,
setTlsConfig,
validateTlsConfig,
addClient,
updateClient,
deleteClient,
toggleClientModal,
addStaticLease,
removeStaticLease,
toggleLeaseModal,
getAccessList,
setAccessList,
</s> add </s> remove const { dashboard, settings } = state;
</s> add const { dashboard, settings, access } = state; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/757bb7285a0afd804d5e26eee29aeecc09d8662e | client/src/containers/Settings.js |
|
<mask> handleUpstreamChange,
<mask> setUpstream,
<mask> testUpstream,
<mask> addErrorToast,
<mask> toggleDhcp,
<mask> getDhcpStatus,
<mask> getDhcpInterfaces,
<mask> setDhcpConfig,
<mask> findActiveDhcp,
<mask> getTlsStatus,
<mask> setTlsConfig,
<mask> validateTlsConfig,
<mask> addClient,
<mask> updateClient,
<mask> deleteClient,
<mask> toggleClientModal,
<mask> addStaticLease,
<mask> removeStaticLease,
<mask> toggleLeaseModal,
<mask> getAccessList,
<mask> setAccessList,
<mask> };
<mask>
<mask> export default connect(
<mask> mapStateToProps,
<mask> mapDispatchToProps,
</s> * client: move access settings to DNS settings page </s> remove import {
initSettings,
toggleSetting,
handleUpstreamChange,
setUpstream,
testUpstream,
addErrorToast,
toggleDhcp,
getDhcpStatus,
getDhcpInterfaces,
setDhcpConfig,
findActiveDhcp,
addStaticLease,
removeStaticLease,
toggleLeaseModal,
} from '../actions';
import {
getTlsStatus,
setTlsConfig,
validateTlsConfig,
} from '../actions/encryption';
import {
addClient,
updateClient,
deleteClient,
toggleClientModal,
} from '../actions/clients';
import {
getAccessList,
setAccessList,
} from '../actions/access';
</s> add import { initSettings, toggleSetting, addErrorToast } from '../actions'; </s> remove handleUpstreamChange,
setUpstream,
testUpstream,
</s> add </s> remove const { dashboard, clients, t } = this.props;
</s> add const {
t,
dashboard,
clients,
addClient,
updateClient,
deleteClient,
toggleClientModal,
} = this.props; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/757bb7285a0afd804d5e26eee29aeecc09d8662e | client/src/containers/Settings.js |
|
processing: false, | <mask> allowed_clients: allowed_clients.join('\n'),
<mask> disallowed_clients: disallowed_clients.join('\n'),
<mask> blocked_hosts: blocked_hosts.join('\n'),
<mask> };
<mask> return newState;
<mask> },
<mask>
<mask> [actions.setAccessListRequest]: state => ({ ...state, processingSet: true }),
<mask> [actions.setAccessListFailure]: state => ({ ...state, processingSet: false }),
</s> * client: move access settings to DNS settings page </s> remove const { dashboard, settings } = state;
</s> add const { dashboard, settings, access } = state; </s> remove const Dns = (props) => {
const { dashboard, settings, t } = props;
</s> add class Dns extends Component {
componentDidMount() {
this.props.getAccessList();
} </s> remove return (
<Fragment>
<PageTitle title={t('dns_settings')} />
<Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
setUpstream={props.setUpstream}
testUpstream={props.testUpstream}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
/>
</Fragment>
);
};
</s> add render() {
const {
t,
dashboard,
settings,
access,
setAccessList,
testUpstream,
setUpstream,
} = this.props;
return (
<Fragment>
<PageTitle title={t('dns_settings')} />
{(dashboard.processing || access.processing) && <Loading />}
{!dashboard.processing && !access.processing && (
<Fragment>
<Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
setUpstream={setUpstream}
testUpstream={testUpstream}
/>
<Access access={access} setAccessList={setAccessList} />
</Fragment>
)}
</Fragment>
);
}
} </s> remove const {
settings,
dashboard,
dhcp,
encryption,
clients,
access,
} = state;
</s> add const { settings } = state; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/757bb7285a0afd804d5e26eee29aeecc09d8662e | client/src/reducers/access.js |
// How many times the server was started
// While creating a dnsfilter object,
// we use this value to set s.dnsFilter property only with the most recent settings.
startCounter uint32
dnsfilterCreatorChan chan dnsfilterCreatorParams
| <mask> queryLog querylog.QueryLog // Query log instance
<mask> stats stats.Stats
<mask>
<mask> AllowedClients map[string]bool // IP addresses of whitelist clients
<mask> DisallowedClients map[string]bool // IP addresses of clients that should be blocked
<mask> AllowedClientsIPNet []net.IPNet // CIDRs of whitelist clients
<mask> DisallowedClientsIPNet []net.IPNet // CIDRs of clients that should be blocked
<mask> BlockedHosts map[string]bool // hosts that should be blocked
<mask>
</s> * dnsforward: create dnsfilter asynchronously </s> remove s.dnsFilter = dnsfilter.New(&s.conf.Config, filters)
if s.dnsFilter == nil {
return fmt.Errorf("could not initialize dnsfilter")
</s> add if s.conf.AsyncStartup {
params := dnsfilterCreatorParams{
conf: s.conf.Config,
filters: filters,
}
s.startCounter++
if s.startCounter == 1 {
s.dnsfilterCreatorChan = make(chan dnsfilterCreatorParams, 1)
go s.dnsfilterCreator()
}
// remove all pending tasks
stop := false
for !stop {
select {
case <-s.dnsfilterCreatorChan:
//
default:
stop = true
}
}
s.dnsfilterCreatorChan <- params
} else {
log.Debug("creating dnsfilter...")
f := dnsfilter.New(&s.conf.Config, filters)
if f == nil {
return fmt.Errorf("could not initialize dnsfilter")
}
log.Debug("created dnsfilter")
s.dnsFilter = f </s> remove log.Tracef("Creating dnsfilter")
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/75b864f25ec5f762d6cbfc07d3dce7d77ca0629c | dnsforward/dnsforward.go |
type dnsfilterCreatorParams struct {
conf dnsfilter.Config
filters map[int]string
}
| <mask> conf ServerConfig
<mask> }
<mask>
<mask> // NewServer creates a new instance of the dnsforward.Server
<mask> // Note: this function must be called only once
<mask> func NewServer(stats stats.Stats, queryLog querylog.QueryLog) *Server {
<mask> s := &Server{}
<mask> s.stats = stats
<mask> s.queryLog = queryLog
</s> * dnsforward: create dnsfilter asynchronously </s> remove log.Tracef("Creating dnsfilter")
</s> add </s> remove s.dnsFilter = dnsfilter.New(&s.conf.Config, filters)
if s.dnsFilter == nil {
return fmt.Errorf("could not initialize dnsfilter")
</s> add if s.conf.AsyncStartup {
params := dnsfilterCreatorParams{
conf: s.conf.Config,
filters: filters,
}
s.startCounter++
if s.startCounter == 1 {
s.dnsfilterCreatorChan = make(chan dnsfilterCreatorParams, 1)
go s.dnsfilterCreator()
}
// remove all pending tasks
stop := false
for !stop {
select {
case <-s.dnsfilterCreatorChan:
//
default:
stop = true
}
}
s.dnsfilterCreatorChan <- params
} else {
log.Debug("creating dnsfilter...")
f := dnsfilter.New(&s.conf.Config, filters)
if f == nil {
return fmt.Errorf("could not initialize dnsfilter")
}
log.Debug("created dnsfilter")
s.dnsFilter = f | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/75b864f25ec5f762d6cbfc07d3dce7d77ca0629c | dnsforward/dnsforward.go |
// Create dnsfilter asynchronously.
// Requests won't be filtered until dnsfilter is created.
// If "restart" command is received while we're creating an old dnsfilter object,
// we delay creation of the new object until the old one is created.
AsyncStartup bool
| <mask> // The zero FilteringConfig is empty and ready for use.
<mask> type FilteringConfig struct {
<mask> ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
<mask> FilteringEnabled bool `yaml:"filtering_enabled"` // whether or not use filter lists
<mask> FiltersUpdateIntervalHours uint32 `yaml:"filters_update_interval"` // time period to update filters (in hours)
<mask>
<mask> BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests
<mask> BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"` // if 0, then default is used (3600)
</s> * dnsforward: create dnsfilter asynchronously </s> remove s.dnsFilter = dnsfilter.New(&s.conf.Config, filters)
if s.dnsFilter == nil {
return fmt.Errorf("could not initialize dnsfilter")
</s> add if s.conf.AsyncStartup {
params := dnsfilterCreatorParams{
conf: s.conf.Config,
filters: filters,
}
s.startCounter++
if s.startCounter == 1 {
s.dnsfilterCreatorChan = make(chan dnsfilterCreatorParams, 1)
go s.dnsfilterCreator()
}
// remove all pending tasks
stop := false
for !stop {
select {
case <-s.dnsfilterCreatorChan:
//
default:
stop = true
}
}
s.dnsfilterCreatorChan <- params
} else {
log.Debug("creating dnsfilter...")
f := dnsfilter.New(&s.conf.Config, filters)
if f == nil {
return fmt.Errorf("could not initialize dnsfilter")
}
log.Debug("created dnsfilter")
s.dnsFilter = f </s> remove log.Tracef("Creating dnsfilter")
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/75b864f25ec5f762d6cbfc07d3dce7d77ca0629c | dnsforward/dnsforward.go |
<mask> }
<mask>
<mask> // Initializes the DNS filter
<mask> func (s *Server) initDNSFilter(config *ServerConfig) error {
<mask> log.Tracef("Creating dnsfilter")
<mask>
<mask> if config != nil {
<mask> s.conf = *config
<mask> }
<mask>
<mask> var filters map[int]string
</s> * dnsforward: create dnsfilter asynchronously </s> remove s.dnsFilter = dnsfilter.New(&s.conf.Config, filters)
if s.dnsFilter == nil {
return fmt.Errorf("could not initialize dnsfilter")
</s> add if s.conf.AsyncStartup {
params := dnsfilterCreatorParams{
conf: s.conf.Config,
filters: filters,
}
s.startCounter++
if s.startCounter == 1 {
s.dnsfilterCreatorChan = make(chan dnsfilterCreatorParams, 1)
go s.dnsfilterCreator()
}
// remove all pending tasks
stop := false
for !stop {
select {
case <-s.dnsfilterCreatorChan:
//
default:
stop = true
}
}
s.dnsfilterCreatorChan <- params
} else {
log.Debug("creating dnsfilter...")
f := dnsfilter.New(&s.conf.Config, filters)
if f == nil {
return fmt.Errorf("could not initialize dnsfilter")
}
log.Debug("created dnsfilter")
s.dnsFilter = f | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/75b864f25ec5f762d6cbfc07d3dce7d77ca0629c | dnsforward/dnsforward.go |
|
if s.conf.AsyncStartup {
params := dnsfilterCreatorParams{
conf: s.conf.Config,
filters: filters,
}
s.startCounter++
if s.startCounter == 1 {
s.dnsfilterCreatorChan = make(chan dnsfilterCreatorParams, 1)
go s.dnsfilterCreator()
}
// remove all pending tasks
stop := false
for !stop {
select {
case <-s.dnsfilterCreatorChan:
//
default:
stop = true
}
}
s.dnsfilterCreatorChan <- params
} else {
log.Debug("creating dnsfilter...")
f := dnsfilter.New(&s.conf.Config, filters)
if f == nil {
return fmt.Errorf("could not initialize dnsfilter")
}
log.Debug("created dnsfilter")
s.dnsFilter = f | <mask> if len(s.conf.SafeBrowsingBlockHost) == 0 {
<mask> s.conf.SafeBrowsingBlockHost = safeBrowsingBlockHost
<mask> }
<mask>
<mask> s.dnsFilter = dnsfilter.New(&s.conf.Config, filters)
<mask> if s.dnsFilter == nil {
<mask> return fmt.Errorf("could not initialize dnsfilter")
<mask> }
<mask> return nil
<mask> }
<mask>
<mask> // Stop stops the DNS server
</s> * dnsforward: create dnsfilter asynchronously </s> remove log.Tracef("Creating dnsfilter")
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/75b864f25ec5f762d6cbfc07d3dce7d77ca0629c | dnsforward/dnsforward.go |
newconfig.AsyncStartup = true | <mask> FilteringConfig: config.DNS.FilteringConfig,
<mask> Filters: filters,
<mask> }
<mask> bindhost := config.DNS.BindHost
<mask> if config.DNS.BindHost == "0.0.0.0" {
<mask> bindhost = "127.0.0.1"
<mask> }
</s> * dnsforward: create dnsfilter asynchronously </s> remove s.dnsFilter = dnsfilter.New(&s.conf.Config, filters)
if s.dnsFilter == nil {
return fmt.Errorf("could not initialize dnsfilter")
</s> add if s.conf.AsyncStartup {
params := dnsfilterCreatorParams{
conf: s.conf.Config,
filters: filters,
}
s.startCounter++
if s.startCounter == 1 {
s.dnsfilterCreatorChan = make(chan dnsfilterCreatorParams, 1)
go s.dnsfilterCreator()
}
// remove all pending tasks
stop := false
for !stop {
select {
case <-s.dnsfilterCreatorChan:
//
default:
stop = true
}
}
s.dnsfilterCreatorChan <- params
} else {
log.Debug("creating dnsfilter...")
f := dnsfilter.New(&s.conf.Config, filters)
if f == nil {
return fmt.Errorf("could not initialize dnsfilter")
}
log.Debug("created dnsfilter")
s.dnsFilter = f </s> remove log.Tracef("Creating dnsfilter")
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/75b864f25ec5f762d6cbfc07d3dce7d77ca0629c | home/dns.go |
if len(s.conf.BlockedHosts) == 0 {
s.conf.BlockedHosts = defaultBlockedHosts
} | <mask> s.conf.TCPListenAddr = defaultValues.TCPListenAddr
<mask> }
<mask> }
<mask>
<mask> // prepareUpstreamSettings - prepares upstream DNS server settings
<mask> func (s *Server) prepareUpstreamSettings() error {
<mask> // We're setting a customized set of RootCAs
<mask> // The reason is that Go default mechanism of loading TLS roots
</s> * (dnsforward): added some hosts to disallowed by default </s> remove github.com/AdguardTeam/dnsproxy v0.32.1 h1:UoiFt/aT8YCBFUGe7hG8ehLRXyvoIf22mOQqeIQxhWI=
github.com/AdguardTeam/dnsproxy v0.32.1/go.mod h1:ZLDrKIypYxBDz2N9FQHgeehuHrwTbuhZXdGwNySshbw=
</s> add github.com/AdguardTeam/dnsproxy v0.32.2 h1:gD2VojnQEIzWp3fkT20RS9ehyF0MBGGZQdcX/eKM7fQ=
github.com/AdguardTeam/dnsproxy v0.32.2/go.mod h1:ZLDrKIypYxBDz2N9FQHgeehuHrwTbuhZXdGwNySshbw= </s> remove github.com/AdguardTeam/dnsproxy v0.32.1
</s> add github.com/AdguardTeam/dnsproxy v0.32.2 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/75d680ff30001e846edcbbc6c102fb36ce52bcba | dnsforward/config.go |
// Often requested by all kinds of DNS probes
var defaultBlockedHosts = []string{"version.bind", "id.server", "hostname.bind"}
| <mask> }
<mask> var defaultBootstrap = []string{"9.9.9.10", "149.112.112.10", "2620:fe::10", "2620:fe::fe:10"}
<mask>
<mask> var webRegistered bool
<mask>
<mask> // Server is the main way to start a DNS server.
<mask> //
</s> * (dnsforward): added some hosts to disallowed by default </s> remove github.com/AdguardTeam/dnsproxy v0.32.1 h1:UoiFt/aT8YCBFUGe7hG8ehLRXyvoIf22mOQqeIQxhWI=
github.com/AdguardTeam/dnsproxy v0.32.1/go.mod h1:ZLDrKIypYxBDz2N9FQHgeehuHrwTbuhZXdGwNySshbw=
</s> add github.com/AdguardTeam/dnsproxy v0.32.2 h1:gD2VojnQEIzWp3fkT20RS9ehyF0MBGGZQdcX/eKM7fQ=
github.com/AdguardTeam/dnsproxy v0.32.2/go.mod h1:ZLDrKIypYxBDz2N9FQHgeehuHrwTbuhZXdGwNySshbw= </s> remove github.com/AdguardTeam/dnsproxy v0.32.1
</s> add github.com/AdguardTeam/dnsproxy v0.32.2 | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/75d680ff30001e846edcbbc6c102fb36ce52bcba | dnsforward/dnsforward.go |
github.com/AdguardTeam/dnsproxy v0.32.2 | <mask>
<mask> go 1.14
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.32.1
<mask> github.com/AdguardTeam/golibs v0.4.2
<mask> github.com/AdguardTeam/urlfilter v0.12.2
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/fsnotify/fsnotify v1.4.9
<mask> github.com/gobuffalo/packr v1.30.1
</s> * (dnsforward): added some hosts to disallowed by default </s> remove github.com/AdguardTeam/dnsproxy v0.32.1 h1:UoiFt/aT8YCBFUGe7hG8ehLRXyvoIf22mOQqeIQxhWI=
github.com/AdguardTeam/dnsproxy v0.32.1/go.mod h1:ZLDrKIypYxBDz2N9FQHgeehuHrwTbuhZXdGwNySshbw=
</s> add github.com/AdguardTeam/dnsproxy v0.32.2 h1:gD2VojnQEIzWp3fkT20RS9ehyF0MBGGZQdcX/eKM7fQ=
github.com/AdguardTeam/dnsproxy v0.32.2/go.mod h1:ZLDrKIypYxBDz2N9FQHgeehuHrwTbuhZXdGwNySshbw= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/75d680ff30001e846edcbbc6c102fb36ce52bcba | go.mod |
github.com/AdguardTeam/dnsproxy v0.32.2 h1:gD2VojnQEIzWp3fkT20RS9ehyF0MBGGZQdcX/eKM7fQ=
github.com/AdguardTeam/dnsproxy v0.32.2/go.mod h1:ZLDrKIypYxBDz2N9FQHgeehuHrwTbuhZXdGwNySshbw= | <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.32.1 h1:UoiFt/aT8YCBFUGe7hG8ehLRXyvoIf22mOQqeIQxhWI=
<mask> github.com/AdguardTeam/dnsproxy v0.32.1/go.mod h1:ZLDrKIypYxBDz2N9FQHgeehuHrwTbuhZXdGwNySshbw=
<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.2 h1:5ZkH/+AWNBK8cCfbcgOL1MIrpPJ2NJXDs00KjYJr2WE=
</s> * (dnsforward): added some hosts to disallowed by default </s> remove github.com/AdguardTeam/dnsproxy v0.32.1
</s> add github.com/AdguardTeam/dnsproxy v0.32.2 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/75d680ff30001e846edcbbc6c102fb36ce52bcba | go.sum |
"number_of_dns_query_days": "A number of DNS queries processed for the last {{value}} days",
"number_of_dns_query_24_hours": "A number of DNS queries processed for the last 24 hours", | <mask> "top_blocked_domains": "Top blocked domains",
<mask> "top_clients": "Top clients",
<mask> "no_clients_found": "No clients found",
<mask> "general_statistics": "General statistics",
<mask> "number_of_dns_query_days": "A number of DNS quieries processed for the last {{value}} days",
<mask> "number_of_dns_query_24_hours": "A number of DNS quieries processed for the last 24 hours",
<mask> "number_of_dns_query_blocked_24_hours": "A number of DNS requests blocked by adblock filters and hosts blocklists",
<mask> "number_of_dns_query_blocked_24_hours_by_sec": "A number of DNS requests blocked by the AdGuard browsing security module",
<mask> "number_of_dns_query_blocked_24_hours_adult": "A number of adult websites blocked",
<mask> "enforced_save_search": "Enforced safe search",
<mask> "number_of_dns_query_to_safe_search": "A number of DNS requests to search engines for which Safe Search was enforced",
</s> * client: fix missed translations
Closes #952 </s> remove <Trans>Add DNS rewrite</Trans>
</s> add <Trans>rewrite_add</Trans> </s> remove "filter_added_successfully": "Filter has been added successfully"
</s> add "answer": "Answer",
"filter_added_successfully": "The filter has been successfully added" </s> remove subtitle={t('Allows to quickly block popular sites.')}
</s> add subtitle={t('blocked_services_desc')} </s> remove Header: 'Answer',
</s> add Header: this.props.t('answer'), </s> remove Header: 'Domain',
</s> add Header: this.props.t('domain'), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/75df5e82922a1e1e113c916d6996ac246186cda8 | client/src/__locales/en.json |
"answer": "Answer",
"filter_added_successfully": "The filter has been successfully added" | <mask> "interval_24_hour": "24 hours",
<mask> "interval_days": "{{value}} days",
<mask> "time_period": "Time period",
<mask> "domain": "Domain",
<mask> "filter_added_successfully": "Filter has been added successfully"
<mask> }
</s> * client: fix missed translations
Closes #952 </s> remove "number_of_dns_query_days": "A number of DNS quieries processed for the last {{value}} days",
"number_of_dns_query_24_hours": "A number of DNS quieries processed for the last 24 hours",
</s> add "number_of_dns_query_days": "A number of DNS queries processed for the last {{value}} days",
"number_of_dns_query_24_hours": "A number of DNS queries processed for the last 24 hours", </s> remove subtitle={t('Allows to quickly block popular sites.')}
</s> add subtitle={t('blocked_services_desc')} </s> remove Header: 'Answer',
</s> add Header: this.props.t('answer'), </s> remove Header: 'Domain',
</s> add Header: this.props.t('domain'), </s> remove <Trans>Add DNS rewrite</Trans>
</s> add <Trans>rewrite_add</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/75df5e82922a1e1e113c916d6996ac246186cda8 | client/src/__locales/en.json |
<Trans>rewrite_add</Trans> | <mask> >
<mask> <div className="modal-content">
<mask> <div className="modal-header">
<mask> <h4 className="modal-title">
<mask> <Trans>Add DNS rewrite</Trans>
<mask> </h4>
<mask> <button type="button" className="close" onClick={() => toggleRewritesModal()}>
<mask> <span className="sr-only">Close</span>
<mask> </button>
<mask> </div>
</s> * client: fix missed translations
Closes #952 </s> remove subtitle={t('Allows to quickly block popular sites.')}
</s> add subtitle={t('blocked_services_desc')} </s> remove "number_of_dns_query_days": "A number of DNS quieries processed for the last {{value}} days",
"number_of_dns_query_24_hours": "A number of DNS quieries processed for the last 24 hours",
</s> add "number_of_dns_query_days": "A number of DNS queries processed for the last {{value}} days",
"number_of_dns_query_24_hours": "A number of DNS queries processed for the last 24 hours", </s> remove Header: 'Answer',
</s> add Header: this.props.t('answer'), </s> remove Header: 'Domain',
</s> add Header: this.props.t('domain'), </s> remove "filter_added_successfully": "Filter has been added successfully"
</s> add "answer": "Answer",
"filter_added_successfully": "The filter has been successfully added" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/75df5e82922a1e1e113c916d6996ac246186cda8 | client/src/components/Settings/Dns/Rewrites/Modal.js |
Header: this.props.t('domain'), | <mask> );
<mask>
<mask> columns = [
<mask> {
<mask> Header: 'Domain',
<mask> accessor: 'domain',
<mask> Cell: this.cellWrap,
<mask> },
<mask> {
<mask> Header: 'Answer',
</s> * client: fix missed translations
Closes #952 </s> remove Header: 'Answer',
</s> add Header: this.props.t('answer'), </s> remove subtitle={t('Allows to quickly block popular sites.')}
</s> add subtitle={t('blocked_services_desc')} </s> remove <Trans>Add DNS rewrite</Trans>
</s> add <Trans>rewrite_add</Trans> </s> remove "filter_added_successfully": "Filter has been added successfully"
</s> add "answer": "Answer",
"filter_added_successfully": "The filter has been successfully added" </s> remove "number_of_dns_query_days": "A number of DNS quieries processed for the last {{value}} days",
"number_of_dns_query_24_hours": "A number of DNS quieries processed for the last 24 hours",
</s> add "number_of_dns_query_days": "A number of DNS queries processed for the last {{value}} days",
"number_of_dns_query_24_hours": "A number of DNS queries processed for the last 24 hours", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/75df5e82922a1e1e113c916d6996ac246186cda8 | client/src/components/Settings/Dns/Rewrites/Table.js |
Header: this.props.t('answer'), | <mask> accessor: 'domain',
<mask> Cell: this.cellWrap,
<mask> },
<mask> {
<mask> Header: 'Answer',
<mask> accessor: 'answer',
<mask> Cell: this.cellWrap,
<mask> },
<mask> {
<mask> Header: this.props.t('actions_table_header'),
</s> * client: fix missed translations
Closes #952 </s> remove Header: 'Domain',
</s> add Header: this.props.t('domain'), </s> remove subtitle={t('Allows to quickly block popular sites.')}
</s> add subtitle={t('blocked_services_desc')} </s> remove <Trans>Add DNS rewrite</Trans>
</s> add <Trans>rewrite_add</Trans> </s> remove "filter_added_successfully": "Filter has been added successfully"
</s> add "answer": "Answer",
"filter_added_successfully": "The filter has been successfully added" </s> remove "number_of_dns_query_days": "A number of DNS quieries processed for the last {{value}} days",
"number_of_dns_query_24_hours": "A number of DNS quieries processed for the last 24 hours",
</s> add "number_of_dns_query_days": "A number of DNS queries processed for the last {{value}} days",
"number_of_dns_query_24_hours": "A number of DNS queries processed for the last 24 hours", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/75df5e82922a1e1e113c916d6996ac246186cda8 | client/src/components/Settings/Dns/Rewrites/Table.js |
subtitle={t('blocked_services_desc')} | <mask>
<mask> return (
<mask> <Card
<mask> title={t('blocked_services')}
<mask> subtitle={t('Allows to quickly block popular sites.')}
<mask> bodyType="card-body box-body--settings"
<mask> >
<mask> <div className="form">
<mask> <Form
<mask> initialValues={{ ...initialData }}
</s> * client: fix missed translations
Closes #952 </s> remove <Trans>Add DNS rewrite</Trans>
</s> add <Trans>rewrite_add</Trans> </s> remove "number_of_dns_query_days": "A number of DNS quieries processed for the last {{value}} days",
"number_of_dns_query_24_hours": "A number of DNS quieries processed for the last 24 hours",
</s> add "number_of_dns_query_days": "A number of DNS queries processed for the last {{value}} days",
"number_of_dns_query_24_hours": "A number of DNS queries processed for the last 24 hours", </s> remove Header: 'Answer',
</s> add Header: this.props.t('answer'), </s> remove Header: 'Domain',
</s> add Header: this.props.t('domain'), </s> remove "filter_added_successfully": "Filter has been added successfully"
</s> add "answer": "Answer",
"filter_added_successfully": "The filter has been successfully added" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/75df5e82922a1e1e113c916d6996ac246186cda8 | client/src/components/Settings/Services/index.js |
staticLeases := convertLeases(dhcpServer.StaticLeases(), false) | <mask>
<mask> func handleDHCPStatus(w http.ResponseWriter, r *http.Request) {
<mask> log.Tracef("%s %v", r.Method, r.URL)
<mask> leases := convertLeases(dhcpServer.Leases(), true)
<mask> status := map[string]interface{}{
<mask> "config": config.DHCP,
<mask> "leases": leases,
<mask> "static_leases": staticLeases,
<mask> }
<mask>
</s> + dhcp: /dhcp/status: return static leases </s> remove if !ipInRange(s.leaseStart, s.leaseStop, obj[i].IP) {
</s> add if obj[i].Expiry != leaseExpireStatic &&
!ipInRange(s.leaseStart, s.leaseStop, obj[i].IP) {
</s> remove "config": config.DHCP,
"leases": leases,
</s> add "config": config.DHCP,
"leases": leases,
"static_leases": staticLeases, | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/763b98695554f04e89ec1cbf15c47194d3a55d4e | dhcp.go |
"config": config.DHCP,
"leases": leases,
"static_leases": staticLeases, | <mask> func handleDHCPStatus(w http.ResponseWriter, r *http.Request) {
<mask> log.Tracef("%s %v", r.Method, r.URL)
<mask> leases := convertLeases(dhcpServer.Leases(), true)
<mask> status := map[string]interface{}{
<mask> "config": config.DHCP,
<mask> "leases": leases,
<mask> }
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask> err := json.NewEncoder(w).Encode(status)
<mask> if err != nil {
</s> + dhcp: /dhcp/status: return static leases </s> remove if !ipInRange(s.leaseStart, s.leaseStop, obj[i].IP) {
</s> add if obj[i].Expiry != leaseExpireStatic &&
!ipInRange(s.leaseStart, s.leaseStop, obj[i].IP) {
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/763b98695554f04e89ec1cbf15c47194d3a55d4e | dhcp.go |
if obj[i].Expiry != leaseExpireStatic &&
!ipInRange(s.leaseStart, s.leaseStop, obj[i].IP) {
| <mask>
<mask> numLeases := len(obj)
<mask> for i := range obj {
<mask>
<mask> if !ipInRange(s.leaseStart, s.leaseStop, obj[i].IP) {
<mask> log.Tracef("Skipping a lease with IP %s: not within current IP range", obj[i].IP)
<mask> continue
<mask> }
<mask>
<mask> lease := Lease{
</s> + dhcp: /dhcp/status: return static leases </s> remove "config": config.DHCP,
"leases": leases,
</s> add "config": config.DHCP,
"leases": leases,
"static_leases": staticLeases, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/763b98695554f04e89ec1cbf15c47194d3a55d4e | dhcpd/db.go |
mutex sync.RWMutex | <mask> type hourTop struct {
<mask> domains gcache.Cache
<mask> blocked gcache.Cache
<mask> clients gcache.Cache
<mask> sync.RWMutex
<mask> }
<mask>
<mask> func (top *hourTop) init() {
<mask> top.domains = gcache.New(500).LRU().Build()
<mask> top.blocked = gcache.New(500).LRU().Build()
</s> coredns plugin -- Final fix for deadlock during coredns reload </s> remove hours []*hourTop
loaded bool
sync.RWMutex // write -- rotating hourTop, read -- anything else
</s> add hours []*hourTop
hoursLock sync.RWMutex // writelock this lock ONLY WHEN rotating or intializing hours!
loaded bool
loadedLock sync.Mutex </s> remove runningTop.Lock()
</s> add runningTop.hoursWriteLock() </s> remove runningTop.Unlock()
</s> add runningTop.hoursWriteUnlock() </s> remove runningTop.Lock()
</s> add runningTop.hoursWriteLock() </s> remove runningTop.Unlock()
</s> add runningTop.hoursWriteUnlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/763dcc46e96393282864c914321007d8810ed223 | coredns_plugin/querylog_top.go |
hours []*hourTop
hoursLock sync.RWMutex // writelock this lock ONLY WHEN rotating or intializing hours!
loaded bool
loadedLock sync.Mutex | <mask> top.clients = gcache.New(500).LRU().Build()
<mask> }
<mask>
<mask> type dayTop struct {
<mask> hours []*hourTop
<mask> loaded bool
<mask> sync.RWMutex // write -- rotating hourTop, read -- anything else
<mask> }
<mask>
<mask> var runningTop dayTop
<mask>
<mask> func init() {
</s> coredns plugin -- Final fix for deadlock during coredns reload </s> remove sync.RWMutex
</s> add mutex sync.RWMutex </s> remove runningTop.Lock()
</s> add runningTop.hoursWriteLock() </s> remove runningTop.Unlock()
</s> add runningTop.hoursWriteUnlock() </s> remove runningTop.Unlock()
</s> add runningTop.hoursWriteUnlock() </s> remove runningTop.Lock()
</s> add runningTop.hoursWriteLock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/763dcc46e96393282864c914321007d8810ed223 | coredns_plugin/querylog_top.go |
runningTop.hoursWriteLock() | <mask>
<mask> var runningTop dayTop
<mask>
<mask> func init() {
<mask> runningTop.Lock()
<mask> for i := 0; i < 24; i++ {
<mask> hour := hourTop{}
<mask> hour.init()
<mask> runningTop.hours = append(runningTop.hours, &hour)
<mask> }
</s> coredns plugin -- Final fix for deadlock during coredns reload </s> remove runningTop.Unlock()
</s> add runningTop.hoursWriteUnlock() </s> remove runningTop.RLock()
</s> add runningTop.hoursReadLock() </s> remove hours []*hourTop
loaded bool
sync.RWMutex // write -- rotating hourTop, read -- anything else
</s> add hours []*hourTop
hoursLock sync.RWMutex // writelock this lock ONLY WHEN rotating or intializing hours!
loaded bool
loadedLock sync.Mutex </s> remove runningTop.Unlock()
</s> add runningTop.hoursWriteUnlock() </s> remove runningTop.Lock()
</s> add runningTop.hoursWriteLock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/763dcc46e96393282864c914321007d8810ed223 | coredns_plugin/querylog_top.go |
runningTop.hoursWriteUnlock() | <mask> hour := hourTop{}
<mask> hour.init()
<mask> runningTop.hours = append(runningTop.hours, &hour)
<mask> }
<mask> runningTop.Unlock()
<mask> }
<mask>
<mask> func rotateHourlyTop() {
<mask> log.Printf("Rotating hourly top")
<mask> hour := &hourTop{}
</s> coredns plugin -- Final fix for deadlock during coredns reload </s> remove runningTop.Lock()
</s> add runningTop.hoursWriteLock() </s> remove runningTop.Lock()
</s> add runningTop.hoursWriteLock() </s> remove runningTop.Unlock()
</s> add runningTop.hoursWriteUnlock() </s> remove runningTop.RLock()
</s> add runningTop.hoursReadLock() </s> remove runningTop.Lock() // not rlock because we set it at the end of the function
defer runningTop.Unlock()
</s> add runningTop.loadedWriteLock()
defer runningTop.loadedWriteUnlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/763dcc46e96393282864c914321007d8810ed223 | coredns_plugin/querylog_top.go |
runningTop.hoursWriteLock() | <mask> func rotateHourlyTop() {
<mask> log.Printf("Rotating hourly top")
<mask> hour := &hourTop{}
<mask> hour.init()
<mask> runningTop.Lock()
<mask> runningTop.hours = append([]*hourTop{hour}, runningTop.hours...)
<mask> runningTop.hours = runningTop.hours[:24]
<mask> runningTop.Unlock()
<mask> }
<mask>
</s> coredns plugin -- Final fix for deadlock during coredns reload </s> remove runningTop.Unlock()
</s> add runningTop.hoursWriteUnlock() </s> remove runningTop.Unlock()
</s> add runningTop.hoursWriteUnlock() </s> remove runningTop.Lock()
</s> add runningTop.hoursWriteLock() </s> remove runningTop.Lock() // not rlock because we set it at the end of the function
defer runningTop.Unlock()
</s> add runningTop.loadedWriteLock()
defer runningTop.loadedWriteUnlock() </s> remove sync.RWMutex
</s> add mutex sync.RWMutex | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/763dcc46e96393282864c914321007d8810ed223 | coredns_plugin/querylog_top.go |
runningTop.hoursWriteUnlock() | <mask> hour.init()
<mask> runningTop.Lock()
<mask> runningTop.hours = append([]*hourTop{hour}, runningTop.hours...)
<mask> runningTop.hours = runningTop.hours[:24]
<mask> runningTop.Unlock()
<mask> }
<mask>
<mask> func periodicHourlyTopRotate() {
<mask> t := time.Hour
<mask> for range time.Tick(t) {
</s> coredns plugin -- Final fix for deadlock during coredns reload </s> remove runningTop.Lock()
</s> add runningTop.hoursWriteLock() </s> remove runningTop.Lock()
</s> add runningTop.hoursWriteLock() </s> remove runningTop.Unlock()
</s> add runningTop.hoursWriteUnlock() </s> remove runningTop.Lock() // not rlock because we set it at the end of the function
defer runningTop.Unlock()
</s> add runningTop.loadedWriteLock()
defer runningTop.loadedWriteUnlock() </s> remove sync.RWMutex
</s> add mutex sync.RWMutex | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/763dcc46e96393282864c914321007d8810ed223 | coredns_plugin/querylog_top.go |
runningTop.hoursReadLock()
defer runningTop.hoursReadUnlock() | <mask>
<mask> hostname := strings.ToLower(strings.TrimSuffix(q.Question[0].Name, "."))
<mask>
<mask> // get value, if not set, crate one
<mask> runningTop.RLock()
<mask> defer runningTop.RUnlock()
<mask> err := runningTop.hours[hour].incrementDomains(hostname)
<mask> if err != nil {
<mask> log.Printf("Failed to increment value: %s", err)
<mask> return err
<mask> }
</s> coredns plugin -- Final fix for deadlock during coredns reload </s> remove runningTop.Lock() // not rlock because we set it at the end of the function
defer runningTop.Unlock()
</s> add runningTop.loadedWriteLock()
defer runningTop.loadedWriteUnlock() </s> remove runningTop.RUnlock()
</s> add runningTop.hoursReadUnlock() </s> remove runningTop.RLock()
</s> add runningTop.hoursReadLock() </s> remove runningTop.Unlock()
</s> add runningTop.hoursWriteUnlock() </s> remove runningTop.Lock()
</s> add runningTop.hoursWriteLock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/763dcc46e96393282864c914321007d8810ed223 | coredns_plugin/querylog_top.go |
runningTop.loadedWriteLock()
defer runningTop.loadedWriteUnlock() | <mask> }
<mask>
<mask> func loadTopFromFiles() error {
<mask> now := time.Now()
<mask> runningTop.Lock() // not rlock because we set it at the end of the function
<mask> defer runningTop.Unlock()
<mask> if runningTop.loaded {
<mask> return nil
<mask> }
<mask> onEntry := func(entry *logEntry) error {
<mask> err := runningTop.addEntry(entry, now)
</s> coredns plugin -- Final fix for deadlock during coredns reload </s> remove runningTop.RLock()
defer runningTop.RUnlock()
</s> add runningTop.hoursReadLock()
defer runningTop.hoursReadUnlock() </s> remove runningTop.Unlock()
</s> add runningTop.hoursWriteUnlock() </s> remove runningTop.Unlock()
</s> add runningTop.hoursWriteUnlock() </s> remove runningTop.Lock()
</s> add runningTop.hoursWriteLock() </s> remove runningTop.RUnlock()
</s> add runningTop.hoursReadUnlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/763dcc46e96393282864c914321007d8810ed223 | coredns_plugin/querylog_top.go |
runningTop.hoursReadLock() | <mask> result[key] += value
<mask> }
<mask> }
<mask>
<mask> runningTop.RLock()
<mask> for hour := 0; hour < 24; hour++ {
<mask> runningTop.hours[hour].RLock()
<mask> do(runningTop.hours[hour].domains.Keys(), runningTop.hours[hour].lockedGetDomains, domains)
<mask> do(runningTop.hours[hour].blocked.Keys(), runningTop.hours[hour].lockedGetBlocked, blocked)
<mask> do(runningTop.hours[hour].clients.Keys(), runningTop.hours[hour].lockedGetClients, clients)
</s> coredns plugin -- Final fix for deadlock during coredns reload </s> remove runningTop.RUnlock()
</s> add runningTop.hoursReadUnlock() </s> remove runningTop.Lock()
</s> add runningTop.hoursWriteLock() </s> remove runningTop.Unlock()
</s> add runningTop.hoursWriteUnlock() </s> remove runningTop.Unlock()
</s> add runningTop.hoursWriteUnlock() </s> remove runningTop.RLock()
defer runningTop.RUnlock()
</s> add runningTop.hoursReadLock()
defer runningTop.hoursReadUnlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/763dcc46e96393282864c914321007d8810ed223 | coredns_plugin/querylog_top.go |
runningTop.hoursReadUnlock() | <mask> do(runningTop.hours[hour].blocked.Keys(), runningTop.hours[hour].lockedGetBlocked, blocked)
<mask> do(runningTop.hours[hour].clients.Keys(), runningTop.hours[hour].lockedGetClients, clients)
<mask> runningTop.hours[hour].RUnlock()
<mask> }
<mask> runningTop.RUnlock()
<mask>
<mask> // use manual json marshalling because we want maps to be sorted by value
<mask> json := bytes.Buffer{}
<mask> json.WriteString("{\n")
<mask>
</s> coredns plugin -- Final fix for deadlock during coredns reload </s> remove runningTop.RLock()
</s> add runningTop.hoursReadLock() </s> remove runningTop.RLock()
defer runningTop.RUnlock()
</s> add runningTop.hoursReadLock()
defer runningTop.hoursReadUnlock() </s> remove runningTop.Lock() // not rlock because we set it at the end of the function
defer runningTop.Unlock()
</s> add runningTop.loadedWriteLock()
defer runningTop.loadedWriteUnlock() </s> remove runningTop.Unlock()
</s> add runningTop.hoursWriteUnlock() </s> remove runningTop.Lock()
</s> add runningTop.hoursWriteLock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/763dcc46e96393282864c914321007d8810ed223 | coredns_plugin/querylog_top.go |
data := validateCertificates(config.TLS.CertificateChain, config.TLS.PrivateKey, config.TLS.ServerName) | <mask> httpsServer.cond.Wait()
<mask> }
<mask> address := net.JoinHostPort(config.BindHost, strconv.Itoa(config.TLS.PortHTTPS))
<mask> // validate current TLS config and update warnings (it could have been loaded from file)
<mask> data := validateCertificates(config.TLS)
<mask> if !data.usable {
<mask> log.Fatal(data.WarningValidation)
<mask> os.Exit(1)
<mask> }
<mask> config.Lock()
</s> * validateCertificates(): change input parameters; added short description </s> remove config.TLS = data // update warnings
</s> add config.TLS.tlsConfigStatus = data // update warnings </s> remove data = validateCertificates(data)
</s> add data.tlsConfigStatus = validateCertificates(data.CertificateChain, data.PrivateKey, data.ServerName) </s> remove if data.PrivateKey != "" {
</s> add if PrivateKey != "" { </s> remove
// clear out status for certificates
data.tlsConfigStatus = tlsConfigStatus{}
</s> add var data tlsConfigStatus </s> remove if data.PrivateKey != "" && data.CertificateChain != "" {
_, err = tls.X509KeyPair([]byte(data.CertificateChain), []byte(data.PrivateKey))
</s> add if PrivateKey != "" && CertificateChain != "" {
_, err = tls.X509KeyPair([]byte(CertificateChain), []byte(PrivateKey)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/766fbab0718f2b02fb3864e521820033ab015e36 | app.go |
config.TLS.tlsConfigStatus = data // update warnings | <mask> log.Fatal(data.WarningValidation)
<mask> os.Exit(1)
<mask> }
<mask> config.Lock()
<mask> config.TLS = data // update warnings
<mask> config.Unlock()
<mask>
<mask> // prepare certs for HTTPS server
<mask> // important -- they have to be copies, otherwise changing the contents in config.TLS will break encryption for in-flight requests
<mask> certchain := make([]byte, len(config.TLS.CertificateChain))
</s> * validateCertificates(): change input parameters; added short description </s> remove data := validateCertificates(config.TLS)
</s> add data := validateCertificates(config.TLS.CertificateChain, config.TLS.PrivateKey, config.TLS.ServerName) </s> remove data = validateCertificates(data)
</s> add data.tlsConfigStatus = validateCertificates(data.CertificateChain, data.PrivateKey, data.ServerName) </s> remove pemblock := []byte(data.CertificateChain)
</s> add pemblock := []byte(CertificateChain) </s> remove pemblock := []byte(data.PrivateKey)
</s> add pemblock := []byte(PrivateKey) </s> remove if data.CertificateChain != "" {
log.Tracef("got certificate: %s", data.CertificateChain)
</s> add if CertificateChain != "" {
log.Tracef("got certificate: %s", CertificateChain) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/766fbab0718f2b02fb3864e521820033ab015e36 | app.go |
data.tlsConfigStatus = validateCertificates(data.CertificateChain, data.PrivateKey, data.ServerName) | <mask> return
<mask> }
<mask> }
<mask>
<mask> data = validateCertificates(data)
<mask> marshalTLS(w, data)
<mask> }
<mask>
<mask> func handleTLSConfigure(w http.ResponseWriter, r *http.Request) {
<mask> data, err := unmarshalTLS(r)
</s> * validateCertificates(): change input parameters; added short description </s> remove func validateCertificates(data tlsConfig) tlsConfig {
</s> add /* Process certificate data and its private key.
CertificateChain, PrivateKey parameters are optional.
On error, return partially set object
with 'WarningValidation' field containing error description.
*/
func validateCertificates(CertificateChain, PrivateKey, ServerName string) tlsConfigStatus { </s> remove if data.PrivateKey != "" && data.CertificateChain != "" {
_, err = tls.X509KeyPair([]byte(data.CertificateChain), []byte(data.PrivateKey))
</s> add if PrivateKey != "" && CertificateChain != "" {
_, err = tls.X509KeyPair([]byte(CertificateChain), []byte(PrivateKey)) </s> remove data.CertificateChain = "bad cert"
data.PrivateKey = ""
data = validateCertificates(data)
</s> add data = validateCertificates("bad cert", "", "") </s> remove data.CertificateChain = ""
data.PrivateKey = "bad priv key"
data = validateCertificates(data)
</s> add data = validateCertificates("", "bad priv key", "") </s> remove data = validateCertificates(data)
</s> add data.tlsConfigStatus = validateCertificates(data.CertificateChain, data.PrivateKey, data.ServerName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/766fbab0718f2b02fb3864e521820033ab015e36 | control.go |
data.tlsConfigStatus = validateCertificates(data.CertificateChain, data.PrivateKey, data.ServerName) | <mask> }
<mask> }
<mask>
<mask> restartHTTPS := false
<mask> data = validateCertificates(data)
<mask> if !reflect.DeepEqual(config.TLS.tlsConfigSettings, data.tlsConfigSettings) {
<mask> log.Printf("tls config settings have changed, will restart HTTPS server")
<mask> restartHTTPS = true
<mask> }
<mask> config.TLS = data
</s> * validateCertificates(): change input parameters; added short description </s> remove config.TLS = data // update warnings
</s> add config.TLS.tlsConfigStatus = data // update warnings </s> remove data := validateCertificates(config.TLS)
</s> add data := validateCertificates(config.TLS.CertificateChain, config.TLS.PrivateKey, config.TLS.ServerName) </s> remove data = validateCertificates(data)
</s> add data.tlsConfigStatus = validateCertificates(data.CertificateChain, data.PrivateKey, data.ServerName) </s> remove if data.PrivateKey != "" && data.CertificateChain != "" {
_, err = tls.X509KeyPair([]byte(data.CertificateChain), []byte(data.PrivateKey))
</s> add if PrivateKey != "" && CertificateChain != "" {
_, err = tls.X509KeyPair([]byte(CertificateChain), []byte(PrivateKey)) </s> remove data.CertificateChain = ""
data.PrivateKey = "bad priv key"
data = validateCertificates(data)
</s> add data = validateCertificates("", "bad priv key", "") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/766fbab0718f2b02fb3864e521820033ab015e36 | control.go |
/* Process certificate data and its private key.
CertificateChain, PrivateKey parameters are optional.
On error, return partially set object
with 'WarningValidation' field containing error description.
*/
func validateCertificates(CertificateChain, PrivateKey, ServerName string) tlsConfigStatus { | <mask> }()
<mask> }
<mask> }
<mask>
<mask> func validateCertificates(data tlsConfig) tlsConfig {
<mask> var err error
<mask>
<mask> // clear out status for certificates
<mask> data.tlsConfigStatus = tlsConfigStatus{}
<mask>
</s> * validateCertificates(): change input parameters; added short description </s> remove
// clear out status for certificates
data.tlsConfigStatus = tlsConfigStatus{}
</s> add var data tlsConfigStatus </s> remove if data.CertificateChain != "" {
log.Tracef("got certificate: %s", data.CertificateChain)
</s> add if CertificateChain != "" {
log.Tracef("got certificate: %s", CertificateChain) </s> remove data = validateCertificates(data)
</s> add data.tlsConfigStatus = validateCertificates(data.CertificateChain, data.PrivateKey, data.ServerName) </s> remove data.CertificateChain = "bad cert"
data.PrivateKey = ""
data = validateCertificates(data)
</s> add data = validateCertificates("bad cert", "", "") </s> remove if data.PrivateKey != "" && data.CertificateChain != "" {
_, err = tls.X509KeyPair([]byte(data.CertificateChain), []byte(data.PrivateKey))
</s> add if PrivateKey != "" && CertificateChain != "" {
_, err = tls.X509KeyPair([]byte(CertificateChain), []byte(PrivateKey)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/766fbab0718f2b02fb3864e521820033ab015e36 | control.go |
var data tlsConfigStatus | <mask> }
<mask>
<mask> func validateCertificates(data tlsConfig) tlsConfig {
<mask> var err error
<mask>
<mask> // clear out status for certificates
<mask> data.tlsConfigStatus = tlsConfigStatus{}
<mask>
<mask> // check only public certificate separately from the key
<mask> if data.CertificateChain != "" {
<mask> log.Tracef("got certificate: %s", data.CertificateChain)
<mask>
</s> * validateCertificates(): change input parameters; added short description </s> remove if data.CertificateChain != "" {
log.Tracef("got certificate: %s", data.CertificateChain)
</s> add if CertificateChain != "" {
log.Tracef("got certificate: %s", CertificateChain) </s> remove func validateCertificates(data tlsConfig) tlsConfig {
</s> add /* Process certificate data and its private key.
CertificateChain, PrivateKey parameters are optional.
On error, return partially set object
with 'WarningValidation' field containing error description.
*/
func validateCertificates(CertificateChain, PrivateKey, ServerName string) tlsConfigStatus { </s> remove if data.PrivateKey != "" && data.CertificateChain != "" {
_, err = tls.X509KeyPair([]byte(data.CertificateChain), []byte(data.PrivateKey))
</s> add if PrivateKey != "" && CertificateChain != "" {
_, err = tls.X509KeyPair([]byte(CertificateChain), []byte(PrivateKey)) </s> remove if data.PrivateKey != "" {
</s> add if PrivateKey != "" { </s> remove var data tlsConfig
</s> add var data tlsConfigStatus | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/766fbab0718f2b02fb3864e521820033ab015e36 | control.go |
if CertificateChain != "" {
log.Tracef("got certificate: %s", CertificateChain) | <mask> // clear out status for certificates
<mask> data.tlsConfigStatus = tlsConfigStatus{}
<mask>
<mask> // check only public certificate separately from the key
<mask> if data.CertificateChain != "" {
<mask> log.Tracef("got certificate: %s", data.CertificateChain)
<mask>
<mask> // now do a more extended validation
<mask> var certs []*pem.Block // PEM-encoded certificates
<mask> var skippedBytes []string // skipped bytes
<mask>
</s> * validateCertificates(): change input parameters; added short description </s> remove
// clear out status for certificates
data.tlsConfigStatus = tlsConfigStatus{}
</s> add var data tlsConfigStatus </s> remove pemblock := []byte(data.CertificateChain)
</s> add pemblock := []byte(CertificateChain) </s> remove if data.PrivateKey != "" {
</s> add if PrivateKey != "" { </s> remove pemblock := []byte(data.PrivateKey)
</s> add pemblock := []byte(PrivateKey) </s> remove func validateCertificates(data tlsConfig) tlsConfig {
</s> add /* Process certificate data and its private key.
CertificateChain, PrivateKey parameters are optional.
On error, return partially set object
with 'WarningValidation' field containing error description.
*/
func validateCertificates(CertificateChain, PrivateKey, ServerName string) tlsConfigStatus { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/766fbab0718f2b02fb3864e521820033ab015e36 | control.go |
pemblock := []byte(CertificateChain) | <mask> // now do a more extended validation
<mask> var certs []*pem.Block // PEM-encoded certificates
<mask> var skippedBytes []string // skipped bytes
<mask>
<mask> pemblock := []byte(data.CertificateChain)
<mask> for {
<mask> var decoded *pem.Block
<mask> decoded, pemblock = pem.Decode(pemblock)
<mask> if decoded == nil {
<mask> break
</s> * validateCertificates(): change input parameters; added short description </s> remove pemblock := []byte(data.PrivateKey)
</s> add pemblock := []byte(PrivateKey) </s> remove if data.CertificateChain != "" {
log.Tracef("got certificate: %s", data.CertificateChain)
</s> add if CertificateChain != "" {
log.Tracef("got certificate: %s", CertificateChain) </s> remove if data.PrivateKey != "" {
</s> add if PrivateKey != "" { </s> remove config.TLS = data // update warnings
</s> add config.TLS.tlsConfigStatus = data // update warnings </s> remove
// clear out status for certificates
data.tlsConfigStatus = tlsConfigStatus{}
</s> add var data tlsConfigStatus | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/766fbab0718f2b02fb3864e521820033ab015e36 | control.go |
DNSName: ServerName, | <mask>
<mask> // spew.Dump(parsedCerts)
<mask>
<mask> opts := x509.VerifyOptions{
<mask> DNSName: data.ServerName,
<mask> }
<mask>
<mask> log.Printf("number of certs - %d", len(parsedCerts))
<mask> if len(parsedCerts) > 1 {
<mask> // set up an intermediate
</s> * validateCertificates(): change input parameters; added short description </s> remove pemblock := []byte(data.CertificateChain)
</s> add pemblock := []byte(CertificateChain) </s> remove if data.CertificateChain != "" {
log.Tracef("got certificate: %s", data.CertificateChain)
</s> add if CertificateChain != "" {
log.Tracef("got certificate: %s", CertificateChain) </s> remove func validateCertificates(data tlsConfig) tlsConfig {
</s> add /* Process certificate data and its private key.
CertificateChain, PrivateKey parameters are optional.
On error, return partially set object
with 'WarningValidation' field containing error description.
*/
func validateCertificates(CertificateChain, PrivateKey, ServerName string) tlsConfigStatus { </s> remove config.TLS = data // update warnings
</s> add config.TLS.tlsConfigStatus = data // update warnings </s> remove data := validateCertificates(config.TLS)
</s> add data := validateCertificates(config.TLS.CertificateChain, config.TLS.PrivateKey, config.TLS.ServerName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/766fbab0718f2b02fb3864e521820033ab015e36 | control.go |
if PrivateKey != "" { | <mask> }
<mask> }
<mask>
<mask> // validate private key (right now the only validation possible is just parsing it)
<mask> if data.PrivateKey != "" {
<mask> // now do a more extended validation
<mask> var key *pem.Block // PEM-encoded certificates
<mask> var skippedBytes []string // skipped bytes
<mask>
<mask> // go through all pem blocks, but take first valid pem block and drop the rest
</s> * validateCertificates(): change input parameters; added short description </s> remove pemblock := []byte(data.PrivateKey)
</s> add pemblock := []byte(PrivateKey) </s> remove if data.CertificateChain != "" {
log.Tracef("got certificate: %s", data.CertificateChain)
</s> add if CertificateChain != "" {
log.Tracef("got certificate: %s", CertificateChain) </s> remove pemblock := []byte(data.CertificateChain)
</s> add pemblock := []byte(CertificateChain) </s> remove
// clear out status for certificates
data.tlsConfigStatus = tlsConfigStatus{}
</s> add var data tlsConfigStatus </s> remove var data tlsConfig
</s> add var data tlsConfigStatus | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/766fbab0718f2b02fb3864e521820033ab015e36 | control.go |
pemblock := []byte(PrivateKey) | <mask> var key *pem.Block // PEM-encoded certificates
<mask> var skippedBytes []string // skipped bytes
<mask>
<mask> // go through all pem blocks, but take first valid pem block and drop the rest
<mask> pemblock := []byte(data.PrivateKey)
<mask> for {
<mask> var decoded *pem.Block
<mask> decoded, pemblock = pem.Decode(pemblock)
<mask> if decoded == nil {
<mask> break
</s> * validateCertificates(): change input parameters; added short description </s> remove pemblock := []byte(data.CertificateChain)
</s> add pemblock := []byte(CertificateChain) </s> remove if data.PrivateKey != "" {
</s> add if PrivateKey != "" { </s> remove if data.CertificateChain != "" {
log.Tracef("got certificate: %s", data.CertificateChain)
</s> add if CertificateChain != "" {
log.Tracef("got certificate: %s", CertificateChain) </s> remove
// clear out status for certificates
data.tlsConfigStatus = tlsConfigStatus{}
</s> add var data tlsConfigStatus </s> remove config.TLS = data // update warnings
</s> add config.TLS.tlsConfigStatus = data // update warnings | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/766fbab0718f2b02fb3864e521820033ab015e36 | control.go |
if PrivateKey != "" && CertificateChain != "" {
_, err = tls.X509KeyPair([]byte(CertificateChain), []byte(PrivateKey)) | <mask> data.KeyType = keytype
<mask> }
<mask>
<mask> // if both are set, validate both in unison
<mask> if data.PrivateKey != "" && data.CertificateChain != "" {
<mask> _, err = tls.X509KeyPair([]byte(data.CertificateChain), []byte(data.PrivateKey))
<mask> if err != nil {
<mask> data.WarningValidation = fmt.Sprintf("Invalid certificate or key: %s", err)
<mask> return data
<mask> }
<mask> data.usable = true
</s> * validateCertificates(): change input parameters; added short description </s> remove
// clear out status for certificates
data.tlsConfigStatus = tlsConfigStatus{}
</s> add var data tlsConfigStatus </s> remove data.CertificateChain = ""
data.PrivateKey = "bad priv key"
data = validateCertificates(data)
</s> add data = validateCertificates("", "bad priv key", "") </s> remove data.CertificateChain = "bad cert"
data.PrivateKey = ""
data = validateCertificates(data)
</s> add data = validateCertificates("bad cert", "", "") </s> remove data = validateCertificates(data)
</s> add data.tlsConfigStatus = validateCertificates(data.CertificateChain, data.PrivateKey, data.ServerName) </s> remove data = validateCertificates(data)
</s> add data.tlsConfigStatus = validateCertificates(data.CertificateChain, data.PrivateKey, data.ServerName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/766fbab0718f2b02fb3864e521820033ab015e36 | control.go |
var data tlsConfigStatus | <mask> . Bad certificate
<mask> . Bad private key
<mask> . Valid certificate & private key */
<mask> func TestValidateCertificates(t *testing.T) {
<mask> var data tlsConfig
<mask>
<mask> // bad cert
<mask> data.CertificateChain = "bad cert"
<mask> data.PrivateKey = ""
<mask> data = validateCertificates(data)
</s> * validateCertificates(): change input parameters; added short description </s> remove data.CertificateChain = "bad cert"
data.PrivateKey = ""
data = validateCertificates(data)
</s> add data = validateCertificates("bad cert", "", "") </s> remove data.CertificateChain = ""
data.PrivateKey = "bad priv key"
data = validateCertificates(data)
</s> add data = validateCertificates("", "bad priv key", "") </s> remove func validateCertificates(data tlsConfig) tlsConfig {
</s> add /* Process certificate data and its private key.
CertificateChain, PrivateKey parameters are optional.
On error, return partially set object
with 'WarningValidation' field containing error description.
*/
func validateCertificates(CertificateChain, PrivateKey, ServerName string) tlsConfigStatus { </s> remove
// clear out status for certificates
data.tlsConfigStatus = tlsConfigStatus{}
</s> add var data tlsConfigStatus </s> remove data.CertificateChain = `-----BEGIN CERTIFICATE-----
</s> add CertificateChain := `-----BEGIN CERTIFICATE----- | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/766fbab0718f2b02fb3864e521820033ab015e36 | control_test.go |
data = validateCertificates("bad cert", "", "") | <mask> func TestValidateCertificates(t *testing.T) {
<mask> var data tlsConfig
<mask>
<mask> // bad cert
<mask> data.CertificateChain = "bad cert"
<mask> data.PrivateKey = ""
<mask> data = validateCertificates(data)
<mask> if !(data.WarningValidation != "" &&
<mask> !data.ValidCert &&
<mask> !data.ValidChain) {
<mask> t.Fatalf("bad cert: validateCertificates(): %v", data)
<mask> }
</s> * validateCertificates(): change input parameters; added short description </s> remove data.CertificateChain = ""
data.PrivateKey = "bad priv key"
data = validateCertificates(data)
</s> add data = validateCertificates("", "bad priv key", "") </s> remove var data tlsConfig
</s> add var data tlsConfigStatus </s> remove if data.PrivateKey != "" && data.CertificateChain != "" {
_, err = tls.X509KeyPair([]byte(data.CertificateChain), []byte(data.PrivateKey))
</s> add if PrivateKey != "" && CertificateChain != "" {
_, err = tls.X509KeyPair([]byte(CertificateChain), []byte(PrivateKey)) </s> remove data.CertificateChain = `-----BEGIN CERTIFICATE-----
</s> add CertificateChain := `-----BEGIN CERTIFICATE----- </s> remove data = validateCertificates(data)
</s> add data = validateCertificates(CertificateChain, PrivateKey, "") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/766fbab0718f2b02fb3864e521820033ab015e36 | control_test.go |
data = validateCertificates("", "bad priv key", "") | <mask> t.Fatalf("bad cert: validateCertificates(): %v", data)
<mask> }
<mask>
<mask> // bad priv key
<mask> data.CertificateChain = ""
<mask> data.PrivateKey = "bad priv key"
<mask> data = validateCertificates(data)
<mask> if !(data.WarningValidation != "" &&
<mask> !data.ValidKey) {
<mask> t.Fatalf("bad priv key: validateCertificates(): %v", data)
<mask> }
<mask>
</s> * validateCertificates(): change input parameters; added short description </s> remove data.CertificateChain = `-----BEGIN CERTIFICATE-----
</s> add CertificateChain := `-----BEGIN CERTIFICATE----- </s> remove data.CertificateChain = "bad cert"
data.PrivateKey = ""
data = validateCertificates(data)
</s> add data = validateCertificates("bad cert", "", "") </s> remove if data.PrivateKey != "" && data.CertificateChain != "" {
_, err = tls.X509KeyPair([]byte(data.CertificateChain), []byte(data.PrivateKey))
</s> add if PrivateKey != "" && CertificateChain != "" {
_, err = tls.X509KeyPair([]byte(CertificateChain), []byte(PrivateKey)) </s> remove var data tlsConfig
</s> add var data tlsConfigStatus </s> remove data = validateCertificates(data)
</s> add data.tlsConfigStatus = validateCertificates(data.CertificateChain, data.PrivateKey, data.ServerName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/766fbab0718f2b02fb3864e521820033ab015e36 | control_test.go |
CertificateChain := `-----BEGIN CERTIFICATE----- | <mask> t.Fatalf("bad priv key: validateCertificates(): %v", data)
<mask> }
<mask>
<mask> // valid cert & priv key
<mask> data.CertificateChain = `-----BEGIN CERTIFICATE-----
<mask> MIICKzCCAZSgAwIBAgIJAMT9kPVJdM7LMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNV
<mask> BAoMC0FkR3VhcmQgTHRkMRUwEwYDVQQDDAxBZEd1YXJkIEhvbWUwHhcNMTkwMjI3
<mask> MDkyNDIzWhcNNDYwNzE0MDkyNDIzWjAtMRQwEgYDVQQKDAtBZEd1YXJkIEx0ZDEV
<mask> MBMGA1UEAwwMQWRHdWFyZCBIb21lMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
<mask> gQCwvwUnPJiOvLcOaWmGu6Y68ksFr13nrXBcsDlhxlXy8PaohVi3XxEmt2OrVjKW
</s> * validateCertificates(): change input parameters; added short description </s> remove data.CertificateChain = ""
data.PrivateKey = "bad priv key"
data = validateCertificates(data)
</s> add data = validateCertificates("", "bad priv key", "") </s> remove data.CertificateChain = "bad cert"
data.PrivateKey = ""
data = validateCertificates(data)
</s> add data = validateCertificates("bad cert", "", "") </s> remove var data tlsConfig
</s> add var data tlsConfigStatus </s> remove data.PrivateKey = `-----BEGIN PRIVATE KEY-----
</s> add PrivateKey := `-----BEGIN PRIVATE KEY----- </s> remove if data.PrivateKey != "" && data.CertificateChain != "" {
_, err = tls.X509KeyPair([]byte(data.CertificateChain), []byte(data.PrivateKey))
</s> add if PrivateKey != "" && CertificateChain != "" {
_, err = tls.X509KeyPair([]byte(CertificateChain), []byte(PrivateKey)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/766fbab0718f2b02fb3864e521820033ab015e36 | control_test.go |
PrivateKey := `-----BEGIN PRIVATE KEY----- | <mask> LwlXfbakf7qkVTlCNXgoY7RaJ8rJdPgOZPoCTVToEhT6u/cb1c2qp8QB0dNExDna
<mask> b0Z+dnODTZqQOJo6z/wIXlcUrnR4cQVvytXt8lFn+26l6Y6EMI26twC/xWr+1swq
<mask> Muj4FeWHVDerquH4yMr1jsYLD3ci+kc5sbIX6TfVxQ==
<mask> -----END CERTIFICATE-----`
<mask> data.PrivateKey = `-----BEGIN PRIVATE KEY-----
<mask> MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBALC/BSc8mI68tw5p
<mask> aYa7pjrySwWvXeetcFywOWHGVfLw9qiFWLdfESa3Y6tWMpZAXD9t1Xh9n211YUBV
<mask> FGSB4ZshnM/tgEPU6t787lJD4NsIIRp++MkJxdAitN4oUTqL0bdpIwezQ/CrYuBX
<mask> xTmZii0uu/IWITxA8iclsMMyloVjAgMBAAECgYEAmjzoG1h27UDkIlB9BVWl95TP
<mask> QVPLB81D267xNFDnWk1Lgr5zL/pnNjkdYjyjgpkBp1yKyE4gHV4skv5sAFWTcOCU
</s> * validateCertificates(): change input parameters; added short description </s> remove data = validateCertificates(data)
</s> add data = validateCertificates(CertificateChain, PrivateKey, "") </s> remove data.CertificateChain = `-----BEGIN CERTIFICATE-----
</s> add CertificateChain := `-----BEGIN CERTIFICATE----- </s> remove data.CertificateChain = "bad cert"
data.PrivateKey = ""
data = validateCertificates(data)
</s> add data = validateCertificates("bad cert", "", "") </s> remove data.CertificateChain = ""
data.PrivateKey = "bad priv key"
data = validateCertificates(data)
</s> add data = validateCertificates("", "bad priv key", "") </s> remove var data tlsConfig
</s> add var data tlsConfigStatus | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/766fbab0718f2b02fb3864e521820033ab015e36 | control_test.go |
data = validateCertificates(CertificateChain, PrivateKey, "") | <mask> O5EX70gpeGQMPDK0QSWpaazg956njJSDbNCFM4BccrdQbJu1cW4qOsfBAkAMgZuG
<mask> O88slmgTRHX4JGFmy3rrLiHNI2BbJSuJ++Yllz8beVzh6NfvuY+HKRCmPqoBPATU
<mask> kXS9jgARhhiWXJrk
<mask> -----END PRIVATE KEY-----`
<mask> data = validateCertificates(data)
<mask> notBefore, _ := time.Parse(time.RFC3339, "2019-02-27T09:24:23Z")
<mask> notAfter, _ := time.Parse(time.RFC3339, "2046-07-14T09:24:23Z")
<mask> if !(data.WarningValidation != "" /* self signed */ &&
<mask> data.ValidCert &&
<mask> !data.ValidChain &&
</s> * validateCertificates(): change input parameters; added short description </s> remove data.CertificateChain = "bad cert"
data.PrivateKey = ""
data = validateCertificates(data)
</s> add data = validateCertificates("bad cert", "", "") </s> remove data.CertificateChain = ""
data.PrivateKey = "bad priv key"
data = validateCertificates(data)
</s> add data = validateCertificates("", "bad priv key", "") </s> remove data.PrivateKey = `-----BEGIN PRIVATE KEY-----
</s> add PrivateKey := `-----BEGIN PRIVATE KEY----- </s> remove if data.PrivateKey != "" && data.CertificateChain != "" {
_, err = tls.X509KeyPair([]byte(data.CertificateChain), []byte(data.PrivateKey))
</s> add if PrivateKey != "" && CertificateChain != "" {
_, err = tls.X509KeyPair([]byte(CertificateChain), []byte(PrivateKey)) </s> remove var data tlsConfig
</s> add var data tlsConfigStatus | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/766fbab0718f2b02fb3864e521820033ab015e36 | control_test.go |
"name": "POL: Polish filters for Pi-hole", | <mask> "homepage": "https://github.com/DandelionSprout/adfilt",
<mask> "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_13.txt"
<mask> },
<mask> "POL_polish_filters_for_pi_hole": {
<mask> "name": "POL: Polish filters for Pi hole",
<mask> "categoryId": "regional",
<mask> "homepage": "https://www.certyficate.it/",
<mask> "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_14.txt"
<mask> },
<mask> "SWE_frellwit_swedish_hosts_file": {
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/filters/filters.js |
"timeUpdated": "2023-02-21T12:46:33.324Z", | <mask> {
<mask> "timeUpdated": "2023-02-09T12:31:34.007Z",
<mask> "categories": {
<mask> "0": "audio_video_player",
<mask> "1": "comments",
<mask> "2": "customer_interaction",
<mask> "3": "pornvertising",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "companyId": "facebook",
</s> add "companyId": "meta", </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" | [
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"companyId": "meta",
"source": "AdGuard" | <mask> "facebook": {
<mask> "name": "Facebook",
<mask> "categoryId": 4,
<mask> "url": "https://www.facebook.com",
<mask> "companyId": "facebook"
<mask> },
<mask> "facebook_beacon": {
<mask> "name": "Facebook Beacon",
<mask> "categoryId": 7,
<mask> "url": "http://www.facebook.com/beacon/faq.php",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"companyId": "meta",
"source": "AdGuard" | <mask> "facebook_beacon": {
<mask> "name": "Facebook Beacon",
<mask> "categoryId": 7,
<mask> "url": "http://www.facebook.com/beacon/faq.php",
<mask> "companyId": "facebook"
<mask> },
<mask> "facebook_cdn": {
<mask> "name": "Facebook CDN",
<mask> "categoryId": 9,
<mask> "url": "https://www.facebook.com",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"companyId": "meta",
"source": "AdGuard" | <mask> "facebook_cdn": {
<mask> "name": "Facebook CDN",
<mask> "categoryId": 9,
<mask> "url": "https://www.facebook.com",
<mask> "companyId": "facebook"
<mask> },
<mask> "facebook_connect": {
<mask> "name": "Facebook Connect",
<mask> "categoryId": 6,
<mask> "url": "https://developers.facebook.com/connect.php",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"companyId": "meta",
"source": "AdGuard" | <mask> "facebook_connect": {
<mask> "name": "Facebook Connect",
<mask> "categoryId": 6,
<mask> "url": "https://developers.facebook.com/connect.php",
<mask> "companyId": "facebook"
<mask> },
<mask> "facebook_conversion_tracking": {
<mask> "name": "Facebook Conversion Tracking",
<mask> "categoryId": 4,
<mask> "url": "http://www.facebook.com/",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"companyId": "meta",
"source": "AdGuard" | <mask> "facebook_conversion_tracking": {
<mask> "name": "Facebook Conversion Tracking",
<mask> "categoryId": 4,
<mask> "url": "http://www.facebook.com/",
<mask> "companyId": "facebook"
<mask> },
<mask> "facebook_custom_audience": {
<mask> "name": "Facebook Custom Audience",
<mask> "categoryId": 4,
<mask> "url": "https://www.facebook.com",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"companyId": "meta",
"source": "AdGuard" | <mask> "facebook_custom_audience": {
<mask> "name": "Facebook Custom Audience",
<mask> "categoryId": 4,
<mask> "url": "https://www.facebook.com",
<mask> "companyId": "facebook"
<mask> },
<mask> "facebook_graph": {
<mask> "name": "Facebook Social Graph",
<mask> "categoryId": 7,
<mask> "url": "https://developers.facebook.com/docs/reference/api/",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"companyId": "meta",
"source": "AdGuard" | <mask> "facebook_graph": {
<mask> "name": "Facebook Social Graph",
<mask> "categoryId": 7,
<mask> "url": "https://developers.facebook.com/docs/reference/api/",
<mask> "companyId": "facebook"
<mask> },
<mask> "facebook_impressions": {
<mask> "name": "Facebook Impressions",
<mask> "categoryId": 4,
<mask> "url": "https://www.facebook.com/",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"companyId": "meta",
"source": "AdGuard" | <mask> "facebook_impressions": {
<mask> "name": "Facebook Impressions",
<mask> "categoryId": 4,
<mask> "url": "https://www.facebook.com/",
<mask> "companyId": "facebook"
<mask> },
<mask> "facebook_social_plugins": {
<mask> "name": "Facebook Social Plugins",
<mask> "categoryId": 7,
<mask> "url": "https://developers.facebook.com/plugins",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"companyId": "meta",
"source": "AdGuard" | <mask> "facebook_social_plugins": {
<mask> "name": "Facebook Social Plugins",
<mask> "categoryId": 7,
<mask> "url": "https://developers.facebook.com/plugins",
<mask> "companyId": "facebook"
<mask> },
<mask> "facetz.dca": {
<mask> "name": "Facetz.DCA",
<mask> "categoryId": 4,
<mask> "url": "http://facetz.net",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"companyId": "meta",
"source": "AdGuard" | <mask> "instagram_com": {
<mask> "name": "Instagram",
<mask> "categoryId": 8,
<mask> "url": "https://www.facebook.com/",
<mask> "companyId": "facebook"
<mask> },
<mask> "instant_check_mate": {
<mask> "name": "Instant Check Mate",
<mask> "categoryId": 2,
<mask> "url": "https://www.instantcheckmate.com/",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"companyId": "meta", | <mask> "facebook_audience": {
<mask> "name": "Facebook Audience Network",
<mask> "categoryId": 4,
<mask> "url": "https://www.facebook.com/business/products/audience-network",
<mask> "companyId": "facebook",
<mask> "source": "AdGuard"
<mask> },
<mask> "crashlytics": {
<mask> "name": "Crashlytics",
<mask> "categoryId": 101,
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"gmail": {
"name": "Gmail",
"categoryId": 13,
"url": "https://mail.google.com/",
"companyId": "google",
"source": "AdGuard"
}, | <mask> "source": "AdGuard"
<mask> },
<mask> "google_trust_services": {
<mask> "name": "Google Trust Services",
<mask> "categoryId": 5,
<mask> "url": "https://pki.goog/",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"telstra": {
"name": "Telstra",
"categoryId": 8,
"url": "https://www.telstra.com.au/",
"companyId": "telstra",
"source": "AdGuard"
},
"medialab": {
"name": "MediaLab.AI Inc.",
"categoryId": 8,
"url": "https://medialab.la/",
"companyId": "medialab",
"source": "AdGuard"
}, | <mask> "url": "https://branch.io/",
<mask> "companyId": "branch_metrics_inc",
<mask> "source": "AdGuard"
<mask> },
<mask> "qualcomm": {
<mask> "name": "Qualcomm",
<mask> "categoryId": 8,
<mask> "url": "https://www.qualcomm.com/",
<mask> "companyId": "qualcomm",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"sectigo": {
"name": "Sectigo Limited",
"categoryId": 5,
"url": "https://www.solaredge.com/",
"companyId": "sectigo",
"source": "AdGuard"
}, | <mask> "url": "https://www.solaredge.com/",
<mask> "companyId": "solaredge",
<mask> "source": "AdGuard"
<mask> },
<mask> "element": {
<mask> "name": "Element",
<mask> "categoryId": 7,
<mask> "url": "https://element.io/",
<mask> "companyId": "element",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"oztam": {
"name": "OzTAM",
"categoryId": 8,
"url": "https://oztam.com.au/",
"companyId": "oztam",
"source": "AdGuard"
},
"oppo": {
"name": "OPPO",
"categoryId": 101,
"url": "https://www.oppo.com/",
"companyId": "oppo",
"source": "AdGuard"
}, | <mask> "source": "AdGuard"
<mask> },
<mask> "outlook": {
<mask> "name": "Microsoft Outlook",
<mask> "categoryId": 13,
<mask> "url": "https://outlook.live.com/",
<mask> "companyId": "microsoft",
<mask> "source": "AdGuard"
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"kik": {
"name": "Kik",
"categoryId": 7,
"url": "https://kik.com/",
"companyId": "kik",
"source": "AdGuard"
}, | <mask> "source": "AdGuard"
<mask> },
<mask> "plex": {
<mask> "name": "Plex",
<mask> "categoryId": 0,
<mask> "url": "https://www.plex.tv/",
<mask> "companyId": "plex",
<mask> "source": "AdGuard"
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"whatsapp.net": "whatsapp",
"whatsapp.com": "whatsapp",
"telstra.com.au": "telstra",
"telstra.com": "telstra", | <mask> "zwaar.org": "zwaar",
<mask> "extend.tv": "zypmedia",
<mask> "slack.com": "slack",
<mask> "slackb.com": "slack",
<mask> "slack-edge.com": "slack",
<mask> "slack-imgs.com": "slack",
<mask> "addlive.io": "snap",
<mask> "feelinsonice.com": "snap",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove FROM alpine:3.16
</s> add FROM alpine:3.17 </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"addlive.io": "snap",
"feelinsonice.com": "snap",
"sc-cdn.net": "snap",
"sc-corp.net": "snap",
"sc-gw.com": "snap",
"sc-jpl.com": "snap",
"sc-prod.net": "snap",
"snap-dev.net": "snap",
"snapads.com": "snap",
"snapkit.com": "snap", | <mask> "slack.com": "slack",
<mask> "slackb.com": "slack",
<mask> "slack-edge.com": "slack",
<mask> "slack-imgs.com": "slack",
<mask> "adguard.app": "adguard",
<mask> "adguard.io": "adguard",
<mask> "adguard.org": "adguard",
<mask> "adguard-dns.com": "adguard",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove FROM alpine:3.16
</s> add FROM alpine:3.17 </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"oppomobile.com": "oppo",
"heytapmobi.com": "oppo",
"heytapmobile.com": "oppo",
"heytapdl.com": "oppo",
"allawnos.com": "oppo",
"allawntech.com": "oppo", | <mask> "adguard-vpn.com": "adguard",
<mask> "adguardvpn.com": "adguard",
<mask> "adguard-vpn.online": "adguard",
<mask> "nflximg.com": "netflix",
<mask> "element.io": "element",
<mask> "riot.im": "element",
<mask> "gvt1.com": "google_servers",
<mask> "gvt2.com": "google_servers",
<mask> "gvt3.com": "google_servers",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "companyId": "facebook"
</s> add "companyId": "meta",
"source": "AdGuard" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"gvt1.com": "google_servers",
"gvt2.com": "google_servers",
"gvt3.com": "google_servers", | <mask> "allawntech.com": "oppo",
<mask> "nflximg.com": "netflix",
<mask> "element.io": "element",
<mask> "riot.im": "element",
<mask> "akadns.net": "akamai_technologies",
<mask> "akamaiedge.net": "akamai_technologies",
<mask> "akaquill.net": "akamai_technologies",
<mask> "me.com": "apple",
<mask> "apple.news": "apple",
<mask> "apple-dns.net": "apple",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"akaquill.net": "akamai_technologies",
"me.com": "apple", | <mask> "gvt3.com": "google_servers",
<mask> "akadns.net": "akamai_technologies",
<mask> "akamaiedge.net": "akamai_technologies",
<mask> "apple.news": "apple",
<mask> "apple-dns.net": "apple",
<mask> "aaplimg.com": "apple",
<mask> "icloud.com": "apple",
<mask> "itunes.com": "apple",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "l-msedge.net": "microsoft",
</s> add "medialab.la": "medialab",
"media-lab.ai": "medialab",
"phicdn.net": "digicert_trust_seal",
"e-msedge.net": "msedge",
"l-msedge.net": "msedge",
"exp-tas.com": "vscode",
"vscode-unpkg.net": "vscode",
"v0cdn.net": "vscode",
"vscode-cdn.net": "vscode", | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"itunes.com": "apple", | <mask> "apple-dns.net": "apple",
<mask> "aaplimg.com": "apple",
<mask> "icloud.com": "apple",
<mask> "icloud-content.com": "apple",
<mask> "kik.com": "kik",
<mask> "apikik.com": "kik",
<mask> "kik-live.com": "kik",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "l-msedge.net": "microsoft",
</s> add "medialab.la": "medialab",
"media-lab.ai": "medialab",
"phicdn.net": "digicert_trust_seal",
"e-msedge.net": "msedge",
"l-msedge.net": "msedge",
"exp-tas.com": "vscode",
"vscode-unpkg.net": "vscode",
"v0cdn.net": "vscode",
"vscode-cdn.net": "vscode", | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"kik.com": "kik",
"apikik.com": "kik",
"kik-live.com": "kik", | <mask> "icloud.com": "apple",
<mask> "itunes.com": "apple",
<mask> "icloud-content.com": "apple",
<mask> "mzstatic.com": "apple",
<mask> "cdn-apple.com": "apple",
<mask> "apple-mapkit.com": "apple",
<mask> "icons.axm-usercontent-apple.com": "apple",
<mask> "apple-cloudkit.com": "apple",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "l-msedge.net": "microsoft",
</s> add "medialab.la": "medialab",
"media-lab.ai": "medialab",
"phicdn.net": "digicert_trust_seal",
"e-msedge.net": "msedge",
"l-msedge.net": "msedge",
"exp-tas.com": "vscode",
"vscode-unpkg.net": "vscode",
"v0cdn.net": "vscode",
"vscode-cdn.net": "vscode", | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"cdn-apple.com": "apple",
"apple-mapkit.com": "apple",
"icons.axm-usercontent-apple.com": "apple",
"apple-cloudkit.com": "apple",
"apzones.com": "apple",
"apple-livephotoskit.com": "apple",
"safebrowsing.apple": "apple",
"safebrowsing.g.applimg.com": "apple", | <mask> "kik-live.com": "kik",
<mask> "mzstatic.com": "apple",
<mask> "matrix.org": "matrix",
<mask> "medialab.la": "medialab",
<mask> "media-lab.ai": "medialab",
<mask> "phicdn.net": "digicert_trust_seal",
<mask> "e-msedge.net": "msedge",
<mask> "l-msedge.net": "msedge",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "l-msedge.net": "microsoft",
</s> add "medialab.la": "medialab",
"media-lab.ai": "medialab",
"phicdn.net": "digicert_trust_seal",
"e-msedge.net": "msedge",
"l-msedge.net": "msedge",
"exp-tas.com": "vscode",
"vscode-unpkg.net": "vscode",
"v0cdn.net": "vscode",
"vscode-cdn.net": "vscode", | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"medialab.la": "medialab",
"media-lab.ai": "medialab",
"phicdn.net": "digicert_trust_seal",
"e-msedge.net": "msedge",
"l-msedge.net": "msedge",
"exp-tas.com": "vscode",
"vscode-unpkg.net": "vscode",
"v0cdn.net": "vscode",
"vscode-cdn.net": "vscode", | <mask> "icloud.com": "apple",
<mask> "icloud-content.com": "apple",
<mask> "mzstatic.com": "apple",
<mask> "matrix.org": "matrix",
<mask> "l-msedge.net": "microsoft",
<mask> "iadsdk.apple.com": "apple_ads",
<mask> "showrss.info": "showrss",
<mask> "solaredge.com": "solaredge",
<mask> "crashlytics.com": "crashlytics",
<mask> "flurry.com": "flurry",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"sectigo.com": "sectigo", | <mask> "v0cdn.net": "vscode",
<mask> "vscode-cdn.net": "vscode",
<mask> "iadsdk.apple.com": "apple_ads",
<mask> "showrss.info": "showrss",
<mask> "solaredge.com": "solaredge",
<mask> "crashlytics.com": "crashlytics",
<mask> "cloudflare-dns.com": "cloudflare",
<mask> "flurry.com": "flurry",
<mask> "hockeyapp.net": "hockeyapp",
<mask> "app-measurement.com": "firebase",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "l-msedge.net": "microsoft",
</s> add "medialab.la": "medialab",
"media-lab.ai": "medialab",
"phicdn.net": "digicert_trust_seal",
"e-msedge.net": "msedge",
"l-msedge.net": "msedge",
"exp-tas.com": "vscode",
"vscode-unpkg.net": "vscode",
"v0cdn.net": "vscode",
"vscode-cdn.net": "vscode", </s> remove FROM alpine:3.16
</s> add FROM alpine:3.17 | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
"cloudflare-dns.com": "cloudflare", | <mask> "sectigo.com": "sectigo",
<mask> "solaredge.com": "solaredge",
<mask> "crashlytics.com": "crashlytics",
<mask> "flurry.com": "flurry",
<mask> "hockeyapp.net": "hockeyapp",
<mask> "app-measurement.com": "firebase",
<mask> "appmetrica.yandex.com": "yandex_appmetrica",
</s> Pull request 1748: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 7014e7631933f7d5cb58ec6fd1a221f497983e98
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 21 17:57:35 2023 +0300
all: upd i18n, filters, trackers, services, tools </s> remove "l-msedge.net": "microsoft",
</s> add "medialab.la": "medialab",
"media-lab.ai": "medialab",
"phicdn.net": "digicert_trust_seal",
"e-msedge.net": "msedge",
"l-msedge.net": "msedge",
"exp-tas.com": "vscode",
"vscode-unpkg.net": "vscode",
"v0cdn.net": "vscode",
"vscode-cdn.net": "vscode", </s> remove FROM alpine:3.16
</s> add FROM alpine:3.17 | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/76a513cdaf3fa2e951843f8779b79d56975916df | client/src/helpers/trackers/trackers.json |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.