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
|
|---|---|---|---|---|
blockedFiltering={dashboard.stats.blocked_filtering}
replacedSafebrowsing={dashboard.stats.replaced_safebrowsing}
replacedParental={dashboard.stats.replaced_parental} | <mask> refreshButton={refreshButton}
<mask> topBlockedDomains={dashboard.topStats.top_blocked_domains}
<mask> />
<mask> </div>
<mask> </Fragment>
<mask> }
<mask> </div>
<mask> }
</s> Add progress bar to the stats tables </s> remove const Clients = props => (
<Card title="Top clients" subtitle="for the last 24 hours" bodyType="card-table" refresh={props.refreshButton}>
<ReactTable
data={map(props.topClients, (value, prop) => (
{ ip: prop, count: value }
))}
columns={[{
Header: 'IP',
accessor: 'ip',
}, {
Header: 'Requests count',
accessor: 'count',
}]}
showPagination={false}
noDataText="No clients found"
minRows={6}
className="-striped -highlight card-table-overflow"
/>
</Card>
);
</s> add import { getPercent } from '../../helpers/helpers';
import { STATUS_COLORS } from '../../helpers/constants';
class Clients extends Component {
getPercentColor = (percent) => {
if (percent > 50) {
return STATUS_COLORS.green;
} else if (percent > 10) {
return STATUS_COLORS.yellow;
}
return STATUS_COLORS.red;
}
columns = [{
Header: 'IP',
accessor: 'ip',
}, {
Header: 'Requests count',
accessor: 'count',
Cell: ({ value }) => {
const percent = getPercent(this.props.dnsQueries, value);
const percentColor = this.getPercentColor(percent);
return (
<Cell value={value} percent={percent} color={percentColor} />
);
},
}];
render() {
return (
<Card title="Top clients" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
<ReactTable
data={map(this.props.topClients, (value, prop) => (
{ ip: prop, count: value }
))}
columns={this.columns}
showPagination={false}
noDataText="No clients found"
minRows={6}
className="-striped -highlight card-table-overflow"
/>
</Card>
);
}
} </s> remove const QueriedDomains = props => (
<Card title="Top queried domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={props.refreshButton}>
<ReactTable
data={map(props.topQueriedDomains, (value, prop) => (
{ ip: prop, count: value }
))}
columns={[{
Header: 'IP',
accessor: 'ip',
}, {
Header: 'Requests count',
accessor: 'count',
}]}
showPagination={false}
noDataText="No domains found"
minRows={6}
className="-striped -highlight card-table-overflow"
/>
</Card>
);
</s> add import { getPercent } from '../../helpers/helpers';
import { STATUS_COLORS } from '../../helpers/constants';
class QueriedDomains extends Component {
getPercentColor = (percent) => {
if (percent > 10) {
return STATUS_COLORS.red;
} else if (percent > 5) {
return STATUS_COLORS.yellow;
}
return STATUS_COLORS.green;
}
columns = [{
Header: 'IP',
accessor: 'ip',
}, {
Header: 'Requests count',
accessor: 'count',
Cell: ({ value }) => {
const percent = getPercent(this.props.dnsQueries, value);
const percentColor = this.getPercentColor(percent);
return (
<Cell value={value} percent={percent} color={percentColor} />
);
},
}];
render() {
return (
<Card title="Top queried domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
<ReactTable
data={map(this.props.topQueriedDomains, (value, prop) => (
{ ip: prop, count: value }
))}
columns={this.columns}
showPagination={false}
noDataText="No domains found"
minRows={6}
className="-striped -highlight card-table-overflow"
/>
</Card>
);
}
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6ca881ee86f586486fa35205eec7617d27e41a72 | client/src/components/Dashboard/index.js |
<mask> .card-graph {
<mask> display: flex;
<mask> align-items: center;
<mask> justify-content: center;
<mask> height: 400px;
<mask> }
<mask>
<mask> .card-body--status {
<mask> padding: 2.5rem 1.5rem;
<mask> text-align: center;
</s> Add progress bar to the stats tables </s> remove const Clients = props => (
<Card title="Top clients" subtitle="for the last 24 hours" bodyType="card-table" refresh={props.refreshButton}>
<ReactTable
data={map(props.topClients, (value, prop) => (
{ ip: prop, count: value }
))}
columns={[{
Header: 'IP',
accessor: 'ip',
}, {
Header: 'Requests count',
accessor: 'count',
}]}
showPagination={false}
noDataText="No clients found"
minRows={6}
className="-striped -highlight card-table-overflow"
/>
</Card>
);
</s> add import { getPercent } from '../../helpers/helpers';
import { STATUS_COLORS } from '../../helpers/constants';
class Clients extends Component {
getPercentColor = (percent) => {
if (percent > 50) {
return STATUS_COLORS.green;
} else if (percent > 10) {
return STATUS_COLORS.yellow;
}
return STATUS_COLORS.red;
}
columns = [{
Header: 'IP',
accessor: 'ip',
}, {
Header: 'Requests count',
accessor: 'count',
Cell: ({ value }) => {
const percent = getPercent(this.props.dnsQueries, value);
const percentColor = this.getPercentColor(percent);
return (
<Cell value={value} percent={percent} color={percentColor} />
);
},
}];
render() {
return (
<Card title="Top clients" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
<ReactTable
data={map(this.props.topClients, (value, prop) => (
{ ip: prop, count: value }
))}
columns={this.columns}
showPagination={false}
noDataText="No clients found"
minRows={6}
className="-striped -highlight card-table-overflow"
/>
</Card>
);
}
} </s> remove const QueriedDomains = props => (
<Card title="Top queried domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={props.refreshButton}>
<ReactTable
data={map(props.topQueriedDomains, (value, prop) => (
{ ip: prop, count: value }
))}
columns={[{
Header: 'IP',
accessor: 'ip',
}, {
Header: 'Requests count',
accessor: 'count',
}]}
showPagination={false}
noDataText="No domains found"
minRows={6}
className="-striped -highlight card-table-overflow"
/>
</Card>
);
</s> add import { getPercent } from '../../helpers/helpers';
import { STATUS_COLORS } from '../../helpers/constants';
class QueriedDomains extends Component {
getPercentColor = (percent) => {
if (percent > 10) {
return STATUS_COLORS.red;
} else if (percent > 5) {
return STATUS_COLORS.yellow;
}
return STATUS_COLORS.green;
}
columns = [{
Header: 'IP',
accessor: 'ip',
}, {
Header: 'Requests count',
accessor: 'count',
Cell: ({ value }) => {
const percent = getPercent(this.props.dnsQueries, value);
const percentColor = this.getPercentColor(percent);
return (
<Cell value={value} percent={percent} color={percentColor} />
);
},
}];
render() {
return (
<Card title="Top queried domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
<ReactTable
data={map(this.props.topQueriedDomains, (value, prop) => (
{ ip: prop, count: value }
))}
columns={this.columns}
showPagination={false}
noDataText="No domains found"
minRows={6}
className="-striped -highlight card-table-overflow"
/>
</Card>
);
}
} </s> remove Clients.propTypes = {
</s> add class BlockedDomains extends Component {
columns = [{
Header: 'IP',
accessor: 'ip',
}, {
Header: 'Requests count',
accessor: 'domain',
Cell: ({ value }) => {
const {
blockedFiltering,
replacedSafebrowsing,
replacedParental,
} = this.props;
const blocked = blockedFiltering + replacedSafebrowsing + replacedParental;
const percent = getPercent(blocked, value);
return (
<Cell value={value} percent={percent} color={STATUS_COLORS.red} />
);
},
}];
render() {
return (
<Card title="Top blocked domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
<ReactTable
data={map(this.props.topBlockedDomains, (value, prop) => (
{ ip: prop, domain: value }
))}
columns={this.columns}
showPagination={false}
noDataText="No domains found"
minRows={6}
className="-striped -highlight card-table-overflow"
/>
</Card>
);
}
}
BlockedDomains.propTypes = { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6ca881ee86f586486fa35205eec7617d27e41a72 | client/src/components/ui/Card.css |
|
export const getPercent = (amount, number) => {
if (amount > 0 && number > 0) {
return round(100 / (amount / number), 2);
}
return 0;
}; | <mask> const newUserRules = Array.isArray(userRules) ? userRules.join('\n') : '';
<mask> return { enabled, userRules: newUserRules, filters: newFilters };
<mask> };
<mask>
<mask> export const getPercent = (amount, number) => round(100 / (amount / number));
</s> Add progress bar to the stats tables </s> remove Clients.propTypes = {
</s> add class BlockedDomains extends Component {
columns = [{
Header: 'IP',
accessor: 'ip',
}, {
Header: 'Requests count',
accessor: 'domain',
Cell: ({ value }) => {
const {
blockedFiltering,
replacedSafebrowsing,
replacedParental,
} = this.props;
const blocked = blockedFiltering + replacedSafebrowsing + replacedParental;
const percent = getPercent(blocked, value);
return (
<Cell value={value} percent={percent} color={STATUS_COLORS.red} />
);
},
}];
render() {
return (
<Card title="Top blocked domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
<ReactTable
data={map(this.props.topBlockedDomains, (value, prop) => (
{ ip: prop, domain: value }
))}
columns={this.columns}
showPagination={false}
noDataText="No domains found"
minRows={6}
className="-striped -highlight card-table-overflow"
/>
</Card>
);
}
}
BlockedDomains.propTypes = { </s> remove const Clients = props => (
<Card title="Top clients" subtitle="for the last 24 hours" bodyType="card-table" refresh={props.refreshButton}>
<ReactTable
data={map(props.topClients, (value, prop) => (
{ ip: prop, count: value }
))}
columns={[{
Header: 'IP',
accessor: 'ip',
}, {
Header: 'Requests count',
accessor: 'count',
}]}
showPagination={false}
noDataText="No clients found"
minRows={6}
className="-striped -highlight card-table-overflow"
/>
</Card>
);
</s> add import { getPercent } from '../../helpers/helpers';
import { STATUS_COLORS } from '../../helpers/constants';
class Clients extends Component {
getPercentColor = (percent) => {
if (percent > 50) {
return STATUS_COLORS.green;
} else if (percent > 10) {
return STATUS_COLORS.yellow;
}
return STATUS_COLORS.red;
}
columns = [{
Header: 'IP',
accessor: 'ip',
}, {
Header: 'Requests count',
accessor: 'count',
Cell: ({ value }) => {
const percent = getPercent(this.props.dnsQueries, value);
const percentColor = this.getPercentColor(percent);
return (
<Cell value={value} percent={percent} color={percentColor} />
);
},
}];
render() {
return (
<Card title="Top clients" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
<ReactTable
data={map(this.props.topClients, (value, prop) => (
{ ip: prop, count: value }
))}
columns={this.columns}
showPagination={false}
noDataText="No clients found"
minRows={6}
className="-striped -highlight card-table-overflow"
/>
</Card>
);
}
} </s> remove const QueriedDomains = props => (
<Card title="Top queried domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={props.refreshButton}>
<ReactTable
data={map(props.topQueriedDomains, (value, prop) => (
{ ip: prop, count: value }
))}
columns={[{
Header: 'IP',
accessor: 'ip',
}, {
Header: 'Requests count',
accessor: 'count',
}]}
showPagination={false}
noDataText="No domains found"
minRows={6}
className="-striped -highlight card-table-overflow"
/>
</Card>
);
</s> add import { getPercent } from '../../helpers/helpers';
import { STATUS_COLORS } from '../../helpers/constants';
class QueriedDomains extends Component {
getPercentColor = (percent) => {
if (percent > 10) {
return STATUS_COLORS.red;
} else if (percent > 5) {
return STATUS_COLORS.yellow;
}
return STATUS_COLORS.green;
}
columns = [{
Header: 'IP',
accessor: 'ip',
}, {
Header: 'Requests count',
accessor: 'count',
Cell: ({ value }) => {
const percent = getPercent(this.props.dnsQueries, value);
const percentColor = this.getPercentColor(percent);
return (
<Cell value={value} percent={percent} color={percentColor} />
);
},
}];
render() {
return (
<Card title="Top queried domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
<ReactTable
data={map(this.props.topQueriedDomains, (value, prop) => (
{ ip: prop, count: value }
))}
columns={this.columns}
showPagination={false}
noDataText="No domains found"
minRows={6}
className="-striped -highlight card-table-overflow"
/>
</Card>
);
}
} </s> remove const Clients = props => (
<Card title="Top blocked domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={props.refreshButton}>
<ReactTable
data={map(props.topBlockedDomains, (value, prop) => (
{ ip: prop, domain: value }
))}
columns={[{
Header: 'IP',
accessor: 'ip',
}, {
Header: 'Domain name',
accessor: 'domain',
}]}
showPagination={false}
noDataText="No domains found"
minRows={6}
className="-striped -highlight card-table-overflow"
/>
</Card>
);
</s> add import { getPercent } from '../../helpers/helpers';
import { STATUS_COLORS } from '../../helpers/constants'; | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6ca881ee86f586486fa35205eec7617d27e41a72 | client/src/helpers/helpers.js |
{"config", "c", "Path to the config file", func(value string) { o.configFilename = value }, nil},
{"work-dir", "w", "Path to the working directory", func(value string) { o.workDir = value }, nil},
{"host", "h", "Host address to bind HTTP server on", func(value string) { o.bindHost = value }, nil},
{"port", "p", "Port to serve HTTP pages on", func(value string) { | <mask> description string
<mask> callbackWithValue func(value string)
<mask> callbackNoValue func()
<mask> }{
<mask> {"config", "c", "path to the config file", func(value string) { o.configFilename = value }, nil},
<mask> {"work-dir", "w", "path to the working directory", func(value string) { o.workDir = value }, nil},
<mask> {"host", "h", "host address to bind HTTP server on", func(value string) { o.bindHost = value }, nil},
<mask> {"port", "p", "port to serve HTTP pages on", func(value string) {
<mask> v, err := strconv.Atoi(value)
<mask> if err != nil {
<mask> panic("Got port that is not a number")
<mask> }
<mask> o.bindPort = v
</s> * app: --help: more pretty help info </s> remove {"service", "s", "service control action: status, install, uninstall, start, stop, restart", func(value string) {
</s> add {"service", "s", "Service control action: status, install, uninstall, start, stop, restart", func(value string) { </s> remove {"pidfile", "", "File name to save PID to", func(value string) { o.pidFile = value }, nil},
</s> add {"pidfile", "", "Path to a file where PID is stored", func(value string) { o.pidFile = value }, nil}, </s> remove {"logfile", "l", "path to the log file. If empty, writes to stdout, if 'syslog' -- system log", func(value string) {
</s> add {"logfile", "l", "Path to log file. If empty: write to stdout; if 'syslog': write to system log", func(value string) { </s> remove {"verbose", "v", "enable verbose output", nil, func() { o.verbose = true }},
{"help", "", "print this help", nil, func() {
</s> add {"verbose", "v", "Enable verbose output", nil, func() { o.verbose = true }},
{"help", "", "Print this help", nil, func() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d14ec18acec68d78572b2c6a3ba548698efde0a | app.go |
{"service", "s", "Service control action: status, install, uninstall, start, stop, restart", func(value string) { | <mask> panic("Got port that is not a number")
<mask> }
<mask> o.bindPort = v
<mask> }, nil},
<mask> {"service", "s", "service control action: status, install, uninstall, start, stop, restart", func(value string) {
<mask> o.serviceControlAction = value
<mask> }, nil},
<mask> {"logfile", "l", "path to the log file. If empty, writes to stdout, if 'syslog' -- system log", func(value string) {
<mask> o.logFile = value
<mask> }, nil},
</s> * app: --help: more pretty help info </s> remove {"logfile", "l", "path to the log file. If empty, writes to stdout, if 'syslog' -- system log", func(value string) {
</s> add {"logfile", "l", "Path to log file. If empty: write to stdout; if 'syslog': write to system log", func(value string) { </s> remove {"config", "c", "path to the config file", func(value string) { o.configFilename = value }, nil},
{"work-dir", "w", "path to the working directory", func(value string) { o.workDir = value }, nil},
{"host", "h", "host address to bind HTTP server on", func(value string) { o.bindHost = value }, nil},
{"port", "p", "port to serve HTTP pages on", func(value string) {
</s> add {"config", "c", "Path to the config file", func(value string) { o.configFilename = value }, nil},
{"work-dir", "w", "Path to the working directory", func(value string) { o.workDir = value }, nil},
{"host", "h", "Host address to bind HTTP server on", func(value string) { o.bindHost = value }, nil},
{"port", "p", "Port to serve HTTP pages on", func(value string) { </s> remove {"pidfile", "", "File name to save PID to", func(value string) { o.pidFile = value }, nil},
</s> add {"pidfile", "", "Path to a file where PID is stored", func(value string) { o.pidFile = value }, nil}, </s> remove {"verbose", "v", "enable verbose output", nil, func() { o.verbose = true }},
{"help", "", "print this help", nil, func() {
</s> add {"verbose", "v", "Enable verbose output", nil, func() { o.verbose = true }},
{"help", "", "Print this help", nil, func() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d14ec18acec68d78572b2c6a3ba548698efde0a | app.go |
{"logfile", "l", "Path to log file. If empty: write to stdout; if 'syslog': write to system log", func(value string) { | <mask> }, nil},
<mask> {"service", "s", "service control action: status, install, uninstall, start, stop, restart", func(value string) {
<mask> o.serviceControlAction = value
<mask> }, nil},
<mask> {"logfile", "l", "path to the log file. If empty, writes to stdout, if 'syslog' -- system log", func(value string) {
<mask> o.logFile = value
<mask> }, nil},
<mask> {"pidfile", "", "File name to save PID to", func(value string) { o.pidFile = value }, nil},
<mask> {"check-config", "", "Check configuration and exit", nil, func() { o.checkConfig = true }},
<mask> {"verbose", "v", "enable verbose output", nil, func() { o.verbose = true }},
</s> * app: --help: more pretty help info </s> remove {"service", "s", "service control action: status, install, uninstall, start, stop, restart", func(value string) {
</s> add {"service", "s", "Service control action: status, install, uninstall, start, stop, restart", func(value string) { </s> remove {"pidfile", "", "File name to save PID to", func(value string) { o.pidFile = value }, nil},
</s> add {"pidfile", "", "Path to a file where PID is stored", func(value string) { o.pidFile = value }, nil}, </s> remove {"verbose", "v", "enable verbose output", nil, func() { o.verbose = true }},
{"help", "", "print this help", nil, func() {
</s> add {"verbose", "v", "Enable verbose output", nil, func() { o.verbose = true }},
{"help", "", "Print this help", nil, func() { </s> remove {"config", "c", "path to the config file", func(value string) { o.configFilename = value }, nil},
{"work-dir", "w", "path to the working directory", func(value string) { o.workDir = value }, nil},
{"host", "h", "host address to bind HTTP server on", func(value string) { o.bindHost = value }, nil},
{"port", "p", "port to serve HTTP pages on", func(value string) {
</s> add {"config", "c", "Path to the config file", func(value string) { o.configFilename = value }, nil},
{"work-dir", "w", "Path to the working directory", func(value string) { o.workDir = value }, nil},
{"host", "h", "Host address to bind HTTP server on", func(value string) { o.bindHost = value }, nil},
{"port", "p", "Port to serve HTTP pages on", func(value string) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d14ec18acec68d78572b2c6a3ba548698efde0a | app.go |
{"pidfile", "", "Path to a file where PID is stored", func(value string) { o.pidFile = value }, nil}, | <mask> }, nil},
<mask> {"logfile", "l", "path to the log file. If empty, writes to stdout, if 'syslog' -- system log", func(value string) {
<mask> o.logFile = value
<mask> }, nil},
<mask> {"pidfile", "", "File name to save PID to", func(value string) { o.pidFile = value }, nil},
<mask> {"check-config", "", "Check configuration and exit", nil, func() { o.checkConfig = true }},
<mask> {"verbose", "v", "enable verbose output", nil, func() { o.verbose = true }},
<mask> {"help", "", "print this help", nil, func() {
<mask> printHelp()
<mask> os.Exit(64)
</s> * app: --help: more pretty help info </s> remove {"verbose", "v", "enable verbose output", nil, func() { o.verbose = true }},
{"help", "", "print this help", nil, func() {
</s> add {"verbose", "v", "Enable verbose output", nil, func() { o.verbose = true }},
{"help", "", "Print this help", nil, func() { </s> remove {"logfile", "l", "path to the log file. If empty, writes to stdout, if 'syslog' -- system log", func(value string) {
</s> add {"logfile", "l", "Path to log file. If empty: write to stdout; if 'syslog': write to system log", func(value string) { </s> remove {"service", "s", "service control action: status, install, uninstall, start, stop, restart", func(value string) {
</s> add {"service", "s", "Service control action: status, install, uninstall, start, stop, restart", func(value string) { </s> remove {"config", "c", "path to the config file", func(value string) { o.configFilename = value }, nil},
{"work-dir", "w", "path to the working directory", func(value string) { o.workDir = value }, nil},
{"host", "h", "host address to bind HTTP server on", func(value string) { o.bindHost = value }, nil},
{"port", "p", "port to serve HTTP pages on", func(value string) {
</s> add {"config", "c", "Path to the config file", func(value string) { o.configFilename = value }, nil},
{"work-dir", "w", "Path to the working directory", func(value string) { o.workDir = value }, nil},
{"host", "h", "Host address to bind HTTP server on", func(value string) { o.bindHost = value }, nil},
{"port", "p", "Port to serve HTTP pages on", func(value string) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d14ec18acec68d78572b2c6a3ba548698efde0a | app.go |
{"verbose", "v", "Enable verbose output", nil, func() { o.verbose = true }},
{"help", "", "Print this help", nil, func() { | <mask> o.logFile = value
<mask> }, nil},
<mask> {"pidfile", "", "File name to save PID to", func(value string) { o.pidFile = value }, nil},
<mask> {"check-config", "", "Check configuration and exit", nil, func() { o.checkConfig = true }},
<mask> {"verbose", "v", "enable verbose output", nil, func() { o.verbose = true }},
<mask> {"help", "", "print this help", nil, func() {
<mask> printHelp()
<mask> os.Exit(64)
<mask> }},
<mask> }
<mask> printHelp = func() {
</s> * app: --help: more pretty help info </s> remove {"pidfile", "", "File name to save PID to", func(value string) { o.pidFile = value }, nil},
</s> add {"pidfile", "", "Path to a file where PID is stored", func(value string) { o.pidFile = value }, nil}, </s> remove {"logfile", "l", "path to the log file. If empty, writes to stdout, if 'syslog' -- system log", func(value string) {
</s> add {"logfile", "l", "Path to log file. If empty: write to stdout; if 'syslog': write to system log", func(value string) { </s> remove {"config", "c", "path to the config file", func(value string) { o.configFilename = value }, nil},
{"work-dir", "w", "path to the working directory", func(value string) { o.workDir = value }, nil},
{"host", "h", "host address to bind HTTP server on", func(value string) { o.bindHost = value }, nil},
{"port", "p", "port to serve HTTP pages on", func(value string) {
</s> add {"config", "c", "Path to the config file", func(value string) { o.configFilename = value }, nil},
{"work-dir", "w", "Path to the working directory", func(value string) { o.workDir = value }, nil},
{"host", "h", "Host address to bind HTTP server on", func(value string) { o.bindHost = value }, nil},
{"port", "p", "Port to serve HTTP pages on", func(value string) { </s> remove {"service", "s", "service control action: status, install, uninstall, start, stop, restart", func(value string) {
</s> add {"service", "s", "Service control action: status, install, uninstall, start, stop, restart", func(value string) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d14ec18acec68d78572b2c6a3ba548698efde0a | app.go |
val := ""
if opt.callbackWithValue != nil {
val = " VALUE"
} | <mask> fmt.Printf("%s [options]\n\n", os.Args[0])
<mask> fmt.Printf("Options:\n")
<mask> for _, opt := range opts {
<mask> if opt.shortName != "" {
<mask> fmt.Printf(" -%s, %-30s %s\n", opt.shortName, "--"+opt.longName+val, opt.description)
<mask> } else {
<mask> fmt.Printf(" %-34s %s\n", "--"+opt.longName+val, opt.description)
<mask> }
</s> * app: --help: more pretty help info </s> remove fmt.Printf(" -%s, %-30s %s\n", opt.shortName, "--"+opt.longName, opt.description)
</s> add fmt.Printf(" -%s, %-30s %s\n", opt.shortName, "--"+opt.longName+val, opt.description) </s> remove fmt.Printf(" %-34s %s\n", "--"+opt.longName, opt.description)
</s> add fmt.Printf(" %-34s %s\n", "--"+opt.longName+val, opt.description) </s> remove {"service", "s", "service control action: status, install, uninstall, start, stop, restart", func(value string) {
</s> add {"service", "s", "Service control action: status, install, uninstall, start, stop, restart", func(value string) { </s> remove {"verbose", "v", "enable verbose output", nil, func() { o.verbose = true }},
{"help", "", "print this help", nil, func() {
</s> add {"verbose", "v", "Enable verbose output", nil, func() { o.verbose = true }},
{"help", "", "Print this help", nil, func() { </s> remove {"config", "c", "path to the config file", func(value string) { o.configFilename = value }, nil},
{"work-dir", "w", "path to the working directory", func(value string) { o.workDir = value }, nil},
{"host", "h", "host address to bind HTTP server on", func(value string) { o.bindHost = value }, nil},
{"port", "p", "port to serve HTTP pages on", func(value string) {
</s> add {"config", "c", "Path to the config file", func(value string) { o.configFilename = value }, nil},
{"work-dir", "w", "Path to the working directory", func(value string) { o.workDir = value }, nil},
{"host", "h", "Host address to bind HTTP server on", func(value string) { o.bindHost = value }, nil},
{"port", "p", "Port to serve HTTP pages on", func(value string) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d14ec18acec68d78572b2c6a3ba548698efde0a | app.go |
fmt.Printf(" -%s, %-30s %s\n", opt.shortName, "--"+opt.longName+val, opt.description) | <mask> fmt.Printf("%s [options]\n\n", os.Args[0])
<mask> fmt.Printf("Options:\n")
<mask> for _, opt := range opts {
<mask> if opt.shortName != "" {
<mask> fmt.Printf(" -%s, %-30s %s\n", opt.shortName, "--"+opt.longName, opt.description)
<mask> } else {
<mask> fmt.Printf(" %-34s %s\n", "--"+opt.longName, opt.description)
<mask> }
<mask> }
<mask> }
</s> * app: --help: more pretty help info </s> remove fmt.Printf(" %-34s %s\n", "--"+opt.longName, opt.description)
</s> add fmt.Printf(" %-34s %s\n", "--"+opt.longName+val, opt.description) </s> remove {"service", "s", "service control action: status, install, uninstall, start, stop, restart", func(value string) {
</s> add {"service", "s", "Service control action: status, install, uninstall, start, stop, restart", func(value string) { </s> remove {"verbose", "v", "enable verbose output", nil, func() { o.verbose = true }},
{"help", "", "print this help", nil, func() {
</s> add {"verbose", "v", "Enable verbose output", nil, func() { o.verbose = true }},
{"help", "", "Print this help", nil, func() { </s> remove {"config", "c", "path to the config file", func(value string) { o.configFilename = value }, nil},
{"work-dir", "w", "path to the working directory", func(value string) { o.workDir = value }, nil},
{"host", "h", "host address to bind HTTP server on", func(value string) { o.bindHost = value }, nil},
{"port", "p", "port to serve HTTP pages on", func(value string) {
</s> add {"config", "c", "Path to the config file", func(value string) { o.configFilename = value }, nil},
{"work-dir", "w", "Path to the working directory", func(value string) { o.workDir = value }, nil},
{"host", "h", "Host address to bind HTTP server on", func(value string) { o.bindHost = value }, nil},
{"port", "p", "Port to serve HTTP pages on", func(value string) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d14ec18acec68d78572b2c6a3ba548698efde0a | app.go |
fmt.Printf(" %-34s %s\n", "--"+opt.longName+val, opt.description) | <mask> for _, opt := range opts {
<mask> if opt.shortName != "" {
<mask> fmt.Printf(" -%s, %-30s %s\n", opt.shortName, "--"+opt.longName, opt.description)
<mask> } else {
<mask> fmt.Printf(" %-34s %s\n", "--"+opt.longName, opt.description)
<mask> }
<mask> }
<mask> }
<mask> for i := 1; i < len(os.Args); i++ {
<mask> v := os.Args[i]
</s> * app: --help: more pretty help info </s> remove fmt.Printf(" -%s, %-30s %s\n", opt.shortName, "--"+opt.longName, opt.description)
</s> add fmt.Printf(" -%s, %-30s %s\n", opt.shortName, "--"+opt.longName+val, opt.description) </s> remove {"service", "s", "service control action: status, install, uninstall, start, stop, restart", func(value string) {
</s> add {"service", "s", "Service control action: status, install, uninstall, start, stop, restart", func(value string) { </s> remove {"config", "c", "path to the config file", func(value string) { o.configFilename = value }, nil},
{"work-dir", "w", "path to the working directory", func(value string) { o.workDir = value }, nil},
{"host", "h", "host address to bind HTTP server on", func(value string) { o.bindHost = value }, nil},
{"port", "p", "port to serve HTTP pages on", func(value string) {
</s> add {"config", "c", "Path to the config file", func(value string) { o.configFilename = value }, nil},
{"work-dir", "w", "Path to the working directory", func(value string) { o.workDir = value }, nil},
{"host", "h", "Host address to bind HTTP server on", func(value string) { o.bindHost = value }, nil},
{"port", "p", "Port to serve HTTP pages on", func(value string) { </s> remove {"verbose", "v", "enable verbose output", nil, func() { o.verbose = true }},
{"help", "", "print this help", nil, func() {
</s> add {"verbose", "v", "Enable verbose output", nil, func() { o.verbose = true }},
{"help", "", "Print this help", nil, func() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d14ec18acec68d78572b2c6a3ba548698efde0a | app.go |
// Error implements the [error] interface for domainSpecificTestError.
func (err domainSpecificTestError) Error() (msg string) {
return fmt.Sprintf("WARNING: %s", err.error)
}
| <mask> error
<mask> }
<mask>
<mask> // checkDNS checks the upstream server defined by upstreamConfigStr using
<mask> // healthCheck for actually exchange messages. It uses bootstrap to resolve the
<mask> // upstream's address.
<mask> func checkDNS(
</s> Pull request: 5193-long-ups-check
Merge in DNS/adguard-home from 5193-long-ups-check to master
Closes #5193.
Squashed commit of the following:
commit 787e6b9950e85b79fe50e16cda5110fe53ec3e80
Merge: f62330bd 01652e6a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 17:07:40 2022 +0300
Merge branch 'master' into 5193-long-ups-check
commit f62330bd17ec260bc8c7475c8f5ae236059cde35
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 16:28:47 2022 +0300
dnsforward: try to fix linux
commit 64bfacc58d2a4c2929d9c3cf80bc31bfca404d54
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:55:48 2022 +0300
all: log changes finally
commit 4331d1c2497a94a95e4eba0ebcb5a813260c188a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:26:45 2022 +0300
all: imp log of chagnes
commit 62ed3c123eda100813a2de2ed95c1446c7a100f0
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:23:17 2022 +0300
all: log changes
commit 73f4d59796dc5de51cf9c9953a6a22342e1ce31a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:37:18 2022 +0300
dnsforward: add defer
commit a15072f1ea3845ba135ddd61aa8d67d9c0dcd7ea
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:30:16 2022 +0300
dnsforward: imp tests
commit e74219f594094f1e3d0001664ed3f79050747a4d
Author: Eugene Burkov <[email protected]>
Date: Sat Dec 3 16:29:31 2022 +0300
dnsforward: get rid of wg
commit 165da7dc186285d6ff8b949e12d95e0da5e828eb
Author: Eugene Burkov <[email protected]>
Date: Fri Dec 2 15:42:55 2022 +0300
dnsforward: add ups check test
commit 3045273997e45e952ba58e9c7fa5bba2d21ad286
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 1 20:28:56 2022 +0300
dnsforward: imp ups check perf </s> remove for _, host := range req.PrivateUpstreams {
err = checkDNS(host, bootstraps, timeout, checkPrivateUpstreamExc)
if err != nil {
log.Info("%v", err)
// TODO(e.burkov): If passed upstream have already written an error
// above, we rewriting the error for it. These cases should be
// handled properly instead.
result[host] = err.Error()
if _, ok := err.(domainSpecificTestError); ok {
result[host] = fmt.Sprintf("WARNING: %s", result[host])
}
</s> add upsNum := len(req.Upstreams) + len(req.PrivateUpstreams)
resCh := make(chan upsCheckResult, upsNum) </s> remove result[host] = "OK"
</s> add for i := 0; i < upsNum; i++ {
pair := <-resCh
// TODO(e.burkov): The upstreams used for both common and private
// resolving should be reported separately.
result[pair.host] = pair.res | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6 | internal/dnsforward/http.go |
<mask> result := map[string]string{}
<mask> bootstraps := req.BootstrapDNS
<mask>
<mask> timeout := s.conf.UpstreamTimeout
<mask> for _, host := range req.Upstreams {
<mask> err = checkDNS(host, bootstraps, timeout, checkDNSUpstreamExc)
<mask> if err != nil {
<mask> log.Info("%v", err)
<mask> result[host] = err.Error()
<mask> if _, ok := err.(domainSpecificTestError); ok {
<mask> result[host] = fmt.Sprintf("WARNING: %s", result[host])
<mask> }
<mask>
<mask> continue
<mask> }
<mask>
<mask> result[host] = "OK"
</s> Pull request: 5193-long-ups-check
Merge in DNS/adguard-home from 5193-long-ups-check to master
Closes #5193.
Squashed commit of the following:
commit 787e6b9950e85b79fe50e16cda5110fe53ec3e80
Merge: f62330bd 01652e6a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 17:07:40 2022 +0300
Merge branch 'master' into 5193-long-ups-check
commit f62330bd17ec260bc8c7475c8f5ae236059cde35
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 16:28:47 2022 +0300
dnsforward: try to fix linux
commit 64bfacc58d2a4c2929d9c3cf80bc31bfca404d54
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:55:48 2022 +0300
all: log changes finally
commit 4331d1c2497a94a95e4eba0ebcb5a813260c188a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:26:45 2022 +0300
all: imp log of chagnes
commit 62ed3c123eda100813a2de2ed95c1446c7a100f0
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:23:17 2022 +0300
all: log changes
commit 73f4d59796dc5de51cf9c9953a6a22342e1ce31a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:37:18 2022 +0300
dnsforward: add defer
commit a15072f1ea3845ba135ddd61aa8d67d9c0dcd7ea
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:30:16 2022 +0300
dnsforward: imp tests
commit e74219f594094f1e3d0001664ed3f79050747a4d
Author: Eugene Burkov <[email protected]>
Date: Sat Dec 3 16:29:31 2022 +0300
dnsforward: get rid of wg
commit 165da7dc186285d6ff8b949e12d95e0da5e828eb
Author: Eugene Burkov <[email protected]>
Date: Fri Dec 2 15:42:55 2022 +0300
dnsforward: add ups check test
commit 3045273997e45e952ba58e9c7fa5bba2d21ad286
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 1 20:28:56 2022 +0300
dnsforward: imp ups check perf </s> remove continue
}
result[host] = "OK"
</s> add type upsCheckResult = struct {
res string
host string </s> remove for _, host := range req.PrivateUpstreams {
err = checkDNS(host, bootstraps, timeout, checkPrivateUpstreamExc)
if err != nil {
log.Info("%v", err)
// TODO(e.burkov): If passed upstream have already written an error
// above, we rewriting the error for it. These cases should be
// handled properly instead.
result[host] = err.Error()
if _, ok := err.(domainSpecificTestError); ok {
result[host] = fmt.Sprintf("WARNING: %s", result[host])
}
</s> add upsNum := len(req.Upstreams) + len(req.PrivateUpstreams)
resCh := make(chan upsCheckResult, upsNum) </s> remove continue
</s> add checkUps := func(ups string, healthCheck healthCheckFunc) {
res := upsCheckResult{
host: ups,
}
defer func() { resCh <- res }()
checkErr := checkDNS(ups, bootstraps, timeout, healthCheck)
if checkErr != nil {
res.res = checkErr.Error()
} else {
res.res = "OK" </s> remove result[host] = "OK"
</s> add for i := 0; i < upsNum; i++ {
pair := <-resCh
// TODO(e.burkov): The upstreams used for both common and private
// resolving should be reported separately.
result[pair.host] = pair.res | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6 | internal/dnsforward/http.go |
|
type upsCheckResult = struct {
res string
host string | <mask> if _, ok := err.(domainSpecificTestError); ok {
<mask> result[host] = fmt.Sprintf("WARNING: %s", result[host])
<mask> }
<mask>
<mask> continue
<mask> }
<mask>
<mask> result[host] = "OK"
<mask> }
<mask>
<mask> for _, host := range req.PrivateUpstreams {
<mask> err = checkDNS(host, bootstraps, timeout, checkPrivateUpstreamExc)
<mask> if err != nil {
</s> Pull request: 5193-long-ups-check
Merge in DNS/adguard-home from 5193-long-ups-check to master
Closes #5193.
Squashed commit of the following:
commit 787e6b9950e85b79fe50e16cda5110fe53ec3e80
Merge: f62330bd 01652e6a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 17:07:40 2022 +0300
Merge branch 'master' into 5193-long-ups-check
commit f62330bd17ec260bc8c7475c8f5ae236059cde35
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 16:28:47 2022 +0300
dnsforward: try to fix linux
commit 64bfacc58d2a4c2929d9c3cf80bc31bfca404d54
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:55:48 2022 +0300
all: log changes finally
commit 4331d1c2497a94a95e4eba0ebcb5a813260c188a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:26:45 2022 +0300
all: imp log of chagnes
commit 62ed3c123eda100813a2de2ed95c1446c7a100f0
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:23:17 2022 +0300
all: log changes
commit 73f4d59796dc5de51cf9c9953a6a22342e1ce31a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:37:18 2022 +0300
dnsforward: add defer
commit a15072f1ea3845ba135ddd61aa8d67d9c0dcd7ea
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:30:16 2022 +0300
dnsforward: imp tests
commit e74219f594094f1e3d0001664ed3f79050747a4d
Author: Eugene Burkov <[email protected]>
Date: Sat Dec 3 16:29:31 2022 +0300
dnsforward: get rid of wg
commit 165da7dc186285d6ff8b949e12d95e0da5e828eb
Author: Eugene Burkov <[email protected]>
Date: Fri Dec 2 15:42:55 2022 +0300
dnsforward: add ups check test
commit 3045273997e45e952ba58e9c7fa5bba2d21ad286
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 1 20:28:56 2022 +0300
dnsforward: imp ups check perf </s> remove for _, host := range req.Upstreams {
err = checkDNS(host, bootstraps, timeout, checkDNSUpstreamExc)
if err != nil {
log.Info("%v", err)
result[host] = err.Error()
if _, ok := err.(domainSpecificTestError); ok {
result[host] = fmt.Sprintf("WARNING: %s", result[host])
}
</s> add </s> remove for _, host := range req.PrivateUpstreams {
err = checkDNS(host, bootstraps, timeout, checkPrivateUpstreamExc)
if err != nil {
log.Info("%v", err)
// TODO(e.burkov): If passed upstream have already written an error
// above, we rewriting the error for it. These cases should be
// handled properly instead.
result[host] = err.Error()
if _, ok := err.(domainSpecificTestError); ok {
result[host] = fmt.Sprintf("WARNING: %s", result[host])
}
</s> add upsNum := len(req.Upstreams) + len(req.PrivateUpstreams)
resCh := make(chan upsCheckResult, upsNum) </s> remove continue
</s> add checkUps := func(ups string, healthCheck healthCheckFunc) {
res := upsCheckResult{
host: ups,
}
defer func() { resCh <- res }()
checkErr := checkDNS(ups, bootstraps, timeout, healthCheck)
if checkErr != nil {
res.res = checkErr.Error()
} else {
res.res = "OK" </s> remove result[host] = "OK"
</s> add for i := 0; i < upsNum; i++ {
pair := <-resCh
// TODO(e.burkov): The upstreams used for both common and private
// resolving should be reported separately.
result[pair.host] = pair.res | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6 | internal/dnsforward/http.go |
upsNum := len(req.Upstreams) + len(req.PrivateUpstreams)
resCh := make(chan upsCheckResult, upsNum) | <mask>
<mask> result[host] = "OK"
<mask> }
<mask>
<mask> for _, host := range req.PrivateUpstreams {
<mask> err = checkDNS(host, bootstraps, timeout, checkPrivateUpstreamExc)
<mask> if err != nil {
<mask> log.Info("%v", err)
<mask> // TODO(e.burkov): If passed upstream have already written an error
<mask> // above, we rewriting the error for it. These cases should be
<mask> // handled properly instead.
<mask> result[host] = err.Error()
<mask> if _, ok := err.(domainSpecificTestError); ok {
<mask> result[host] = fmt.Sprintf("WARNING: %s", result[host])
<mask> }
<mask>
<mask> continue
<mask> }
<mask>
<mask> result[host] = "OK"
</s> Pull request: 5193-long-ups-check
Merge in DNS/adguard-home from 5193-long-ups-check to master
Closes #5193.
Squashed commit of the following:
commit 787e6b9950e85b79fe50e16cda5110fe53ec3e80
Merge: f62330bd 01652e6a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 17:07:40 2022 +0300
Merge branch 'master' into 5193-long-ups-check
commit f62330bd17ec260bc8c7475c8f5ae236059cde35
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 16:28:47 2022 +0300
dnsforward: try to fix linux
commit 64bfacc58d2a4c2929d9c3cf80bc31bfca404d54
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:55:48 2022 +0300
all: log changes finally
commit 4331d1c2497a94a95e4eba0ebcb5a813260c188a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:26:45 2022 +0300
all: imp log of chagnes
commit 62ed3c123eda100813a2de2ed95c1446c7a100f0
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:23:17 2022 +0300
all: log changes
commit 73f4d59796dc5de51cf9c9953a6a22342e1ce31a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:37:18 2022 +0300
dnsforward: add defer
commit a15072f1ea3845ba135ddd61aa8d67d9c0dcd7ea
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:30:16 2022 +0300
dnsforward: imp tests
commit e74219f594094f1e3d0001664ed3f79050747a4d
Author: Eugene Burkov <[email protected]>
Date: Sat Dec 3 16:29:31 2022 +0300
dnsforward: get rid of wg
commit 165da7dc186285d6ff8b949e12d95e0da5e828eb
Author: Eugene Burkov <[email protected]>
Date: Fri Dec 2 15:42:55 2022 +0300
dnsforward: add ups check test
commit 3045273997e45e952ba58e9c7fa5bba2d21ad286
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 1 20:28:56 2022 +0300
dnsforward: imp ups check perf </s> remove for _, host := range req.Upstreams {
err = checkDNS(host, bootstraps, timeout, checkDNSUpstreamExc)
if err != nil {
log.Info("%v", err)
result[host] = err.Error()
if _, ok := err.(domainSpecificTestError); ok {
result[host] = fmt.Sprintf("WARNING: %s", result[host])
}
</s> add </s> remove continue
}
result[host] = "OK"
</s> add type upsCheckResult = struct {
res string
host string </s> remove continue
</s> add checkUps := func(ups string, healthCheck healthCheckFunc) {
res := upsCheckResult{
host: ups,
}
defer func() { resCh <- res }()
checkErr := checkDNS(ups, bootstraps, timeout, healthCheck)
if checkErr != nil {
res.res = checkErr.Error()
} else {
res.res = "OK" </s> remove result[host] = "OK"
</s> add for i := 0; i < upsNum; i++ {
pair := <-resCh
// TODO(e.burkov): The upstreams used for both common and private
// resolving should be reported separately.
result[pair.host] = pair.res | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6 | internal/dnsforward/http.go |
checkUps := func(ups string, healthCheck healthCheckFunc) {
res := upsCheckResult{
host: ups,
}
defer func() { resCh <- res }()
checkErr := checkDNS(ups, bootstraps, timeout, healthCheck)
if checkErr != nil {
res.res = checkErr.Error()
} else {
res.res = "OK" | <mask> if _, ok := err.(domainSpecificTestError); ok {
<mask> result[host] = fmt.Sprintf("WARNING: %s", result[host])
<mask> }
<mask>
<mask> continue
<mask> }
<mask>
<mask> result[host] = "OK"
<mask> }
<mask>
</s> Pull request: 5193-long-ups-check
Merge in DNS/adguard-home from 5193-long-ups-check to master
Closes #5193.
Squashed commit of the following:
commit 787e6b9950e85b79fe50e16cda5110fe53ec3e80
Merge: f62330bd 01652e6a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 17:07:40 2022 +0300
Merge branch 'master' into 5193-long-ups-check
commit f62330bd17ec260bc8c7475c8f5ae236059cde35
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 16:28:47 2022 +0300
dnsforward: try to fix linux
commit 64bfacc58d2a4c2929d9c3cf80bc31bfca404d54
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:55:48 2022 +0300
all: log changes finally
commit 4331d1c2497a94a95e4eba0ebcb5a813260c188a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:26:45 2022 +0300
all: imp log of chagnes
commit 62ed3c123eda100813a2de2ed95c1446c7a100f0
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:23:17 2022 +0300
all: log changes
commit 73f4d59796dc5de51cf9c9953a6a22342e1ce31a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:37:18 2022 +0300
dnsforward: add defer
commit a15072f1ea3845ba135ddd61aa8d67d9c0dcd7ea
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:30:16 2022 +0300
dnsforward: imp tests
commit e74219f594094f1e3d0001664ed3f79050747a4d
Author: Eugene Burkov <[email protected]>
Date: Sat Dec 3 16:29:31 2022 +0300
dnsforward: get rid of wg
commit 165da7dc186285d6ff8b949e12d95e0da5e828eb
Author: Eugene Burkov <[email protected]>
Date: Fri Dec 2 15:42:55 2022 +0300
dnsforward: add ups check test
commit 3045273997e45e952ba58e9c7fa5bba2d21ad286
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 1 20:28:56 2022 +0300
dnsforward: imp ups check perf </s> remove continue
}
result[host] = "OK"
</s> add type upsCheckResult = struct {
res string
host string </s> remove for _, host := range req.Upstreams {
err = checkDNS(host, bootstraps, timeout, checkDNSUpstreamExc)
if err != nil {
log.Info("%v", err)
result[host] = err.Error()
if _, ok := err.(domainSpecificTestError); ok {
result[host] = fmt.Sprintf("WARNING: %s", result[host])
}
</s> add </s> remove for _, host := range req.PrivateUpstreams {
err = checkDNS(host, bootstraps, timeout, checkPrivateUpstreamExc)
if err != nil {
log.Info("%v", err)
// TODO(e.burkov): If passed upstream have already written an error
// above, we rewriting the error for it. These cases should be
// handled properly instead.
result[host] = err.Error()
if _, ok := err.(domainSpecificTestError); ok {
result[host] = fmt.Sprintf("WARNING: %s", result[host])
}
</s> add upsNum := len(req.Upstreams) + len(req.PrivateUpstreams)
resCh := make(chan upsCheckResult, upsNum) </s> remove result[host] = "OK"
</s> add for i := 0; i < upsNum; i++ {
pair := <-resCh
// TODO(e.burkov): The upstreams used for both common and private
// resolving should be reported separately.
result[pair.host] = pair.res | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6 | internal/dnsforward/http.go |
}
for _, ups := range req.Upstreams {
go checkUps(ups, checkDNSUpstreamExc)
}
for _, ups := range req.PrivateUpstreams {
go checkUps(ups, checkPrivateUpstreamExc)
} | <mask> res.res = checkErr.Error()
<mask> } else {
<mask> res.res = "OK"
<mask> }
<mask>
<mask> for i := 0; i < upsNum; i++ {
<mask> pair := <-resCh
<mask> // TODO(e.burkov): The upstreams used for both common and private
<mask> // resolving should be reported separately.
<mask> result[pair.host] = pair.res
</s> Pull request: 5193-long-ups-check
Merge in DNS/adguard-home from 5193-long-ups-check to master
Closes #5193.
Squashed commit of the following:
commit 787e6b9950e85b79fe50e16cda5110fe53ec3e80
Merge: f62330bd 01652e6a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 17:07:40 2022 +0300
Merge branch 'master' into 5193-long-ups-check
commit f62330bd17ec260bc8c7475c8f5ae236059cde35
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 16:28:47 2022 +0300
dnsforward: try to fix linux
commit 64bfacc58d2a4c2929d9c3cf80bc31bfca404d54
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:55:48 2022 +0300
all: log changes finally
commit 4331d1c2497a94a95e4eba0ebcb5a813260c188a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:26:45 2022 +0300
all: imp log of chagnes
commit 62ed3c123eda100813a2de2ed95c1446c7a100f0
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:23:17 2022 +0300
all: log changes
commit 73f4d59796dc5de51cf9c9953a6a22342e1ce31a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:37:18 2022 +0300
dnsforward: add defer
commit a15072f1ea3845ba135ddd61aa8d67d9c0dcd7ea
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:30:16 2022 +0300
dnsforward: imp tests
commit e74219f594094f1e3d0001664ed3f79050747a4d
Author: Eugene Burkov <[email protected]>
Date: Sat Dec 3 16:29:31 2022 +0300
dnsforward: get rid of wg
commit 165da7dc186285d6ff8b949e12d95e0da5e828eb
Author: Eugene Burkov <[email protected]>
Date: Fri Dec 2 15:42:55 2022 +0300
dnsforward: add ups check test
commit 3045273997e45e952ba58e9c7fa5bba2d21ad286
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 1 20:28:56 2022 +0300
dnsforward: imp ups check perf </s> remove result[host] = "OK"
</s> add for i := 0; i < upsNum; i++ {
pair := <-resCh
// TODO(e.burkov): The upstreams used for both common and private
// resolving should be reported separately.
result[pair.host] = pair.res </s> remove continue
</s> add checkUps := func(ups string, healthCheck healthCheckFunc) {
res := upsCheckResult{
host: ups,
}
defer func() { resCh <- res }()
checkErr := checkDNS(ups, bootstraps, timeout, healthCheck)
if checkErr != nil {
res.res = checkErr.Error()
} else {
res.res = "OK" </s> remove for _, host := range req.PrivateUpstreams {
err = checkDNS(host, bootstraps, timeout, checkPrivateUpstreamExc)
if err != nil {
log.Info("%v", err)
// TODO(e.burkov): If passed upstream have already written an error
// above, we rewriting the error for it. These cases should be
// handled properly instead.
result[host] = err.Error()
if _, ok := err.(domainSpecificTestError); ok {
result[host] = fmt.Sprintf("WARNING: %s", result[host])
}
</s> add upsNum := len(req.Upstreams) + len(req.PrivateUpstreams)
resCh := make(chan upsCheckResult, upsNum) </s> remove continue
}
result[host] = "OK"
</s> add type upsCheckResult = struct {
res string
host string | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6 | internal/dnsforward/http.go |
for i := 0; i < upsNum; i++ {
pair := <-resCh
// TODO(e.burkov): The upstreams used for both common and private
// resolving should be reported separately.
result[pair.host] = pair.res | <mask>
<mask> continue
<mask> }
<mask>
<mask> result[host] = "OK"
<mask> }
<mask>
<mask> _ = aghhttp.WriteJSONResponse(w, r, result)
<mask> }
<mask>
</s> Pull request: 5193-long-ups-check
Merge in DNS/adguard-home from 5193-long-ups-check to master
Closes #5193.
Squashed commit of the following:
commit 787e6b9950e85b79fe50e16cda5110fe53ec3e80
Merge: f62330bd 01652e6a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 17:07:40 2022 +0300
Merge branch 'master' into 5193-long-ups-check
commit f62330bd17ec260bc8c7475c8f5ae236059cde35
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 16:28:47 2022 +0300
dnsforward: try to fix linux
commit 64bfacc58d2a4c2929d9c3cf80bc31bfca404d54
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:55:48 2022 +0300
all: log changes finally
commit 4331d1c2497a94a95e4eba0ebcb5a813260c188a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:26:45 2022 +0300
all: imp log of chagnes
commit 62ed3c123eda100813a2de2ed95c1446c7a100f0
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:23:17 2022 +0300
all: log changes
commit 73f4d59796dc5de51cf9c9953a6a22342e1ce31a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:37:18 2022 +0300
dnsforward: add defer
commit a15072f1ea3845ba135ddd61aa8d67d9c0dcd7ea
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:30:16 2022 +0300
dnsforward: imp tests
commit e74219f594094f1e3d0001664ed3f79050747a4d
Author: Eugene Burkov <[email protected]>
Date: Sat Dec 3 16:29:31 2022 +0300
dnsforward: get rid of wg
commit 165da7dc186285d6ff8b949e12d95e0da5e828eb
Author: Eugene Burkov <[email protected]>
Date: Fri Dec 2 15:42:55 2022 +0300
dnsforward: add ups check test
commit 3045273997e45e952ba58e9c7fa5bba2d21ad286
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 1 20:28:56 2022 +0300
dnsforward: imp ups check perf </s> remove continue
</s> add checkUps := func(ups string, healthCheck healthCheckFunc) {
res := upsCheckResult{
host: ups,
}
defer func() { resCh <- res }()
checkErr := checkDNS(ups, bootstraps, timeout, healthCheck)
if checkErr != nil {
res.res = checkErr.Error()
} else {
res.res = "OK" </s> remove continue
}
result[host] = "OK"
</s> add type upsCheckResult = struct {
res string
host string </s> remove for _, host := range req.Upstreams {
err = checkDNS(host, bootstraps, timeout, checkDNSUpstreamExc)
if err != nil {
log.Info("%v", err)
result[host] = err.Error()
if _, ok := err.(domainSpecificTestError); ok {
result[host] = fmt.Sprintf("WARNING: %s", result[host])
}
</s> add </s> remove for _, host := range req.PrivateUpstreams {
err = checkDNS(host, bootstraps, timeout, checkPrivateUpstreamExc)
if err != nil {
log.Info("%v", err)
// TODO(e.burkov): If passed upstream have already written an error
// above, we rewriting the error for it. These cases should be
// handled properly instead.
result[host] = err.Error()
if _, ok := err.(domainSpecificTestError); ok {
result[host] = fmt.Sprintf("WARNING: %s", result[host])
}
</s> add upsNum := len(req.Upstreams) + len(req.PrivateUpstreams)
resCh := make(chan upsCheckResult, upsNum) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6 | internal/dnsforward/http.go |
close(resCh) | <mask> result[pair.host] = pair.res
<mask> }
<mask>
<mask> _ = aghhttp.WriteJSONResponse(w, r, result)
<mask> }
<mask>
<mask> // handleCacheClear is the handler for the POST /control/cache_clear HTTP API.
</s> Pull request: 5193-long-ups-check
Merge in DNS/adguard-home from 5193-long-ups-check to master
Closes #5193.
Squashed commit of the following:
commit 787e6b9950e85b79fe50e16cda5110fe53ec3e80
Merge: f62330bd 01652e6a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 17:07:40 2022 +0300
Merge branch 'master' into 5193-long-ups-check
commit f62330bd17ec260bc8c7475c8f5ae236059cde35
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 16:28:47 2022 +0300
dnsforward: try to fix linux
commit 64bfacc58d2a4c2929d9c3cf80bc31bfca404d54
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:55:48 2022 +0300
all: log changes finally
commit 4331d1c2497a94a95e4eba0ebcb5a813260c188a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:26:45 2022 +0300
all: imp log of chagnes
commit 62ed3c123eda100813a2de2ed95c1446c7a100f0
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:23:17 2022 +0300
all: log changes
commit 73f4d59796dc5de51cf9c9953a6a22342e1ce31a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:37:18 2022 +0300
dnsforward: add defer
commit a15072f1ea3845ba135ddd61aa8d67d9c0dcd7ea
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:30:16 2022 +0300
dnsforward: imp tests
commit e74219f594094f1e3d0001664ed3f79050747a4d
Author: Eugene Burkov <[email protected]>
Date: Sat Dec 3 16:29:31 2022 +0300
dnsforward: get rid of wg
commit 165da7dc186285d6ff8b949e12d95e0da5e828eb
Author: Eugene Burkov <[email protected]>
Date: Fri Dec 2 15:42:55 2022 +0300
dnsforward: add ups check test
commit 3045273997e45e952ba58e9c7fa5bba2d21ad286
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 1 20:28:56 2022 +0300
dnsforward: imp ups check perf </s> remove result[host] = "OK"
</s> add for i := 0; i < upsNum; i++ {
pair := <-resCh
// TODO(e.burkov): The upstreams used for both common and private
// resolving should be reported separately.
result[pair.host] = pair.res </s> remove for _, host := range req.PrivateUpstreams {
err = checkDNS(host, bootstraps, timeout, checkPrivateUpstreamExc)
if err != nil {
log.Info("%v", err)
// TODO(e.burkov): If passed upstream have already written an error
// above, we rewriting the error for it. These cases should be
// handled properly instead.
result[host] = err.Error()
if _, ok := err.(domainSpecificTestError); ok {
result[host] = fmt.Sprintf("WARNING: %s", result[host])
}
</s> add upsNum := len(req.Upstreams) + len(req.PrivateUpstreams)
resCh := make(chan upsCheckResult, upsNum) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6 | internal/dnsforward/http.go |
"net/netip"
"net/url" | <mask> "net/http"
<mask> "net/http/httptest"
<mask> "os"
<mask> "path/filepath"
<mask> "strings"
<mask> "testing"
<mask> "time"
<mask>
</s> Pull request: 5193-long-ups-check
Merge in DNS/adguard-home from 5193-long-ups-check to master
Closes #5193.
Squashed commit of the following:
commit 787e6b9950e85b79fe50e16cda5110fe53ec3e80
Merge: f62330bd 01652e6a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 17:07:40 2022 +0300
Merge branch 'master' into 5193-long-ups-check
commit f62330bd17ec260bc8c7475c8f5ae236059cde35
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 16:28:47 2022 +0300
dnsforward: try to fix linux
commit 64bfacc58d2a4c2929d9c3cf80bc31bfca404d54
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:55:48 2022 +0300
all: log changes finally
commit 4331d1c2497a94a95e4eba0ebcb5a813260c188a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:26:45 2022 +0300
all: imp log of chagnes
commit 62ed3c123eda100813a2de2ed95c1446c7a100f0
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:23:17 2022 +0300
all: log changes
commit 73f4d59796dc5de51cf9c9953a6a22342e1ce31a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:37:18 2022 +0300
dnsforward: add defer
commit a15072f1ea3845ba135ddd61aa8d67d9c0dcd7ea
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:30:16 2022 +0300
dnsforward: imp tests
commit e74219f594094f1e3d0001664ed3f79050747a4d
Author: Eugene Burkov <[email protected]>
Date: Sat Dec 3 16:29:31 2022 +0300
dnsforward: get rid of wg
commit 165da7dc186285d6ff8b949e12d95e0da5e828eb
Author: Eugene Burkov <[email protected]>
Date: Fri Dec 2 15:42:55 2022 +0300
dnsforward: add ups check test
commit 3045273997e45e952ba58e9c7fa5bba2d21ad286
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 1 20:28:56 2022 +0300
dnsforward: imp ups check perf </s> remove result[host] = "OK"
</s> add for i := 0; i < upsNum; i++ {
pair := <-resCh
// TODO(e.burkov): The upstreams used for both common and private
// resolving should be reported separately.
result[pair.host] = pair.res | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6 | internal/dnsforward/http_test.go |
"time" | <mask> "os"
<mask> "path/filepath"
<mask> "strings"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
</s> Pull request: 5193-long-ups-check
Merge in DNS/adguard-home from 5193-long-ups-check to master
Closes #5193.
Squashed commit of the following:
commit 787e6b9950e85b79fe50e16cda5110fe53ec3e80
Merge: f62330bd 01652e6a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 17:07:40 2022 +0300
Merge branch 'master' into 5193-long-ups-check
commit f62330bd17ec260bc8c7475c8f5ae236059cde35
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 16:28:47 2022 +0300
dnsforward: try to fix linux
commit 64bfacc58d2a4c2929d9c3cf80bc31bfca404d54
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:55:48 2022 +0300
all: log changes finally
commit 4331d1c2497a94a95e4eba0ebcb5a813260c188a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:26:45 2022 +0300
all: imp log of chagnes
commit 62ed3c123eda100813a2de2ed95c1446c7a100f0
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:23:17 2022 +0300
all: log changes
commit 73f4d59796dc5de51cf9c9953a6a22342e1ce31a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:37:18 2022 +0300
dnsforward: add defer
commit a15072f1ea3845ba135ddd61aa8d67d9c0dcd7ea
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:30:16 2022 +0300
dnsforward: imp tests
commit e74219f594094f1e3d0001664ed3f79050747a4d
Author: Eugene Burkov <[email protected]>
Date: Sat Dec 3 16:29:31 2022 +0300
dnsforward: get rid of wg
commit 165da7dc186285d6ff8b949e12d95e0da5e828eb
Author: Eugene Burkov <[email protected]>
Date: Fri Dec 2 15:42:55 2022 +0300
dnsforward: add ups check test
commit 3045273997e45e952ba58e9c7fa5bba2d21ad286
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 1 20:28:56 2022 +0300
dnsforward: imp ups check perf </s> remove result[host] = "OK"
</s> add for i := 0; i < upsNum; i++ {
pair := <-resCh
// TODO(e.burkov): The upstreams used for both common and private
// resolving should be reported separately.
result[pair.host] = pair.res | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6 | internal/dnsforward/http_test.go |
"github.com/miekg/dns" | <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/AdguardTeam/golibs/testutil"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> // fakeSystemResolvers is a mock aghnet.SystemResolvers implementation for
<mask> // tests.
</s> Pull request: 5193-long-ups-check
Merge in DNS/adguard-home from 5193-long-ups-check to master
Closes #5193.
Squashed commit of the following:
commit 787e6b9950e85b79fe50e16cda5110fe53ec3e80
Merge: f62330bd 01652e6a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 17:07:40 2022 +0300
Merge branch 'master' into 5193-long-ups-check
commit f62330bd17ec260bc8c7475c8f5ae236059cde35
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 16:28:47 2022 +0300
dnsforward: try to fix linux
commit 64bfacc58d2a4c2929d9c3cf80bc31bfca404d54
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:55:48 2022 +0300
all: log changes finally
commit 4331d1c2497a94a95e4eba0ebcb5a813260c188a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:26:45 2022 +0300
all: imp log of chagnes
commit 62ed3c123eda100813a2de2ed95c1446c7a100f0
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 15:23:17 2022 +0300
all: log changes
commit 73f4d59796dc5de51cf9c9953a6a22342e1ce31a
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:37:18 2022 +0300
dnsforward: add defer
commit a15072f1ea3845ba135ddd61aa8d67d9c0dcd7ea
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 5 14:30:16 2022 +0300
dnsforward: imp tests
commit e74219f594094f1e3d0001664ed3f79050747a4d
Author: Eugene Burkov <[email protected]>
Date: Sat Dec 3 16:29:31 2022 +0300
dnsforward: get rid of wg
commit 165da7dc186285d6ff8b949e12d95e0da5e828eb
Author: Eugene Burkov <[email protected]>
Date: Fri Dec 2 15:42:55 2022 +0300
dnsforward: add ups check test
commit 3045273997e45e952ba58e9c7fa5bba2d21ad286
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 1 20:28:56 2022 +0300
dnsforward: imp ups check perf </s> remove result[host] = "OK"
</s> add for i := 0; i < upsNum; i++ {
pair := <-resCh
// TODO(e.burkov): The upstreams used for both common and private
// resolving should be reported separately.
result[pair.host] = pair.res | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6 | internal/dnsforward/http_test.go |
// TODO(a.garipov): This package is deprecated; find a new one or use our
// own code for that. Perhaps, use gopacket.
github.com/mdlayher/raw v0.1.0 | <mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118
<mask> github.com/mdlayher/netlink v1.7.1
<mask> github.com/mdlayher/packet v1.1.1
<mask> github.com/miekg/dns v1.1.53
<mask> github.com/quic-go/quic-go v0.33.0
<mask> github.com/stretchr/testify v1.8.2
<mask> github.com/ti-mo/netfilter v0.5.0
<mask> go.etcd.io/bbolt v1.3.7
</s> Pull request 1830: 5712-rollback-dhcp
Merge in DNS/adguard-home from 5712-rollback-dhcp to master
Updates #5712.
Squashed commit of the following:
commit 3d53a6385ad08dfad0b7ac28bb057cf25608554d
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:30:18 2023 +0300
dhcpd: imp import
commit 86bd55b0225b5d9067bd0bf9e6def1e52dd27124
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:26:41 2023 +0300
all: return todo
commit 629c548989a464a9cf461fffc0815b99a00c4851
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:24:10 2023 +0300
all: log changes
commit e4c369e55cbcc7c73d73d8df333996862e1e146a
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:03:03 2023 +0300
dhcpd: revert raw for darwin </s> remove github.com/mdlayher/raw v0.1.0 // indirect
</s> add </s> remove func TestV4Server_Send(t *testing.T) {
s := &v4Server{}
var (
defaultIP = net.IP{99, 99, 99, 99}
knownIP = net.IP{4, 2, 4, 2}
knownMAC = net.HardwareAddr{6, 5, 4, 3, 2, 1}
)
defaultPeer := &net.UDPAddr{
IP: defaultIP,
// Use neither client nor server port to check it actually
// changed.
Port: dhcpv4.ClientPort + dhcpv4.ServerPort,
}
defaultResp := &dhcpv4.DHCPv4{}
testCases := []struct {
want net.Addr
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
name string
}{{
name: "giaddr",
req: &dhcpv4.DHCPv4{GatewayIPAddr: knownIP},
resp: defaultResp,
want: &net.UDPAddr{
IP: knownIP,
Port: dhcpv4.ServerPort,
},
}, {
name: "nak",
req: &dhcpv4.DHCPv4{},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
want: defaultPeer,
}, {
name: "ciaddr",
req: &dhcpv4.DHCPv4{ClientIPAddr: knownIP},
resp: &dhcpv4.DHCPv4{},
want: &net.UDPAddr{
IP: knownIP,
Port: dhcpv4.ClientPort,
},
}, {
name: "chaddr",
req: &dhcpv4.DHCPv4{ClientHWAddr: knownMAC},
resp: &dhcpv4.DHCPv4{YourIPAddr: knownIP},
want: &dhcpUnicastAddr{
Addr: packet.Addr{HardwareAddr: knownMAC},
yiaddr: knownIP,
},
}, {
name: "who_are_you",
req: &dhcpv4.DHCPv4{},
resp: &dhcpv4.DHCPv4{},
want: defaultPeer,
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
assert.Equal(t, tc.want, addr)
return 0, nil
},
}
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
})
}
t.Run("giaddr_nak", func(t *testing.T) {
req := &dhcpv4.DHCPv4{
GatewayIPAddr: knownIP,
}
// Ensure the request is for unicast.
req.SetUnicast()
resp := &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
}
want := &net.UDPAddr{
IP: req.GatewayIPAddr,
Port: dhcpv4.ServerPort,
}
conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (n int, err error) {
assert.Equal(t, want, addr)
return 0, nil
},
}
s.send(cloneUDPAddr(defaultPeer), conn, req, resp)
assert.True(t, resp.IsBroadcast())
})
}
</s> add </s> remove "github.com/mdlayher/packet"
</s> add </s> remove // send writes resp for peer to conn considering the req's parameters according
// to RFC-2131.
//
// See https://datatracker.ietf.org/doc/html/rfc2131#section-4.1.
func (s *v4Server) send(peer net.Addr, conn net.PacketConn, req, resp *dhcpv4.DHCPv4) {
switch giaddr, ciaddr, mtype := req.GatewayIPAddr, req.ClientIPAddr, resp.MessageType(); {
case giaddr != nil && !giaddr.IsUnspecified():
// Send any return messages to the server port on the BOOTP
// relay agent whose address appears in giaddr.
peer = &net.UDPAddr{
IP: giaddr,
Port: dhcpv4.ServerPort,
}
if mtype == dhcpv4.MessageTypeNak {
// Set the broadcast bit in the DHCPNAK, so that the relay agent
// broadcasts it to the client, because the client may not have
// a correct network address or subnet mask, and the client may not
// be answering ARP requests.
resp.SetBroadcast()
}
case mtype == dhcpv4.MessageTypeNak:
// Broadcast any DHCPNAK messages to 0xffffffff.
case ciaddr != nil && !ciaddr.IsUnspecified():
// Unicast DHCPOFFER and DHCPACK messages to the address in
// ciaddr.
peer = &net.UDPAddr{
IP: ciaddr,
Port: dhcpv4.ClientPort,
}
case !req.IsBroadcast() && req.ClientHWAddr != nil:
// Unicast DHCPOFFER and DHCPACK messages to the client's
// hardware address and yiaddr.
peer = &dhcpUnicastAddr{
Addr: packet.Addr{HardwareAddr: req.ClientHWAddr},
yiaddr: resp.YourIPAddr,
}
default:
// Go on since peer is already set to broadcast.
}
pktData := resp.ToBytes()
log.Debug("dhcpv4: sending %d bytes to %s: %s", len(pktData), peer, resp.Summary())
_, err := conn.WriteTo(pktData, peer)
if err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
}
</s> add </s> remove "github.com/mdlayher/packet"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d402dc86c9b77c106993206cdb91721a0177c7e | go.mod |
<mask> github.com/davecgh/go-spew v1.1.1 // indirect
<mask> github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
<mask> github.com/golang/mock v1.6.0 // indirect
<mask> github.com/google/pprof v0.0.0-20230406165453-00490a63f317 // indirect
<mask> github.com/mdlayher/raw v0.1.0 // indirect
<mask> github.com/mdlayher/socket v0.4.0 // indirect
<mask> github.com/onsi/ginkgo/v2 v2.9.2 // indirect
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
<mask> github.com/pierrec/lz4/v4 v4.1.17 // indirect
<mask> github.com/pkg/errors v0.9.1 // indirect
</s> Pull request 1830: 5712-rollback-dhcp
Merge in DNS/adguard-home from 5712-rollback-dhcp to master
Updates #5712.
Squashed commit of the following:
commit 3d53a6385ad08dfad0b7ac28bb057cf25608554d
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:30:18 2023 +0300
dhcpd: imp import
commit 86bd55b0225b5d9067bd0bf9e6def1e52dd27124
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:26:41 2023 +0300
all: return todo
commit 629c548989a464a9cf461fffc0815b99a00c4851
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:24:10 2023 +0300
all: log changes
commit e4c369e55cbcc7c73d73d8df333996862e1e146a
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:03:03 2023 +0300
dhcpd: revert raw for darwin </s> remove // send writes resp for peer to conn considering the req's parameters according
// to RFC-2131.
//
// See https://datatracker.ietf.org/doc/html/rfc2131#section-4.1.
func (s *v4Server) send(peer net.Addr, conn net.PacketConn, req, resp *dhcpv4.DHCPv4) {
switch giaddr, ciaddr, mtype := req.GatewayIPAddr, req.ClientIPAddr, resp.MessageType(); {
case giaddr != nil && !giaddr.IsUnspecified():
// Send any return messages to the server port on the BOOTP
// relay agent whose address appears in giaddr.
peer = &net.UDPAddr{
IP: giaddr,
Port: dhcpv4.ServerPort,
}
if mtype == dhcpv4.MessageTypeNak {
// Set the broadcast bit in the DHCPNAK, so that the relay agent
// broadcasts it to the client, because the client may not have
// a correct network address or subnet mask, and the client may not
// be answering ARP requests.
resp.SetBroadcast()
}
case mtype == dhcpv4.MessageTypeNak:
// Broadcast any DHCPNAK messages to 0xffffffff.
case ciaddr != nil && !ciaddr.IsUnspecified():
// Unicast DHCPOFFER and DHCPACK messages to the address in
// ciaddr.
peer = &net.UDPAddr{
IP: ciaddr,
Port: dhcpv4.ClientPort,
}
case !req.IsBroadcast() && req.ClientHWAddr != nil:
// Unicast DHCPOFFER and DHCPACK messages to the client's
// hardware address and yiaddr.
peer = &dhcpUnicastAddr{
Addr: packet.Addr{HardwareAddr: req.ClientHWAddr},
yiaddr: resp.YourIPAddr,
}
default:
// Go on since peer is already set to broadcast.
}
pktData := resp.ToBytes()
log.Debug("dhcpv4: sending %d bytes to %s: %s", len(pktData), peer, resp.Summary())
_, err := conn.WriteTo(pktData, peer)
if err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
}
</s> add </s> remove "github.com/mdlayher/packet"
</s> add </s> remove func TestV4Server_Send(t *testing.T) {
s := &v4Server{}
var (
defaultIP = net.IP{99, 99, 99, 99}
knownIP = net.IP{4, 2, 4, 2}
knownMAC = net.HardwareAddr{6, 5, 4, 3, 2, 1}
)
defaultPeer := &net.UDPAddr{
IP: defaultIP,
// Use neither client nor server port to check it actually
// changed.
Port: dhcpv4.ClientPort + dhcpv4.ServerPort,
}
defaultResp := &dhcpv4.DHCPv4{}
testCases := []struct {
want net.Addr
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
name string
}{{
name: "giaddr",
req: &dhcpv4.DHCPv4{GatewayIPAddr: knownIP},
resp: defaultResp,
want: &net.UDPAddr{
IP: knownIP,
Port: dhcpv4.ServerPort,
},
}, {
name: "nak",
req: &dhcpv4.DHCPv4{},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
want: defaultPeer,
}, {
name: "ciaddr",
req: &dhcpv4.DHCPv4{ClientIPAddr: knownIP},
resp: &dhcpv4.DHCPv4{},
want: &net.UDPAddr{
IP: knownIP,
Port: dhcpv4.ClientPort,
},
}, {
name: "chaddr",
req: &dhcpv4.DHCPv4{ClientHWAddr: knownMAC},
resp: &dhcpv4.DHCPv4{YourIPAddr: knownIP},
want: &dhcpUnicastAddr{
Addr: packet.Addr{HardwareAddr: knownMAC},
yiaddr: knownIP,
},
}, {
name: "who_are_you",
req: &dhcpv4.DHCPv4{},
resp: &dhcpv4.DHCPv4{},
want: defaultPeer,
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
assert.Equal(t, tc.want, addr)
return 0, nil
},
}
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
})
}
t.Run("giaddr_nak", func(t *testing.T) {
req := &dhcpv4.DHCPv4{
GatewayIPAddr: knownIP,
}
// Ensure the request is for unicast.
req.SetUnicast()
resp := &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
}
want := &net.UDPAddr{
IP: req.GatewayIPAddr,
Port: dhcpv4.ServerPort,
}
conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (n int, err error) {
assert.Equal(t, want, addr)
return 0, nil
},
}
s.send(cloneUDPAddr(defaultPeer), conn, req, resp)
assert.True(t, resp.IsBroadcast())
})
}
</s> add </s> remove "github.com/mdlayher/packet"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d402dc86c9b77c106993206cdb91721a0177c7e | go.mod |
|
//go:build freebsd || linux || openbsd | <mask> //go:build darwin || freebsd || linux || openbsd
<mask>
<mask> package dhcpd
<mask>
<mask> import (
<mask> "fmt"
</s> Pull request 1830: 5712-rollback-dhcp
Merge in DNS/adguard-home from 5712-rollback-dhcp to master
Updates #5712.
Squashed commit of the following:
commit 3d53a6385ad08dfad0b7ac28bb057cf25608554d
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:30:18 2023 +0300
dhcpd: imp import
commit 86bd55b0225b5d9067bd0bf9e6def1e52dd27124
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:26:41 2023 +0300
all: return todo
commit 629c548989a464a9cf461fffc0815b99a00c4851
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:24:10 2023 +0300
all: log changes
commit e4c369e55cbcc7c73d73d8df333996862e1e146a
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:03:03 2023 +0300
dhcpd: revert raw for darwin </s> remove "github.com/mdlayher/packet"
</s> add </s> remove func TestV4Server_Send(t *testing.T) {
s := &v4Server{}
var (
defaultIP = net.IP{99, 99, 99, 99}
knownIP = net.IP{4, 2, 4, 2}
knownMAC = net.HardwareAddr{6, 5, 4, 3, 2, 1}
)
defaultPeer := &net.UDPAddr{
IP: defaultIP,
// Use neither client nor server port to check it actually
// changed.
Port: dhcpv4.ClientPort + dhcpv4.ServerPort,
}
defaultResp := &dhcpv4.DHCPv4{}
testCases := []struct {
want net.Addr
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
name string
}{{
name: "giaddr",
req: &dhcpv4.DHCPv4{GatewayIPAddr: knownIP},
resp: defaultResp,
want: &net.UDPAddr{
IP: knownIP,
Port: dhcpv4.ServerPort,
},
}, {
name: "nak",
req: &dhcpv4.DHCPv4{},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
want: defaultPeer,
}, {
name: "ciaddr",
req: &dhcpv4.DHCPv4{ClientIPAddr: knownIP},
resp: &dhcpv4.DHCPv4{},
want: &net.UDPAddr{
IP: knownIP,
Port: dhcpv4.ClientPort,
},
}, {
name: "chaddr",
req: &dhcpv4.DHCPv4{ClientHWAddr: knownMAC},
resp: &dhcpv4.DHCPv4{YourIPAddr: knownIP},
want: &dhcpUnicastAddr{
Addr: packet.Addr{HardwareAddr: knownMAC},
yiaddr: knownIP,
},
}, {
name: "who_are_you",
req: &dhcpv4.DHCPv4{},
resp: &dhcpv4.DHCPv4{},
want: defaultPeer,
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
assert.Equal(t, tc.want, addr)
return 0, nil
},
}
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
})
}
t.Run("giaddr_nak", func(t *testing.T) {
req := &dhcpv4.DHCPv4{
GatewayIPAddr: knownIP,
}
// Ensure the request is for unicast.
req.SetUnicast()
resp := &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
}
want := &net.UDPAddr{
IP: req.GatewayIPAddr,
Port: dhcpv4.ServerPort,
}
conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (n int, err error) {
assert.Equal(t, want, addr)
return 0, nil
},
}
s.send(cloneUDPAddr(defaultPeer), conn, req, resp)
assert.True(t, resp.IsBroadcast())
})
}
</s> add </s> remove // send writes resp for peer to conn considering the req's parameters according
// to RFC-2131.
//
// See https://datatracker.ietf.org/doc/html/rfc2131#section-4.1.
func (s *v4Server) send(peer net.Addr, conn net.PacketConn, req, resp *dhcpv4.DHCPv4) {
switch giaddr, ciaddr, mtype := req.GatewayIPAddr, req.ClientIPAddr, resp.MessageType(); {
case giaddr != nil && !giaddr.IsUnspecified():
// Send any return messages to the server port on the BOOTP
// relay agent whose address appears in giaddr.
peer = &net.UDPAddr{
IP: giaddr,
Port: dhcpv4.ServerPort,
}
if mtype == dhcpv4.MessageTypeNak {
// Set the broadcast bit in the DHCPNAK, so that the relay agent
// broadcasts it to the client, because the client may not have
// a correct network address or subnet mask, and the client may not
// be answering ARP requests.
resp.SetBroadcast()
}
case mtype == dhcpv4.MessageTypeNak:
// Broadcast any DHCPNAK messages to 0xffffffff.
case ciaddr != nil && !ciaddr.IsUnspecified():
// Unicast DHCPOFFER and DHCPACK messages to the address in
// ciaddr.
peer = &net.UDPAddr{
IP: ciaddr,
Port: dhcpv4.ClientPort,
}
case !req.IsBroadcast() && req.ClientHWAddr != nil:
// Unicast DHCPOFFER and DHCPACK messages to the client's
// hardware address and yiaddr.
peer = &dhcpUnicastAddr{
Addr: packet.Addr{HardwareAddr: req.ClientHWAddr},
yiaddr: resp.YourIPAddr,
}
default:
// Go on since peer is already set to broadcast.
}
pktData := resp.ToBytes()
log.Debug("dhcpv4: sending %d bytes to %s: %s", len(pktData), peer, resp.Summary())
_, err := conn.WriteTo(pktData, peer)
if err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
}
</s> add </s> remove "github.com/mdlayher/packet"
</s> add | [
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d402dc86c9b77c106993206cdb91721a0177c7e | internal/dhcpd/conn_unix.go |
"github.com/AdguardTeam/golibs/log" | <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/google/gopacket"
<mask> "github.com/google/gopacket/layers"
<mask> "github.com/insomniacslk/dhcp/dhcpv4"
<mask> "github.com/insomniacslk/dhcp/dhcpv4/server4"
</s> Pull request 1830: 5712-rollback-dhcp
Merge in DNS/adguard-home from 5712-rollback-dhcp to master
Updates #5712.
Squashed commit of the following:
commit 3d53a6385ad08dfad0b7ac28bb057cf25608554d
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:30:18 2023 +0300
dhcpd: imp import
commit 86bd55b0225b5d9067bd0bf9e6def1e52dd27124
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:26:41 2023 +0300
all: return todo
commit 629c548989a464a9cf461fffc0815b99a00c4851
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:24:10 2023 +0300
all: log changes
commit e4c369e55cbcc7c73d73d8df333996862e1e146a
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:03:03 2023 +0300
dhcpd: revert raw for darwin </s> remove "github.com/mdlayher/packet"
</s> add </s> remove "github.com/mdlayher/packet"
</s> add </s> remove func TestV4Server_Send(t *testing.T) {
s := &v4Server{}
var (
defaultIP = net.IP{99, 99, 99, 99}
knownIP = net.IP{4, 2, 4, 2}
knownMAC = net.HardwareAddr{6, 5, 4, 3, 2, 1}
)
defaultPeer := &net.UDPAddr{
IP: defaultIP,
// Use neither client nor server port to check it actually
// changed.
Port: dhcpv4.ClientPort + dhcpv4.ServerPort,
}
defaultResp := &dhcpv4.DHCPv4{}
testCases := []struct {
want net.Addr
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
name string
}{{
name: "giaddr",
req: &dhcpv4.DHCPv4{GatewayIPAddr: knownIP},
resp: defaultResp,
want: &net.UDPAddr{
IP: knownIP,
Port: dhcpv4.ServerPort,
},
}, {
name: "nak",
req: &dhcpv4.DHCPv4{},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
want: defaultPeer,
}, {
name: "ciaddr",
req: &dhcpv4.DHCPv4{ClientIPAddr: knownIP},
resp: &dhcpv4.DHCPv4{},
want: &net.UDPAddr{
IP: knownIP,
Port: dhcpv4.ClientPort,
},
}, {
name: "chaddr",
req: &dhcpv4.DHCPv4{ClientHWAddr: knownMAC},
resp: &dhcpv4.DHCPv4{YourIPAddr: knownIP},
want: &dhcpUnicastAddr{
Addr: packet.Addr{HardwareAddr: knownMAC},
yiaddr: knownIP,
},
}, {
name: "who_are_you",
req: &dhcpv4.DHCPv4{},
resp: &dhcpv4.DHCPv4{},
want: defaultPeer,
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
assert.Equal(t, tc.want, addr)
return 0, nil
},
}
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
})
}
t.Run("giaddr_nak", func(t *testing.T) {
req := &dhcpv4.DHCPv4{
GatewayIPAddr: knownIP,
}
// Ensure the request is for unicast.
req.SetUnicast()
resp := &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
}
want := &net.UDPAddr{
IP: req.GatewayIPAddr,
Port: dhcpv4.ServerPort,
}
conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (n int, err error) {
assert.Equal(t, want, addr)
return 0, nil
},
}
s.send(cloneUDPAddr(defaultPeer), conn, req, resp)
assert.True(t, resp.IsBroadcast())
})
}
</s> add </s> remove // send writes resp for peer to conn considering the req's parameters according
// to RFC-2131.
//
// See https://datatracker.ietf.org/doc/html/rfc2131#section-4.1.
func (s *v4Server) send(peer net.Addr, conn net.PacketConn, req, resp *dhcpv4.DHCPv4) {
switch giaddr, ciaddr, mtype := req.GatewayIPAddr, req.ClientIPAddr, resp.MessageType(); {
case giaddr != nil && !giaddr.IsUnspecified():
// Send any return messages to the server port on the BOOTP
// relay agent whose address appears in giaddr.
peer = &net.UDPAddr{
IP: giaddr,
Port: dhcpv4.ServerPort,
}
if mtype == dhcpv4.MessageTypeNak {
// Set the broadcast bit in the DHCPNAK, so that the relay agent
// broadcasts it to the client, because the client may not have
// a correct network address or subnet mask, and the client may not
// be answering ARP requests.
resp.SetBroadcast()
}
case mtype == dhcpv4.MessageTypeNak:
// Broadcast any DHCPNAK messages to 0xffffffff.
case ciaddr != nil && !ciaddr.IsUnspecified():
// Unicast DHCPOFFER and DHCPACK messages to the address in
// ciaddr.
peer = &net.UDPAddr{
IP: ciaddr,
Port: dhcpv4.ClientPort,
}
case !req.IsBroadcast() && req.ClientHWAddr != nil:
// Unicast DHCPOFFER and DHCPACK messages to the client's
// hardware address and yiaddr.
peer = &dhcpUnicastAddr{
Addr: packet.Addr{HardwareAddr: req.ClientHWAddr},
yiaddr: resp.YourIPAddr,
}
default:
// Go on since peer is already set to broadcast.
}
pktData := resp.ToBytes()
log.Debug("dhcpv4: sending %d bytes to %s: %s", len(pktData), peer, resp.Summary())
_, err := conn.WriteTo(pktData, peer)
if err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
}
</s> add </s> remove //go:build darwin || freebsd || linux || openbsd
</s> add //go:build freebsd || linux || openbsd | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d402dc86c9b77c106993206cdb91721a0177c7e | internal/dhcpd/conn_unix.go |
<mask> "github.com/AdguardTeam/golibs/timeutil"
<mask> "github.com/go-ping/ping"
<mask> "github.com/insomniacslk/dhcp/dhcpv4"
<mask> "github.com/insomniacslk/dhcp/dhcpv4/server4"
<mask> "github.com/mdlayher/packet"
<mask> "golang.org/x/exp/slices"
<mask> )
<mask>
<mask> // v4Server is a DHCPv4 server.
<mask> //
</s> Pull request 1830: 5712-rollback-dhcp
Merge in DNS/adguard-home from 5712-rollback-dhcp to master
Updates #5712.
Squashed commit of the following:
commit 3d53a6385ad08dfad0b7ac28bb057cf25608554d
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:30:18 2023 +0300
dhcpd: imp import
commit 86bd55b0225b5d9067bd0bf9e6def1e52dd27124
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:26:41 2023 +0300
all: return todo
commit 629c548989a464a9cf461fffc0815b99a00c4851
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:24:10 2023 +0300
all: log changes
commit e4c369e55cbcc7c73d73d8df333996862e1e146a
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:03:03 2023 +0300
dhcpd: revert raw for darwin </s> remove "github.com/mdlayher/packet"
</s> add </s> remove // send writes resp for peer to conn considering the req's parameters according
// to RFC-2131.
//
// See https://datatracker.ietf.org/doc/html/rfc2131#section-4.1.
func (s *v4Server) send(peer net.Addr, conn net.PacketConn, req, resp *dhcpv4.DHCPv4) {
switch giaddr, ciaddr, mtype := req.GatewayIPAddr, req.ClientIPAddr, resp.MessageType(); {
case giaddr != nil && !giaddr.IsUnspecified():
// Send any return messages to the server port on the BOOTP
// relay agent whose address appears in giaddr.
peer = &net.UDPAddr{
IP: giaddr,
Port: dhcpv4.ServerPort,
}
if mtype == dhcpv4.MessageTypeNak {
// Set the broadcast bit in the DHCPNAK, so that the relay agent
// broadcasts it to the client, because the client may not have
// a correct network address or subnet mask, and the client may not
// be answering ARP requests.
resp.SetBroadcast()
}
case mtype == dhcpv4.MessageTypeNak:
// Broadcast any DHCPNAK messages to 0xffffffff.
case ciaddr != nil && !ciaddr.IsUnspecified():
// Unicast DHCPOFFER and DHCPACK messages to the address in
// ciaddr.
peer = &net.UDPAddr{
IP: ciaddr,
Port: dhcpv4.ClientPort,
}
case !req.IsBroadcast() && req.ClientHWAddr != nil:
// Unicast DHCPOFFER and DHCPACK messages to the client's
// hardware address and yiaddr.
peer = &dhcpUnicastAddr{
Addr: packet.Addr{HardwareAddr: req.ClientHWAddr},
yiaddr: resp.YourIPAddr,
}
default:
// Go on since peer is already set to broadcast.
}
pktData := resp.ToBytes()
log.Debug("dhcpv4: sending %d bytes to %s: %s", len(pktData), peer, resp.Summary())
_, err := conn.WriteTo(pktData, peer)
if err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
}
</s> add </s> remove github.com/mdlayher/raw v0.1.0 // indirect
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d402dc86c9b77c106993206cdb91721a0177c7e | internal/dhcpd/v4_unix.go |
|
<mask>
<mask> s.send(peer, conn, req, resp)
<mask> }
<mask>
<mask> // send writes resp for peer to conn considering the req's parameters according
<mask> // to RFC-2131.
<mask> //
<mask> // See https://datatracker.ietf.org/doc/html/rfc2131#section-4.1.
<mask> func (s *v4Server) send(peer net.Addr, conn net.PacketConn, req, resp *dhcpv4.DHCPv4) {
<mask> switch giaddr, ciaddr, mtype := req.GatewayIPAddr, req.ClientIPAddr, resp.MessageType(); {
<mask> case giaddr != nil && !giaddr.IsUnspecified():
<mask> // Send any return messages to the server port on the BOOTP
<mask> // relay agent whose address appears in giaddr.
<mask> peer = &net.UDPAddr{
<mask> IP: giaddr,
<mask> Port: dhcpv4.ServerPort,
<mask> }
<mask> if mtype == dhcpv4.MessageTypeNak {
<mask> // Set the broadcast bit in the DHCPNAK, so that the relay agent
<mask> // broadcasts it to the client, because the client may not have
<mask> // a correct network address or subnet mask, and the client may not
<mask> // be answering ARP requests.
<mask> resp.SetBroadcast()
<mask> }
<mask> case mtype == dhcpv4.MessageTypeNak:
<mask> // Broadcast any DHCPNAK messages to 0xffffffff.
<mask> case ciaddr != nil && !ciaddr.IsUnspecified():
<mask> // Unicast DHCPOFFER and DHCPACK messages to the address in
<mask> // ciaddr.
<mask> peer = &net.UDPAddr{
<mask> IP: ciaddr,
<mask> Port: dhcpv4.ClientPort,
<mask> }
<mask> case !req.IsBroadcast() && req.ClientHWAddr != nil:
<mask> // Unicast DHCPOFFER and DHCPACK messages to the client's
<mask> // hardware address and yiaddr.
<mask> peer = &dhcpUnicastAddr{
<mask> Addr: packet.Addr{HardwareAddr: req.ClientHWAddr},
<mask> yiaddr: resp.YourIPAddr,
<mask> }
<mask> default:
<mask> // Go on since peer is already set to broadcast.
<mask> }
<mask>
<mask> pktData := resp.ToBytes()
<mask>
<mask> log.Debug("dhcpv4: sending %d bytes to %s: %s", len(pktData), peer, resp.Summary())
<mask>
<mask> _, err := conn.WriteTo(pktData, peer)
<mask> if err != nil {
<mask> log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
<mask> }
<mask> }
<mask>
<mask> // Start starts the IPv4 DHCP server.
<mask> func (s *v4Server) Start() (err error) {
<mask> defer func() { err = errors.Annotate(err, "dhcpv4: %w") }()
<mask>
<mask> if !s.enabled() {
</s> Pull request 1830: 5712-rollback-dhcp
Merge in DNS/adguard-home from 5712-rollback-dhcp to master
Updates #5712.
Squashed commit of the following:
commit 3d53a6385ad08dfad0b7ac28bb057cf25608554d
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:30:18 2023 +0300
dhcpd: imp import
commit 86bd55b0225b5d9067bd0bf9e6def1e52dd27124
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:26:41 2023 +0300
all: return todo
commit 629c548989a464a9cf461fffc0815b99a00c4851
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:24:10 2023 +0300
all: log changes
commit e4c369e55cbcc7c73d73d8df333996862e1e146a
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:03:03 2023 +0300
dhcpd: revert raw for darwin </s> remove func TestV4Server_Send(t *testing.T) {
s := &v4Server{}
var (
defaultIP = net.IP{99, 99, 99, 99}
knownIP = net.IP{4, 2, 4, 2}
knownMAC = net.HardwareAddr{6, 5, 4, 3, 2, 1}
)
defaultPeer := &net.UDPAddr{
IP: defaultIP,
// Use neither client nor server port to check it actually
// changed.
Port: dhcpv4.ClientPort + dhcpv4.ServerPort,
}
defaultResp := &dhcpv4.DHCPv4{}
testCases := []struct {
want net.Addr
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
name string
}{{
name: "giaddr",
req: &dhcpv4.DHCPv4{GatewayIPAddr: knownIP},
resp: defaultResp,
want: &net.UDPAddr{
IP: knownIP,
Port: dhcpv4.ServerPort,
},
}, {
name: "nak",
req: &dhcpv4.DHCPv4{},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
want: defaultPeer,
}, {
name: "ciaddr",
req: &dhcpv4.DHCPv4{ClientIPAddr: knownIP},
resp: &dhcpv4.DHCPv4{},
want: &net.UDPAddr{
IP: knownIP,
Port: dhcpv4.ClientPort,
},
}, {
name: "chaddr",
req: &dhcpv4.DHCPv4{ClientHWAddr: knownMAC},
resp: &dhcpv4.DHCPv4{YourIPAddr: knownIP},
want: &dhcpUnicastAddr{
Addr: packet.Addr{HardwareAddr: knownMAC},
yiaddr: knownIP,
},
}, {
name: "who_are_you",
req: &dhcpv4.DHCPv4{},
resp: &dhcpv4.DHCPv4{},
want: defaultPeer,
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
assert.Equal(t, tc.want, addr)
return 0, nil
},
}
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
})
}
t.Run("giaddr_nak", func(t *testing.T) {
req := &dhcpv4.DHCPv4{
GatewayIPAddr: knownIP,
}
// Ensure the request is for unicast.
req.SetUnicast()
resp := &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
}
want := &net.UDPAddr{
IP: req.GatewayIPAddr,
Port: dhcpv4.ServerPort,
}
conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (n int, err error) {
assert.Equal(t, want, addr)
return 0, nil
},
}
s.send(cloneUDPAddr(defaultPeer), conn, req, resp)
assert.True(t, resp.IsBroadcast())
})
}
</s> add </s> remove "github.com/mdlayher/packet"
</s> add </s> remove github.com/mdlayher/raw v0.1.0 // indirect
</s> add </s> remove "github.com/mdlayher/packet"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d402dc86c9b77c106993206cdb91721a0177c7e | internal/dhcpd/v4_unix.go |
|
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/AdguardTeam/golibs/stringutil"
<mask> "github.com/AdguardTeam/golibs/testutil"
<mask> "github.com/insomniacslk/dhcp/dhcpv4"
<mask> "github.com/mdlayher/packet"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> var (
</s> Pull request 1830: 5712-rollback-dhcp
Merge in DNS/adguard-home from 5712-rollback-dhcp to master
Updates #5712.
Squashed commit of the following:
commit 3d53a6385ad08dfad0b7ac28bb057cf25608554d
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:30:18 2023 +0300
dhcpd: imp import
commit 86bd55b0225b5d9067bd0bf9e6def1e52dd27124
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:26:41 2023 +0300
all: return todo
commit 629c548989a464a9cf461fffc0815b99a00c4851
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:24:10 2023 +0300
all: log changes
commit e4c369e55cbcc7c73d73d8df333996862e1e146a
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:03:03 2023 +0300
dhcpd: revert raw for darwin </s> remove "github.com/mdlayher/packet"
</s> add </s> remove func TestV4Server_Send(t *testing.T) {
s := &v4Server{}
var (
defaultIP = net.IP{99, 99, 99, 99}
knownIP = net.IP{4, 2, 4, 2}
knownMAC = net.HardwareAddr{6, 5, 4, 3, 2, 1}
)
defaultPeer := &net.UDPAddr{
IP: defaultIP,
// Use neither client nor server port to check it actually
// changed.
Port: dhcpv4.ClientPort + dhcpv4.ServerPort,
}
defaultResp := &dhcpv4.DHCPv4{}
testCases := []struct {
want net.Addr
req *dhcpv4.DHCPv4
resp *dhcpv4.DHCPv4
name string
}{{
name: "giaddr",
req: &dhcpv4.DHCPv4{GatewayIPAddr: knownIP},
resp: defaultResp,
want: &net.UDPAddr{
IP: knownIP,
Port: dhcpv4.ServerPort,
},
}, {
name: "nak",
req: &dhcpv4.DHCPv4{},
resp: &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
},
want: defaultPeer,
}, {
name: "ciaddr",
req: &dhcpv4.DHCPv4{ClientIPAddr: knownIP},
resp: &dhcpv4.DHCPv4{},
want: &net.UDPAddr{
IP: knownIP,
Port: dhcpv4.ClientPort,
},
}, {
name: "chaddr",
req: &dhcpv4.DHCPv4{ClientHWAddr: knownMAC},
resp: &dhcpv4.DHCPv4{YourIPAddr: knownIP},
want: &dhcpUnicastAddr{
Addr: packet.Addr{HardwareAddr: knownMAC},
yiaddr: knownIP,
},
}, {
name: "who_are_you",
req: &dhcpv4.DHCPv4{},
resp: &dhcpv4.DHCPv4{},
want: defaultPeer,
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
assert.Equal(t, tc.want, addr)
return 0, nil
},
}
s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
})
}
t.Run("giaddr_nak", func(t *testing.T) {
req := &dhcpv4.DHCPv4{
GatewayIPAddr: knownIP,
}
// Ensure the request is for unicast.
req.SetUnicast()
resp := &dhcpv4.DHCPv4{
Options: dhcpv4.OptionsFromList(
dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
),
}
want := &net.UDPAddr{
IP: req.GatewayIPAddr,
Port: dhcpv4.ServerPort,
}
conn := &fakePacketConn{
writeTo: func(_ []byte, addr net.Addr) (n int, err error) {
assert.Equal(t, want, addr)
return 0, nil
},
}
s.send(cloneUDPAddr(defaultPeer), conn, req, resp)
assert.True(t, resp.IsBroadcast())
})
}
</s> add </s> remove //go:build darwin || freebsd || linux || openbsd
</s> add //go:build freebsd || linux || openbsd </s> remove // send writes resp for peer to conn considering the req's parameters according
// to RFC-2131.
//
// See https://datatracker.ietf.org/doc/html/rfc2131#section-4.1.
func (s *v4Server) send(peer net.Addr, conn net.PacketConn, req, resp *dhcpv4.DHCPv4) {
switch giaddr, ciaddr, mtype := req.GatewayIPAddr, req.ClientIPAddr, resp.MessageType(); {
case giaddr != nil && !giaddr.IsUnspecified():
// Send any return messages to the server port on the BOOTP
// relay agent whose address appears in giaddr.
peer = &net.UDPAddr{
IP: giaddr,
Port: dhcpv4.ServerPort,
}
if mtype == dhcpv4.MessageTypeNak {
// Set the broadcast bit in the DHCPNAK, so that the relay agent
// broadcasts it to the client, because the client may not have
// a correct network address or subnet mask, and the client may not
// be answering ARP requests.
resp.SetBroadcast()
}
case mtype == dhcpv4.MessageTypeNak:
// Broadcast any DHCPNAK messages to 0xffffffff.
case ciaddr != nil && !ciaddr.IsUnspecified():
// Unicast DHCPOFFER and DHCPACK messages to the address in
// ciaddr.
peer = &net.UDPAddr{
IP: ciaddr,
Port: dhcpv4.ClientPort,
}
case !req.IsBroadcast() && req.ClientHWAddr != nil:
// Unicast DHCPOFFER and DHCPACK messages to the client's
// hardware address and yiaddr.
peer = &dhcpUnicastAddr{
Addr: packet.Addr{HardwareAddr: req.ClientHWAddr},
yiaddr: resp.YourIPAddr,
}
default:
// Go on since peer is already set to broadcast.
}
pktData := resp.ToBytes()
log.Debug("dhcpv4: sending %d bytes to %s: %s", len(pktData), peer, resp.Summary())
_, err := conn.WriteTo(pktData, peer)
if err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d402dc86c9b77c106993206cdb91721a0177c7e | internal/dhcpd/v4_unix_test.go |
|
<mask> func (fc *fakePacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
<mask> return fc.writeTo(p, addr)
<mask> }
<mask>
<mask> func TestV4Server_Send(t *testing.T) {
<mask> s := &v4Server{}
<mask>
<mask> var (
<mask> defaultIP = net.IP{99, 99, 99, 99}
<mask> knownIP = net.IP{4, 2, 4, 2}
<mask> knownMAC = net.HardwareAddr{6, 5, 4, 3, 2, 1}
<mask> )
<mask>
<mask> defaultPeer := &net.UDPAddr{
<mask> IP: defaultIP,
<mask> // Use neither client nor server port to check it actually
<mask> // changed.
<mask> Port: dhcpv4.ClientPort + dhcpv4.ServerPort,
<mask> }
<mask> defaultResp := &dhcpv4.DHCPv4{}
<mask>
<mask> testCases := []struct {
<mask> want net.Addr
<mask> req *dhcpv4.DHCPv4
<mask> resp *dhcpv4.DHCPv4
<mask> name string
<mask> }{{
<mask> name: "giaddr",
<mask> req: &dhcpv4.DHCPv4{GatewayIPAddr: knownIP},
<mask> resp: defaultResp,
<mask> want: &net.UDPAddr{
<mask> IP: knownIP,
<mask> Port: dhcpv4.ServerPort,
<mask> },
<mask> }, {
<mask> name: "nak",
<mask> req: &dhcpv4.DHCPv4{},
<mask> resp: &dhcpv4.DHCPv4{
<mask> Options: dhcpv4.OptionsFromList(
<mask> dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
<mask> ),
<mask> },
<mask> want: defaultPeer,
<mask> }, {
<mask> name: "ciaddr",
<mask> req: &dhcpv4.DHCPv4{ClientIPAddr: knownIP},
<mask> resp: &dhcpv4.DHCPv4{},
<mask> want: &net.UDPAddr{
<mask> IP: knownIP,
<mask> Port: dhcpv4.ClientPort,
<mask> },
<mask> }, {
<mask> name: "chaddr",
<mask> req: &dhcpv4.DHCPv4{ClientHWAddr: knownMAC},
<mask> resp: &dhcpv4.DHCPv4{YourIPAddr: knownIP},
<mask> want: &dhcpUnicastAddr{
<mask> Addr: packet.Addr{HardwareAddr: knownMAC},
<mask> yiaddr: knownIP,
<mask> },
<mask> }, {
<mask> name: "who_are_you",
<mask> req: &dhcpv4.DHCPv4{},
<mask> resp: &dhcpv4.DHCPv4{},
<mask> want: defaultPeer,
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> conn := &fakePacketConn{
<mask> writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
<mask> assert.Equal(t, tc.want, addr)
<mask>
<mask> return 0, nil
<mask> },
<mask> }
<mask>
<mask> s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
<mask> })
<mask> }
<mask>
<mask> t.Run("giaddr_nak", func(t *testing.T) {
<mask> req := &dhcpv4.DHCPv4{
<mask> GatewayIPAddr: knownIP,
<mask> }
<mask> // Ensure the request is for unicast.
<mask> req.SetUnicast()
<mask> resp := &dhcpv4.DHCPv4{
<mask> Options: dhcpv4.OptionsFromList(
<mask> dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
<mask> ),
<mask> }
<mask> want := &net.UDPAddr{
<mask> IP: req.GatewayIPAddr,
<mask> Port: dhcpv4.ServerPort,
<mask> }
<mask>
<mask> conn := &fakePacketConn{
<mask> writeTo: func(_ []byte, addr net.Addr) (n int, err error) {
<mask> assert.Equal(t, want, addr)
<mask>
<mask> return 0, nil
<mask> },
<mask> }
<mask>
<mask> s.send(cloneUDPAddr(defaultPeer), conn, req, resp)
<mask> assert.True(t, resp.IsBroadcast())
<mask> })
<mask> }
<mask>
<mask> func TestV4Server_FindMACbyIP(t *testing.T) {
<mask> const (
<mask> staticName = "static-client"
<mask> anotherName = "another-client"
<mask> )
</s> Pull request 1830: 5712-rollback-dhcp
Merge in DNS/adguard-home from 5712-rollback-dhcp to master
Updates #5712.
Squashed commit of the following:
commit 3d53a6385ad08dfad0b7ac28bb057cf25608554d
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:30:18 2023 +0300
dhcpd: imp import
commit 86bd55b0225b5d9067bd0bf9e6def1e52dd27124
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:26:41 2023 +0300
all: return todo
commit 629c548989a464a9cf461fffc0815b99a00c4851
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:24:10 2023 +0300
all: log changes
commit e4c369e55cbcc7c73d73d8df333996862e1e146a
Author: Eugene Burkov <[email protected]>
Date: Fri Apr 14 16:03:03 2023 +0300
dhcpd: revert raw for darwin </s> remove // send writes resp for peer to conn considering the req's parameters according
// to RFC-2131.
//
// See https://datatracker.ietf.org/doc/html/rfc2131#section-4.1.
func (s *v4Server) send(peer net.Addr, conn net.PacketConn, req, resp *dhcpv4.DHCPv4) {
switch giaddr, ciaddr, mtype := req.GatewayIPAddr, req.ClientIPAddr, resp.MessageType(); {
case giaddr != nil && !giaddr.IsUnspecified():
// Send any return messages to the server port on the BOOTP
// relay agent whose address appears in giaddr.
peer = &net.UDPAddr{
IP: giaddr,
Port: dhcpv4.ServerPort,
}
if mtype == dhcpv4.MessageTypeNak {
// Set the broadcast bit in the DHCPNAK, so that the relay agent
// broadcasts it to the client, because the client may not have
// a correct network address or subnet mask, and the client may not
// be answering ARP requests.
resp.SetBroadcast()
}
case mtype == dhcpv4.MessageTypeNak:
// Broadcast any DHCPNAK messages to 0xffffffff.
case ciaddr != nil && !ciaddr.IsUnspecified():
// Unicast DHCPOFFER and DHCPACK messages to the address in
// ciaddr.
peer = &net.UDPAddr{
IP: ciaddr,
Port: dhcpv4.ClientPort,
}
case !req.IsBroadcast() && req.ClientHWAddr != nil:
// Unicast DHCPOFFER and DHCPACK messages to the client's
// hardware address and yiaddr.
peer = &dhcpUnicastAddr{
Addr: packet.Addr{HardwareAddr: req.ClientHWAddr},
yiaddr: resp.YourIPAddr,
}
default:
// Go on since peer is already set to broadcast.
}
pktData := resp.ToBytes()
log.Debug("dhcpv4: sending %d bytes to %s: %s", len(pktData), peer, resp.Summary())
_, err := conn.WriteTo(pktData, peer)
if err != nil {
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
}
}
</s> add </s> remove "github.com/mdlayher/packet"
</s> add </s> remove "github.com/mdlayher/packet"
</s> add </s> remove github.com/mdlayher/raw v0.1.0 // indirect
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d402dc86c9b77c106993206cdb91721a0177c7e | internal/dhcpd/v4_unix_test.go |
|
rm -rf /var/cache/apk/* && mkdir -p /opt/adguardhome | <mask> LABEL maintainer="AdGuard Team <[email protected]>"
<mask>
<mask> # Update CA certs
<mask> RUN apk --no-cache --update add ca-certificates && \
<mask> rm -rf /var/cache/apk/*
<mask>
<mask> COPY --from=build /src/AdGuardHome/AdGuardHome /AdGuardHome
<mask>
<mask> EXPOSE 53 3000
<mask>
</s> Fix to go along with new concept </s> remove ENTRYPOINT ["/AdGuardHome"]
CMD ["-h", "0.0.0.0"] </s> add </s> remove COPY --from=build /src/AdGuardHome/AdGuardHome /AdGuardHome
</s> add COPY --from=build /src/AdGuardHome/AdGuardHome /opt/adguardhome/AdGuardHome </s> remove VOLUME /data
</s> add VOLUME ["/opt/adguardhome/conf", "/opt/adguardhome/work"] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d7d10ec3870ea0d412f6b5e7c26cfdcce414dc7 | Dockerfile |
COPY --from=build /src/AdGuardHome/AdGuardHome /opt/adguardhome/AdGuardHome | <mask> # Update CA certs
<mask> RUN apk --no-cache --update add ca-certificates && \
<mask> rm -rf /var/cache/apk/*
<mask>
<mask> COPY --from=build /src/AdGuardHome/AdGuardHome /AdGuardHome
<mask>
<mask> EXPOSE 53 3000
<mask>
<mask> VOLUME /data
<mask>
</s> Fix to go along with new concept </s> remove rm -rf /var/cache/apk/*
</s> add rm -rf /var/cache/apk/* && mkdir -p /opt/adguardhome </s> remove ENTRYPOINT ["/AdGuardHome"]
CMD ["-h", "0.0.0.0"] </s> add </s> remove VOLUME /data
</s> add VOLUME ["/opt/adguardhome/conf", "/opt/adguardhome/work"] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d7d10ec3870ea0d412f6b5e7c26cfdcce414dc7 | Dockerfile |
VOLUME ["/opt/adguardhome/conf", "/opt/adguardhome/work"] | <mask> COPY --from=build /src/AdGuardHome/AdGuardHome /AdGuardHome
<mask>
<mask> EXPOSE 53 3000
<mask>
<mask> VOLUME /data
<mask>
<mask> ENTRYPOINT ["/AdGuardHome"]
<mask> CMD ["-h", "0.0.0.0"] </s> Fix to go along with new concept </s> remove ENTRYPOINT ["/AdGuardHome"]
CMD ["-h", "0.0.0.0"] </s> add </s> remove rm -rf /var/cache/apk/*
</s> add rm -rf /var/cache/apk/* && mkdir -p /opt/adguardhome </s> remove COPY --from=build /src/AdGuardHome/AdGuardHome /AdGuardHome
</s> add COPY --from=build /src/AdGuardHome/AdGuardHome /opt/adguardhome/AdGuardHome | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d7d10ec3870ea0d412f6b5e7c26cfdcce414dc7 | Dockerfile |
<mask> EXPOSE 53 3000
<mask>
<mask> VOLUME /data
<mask>
<mask> ENTRYPOINT ["/AdGuardHome"]
<mask> CMD ["-h", "0.0.0.0"] </s> Fix to go along with new concept </s> remove rm -rf /var/cache/apk/*
</s> add rm -rf /var/cache/apk/* && mkdir -p /opt/adguardhome </s> remove COPY --from=build /src/AdGuardHome/AdGuardHome /AdGuardHome
</s> add COPY --from=build /src/AdGuardHome/AdGuardHome /opt/adguardhome/AdGuardHome </s> remove VOLUME /data
</s> add VOLUME ["/opt/adguardhome/conf", "/opt/adguardhome/work"] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6d7d10ec3870ea0d412f6b5e7c26cfdcce414dc7 | Dockerfile |
|
// 1. Run "sudo ipset create example_set hash:ip family ipv4". | <mask> )
<mask>
<mask> // How to test on a real Linux machine:
<mask> //
<mask> // 1. Run:
<mask> //
<mask> // sudo ipset create example_set hash:ip family ipv4
<mask> //
<mask> // 2. Run:
<mask> //
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove // sudo ipset create example_set hash:ip family ipv4
</s> add // 2. Run "sudo ipset list example_set". The Members field should be empty. </s> remove // 2. Run:
</s> add // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. </s> remove // sudo ipset list example_set
</s> add // 4. Start AdGuardHome. </s> remove // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml.
//
// 4. Start AdGuardHome.
//
// 5. Make requests to example.com and its subdomains.
//
// 6. Run:
//
// sudo ipset list example_set
//
// The Members field should contain the resolved IP addresses.
</s> add // 6. Run "sudo ipset list example_set". The Members field should contain the
// resolved IP addresses. </s> remove // The Members field should be empty.
</s> add // 5. Make requests to example.com and its subdomains. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801 | internal/aghnet/ipset_linux.go |
// 2. Run "sudo ipset list example_set". The Members field should be empty. | <mask> // How to test on a real Linux machine:
<mask> //
<mask> // 1. Run:
<mask> //
<mask> // sudo ipset create example_set hash:ip family ipv4
<mask> //
<mask> // 2. Run:
<mask> //
<mask> // sudo ipset list example_set
<mask> //
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove // 1. Run:
</s> add // 1. Run "sudo ipset create example_set hash:ip family ipv4". </s> remove // 2. Run:
</s> add // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. </s> remove // sudo ipset list example_set
</s> add // 4. Start AdGuardHome. </s> remove // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml.
//
// 4. Start AdGuardHome.
//
// 5. Make requests to example.com and its subdomains.
//
// 6. Run:
//
// sudo ipset list example_set
//
// The Members field should contain the resolved IP addresses.
</s> add // 6. Run "sudo ipset list example_set". The Members field should contain the
// resolved IP addresses. </s> remove // The Members field should be empty.
</s> add // 5. Make requests to example.com and its subdomains. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801 | internal/aghnet/ipset_linux.go |
// 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. | <mask> // 1. Run:
<mask> //
<mask> // sudo ipset create example_set hash:ip family ipv4
<mask> //
<mask> // 2. Run:
<mask> //
<mask> // sudo ipset list example_set
<mask> //
<mask> // The Members field should be empty.
<mask> //
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove // sudo ipset create example_set hash:ip family ipv4
</s> add // 2. Run "sudo ipset list example_set". The Members field should be empty. </s> remove // sudo ipset list example_set
</s> add // 4. Start AdGuardHome. </s> remove // 1. Run:
</s> add // 1. Run "sudo ipset create example_set hash:ip family ipv4". </s> remove // The Members field should be empty.
</s> add // 5. Make requests to example.com and its subdomains. </s> remove // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml.
//
// 4. Start AdGuardHome.
//
// 5. Make requests to example.com and its subdomains.
//
// 6. Run:
//
// sudo ipset list example_set
//
// The Members field should contain the resolved IP addresses.
</s> add // 6. Run "sudo ipset list example_set". The Members field should contain the
// resolved IP addresses. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801 | internal/aghnet/ipset_linux.go |
// 4. Start AdGuardHome. | <mask> // sudo ipset create example_set hash:ip family ipv4
<mask> //
<mask> // 2. Run:
<mask> //
<mask> // sudo ipset list example_set
<mask> //
<mask> // The Members field should be empty.
<mask> //
<mask> // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml.
<mask> //
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove // 2. Run:
</s> add // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. </s> remove // The Members field should be empty.
</s> add // 5. Make requests to example.com and its subdomains. </s> remove // sudo ipset create example_set hash:ip family ipv4
</s> add // 2. Run "sudo ipset list example_set". The Members field should be empty. </s> remove // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml.
//
// 4. Start AdGuardHome.
//
// 5. Make requests to example.com and its subdomains.
//
// 6. Run:
//
// sudo ipset list example_set
//
// The Members field should contain the resolved IP addresses.
</s> add // 6. Run "sudo ipset list example_set". The Members field should contain the
// resolved IP addresses. </s> remove // 1. Run:
</s> add // 1. Run "sudo ipset create example_set hash:ip family ipv4". | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801 | internal/aghnet/ipset_linux.go |
// 5. Make requests to example.com and its subdomains. | <mask> // 2. Run:
<mask> //
<mask> // sudo ipset list example_set
<mask> //
<mask> // The Members field should be empty.
<mask> //
<mask> // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml.
<mask> //
<mask> // 4. Start AdGuardHome.
<mask> //
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove // sudo ipset list example_set
</s> add // 4. Start AdGuardHome. </s> remove // 2. Run:
</s> add // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. </s> remove // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml.
//
// 4. Start AdGuardHome.
//
// 5. Make requests to example.com and its subdomains.
//
// 6. Run:
//
// sudo ipset list example_set
//
// The Members field should contain the resolved IP addresses.
</s> add // 6. Run "sudo ipset list example_set". The Members field should contain the
// resolved IP addresses. </s> remove // sudo ipset create example_set hash:ip family ipv4
</s> add // 2. Run "sudo ipset list example_set". The Members field should be empty. </s> remove // 1. Run:
</s> add // 1. Run "sudo ipset create example_set hash:ip family ipv4". | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801 | internal/aghnet/ipset_linux.go |
// 6. Run "sudo ipset list example_set". The Members field should contain the
// resolved IP addresses. | <mask> // sudo ipset list example_set
<mask> //
<mask> // The Members field should be empty.
<mask> //
<mask> // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml.
<mask> //
<mask> // 4. Start AdGuardHome.
<mask> //
<mask> // 5. Make requests to example.com and its subdomains.
<mask> //
<mask> // 6. Run:
<mask> //
<mask> // sudo ipset list example_set
<mask> //
<mask> // The Members field should contain the resolved IP addresses.
<mask>
<mask> // newIpsetMgr returns a new Linux ipset manager.
<mask> func newIpsetMgr(ipsetConf []string) (set IpsetManager, err error) {
<mask> return newIpsetMgrWithDialer(ipsetConf, defaultDial)
<mask> }
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove // The Members field should be empty.
</s> add // 5. Make requests to example.com and its subdomains. </s> remove // sudo ipset list example_set
</s> add // 4. Start AdGuardHome. </s> remove // 2. Run:
</s> add // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. </s> remove // sudo ipset create example_set hash:ip family ipv4
</s> add // 2. Run "sudo ipset list example_set". The Members field should be empty. </s> remove // 1. Run:
</s> add // 1. Run "sudo ipset create example_set hash:ip family ipv4". | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801 | internal/aghnet/ipset_linux.go |
golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5
golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84 | <mask> github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8
<mask> github.com/kisielk/errcheck v1.6.2
<mask> github.com/kyoh86/looppointer v0.1.7
<mask> github.com/securego/gosec/v2 v2.13.1
<mask> golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3
<mask> golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05
<mask> honnef.co/go/tools v0.3.3
<mask> mvdan.cc/gofumpt v0.3.1
<mask> mvdan.cc/unparam v0.0.0-20220831102321-2fc90a84c7ec
<mask> )
<mask>
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3 h1:aE4T3aJwdCNz+s35ScSQYUzeGu7BOLDHZ1bBHVurqqY=
golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05 h1:NWQHMTdThZhCArzUbnu1Bh+l3LdwUfjZws+ivBR2sxM=
golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05/go.mod h1:7tDfEDtOLlzHQRi4Yzfg5seVBSvouUIjyPzBx4q5CxQ=
</s> add golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5 h1:o1LhIiY5L+hLK9DWqfFlilCrpZnw/s7WU4iCUkb/bao=
golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5/go.mod h1:VsjNM1dMo+Ofkp5d7y7fOdQZD8MTXSQ4w3EPk65AvKU=
golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84 h1:L0qUjdplndgX880fozFRGC242wAtfsViyRXWGlpZQ54=
golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84/go.mod h1:7tDfEDtOLlzHQRi4Yzfg5seVBSvouUIjyPzBx4q5CxQ= </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 // indirect </s> remove // 1. Run:
</s> add // 1. Run "sudo ipset create example_set hash:ip family ipv4". </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 h1:wM1k/lXfpc5HdkJJyW9GELpd8ERGdnh8sMGL6Gzq3Ho=
golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801 | internal/tools/go.mod |
golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect | <mask> github.com/gookit/color v1.5.2 // indirect
<mask> github.com/kyoh86/nolint v0.0.1 // indirect
<mask> github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
<mask> github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
<mask> golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
<mask> golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
<mask> golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
<mask> golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
<mask> golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
<mask> gopkg.in/yaml.v2 v2.4.0 // indirect
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 // indirect </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect </s> remove // 2. Run:
</s> add // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. </s> remove // sudo ipset list example_set
</s> add // 4. Start AdGuardHome. </s> remove // The Members field should be empty.
</s> add // 5. Make requests to example.com and its subdomains. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801 | internal/tools/go.mod |
golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 // indirect | <mask> github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
<mask> github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
<mask> golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
<mask> golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
<mask> golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
<mask> golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
<mask> golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
<mask> gopkg.in/yaml.v2 v2.4.0 // indirect
<mask> )
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect </s> remove // 1. Run:
</s> add // 1. Run "sudo ipset create example_set hash:ip family ipv4". </s> remove // 2. Run:
</s> add // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. </s> remove // sudo ipset list example_set
</s> add // 4. Start AdGuardHome. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801 | internal/tools/go.mod |
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect | <mask> golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
<mask> golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
<mask> golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
<mask> golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
<mask> golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
<mask> gopkg.in/yaml.v2 v2.4.0 // indirect
<mask> )
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 // indirect </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect </s> remove // 1. Run:
</s> add // 1. Run "sudo ipset create example_set hash:ip family ipv4". </s> remove // 2. Run:
</s> add // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. </s> remove // sudo ipset list example_set
</s> add // 4. Start AdGuardHome. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801 | internal/tools/go.mod |
golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e h1:Ctm9yurWsg7aWwIpH9Bnap/IdSVxixymIb3MhiMEQQA=
golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= | <mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
<mask> golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
<mask> golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
<mask> golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
<mask> golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 h1:Ic/qN6TEifvObMGQy72k0n1LlJr7DjWWEi+MOsDOiSk=
<mask> golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
<mask> golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 h1:CZP0Rbk/s1EIiUMx5DS2MhK2ct52xpQxqddVD0FmF+o=
golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 // indirect </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 h1:wM1k/lXfpc5HdkJJyW9GELpd8ERGdnh8sMGL6Gzq3Ho=
golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801 | internal/tools/go.sum |
golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 h1:CZP0Rbk/s1EIiUMx5DS2MhK2ct52xpQxqddVD0FmF+o=
golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= | <mask> golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
<mask> golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
<mask> golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
<mask> golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
<mask> golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
<mask> golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e h1:Ctm9yurWsg7aWwIpH9Bnap/IdSVxixymIb3MhiMEQQA=
golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 // indirect </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 h1:wM1k/lXfpc5HdkJJyW9GELpd8ERGdnh8sMGL6Gzq3Ho=
golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801 | internal/tools/go.sum |
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | <mask> golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 h1:wM1k/lXfpc5HdkJJyW9GELpd8ERGdnh8sMGL6Gzq3Ho=
<mask> golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 // indirect </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 h1:CZP0Rbk/s1EIiUMx5DS2MhK2ct52xpQxqddVD0FmF+o=
golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e h1:Ctm9yurWsg7aWwIpH9Bnap/IdSVxixymIb3MhiMEQQA=
golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801 | internal/tools/go.sum |
golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5 h1:o1LhIiY5L+hLK9DWqfFlilCrpZnw/s7WU4iCUkb/bao=
golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5/go.mod h1:VsjNM1dMo+Ofkp5d7y7fOdQZD8MTXSQ4w3EPk65AvKU=
golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84 h1:L0qUjdplndgX880fozFRGC242wAtfsViyRXWGlpZQ54=
golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84/go.mod h1:7tDfEDtOLlzHQRi4Yzfg5seVBSvouUIjyPzBx4q5CxQ= | <mask> golang.org/x/tools v0.0.0-20200710042808-f1c4188a97a1/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
<mask> golang.org/x/tools v0.0.0-20201007032633-0806396f153e/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
<mask> golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
<mask> golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
<mask> golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3 h1:aE4T3aJwdCNz+s35ScSQYUzeGu7BOLDHZ1bBHVurqqY=
<mask> golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
<mask> golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05 h1:NWQHMTdThZhCArzUbnu1Bh+l3LdwUfjZws+ivBR2sxM=
<mask> golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05/go.mod h1:7tDfEDtOLlzHQRi4Yzfg5seVBSvouUIjyPzBx4q5CxQ=
<mask> golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3
golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05
</s> add golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5
golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84 </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 h1:wM1k/lXfpc5HdkJJyW9GELpd8ERGdnh8sMGL6Gzq3Ho=
golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 h1:CZP0Rbk/s1EIiUMx5DS2MhK2ct52xpQxqddVD0FmF+o=
golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e h1:Ctm9yurWsg7aWwIpH9Bnap/IdSVxixymIb3MhiMEQQA=
golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801 | internal/tools/go.sum |
"dhcp_lease_added": "Static lease \"{{key}}\" successfully added",
"dhcp_lease_deleted": "Static lease \"{{key}}\" successfully deleted",
"dhcp_new_static_lease": "New static lease",
"dhcp_static_leases_not_found": "No DHCP static leases found",
"dhcp_add_static_lease": "Add static lease",
"delete_confirm": "Are you sure you want to delete \"{{key}}\"?",
"form_enter_hostname": "Enter hostname", | <mask> "dhcp_warning": "If you want to enable DHCP server anyway, make sure that there is no other active DHCP server in your network. Otherwise, it can break the Internet for connected devices!",
<mask> "dhcp_error": "We could not determine whether there is another DHCP server in the network.",
<mask> "dhcp_static_ip_error": "In order to use DHCP server a static IP address must be set. We failed to determine if this network interface is configured using static IP address. Please set a static IP address manually.",
<mask> "dhcp_dynamic_ip_found": "Your system uses dynamic IP address configuration for interface <0>{{interfaceName}}</0>. In order to use DHCP server a static IP address must be set. Your current IP address is <0>{{ipAddress}}</0>. We will automatically set this IP address as static if you press Enable DHCP button.",
<mask> "error_details": "Error details",
<mask> "back": "Back",
<mask> "dashboard": "Dashboard",
<mask> "settings": "Settings",
</s> + client: handle static leases form </s> remove this.props.setDhcpConfig(values);
</s> add if (values.interface_name) {
this.props.setDhcpConfig(values);
} </s> remove // TODO rewrite findActiveDhcp part
</s> add </s> remove if (values.interface_name) {
dispatch(findActiveDhcpRequest());
try {
const activeDhcp = await apiClient.findActiveDhcp(values.interface_name);
dispatch(findActiveDhcpSuccess(activeDhcp));
if (!activeDhcp.found) {
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure());
}
} else {
dispatch(addErrorToast({ error: 'dhcp_found' }));
}
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(findActiveDhcpFailure());
}
} else {
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure());
}
</s> add dispatch(findActiveDhcp(values.interface_name));
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure()); </s> remove // TODO rewrite findActiveDhcp part
export const toggleDhcp = config => async (dispatch) => {
</s> add export const toggleDhcp = values => async (dispatch) => { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/__locales/en.json |
<mask> export const setDhcpConfigRequest = createAction('SET_DHCP_CONFIG_REQUEST');
<mask> export const setDhcpConfigSuccess = createAction('SET_DHCP_CONFIG_SUCCESS');
<mask> export const setDhcpConfigFailure = createAction('SET_DHCP_CONFIG_FAILURE');
<mask>
<mask> // TODO rewrite findActiveDhcp part
<mask> export const setDhcpConfig = values => async (dispatch, getState) => {
<mask> const { config } = getState().dhcp;
<mask> const updatedConfig = { ...config, ...values };
<mask> dispatch(setDhcpConfigRequest());
<mask> if (values.interface_name) {
</s> + client: handle static leases form </s> remove // TODO rewrite findActiveDhcp part
export const toggleDhcp = config => async (dispatch) => {
</s> add export const toggleDhcp = values => async (dispatch) => { </s> remove if (values.interface_name) {
dispatch(findActiveDhcpRequest());
try {
const activeDhcp = await apiClient.findActiveDhcp(values.interface_name);
dispatch(findActiveDhcpSuccess(activeDhcp));
if (!activeDhcp.found) {
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure());
}
} else {
dispatch(addErrorToast({ error: 'dhcp_found' }));
}
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(findActiveDhcpFailure());
}
} else {
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure());
}
</s> add dispatch(findActiveDhcp(values.interface_name));
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure()); </s> remove if (config.enabled) {
try {
await apiClient.setDhcpConfig({ ...config, enabled: false });
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast('disabled_dhcp'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
} else {
dispatch(findActiveDhcpRequest());
try {
const activeDhcp = await apiClient.findActiveDhcp(config.interface_name);
dispatch(findActiveDhcpSuccess(activeDhcp));
if (!activeDhcp.found) {
try {
await apiClient.setDhcpConfig({ ...config, enabled: true });
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast('enabled_dhcp'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
} else {
dispatch(addErrorToast({ error: 'dhcp_found' }));
}
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(findActiveDhcpFailure());
}
</s> add if (!values.enabled) {
config = { ...values, enabled: true };
successMessage = 'enabled_dhcp';
dispatch(findActiveDhcp(values.interface_name));
}
try {
await apiClient.setDhcpConfig(config);
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast(successMessage));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
};
export const toggleLeaseModal = createAction('TOGGLE_LEASE_MODAL');
export const addStaticLeaseRequest = createAction('ADD_STATIC_LEASE_REQUEST');
export const addStaticLeaseFailure = createAction('ADD_STATIC_LEASE_FAILURE');
export const addStaticLeaseSuccess = createAction('ADD_STATIC_LEASE_SUCCESS');
export const addStaticLease = config => async (dispatch) => {
dispatch(addStaticLeaseRequest());
try {
await apiClient.addStaticLease(config);
dispatch(addStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_added', { key: config.hostname })));
dispatch(toggleLeaseModal());
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addStaticLeaseFailure());
}
};
export const removeStaticLeaseRequest = createAction('REMOVE_STATIC_LEASE_REQUEST');
export const removeStaticLeaseFailure = createAction('REMOVE_STATIC_LEASE_FAILURE');
export const removeStaticLeaseSuccess = createAction('REMOVE_STATIC_LEASE_SUCCESS');
export const removeStaticLease = config => async (dispatch) => {
dispatch(removeStaticLeaseRequest());
try {
await apiClient.removeStaticLease(config);
dispatch(removeStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_deleted', { key: config.hostname })));
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeStaticLeaseFailure()); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/actions/index.js |
|
dispatch(findActiveDhcp(values.interface_name));
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure()); | <mask> export const setDhcpConfig = values => async (dispatch, getState) => {
<mask> const { config } = getState().dhcp;
<mask> const updatedConfig = { ...config, ...values };
<mask> dispatch(setDhcpConfigRequest());
<mask> if (values.interface_name) {
<mask> dispatch(findActiveDhcpRequest());
<mask> try {
<mask> const activeDhcp = await apiClient.findActiveDhcp(values.interface_name);
<mask> dispatch(findActiveDhcpSuccess(activeDhcp));
<mask> if (!activeDhcp.found) {
<mask> try {
<mask> await apiClient.setDhcpConfig(updatedConfig);
<mask> dispatch(setDhcpConfigSuccess(updatedConfig));
<mask> dispatch(addSuccessToast('dhcp_config_saved'));
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(setDhcpConfigFailure());
<mask> }
<mask> } else {
<mask> dispatch(addErrorToast({ error: 'dhcp_found' }));
<mask> }
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(findActiveDhcpFailure());
<mask> }
<mask> } else {
<mask> try {
<mask> await apiClient.setDhcpConfig(updatedConfig);
<mask> dispatch(setDhcpConfigSuccess(updatedConfig));
<mask> dispatch(addSuccessToast('dhcp_config_saved'));
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(setDhcpConfigFailure());
<mask> }
<mask> }
<mask> };
<mask>
<mask> export const toggleDhcpRequest = createAction('TOGGLE_DHCP_REQUEST');
<mask> export const toggleDhcpFailure = createAction('TOGGLE_DHCP_FAILURE');
</s> + client: handle static leases form </s> remove if (config.enabled) {
try {
await apiClient.setDhcpConfig({ ...config, enabled: false });
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast('disabled_dhcp'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
} else {
dispatch(findActiveDhcpRequest());
try {
const activeDhcp = await apiClient.findActiveDhcp(config.interface_name);
dispatch(findActiveDhcpSuccess(activeDhcp));
if (!activeDhcp.found) {
try {
await apiClient.setDhcpConfig({ ...config, enabled: true });
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast('enabled_dhcp'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
} else {
dispatch(addErrorToast({ error: 'dhcp_found' }));
}
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(findActiveDhcpFailure());
}
</s> add if (!values.enabled) {
config = { ...values, enabled: true };
successMessage = 'enabled_dhcp';
dispatch(findActiveDhcp(values.interface_name));
}
try {
await apiClient.setDhcpConfig(config);
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast(successMessage));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
};
export const toggleLeaseModal = createAction('TOGGLE_LEASE_MODAL');
export const addStaticLeaseRequest = createAction('ADD_STATIC_LEASE_REQUEST');
export const addStaticLeaseFailure = createAction('ADD_STATIC_LEASE_FAILURE');
export const addStaticLeaseSuccess = createAction('ADD_STATIC_LEASE_SUCCESS');
export const addStaticLease = config => async (dispatch) => {
dispatch(addStaticLeaseRequest());
try {
await apiClient.addStaticLease(config);
dispatch(addStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_added', { key: config.hostname })));
dispatch(toggleLeaseModal());
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addStaticLeaseFailure());
}
};
export const removeStaticLeaseRequest = createAction('REMOVE_STATIC_LEASE_REQUEST');
export const removeStaticLeaseFailure = createAction('REMOVE_STATIC_LEASE_FAILURE');
export const removeStaticLeaseSuccess = createAction('REMOVE_STATIC_LEASE_SUCCESS');
export const removeStaticLease = config => async (dispatch) => {
dispatch(removeStaticLeaseRequest());
try {
await apiClient.removeStaticLease(config);
dispatch(removeStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_deleted', { key: config.hostname })));
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeStaticLeaseFailure()); </s> remove // TODO rewrite findActiveDhcp part
</s> add </s> remove // TODO rewrite findActiveDhcp part
export const toggleDhcp = config => async (dispatch) => {
</s> add export const toggleDhcp = values => async (dispatch) => { </s> remove const Form = (props) => {
</s> add const renderInterfaces = (interfaces => (
Object.keys(interfaces).map((item) => {
const option = interfaces[item];
const { name } = option;
const onlyIPv6 = option.ip_addresses.every(ip => ip.includes(':'));
let interfaceIP = option.ip_addresses[0];
if (!onlyIPv6) {
option.ip_addresses.forEach((ip) => {
if (!ip.includes(':')) {
interfaceIP = ip;
}
});
}
return (
<option value={name} key={name} disabled={onlyIPv6}>
{name} - {interfaceIP}
</option>
);
})
));
const renderInterfaceValues = (interfaceValues => (
<ul className="list-unstyled mt-1 mb-0">
<li>
<span className="interface__title">MTU: </span>
{interfaceValues.mtu}
</li>
<li>
<span className="interface__title"><Trans>dhcp_hardware_address</Trans>: </span>
{interfaceValues.hardware_address}
</li>
<li>
<span className="interface__title"><Trans>dhcp_ip_addresses</Trans>: </span>
{
interfaceValues.ip_addresses
.map(ip => <span key={ip} className="interface__ip">{ip}</span>)
}
</li>
</ul>
));
let Form = (props) => { </s> remove this.props.setDhcpConfig(values);
</s> add if (values.interface_name) {
this.props.setDhcpConfig(values);
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/actions/index.js |
export const toggleDhcp = values => async (dispatch) => { | <mask> export const toggleDhcpRequest = createAction('TOGGLE_DHCP_REQUEST');
<mask> export const toggleDhcpFailure = createAction('TOGGLE_DHCP_FAILURE');
<mask> export const toggleDhcpSuccess = createAction('TOGGLE_DHCP_SUCCESS');
<mask>
<mask> // TODO rewrite findActiveDhcp part
<mask> export const toggleDhcp = config => async (dispatch) => {
<mask> dispatch(toggleDhcpRequest());
<mask>
<mask> if (config.enabled) {
<mask> try {
<mask> await apiClient.setDhcpConfig({ ...config, enabled: false });
</s> + client: handle static leases form </s> remove if (config.enabled) {
try {
await apiClient.setDhcpConfig({ ...config, enabled: false });
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast('disabled_dhcp'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
} else {
dispatch(findActiveDhcpRequest());
try {
const activeDhcp = await apiClient.findActiveDhcp(config.interface_name);
dispatch(findActiveDhcpSuccess(activeDhcp));
if (!activeDhcp.found) {
try {
await apiClient.setDhcpConfig({ ...config, enabled: true });
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast('enabled_dhcp'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
} else {
dispatch(addErrorToast({ error: 'dhcp_found' }));
}
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(findActiveDhcpFailure());
}
</s> add if (!values.enabled) {
config = { ...values, enabled: true };
successMessage = 'enabled_dhcp';
dispatch(findActiveDhcp(values.interface_name));
}
try {
await apiClient.setDhcpConfig(config);
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast(successMessage));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
};
export const toggleLeaseModal = createAction('TOGGLE_LEASE_MODAL');
export const addStaticLeaseRequest = createAction('ADD_STATIC_LEASE_REQUEST');
export const addStaticLeaseFailure = createAction('ADD_STATIC_LEASE_FAILURE');
export const addStaticLeaseSuccess = createAction('ADD_STATIC_LEASE_SUCCESS');
export const addStaticLease = config => async (dispatch) => {
dispatch(addStaticLeaseRequest());
try {
await apiClient.addStaticLease(config);
dispatch(addStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_added', { key: config.hostname })));
dispatch(toggleLeaseModal());
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addStaticLeaseFailure());
}
};
export const removeStaticLeaseRequest = createAction('REMOVE_STATIC_LEASE_REQUEST');
export const removeStaticLeaseFailure = createAction('REMOVE_STATIC_LEASE_FAILURE');
export const removeStaticLeaseSuccess = createAction('REMOVE_STATIC_LEASE_SUCCESS');
export const removeStaticLease = config => async (dispatch) => {
dispatch(removeStaticLeaseRequest());
try {
await apiClient.removeStaticLease(config);
dispatch(removeStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_deleted', { key: config.hostname })));
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeStaticLeaseFailure()); </s> remove // TODO rewrite findActiveDhcp part
</s> add </s> remove if (values.interface_name) {
dispatch(findActiveDhcpRequest());
try {
const activeDhcp = await apiClient.findActiveDhcp(values.interface_name);
dispatch(findActiveDhcpSuccess(activeDhcp));
if (!activeDhcp.found) {
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure());
}
} else {
dispatch(addErrorToast({ error: 'dhcp_found' }));
}
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(findActiveDhcpFailure());
}
} else {
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure());
}
</s> add dispatch(findActiveDhcp(values.interface_name));
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure()); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/actions/index.js |
let config = { ...values, enabled: false };
let successMessage = 'disabled_dhcp'; | <mask> export const toggleDhcp = values => async (dispatch) => {
<mask> dispatch(toggleDhcpRequest());
<mask>
<mask> if (!values.enabled) {
<mask> config = { ...values, enabled: true };
<mask> successMessage = 'enabled_dhcp';
<mask> dispatch(findActiveDhcp(values.interface_name));
</s> + client: handle static leases form </s> remove // TODO rewrite findActiveDhcp part
export const toggleDhcp = config => async (dispatch) => {
</s> add export const toggleDhcp = values => async (dispatch) => { </s> remove if (config.enabled) {
try {
await apiClient.setDhcpConfig({ ...config, enabled: false });
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast('disabled_dhcp'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
} else {
dispatch(findActiveDhcpRequest());
try {
const activeDhcp = await apiClient.findActiveDhcp(config.interface_name);
dispatch(findActiveDhcpSuccess(activeDhcp));
if (!activeDhcp.found) {
try {
await apiClient.setDhcpConfig({ ...config, enabled: true });
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast('enabled_dhcp'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
} else {
dispatch(addErrorToast({ error: 'dhcp_found' }));
}
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(findActiveDhcpFailure());
}
</s> add if (!values.enabled) {
config = { ...values, enabled: true };
successMessage = 'enabled_dhcp';
dispatch(findActiveDhcp(values.interface_name));
}
try {
await apiClient.setDhcpConfig(config);
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast(successMessage));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
};
export const toggleLeaseModal = createAction('TOGGLE_LEASE_MODAL');
export const addStaticLeaseRequest = createAction('ADD_STATIC_LEASE_REQUEST');
export const addStaticLeaseFailure = createAction('ADD_STATIC_LEASE_FAILURE');
export const addStaticLeaseSuccess = createAction('ADD_STATIC_LEASE_SUCCESS');
export const addStaticLease = config => async (dispatch) => {
dispatch(addStaticLeaseRequest());
try {
await apiClient.addStaticLease(config);
dispatch(addStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_added', { key: config.hostname })));
dispatch(toggleLeaseModal());
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addStaticLeaseFailure());
}
};
export const removeStaticLeaseRequest = createAction('REMOVE_STATIC_LEASE_REQUEST');
export const removeStaticLeaseFailure = createAction('REMOVE_STATIC_LEASE_FAILURE');
export const removeStaticLeaseSuccess = createAction('REMOVE_STATIC_LEASE_SUCCESS');
export const removeStaticLease = config => async (dispatch) => {
dispatch(removeStaticLeaseRequest());
try {
await apiClient.removeStaticLease(config);
dispatch(removeStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_deleted', { key: config.hostname })));
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeStaticLeaseFailure()); </s> remove // TODO rewrite findActiveDhcp part
</s> add </s> remove if (values.interface_name) {
dispatch(findActiveDhcpRequest());
try {
const activeDhcp = await apiClient.findActiveDhcp(values.interface_name);
dispatch(findActiveDhcpSuccess(activeDhcp));
if (!activeDhcp.found) {
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure());
}
} else {
dispatch(addErrorToast({ error: 'dhcp_found' }));
}
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(findActiveDhcpFailure());
}
} else {
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure());
}
</s> add dispatch(findActiveDhcp(values.interface_name));
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure()); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/actions/index.js |
if (!values.enabled) {
config = { ...values, enabled: true };
successMessage = 'enabled_dhcp';
dispatch(findActiveDhcp(values.interface_name));
}
try {
await apiClient.setDhcpConfig(config);
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast(successMessage));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
};
export const toggleLeaseModal = createAction('TOGGLE_LEASE_MODAL');
export const addStaticLeaseRequest = createAction('ADD_STATIC_LEASE_REQUEST');
export const addStaticLeaseFailure = createAction('ADD_STATIC_LEASE_FAILURE');
export const addStaticLeaseSuccess = createAction('ADD_STATIC_LEASE_SUCCESS');
export const addStaticLease = config => async (dispatch) => {
dispatch(addStaticLeaseRequest());
try {
await apiClient.addStaticLease(config);
dispatch(addStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_added', { key: config.hostname })));
dispatch(toggleLeaseModal());
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addStaticLeaseFailure());
}
};
export const removeStaticLeaseRequest = createAction('REMOVE_STATIC_LEASE_REQUEST');
export const removeStaticLeaseFailure = createAction('REMOVE_STATIC_LEASE_FAILURE');
export const removeStaticLeaseSuccess = createAction('REMOVE_STATIC_LEASE_SUCCESS');
export const removeStaticLease = config => async (dispatch) => {
dispatch(removeStaticLeaseRequest());
try {
await apiClient.removeStaticLease(config);
dispatch(removeStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_deleted', { key: config.hostname })));
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeStaticLeaseFailure()); | <mask> // TODO rewrite findActiveDhcp part
<mask> export const toggleDhcp = config => async (dispatch) => {
<mask> dispatch(toggleDhcpRequest());
<mask>
<mask> if (config.enabled) {
<mask> try {
<mask> await apiClient.setDhcpConfig({ ...config, enabled: false });
<mask> dispatch(toggleDhcpSuccess());
<mask> dispatch(addSuccessToast('disabled_dhcp'));
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(toggleDhcpFailure());
<mask> }
<mask> } else {
<mask> dispatch(findActiveDhcpRequest());
<mask> try {
<mask> const activeDhcp = await apiClient.findActiveDhcp(config.interface_name);
<mask> dispatch(findActiveDhcpSuccess(activeDhcp));
<mask>
<mask> if (!activeDhcp.found) {
<mask> try {
<mask> await apiClient.setDhcpConfig({ ...config, enabled: true });
<mask> dispatch(toggleDhcpSuccess());
<mask> dispatch(addSuccessToast('enabled_dhcp'));
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(toggleDhcpFailure());
<mask> }
<mask> } else {
<mask> dispatch(addErrorToast({ error: 'dhcp_found' }));
<mask> }
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(findActiveDhcpFailure());
<mask> }
<mask> }
<mask> };
</s> + client: handle static leases form </s> remove if (values.interface_name) {
dispatch(findActiveDhcpRequest());
try {
const activeDhcp = await apiClient.findActiveDhcp(values.interface_name);
dispatch(findActiveDhcpSuccess(activeDhcp));
if (!activeDhcp.found) {
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure());
}
} else {
dispatch(addErrorToast({ error: 'dhcp_found' }));
}
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(findActiveDhcpFailure());
}
} else {
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure());
}
</s> add dispatch(findActiveDhcp(values.interface_name));
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure()); </s> remove // TODO rewrite findActiveDhcp part
export const toggleDhcp = config => async (dispatch) => {
</s> add export const toggleDhcp = values => async (dispatch) => { </s> remove // TODO rewrite findActiveDhcp part
</s> add </s> remove const Form = (props) => {
</s> add const renderInterfaces = (interfaces => (
Object.keys(interfaces).map((item) => {
const option = interfaces[item];
const { name } = option;
const onlyIPv6 = option.ip_addresses.every(ip => ip.includes(':'));
let interfaceIP = option.ip_addresses[0];
if (!onlyIPv6) {
option.ip_addresses.forEach((ip) => {
if (!ip.includes(':')) {
interfaceIP = ip;
}
});
}
return (
<option value={name} key={name} disabled={onlyIPv6}>
{name} - {interfaceIP}
</option>
);
})
));
const renderInterfaceValues = (interfaceValues => (
<ul className="list-unstyled mt-1 mb-0">
<li>
<span className="interface__title">MTU: </span>
{interfaceValues.mtu}
</li>
<li>
<span className="interface__title"><Trans>dhcp_hardware_address</Trans>: </span>
{interfaceValues.hardware_address}
</li>
<li>
<span className="interface__title"><Trans>dhcp_ip_addresses</Trans>: </span>
{
interfaceValues.ip_addresses
.map(ip => <span key={ip} className="interface__ip">{ip}</span>)
}
</li>
</ul>
));
let Form = (props) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/actions/index.js |
DHCP_ADD_STATIC_LEASE = { path: 'dhcp/add_static_lease', method: 'POST' };
DHCP_REMOVE_STATIC_LEASE = { path: 'dhcp/remove_static_lease', method: 'POST' }; | <mask> DHCP_STATUS = { path: 'dhcp/status', method: 'GET' };
<mask> DHCP_SET_CONFIG = { path: 'dhcp/set_config', method: 'POST' };
<mask> DHCP_FIND_ACTIVE = { path: 'dhcp/find_active_dhcp', method: 'POST' };
<mask> DHCP_INTERFACES = { path: 'dhcp/interfaces', method: 'GET' };
<mask>
<mask> getDhcpStatus() {
<mask> const { path, method } = this.DHCP_STATUS;
<mask> return this.makeRequest(path, method);
<mask> }
<mask>
</s> + client: handle static leases form </s> remove if (values.interface_name) {
dispatch(findActiveDhcpRequest());
try {
const activeDhcp = await apiClient.findActiveDhcp(values.interface_name);
dispatch(findActiveDhcpSuccess(activeDhcp));
if (!activeDhcp.found) {
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure());
}
} else {
dispatch(addErrorToast({ error: 'dhcp_found' }));
}
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(findActiveDhcpFailure());
}
} else {
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure());
}
</s> add dispatch(findActiveDhcp(values.interface_name));
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure()); </s> remove if (config.enabled) {
try {
await apiClient.setDhcpConfig({ ...config, enabled: false });
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast('disabled_dhcp'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
} else {
dispatch(findActiveDhcpRequest());
try {
const activeDhcp = await apiClient.findActiveDhcp(config.interface_name);
dispatch(findActiveDhcpSuccess(activeDhcp));
if (!activeDhcp.found) {
try {
await apiClient.setDhcpConfig({ ...config, enabled: true });
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast('enabled_dhcp'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
} else {
dispatch(addErrorToast({ error: 'dhcp_found' }));
}
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(findActiveDhcpFailure());
}
</s> add if (!values.enabled) {
config = { ...values, enabled: true };
successMessage = 'enabled_dhcp';
dispatch(findActiveDhcp(values.interface_name));
}
try {
await apiClient.setDhcpConfig(config);
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast(successMessage));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
};
export const toggleLeaseModal = createAction('TOGGLE_LEASE_MODAL');
export const addStaticLeaseRequest = createAction('ADD_STATIC_LEASE_REQUEST');
export const addStaticLeaseFailure = createAction('ADD_STATIC_LEASE_FAILURE');
export const addStaticLeaseSuccess = createAction('ADD_STATIC_LEASE_SUCCESS');
export const addStaticLease = config => async (dispatch) => {
dispatch(addStaticLeaseRequest());
try {
await apiClient.addStaticLease(config);
dispatch(addStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_added', { key: config.hostname })));
dispatch(toggleLeaseModal());
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addStaticLeaseFailure());
}
};
export const removeStaticLeaseRequest = createAction('REMOVE_STATIC_LEASE_REQUEST');
export const removeStaticLeaseFailure = createAction('REMOVE_STATIC_LEASE_FAILURE');
export const removeStaticLeaseSuccess = createAction('REMOVE_STATIC_LEASE_SUCCESS');
export const removeStaticLease = config => async (dispatch) => {
dispatch(removeStaticLeaseRequest());
try {
await apiClient.removeStaticLease(config);
dispatch(removeStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_deleted', { key: config.hostname })));
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeStaticLeaseFailure()); </s> remove this.props.setDhcpConfig(values);
</s> add if (values.interface_name) {
this.props.setDhcpConfig(values);
} </s> remove // TODO rewrite findActiveDhcp part
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/api/Api.js |
import { connect } from 'react-redux'; | <mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Field, reduxForm, formValueSelector } from 'redux-form';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask>
<mask> import { renderField, required, ipv4, isPositive, toNumber } from '../../../helpers/form';
</s> + client: handle static leases form </s> remove import { Field, reduxForm } from 'redux-form';
import { withNamespaces } from 'react-i18next';
</s> add import { Field, reduxForm, formValueSelector } from 'redux-form';
import { Trans, withNamespaces } from 'react-i18next'; </s> remove import StaticLeases from './StaticLeases';
import Interface from './Interface';
</s> add import StaticLeases from './StaticLeases/index'; </s> remove const Form = (props) => {
</s> add const renderInterfaces = (interfaces => (
Object.keys(interfaces).map((item) => {
const option = interfaces[item];
const { name } = option;
const onlyIPv6 = option.ip_addresses.every(ip => ip.includes(':'));
let interfaceIP = option.ip_addresses[0];
if (!onlyIPv6) {
option.ip_addresses.forEach((ip) => {
if (!ip.includes(':')) {
interfaceIP = ip;
}
});
}
return (
<option value={name} key={name} disabled={onlyIPv6}>
{name} - {interfaceIP}
</option>
);
})
));
const renderInterfaceValues = (interfaceValues => (
<ul className="list-unstyled mt-1 mb-0">
<li>
<span className="interface__title">MTU: </span>
{interfaceValues.mtu}
</li>
<li>
<span className="interface__title"><Trans>dhcp_hardware_address</Trans>: </span>
{interfaceValues.hardware_address}
</li>
<li>
<span className="interface__title"><Trans>dhcp_ip_addresses</Trans>: </span>
{
interfaceValues.ip_addresses
.map(ip => <span key={ip} className="interface__ip">{ip}</span>)
}
</li>
</ul>
));
let Form = (props) => { </s> remove this.props.setDhcpConfig(values);
</s> add if (values.interface_name) {
this.props.setDhcpConfig(values);
} | [
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/components/Settings/Dhcp/Form.js |
import { Field, reduxForm, formValueSelector } from 'redux-form';
import { Trans, withNamespaces } from 'react-i18next'; | <mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Field, reduxForm } from 'redux-form';
<mask> import { withNamespaces } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask>
<mask> import { renderField, required, ipv4, isPositive, toNumber } from '../../../helpers/form';
<mask>
<mask> const Form = (props) => {
</s> + client: handle static leases form </s> remove import StaticLeases from './StaticLeases';
import Interface from './Interface';
</s> add import StaticLeases from './StaticLeases/index'; </s> remove const Form = (props) => {
</s> add const renderInterfaces = (interfaces => (
Object.keys(interfaces).map((item) => {
const option = interfaces[item];
const { name } = option;
const onlyIPv6 = option.ip_addresses.every(ip => ip.includes(':'));
let interfaceIP = option.ip_addresses[0];
if (!onlyIPv6) {
option.ip_addresses.forEach((ip) => {
if (!ip.includes(':')) {
interfaceIP = ip;
}
});
}
return (
<option value={name} key={name} disabled={onlyIPv6}>
{name} - {interfaceIP}
</option>
);
})
));
const renderInterfaceValues = (interfaceValues => (
<ul className="list-unstyled mt-1 mb-0">
<li>
<span className="interface__title">MTU: </span>
{interfaceValues.mtu}
</li>
<li>
<span className="interface__title"><Trans>dhcp_hardware_address</Trans>: </span>
{interfaceValues.hardware_address}
</li>
<li>
<span className="interface__title"><Trans>dhcp_ip_addresses</Trans>: </span>
{
interfaceValues.ip_addresses
.map(ip => <span key={ip} className="interface__ip">{ip}</span>)
}
</li>
</ul>
));
let Form = (props) => { </s> remove this.props.setDhcpConfig(values);
</s> add if (values.interface_name) {
this.props.setDhcpConfig(values);
} | [
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/components/Settings/Dhcp/Form.js |
const renderInterfaces = (interfaces => (
Object.keys(interfaces).map((item) => {
const option = interfaces[item];
const { name } = option;
const onlyIPv6 = option.ip_addresses.every(ip => ip.includes(':'));
let interfaceIP = option.ip_addresses[0];
if (!onlyIPv6) {
option.ip_addresses.forEach((ip) => {
if (!ip.includes(':')) {
interfaceIP = ip;
}
});
}
return (
<option value={name} key={name} disabled={onlyIPv6}>
{name} - {interfaceIP}
</option>
);
})
));
const renderInterfaceValues = (interfaceValues => (
<ul className="list-unstyled mt-1 mb-0">
<li>
<span className="interface__title">MTU: </span>
{interfaceValues.mtu}
</li>
<li>
<span className="interface__title"><Trans>dhcp_hardware_address</Trans>: </span>
{interfaceValues.hardware_address}
</li>
<li>
<span className="interface__title"><Trans>dhcp_ip_addresses</Trans>: </span>
{
interfaceValues.ip_addresses
.map(ip => <span key={ip} className="interface__ip">{ip}</span>)
}
</li>
</ul>
));
let Form = (props) => { | <mask> import flow from 'lodash/flow';
<mask>
<mask> import { renderField, required, ipv4, isPositive, toNumber } from '../../../helpers/form';
<mask>
<mask> const Form = (props) => {
<mask> const {
<mask> t,
<mask> handleSubmit,
<mask> submitting,
<mask> invalid,
</s> + client: handle static leases form </s> remove import { Field, reduxForm } from 'redux-form';
import { withNamespaces } from 'react-i18next';
</s> add import { Field, reduxForm, formValueSelector } from 'redux-form';
import { Trans, withNamespaces } from 'react-i18next'; </s> remove import StaticLeases from './StaticLeases';
import Interface from './Interface';
</s> add import StaticLeases from './StaticLeases/index'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/components/Settings/Dhcp/Form.js |
enabled,
interfaces,
interfaceValue, | <mask> submitting,
<mask> invalid,
<mask> processingConfig,
<mask> processingInterfaces,
<mask> } = props;
<mask>
<mask> return (
</s> + client: handle static leases form </s> remove const Form = (props) => {
</s> add const renderInterfaces = (interfaces => (
Object.keys(interfaces).map((item) => {
const option = interfaces[item];
const { name } = option;
const onlyIPv6 = option.ip_addresses.every(ip => ip.includes(':'));
let interfaceIP = option.ip_addresses[0];
if (!onlyIPv6) {
option.ip_addresses.forEach((ip) => {
if (!ip.includes(':')) {
interfaceIP = ip;
}
});
}
return (
<option value={name} key={name} disabled={onlyIPv6}>
{name} - {interfaceIP}
</option>
);
})
));
const renderInterfaceValues = (interfaceValues => (
<ul className="list-unstyled mt-1 mb-0">
<li>
<span className="interface__title">MTU: </span>
{interfaceValues.mtu}
</li>
<li>
<span className="interface__title"><Trans>dhcp_hardware_address</Trans>: </span>
{interfaceValues.hardware_address}
</li>
<li>
<span className="interface__title"><Trans>dhcp_ip_addresses</Trans>: </span>
{
interfaceValues.ip_addresses
.map(ip => <span key={ip} className="interface__ip">{ip}</span>)
}
</li>
</ul>
));
let Form = (props) => { </s> remove if (values.interface_name) {
dispatch(findActiveDhcpRequest());
try {
const activeDhcp = await apiClient.findActiveDhcp(values.interface_name);
dispatch(findActiveDhcpSuccess(activeDhcp));
if (!activeDhcp.found) {
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure());
}
} else {
dispatch(addErrorToast({ error: 'dhcp_found' }));
}
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(findActiveDhcpFailure());
}
} else {
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure());
}
</s> add dispatch(findActiveDhcp(values.interface_name));
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure()); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/components/Settings/Dhcp/Form.js |
processingInterfaces, | <mask> interfaceValue,
<mask> processingConfig,
<mask> } = props;
<mask>
<mask> return (
<mask> <form onSubmit={handleSubmit}>
<mask> {!processingInterfaces && interfaces &&
<mask> <div className="row">
</s> + client: handle static leases form </s> remove <Interface
onChange={this.handleFormSubmit}
initialValues={{ interface_name }}
interfaces={dhcp.interfaces}
processing={dhcp.processingInterfaces}
enabled={dhcp.config.enabled}
/>
</s> add </s> remove <div className="col">
<StaticLeases staticLeases={dhcp.staticLeases} />
</s> add <div className="col-12">
<StaticLeases
staticLeases={dhcp.staticLeases}
isModalOpen={dhcp.isModalOpen}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
processingAdding={dhcp.processingAdding}
processingDeleting={dhcp.processingDeleting}
/>
</div>
<div className="col-12">
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => this.props.toggleLeaseModal()}
>
<Trans>dhcp_add_static_lease</Trans>
</button> </s> remove const Form = (props) => {
</s> add const renderInterfaces = (interfaces => (
Object.keys(interfaces).map((item) => {
const option = interfaces[item];
const { name } = option;
const onlyIPv6 = option.ip_addresses.every(ip => ip.includes(':'));
let interfaceIP = option.ip_addresses[0];
if (!onlyIPv6) {
option.ip_addresses.forEach((ip) => {
if (!ip.includes(':')) {
interfaceIP = ip;
}
});
}
return (
<option value={name} key={name} disabled={onlyIPv6}>
{name} - {interfaceIP}
</option>
);
})
));
const renderInterfaceValues = (interfaceValues => (
<ul className="list-unstyled mt-1 mb-0">
<li>
<span className="interface__title">MTU: </span>
{interfaceValues.mtu}
</li>
<li>
<span className="interface__title"><Trans>dhcp_hardware_address</Trans>: </span>
{interfaceValues.hardware_address}
</li>
<li>
<span className="interface__title"><Trans>dhcp_ip_addresses</Trans>: </span>
{
interfaceValues.ip_addresses
.map(ip => <span key={ip} className="interface__ip">{ip}</span>)
}
</li>
</ul>
));
let Form = (props) => { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/components/Settings/Dhcp/Form.js |
interfaceValue: PropTypes.string, | <mask> handleSubmit: PropTypes.func,
<mask> submitting: PropTypes.bool,
<mask> invalid: PropTypes.bool,
<mask> interfaces: PropTypes.object,
<mask> initialValues: PropTypes.object,
<mask> processingConfig: PropTypes.bool,
<mask> processingInterfaces: PropTypes.bool,
<mask> enabled: PropTypes.bool,
<mask> t: PropTypes.func,
<mask> };
</s> + client: handle static leases form </s> remove if (config.enabled) {
try {
await apiClient.setDhcpConfig({ ...config, enabled: false });
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast('disabled_dhcp'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
} else {
dispatch(findActiveDhcpRequest());
try {
const activeDhcp = await apiClient.findActiveDhcp(config.interface_name);
dispatch(findActiveDhcpSuccess(activeDhcp));
if (!activeDhcp.found) {
try {
await apiClient.setDhcpConfig({ ...config, enabled: true });
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast('enabled_dhcp'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
} else {
dispatch(addErrorToast({ error: 'dhcp_found' }));
}
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(findActiveDhcpFailure());
}
</s> add if (!values.enabled) {
config = { ...values, enabled: true };
successMessage = 'enabled_dhcp';
dispatch(findActiveDhcp(values.interface_name));
}
try {
await apiClient.setDhcpConfig(config);
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast(successMessage));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
};
export const toggleLeaseModal = createAction('TOGGLE_LEASE_MODAL');
export const addStaticLeaseRequest = createAction('ADD_STATIC_LEASE_REQUEST');
export const addStaticLeaseFailure = createAction('ADD_STATIC_LEASE_FAILURE');
export const addStaticLeaseSuccess = createAction('ADD_STATIC_LEASE_SUCCESS');
export const addStaticLease = config => async (dispatch) => {
dispatch(addStaticLeaseRequest());
try {
await apiClient.addStaticLease(config);
dispatch(addStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_added', { key: config.hostname })));
dispatch(toggleLeaseModal());
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addStaticLeaseFailure());
}
};
export const removeStaticLeaseRequest = createAction('REMOVE_STATIC_LEASE_REQUEST');
export const removeStaticLeaseFailure = createAction('REMOVE_STATIC_LEASE_FAILURE');
export const removeStaticLeaseSuccess = createAction('REMOVE_STATIC_LEASE_SUCCESS');
export const removeStaticLease = config => async (dispatch) => {
dispatch(removeStaticLeaseRequest());
try {
await apiClient.removeStaticLease(config);
dispatch(removeStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_deleted', { key: config.hostname })));
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeStaticLeaseFailure()); | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/components/Settings/Dhcp/Form.js |
processingInterfaces: PropTypes.bool,
enabled: PropTypes.bool, | <mask> initialValues: PropTypes.object,
<mask> processingConfig: PropTypes.bool,
<mask> t: PropTypes.func,
<mask> };
<mask>
<mask>
<mask> const selector = formValueSelector('dhcpForm');
<mask>
</s> + client: handle static leases form </s> remove // TODO rewrite findActiveDhcp part
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/components/Settings/Dhcp/Form.js |
const selector = formValueSelector('dhcpForm');
Form = connect((state) => {
const interfaceValue = selector(state, 'interface_name');
return {
interfaceValue,
};
})(Form);
| <mask> };
<mask>
<mask> export default flow([
<mask> withNamespaces(),
<mask> reduxForm({ form: 'dhcpForm' }),
<mask> ])(Form);
</s> + client: handle static leases form </s> remove // TODO rewrite findActiveDhcp part
</s> add </s> remove if (config.enabled) {
try {
await apiClient.setDhcpConfig({ ...config, enabled: false });
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast('disabled_dhcp'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
} else {
dispatch(findActiveDhcpRequest());
try {
const activeDhcp = await apiClient.findActiveDhcp(config.interface_name);
dispatch(findActiveDhcpSuccess(activeDhcp));
if (!activeDhcp.found) {
try {
await apiClient.setDhcpConfig({ ...config, enabled: true });
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast('enabled_dhcp'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
} else {
dispatch(addErrorToast({ error: 'dhcp_found' }));
}
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(findActiveDhcpFailure());
}
</s> add if (!values.enabled) {
config = { ...values, enabled: true };
successMessage = 'enabled_dhcp';
dispatch(findActiveDhcp(values.interface_name));
}
try {
await apiClient.setDhcpConfig(config);
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast(successMessage));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
};
export const toggleLeaseModal = createAction('TOGGLE_LEASE_MODAL');
export const addStaticLeaseRequest = createAction('ADD_STATIC_LEASE_REQUEST');
export const addStaticLeaseFailure = createAction('ADD_STATIC_LEASE_FAILURE');
export const addStaticLeaseSuccess = createAction('ADD_STATIC_LEASE_SUCCESS');
export const addStaticLease = config => async (dispatch) => {
dispatch(addStaticLeaseRequest());
try {
await apiClient.addStaticLease(config);
dispatch(addStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_added', { key: config.hostname })));
dispatch(toggleLeaseModal());
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addStaticLeaseFailure());
}
};
export const removeStaticLeaseRequest = createAction('REMOVE_STATIC_LEASE_REQUEST');
export const removeStaticLeaseFailure = createAction('REMOVE_STATIC_LEASE_FAILURE');
export const removeStaticLeaseSuccess = createAction('REMOVE_STATIC_LEASE_SUCCESS');
export const removeStaticLease = config => async (dispatch) => {
dispatch(removeStaticLeaseRequest());
try {
await apiClient.removeStaticLease(config);
dispatch(removeStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_deleted', { key: config.hostname })));
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeStaticLeaseFailure()); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/components/Settings/Dhcp/Form.js |
import StaticLeases from './StaticLeases/index'; | <mask>
<mask> import { DHCP_STATUS_RESPONSE } from '../../../helpers/constants';
<mask> import Form from './Form';
<mask> import Leases from './Leases';
<mask> import StaticLeases from './StaticLeases';
<mask> import Interface from './Interface';
<mask> import Card from '../../ui/Card';
<mask> import Accordion from '../../ui/Accordion';
<mask>
<mask> class Dhcp extends Component {
<mask> handleFormSubmit = (values) => {
</s> + client: handle static leases form </s> remove this.props.setDhcpConfig(values);
</s> add if (values.interface_name) {
this.props.setDhcpConfig(values);
} </s> remove import { Field, reduxForm } from 'redux-form';
import { withNamespaces } from 'react-i18next';
</s> add import { Field, reduxForm, formValueSelector } from 'redux-form';
import { Trans, withNamespaces } from 'react-i18next'; </s> remove const Form = (props) => {
</s> add const renderInterfaces = (interfaces => (
Object.keys(interfaces).map((item) => {
const option = interfaces[item];
const { name } = option;
const onlyIPv6 = option.ip_addresses.every(ip => ip.includes(':'));
let interfaceIP = option.ip_addresses[0];
if (!onlyIPv6) {
option.ip_addresses.forEach((ip) => {
if (!ip.includes(':')) {
interfaceIP = ip;
}
});
}
return (
<option value={name} key={name} disabled={onlyIPv6}>
{name} - {interfaceIP}
</option>
);
})
));
const renderInterfaceValues = (interfaceValues => (
<ul className="list-unstyled mt-1 mb-0">
<li>
<span className="interface__title">MTU: </span>
{interfaceValues.mtu}
</li>
<li>
<span className="interface__title"><Trans>dhcp_hardware_address</Trans>: </span>
{interfaceValues.hardware_address}
</li>
<li>
<span className="interface__title"><Trans>dhcp_ip_addresses</Trans>: </span>
{
interfaceValues.ip_addresses
.map(ip => <span key={ip} className="interface__ip">{ip}</span>)
}
</li>
</ul>
));
let Form = (props) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/components/Settings/Dhcp/index.js |
if (values.interface_name) {
this.props.setDhcpConfig(values);
} | <mask> import Accordion from '../../ui/Accordion';
<mask>
<mask> class Dhcp extends Component {
<mask> handleFormSubmit = (values) => {
<mask> this.props.setDhcpConfig(values);
<mask> };
<mask>
<mask> handleToggle = (config) => {
<mask> this.props.toggleDhcp(config);
<mask> }
</s> + client: handle static leases form </s> remove import StaticLeases from './StaticLeases';
import Interface from './Interface';
</s> add import StaticLeases from './StaticLeases/index'; </s> remove import { Field, reduxForm } from 'redux-form';
import { withNamespaces } from 'react-i18next';
</s> add import { Field, reduxForm, formValueSelector } from 'redux-form';
import { Trans, withNamespaces } from 'react-i18next'; </s> remove const Form = (props) => {
</s> add const renderInterfaces = (interfaces => (
Object.keys(interfaces).map((item) => {
const option = interfaces[item];
const { name } = option;
const onlyIPv6 = option.ip_addresses.every(ip => ip.includes(':'));
let interfaceIP = option.ip_addresses[0];
if (!onlyIPv6) {
option.ip_addresses.forEach((ip) => {
if (!ip.includes(':')) {
interfaceIP = ip;
}
});
}
return (
<option value={name} key={name} disabled={onlyIPv6}>
{name} - {interfaceIP}
</option>
);
})
));
const renderInterfaceValues = (interfaceValues => (
<ul className="list-unstyled mt-1 mb-0">
<li>
<span className="interface__title">MTU: </span>
{interfaceValues.mtu}
</li>
<li>
<span className="interface__title"><Trans>dhcp_hardware_address</Trans>: </span>
{interfaceValues.hardware_address}
</li>
<li>
<span className="interface__title"><Trans>dhcp_ip_addresses</Trans>: </span>
{
interfaceValues.ip_addresses
.map(ip => <span key={ip} className="interface__ip">{ip}</span>)
}
</li>
</ul>
));
let Form = (props) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/components/Settings/Dhcp/index.js |
<mask> <Card title={ t('dhcp_title') } subtitle={ t('dhcp_description') } bodyType="card-body box-body--settings">
<mask> <div className="dhcp">
<mask> {!dhcp.processing &&
<mask> <Fragment>
<mask> <Interface
<mask> onChange={this.handleFormSubmit}
<mask> initialValues={{ interface_name }}
<mask> interfaces={dhcp.interfaces}
<mask> processing={dhcp.processingInterfaces}
<mask> enabled={dhcp.config.enabled}
<mask> />
<mask> <Form
<mask> onSubmit={this.handleFormSubmit}
<mask> initialValues={{ ...values }}
<mask> interfaces={dhcp.interfaces}
<mask> processingConfig={dhcp.processingConfig}
</s> + client: handle static leases form </s> remove initialValues={{ ...values }}
</s> add initialValues={{
interface_name,
...values,
}} </s> remove <div className="col">
<StaticLeases staticLeases={dhcp.staticLeases} />
</s> add <div className="col-12">
<StaticLeases
staticLeases={dhcp.staticLeases}
isModalOpen={dhcp.isModalOpen}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
processingAdding={dhcp.processingAdding}
processingDeleting={dhcp.processingDeleting}
/>
</div>
<div className="col-12">
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => this.props.toggleLeaseModal()}
>
<Trans>dhcp_add_static_lease</Trans>
</button> </s> remove if (values.interface_name) {
dispatch(findActiveDhcpRequest());
try {
const activeDhcp = await apiClient.findActiveDhcp(values.interface_name);
dispatch(findActiveDhcpSuccess(activeDhcp));
if (!activeDhcp.found) {
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure());
}
} else {
dispatch(addErrorToast({ error: 'dhcp_found' }));
}
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(findActiveDhcpFailure());
}
} else {
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure());
}
</s> add dispatch(findActiveDhcp(values.interface_name));
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure()); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/components/Settings/Dhcp/index.js |
|
initialValues={{
interface_name,
...values,
}} | <mask> enabled={dhcp.config.enabled}
<mask> />
<mask> <Form
<mask> onSubmit={this.handleFormSubmit}
<mask> initialValues={{ ...values }}
<mask> interfaces={dhcp.interfaces}
<mask> processingConfig={dhcp.processingConfig}
<mask> />
<mask> <hr/>
<mask> <div className="card-actions mb-3">
</s> + client: handle static leases form </s> remove <Interface
onChange={this.handleFormSubmit}
initialValues={{ interface_name }}
interfaces={dhcp.interfaces}
processing={dhcp.processingInterfaces}
enabled={dhcp.config.enabled}
/>
</s> add </s> remove <div className="col">
<StaticLeases staticLeases={dhcp.staticLeases} />
</s> add <div className="col-12">
<StaticLeases
staticLeases={dhcp.staticLeases}
isModalOpen={dhcp.isModalOpen}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
processingAdding={dhcp.processingAdding}
processingDeleting={dhcp.processingDeleting}
/>
</div>
<div className="col-12">
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => this.props.toggleLeaseModal()}
>
<Trans>dhcp_add_static_lease</Trans>
</button> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/components/Settings/Dhcp/index.js |
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled} | <mask> ...values,
<mask> }}
<mask> interfaces={dhcp.interfaces}
<mask> processingConfig={dhcp.processingConfig}
<mask> />
<mask> <hr/>
<mask> <div className="card-actions mb-3">
<mask> {this.getToggleDhcpButton()}
</s> + client: handle static leases form </s> remove initialValues={{ ...values }}
</s> add initialValues={{
interface_name,
...values,
}} </s> remove <Interface
onChange={this.handleFormSubmit}
initialValues={{ interface_name }}
interfaces={dhcp.interfaces}
processing={dhcp.processingInterfaces}
enabled={dhcp.config.enabled}
/>
</s> add </s> remove <div className="col">
<StaticLeases staticLeases={dhcp.staticLeases} />
</s> add <div className="col-12">
<StaticLeases
staticLeases={dhcp.staticLeases}
isModalOpen={dhcp.isModalOpen}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
processingAdding={dhcp.processingAdding}
processingDeleting={dhcp.processingDeleting}
/>
</div>
<div className="col-12">
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => this.props.toggleLeaseModal()}
>
<Trans>dhcp_add_static_lease</Trans>
</button> | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/components/Settings/Dhcp/index.js |
this.props.findActiveDhcp(interface_name) | <mask> <button
<mask> type="button"
<mask> className={statusButtonClass}
<mask> onClick={() =>
<mask> this.props.findActiveDhcp(dhcp.config.interface_name)
<mask> }
<mask> disabled={
<mask> dhcp.config.enabled
<mask> || !dhcp.config.interface_name
<mask> || dhcp.processingConfig
</s> + client: handle static leases form </s> remove dhcp.config.enabled
|| !dhcp.config.interface_name
</s> add enabled
|| !interface_name </s> remove <div className="col">
<StaticLeases staticLeases={dhcp.staticLeases} />
</s> add <div className="col-12">
<StaticLeases
staticLeases={dhcp.staticLeases}
isModalOpen={dhcp.isModalOpen}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
processingAdding={dhcp.processingAdding}
processingDeleting={dhcp.processingDeleting}
/>
</div>
<div className="col-12">
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => this.props.toggleLeaseModal()}
>
<Trans>dhcp_add_static_lease</Trans>
</button> </s> remove if (values.interface_name) {
dispatch(findActiveDhcpRequest());
try {
const activeDhcp = await apiClient.findActiveDhcp(values.interface_name);
dispatch(findActiveDhcpSuccess(activeDhcp));
if (!activeDhcp.found) {
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure());
}
} else {
dispatch(addErrorToast({ error: 'dhcp_found' }));
}
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(findActiveDhcpFailure());
}
} else {
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure());
}
</s> add dispatch(findActiveDhcp(values.interface_name));
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure()); </s> remove if (config.enabled) {
try {
await apiClient.setDhcpConfig({ ...config, enabled: false });
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast('disabled_dhcp'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
} else {
dispatch(findActiveDhcpRequest());
try {
const activeDhcp = await apiClient.findActiveDhcp(config.interface_name);
dispatch(findActiveDhcpSuccess(activeDhcp));
if (!activeDhcp.found) {
try {
await apiClient.setDhcpConfig({ ...config, enabled: true });
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast('enabled_dhcp'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
} else {
dispatch(addErrorToast({ error: 'dhcp_found' }));
}
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(findActiveDhcpFailure());
}
</s> add if (!values.enabled) {
config = { ...values, enabled: true };
successMessage = 'enabled_dhcp';
dispatch(findActiveDhcp(values.interface_name));
}
try {
await apiClient.setDhcpConfig(config);
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast(successMessage));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
};
export const toggleLeaseModal = createAction('TOGGLE_LEASE_MODAL');
export const addStaticLeaseRequest = createAction('ADD_STATIC_LEASE_REQUEST');
export const addStaticLeaseFailure = createAction('ADD_STATIC_LEASE_FAILURE');
export const addStaticLeaseSuccess = createAction('ADD_STATIC_LEASE_SUCCESS');
export const addStaticLease = config => async (dispatch) => {
dispatch(addStaticLeaseRequest());
try {
await apiClient.addStaticLease(config);
dispatch(addStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_added', { key: config.hostname })));
dispatch(toggleLeaseModal());
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addStaticLeaseFailure());
}
};
export const removeStaticLeaseRequest = createAction('REMOVE_STATIC_LEASE_REQUEST');
export const removeStaticLeaseFailure = createAction('REMOVE_STATIC_LEASE_FAILURE');
export const removeStaticLeaseSuccess = createAction('REMOVE_STATIC_LEASE_SUCCESS');
export const removeStaticLease = config => async (dispatch) => {
dispatch(removeStaticLeaseRequest());
try {
await apiClient.removeStaticLease(config);
dispatch(removeStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_deleted', { key: config.hostname })));
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeStaticLeaseFailure()); </s> remove import { Field, reduxForm } from 'redux-form';
import { withNamespaces } from 'react-i18next';
</s> add import { Field, reduxForm, formValueSelector } from 'redux-form';
import { Trans, withNamespaces } from 'react-i18next'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/components/Settings/Dhcp/index.js |
enabled
|| !interface_name | <mask> onClick={() =>
<mask> this.props.findActiveDhcp(dhcp.config.interface_name)
<mask> }
<mask> disabled={
<mask> dhcp.config.enabled
<mask> || !dhcp.config.interface_name
<mask> || dhcp.processingConfig
<mask> }
<mask> >
<mask> <Trans>check_dhcp_servers</Trans>
<mask> </button>
</s> + client: handle static leases form </s> remove this.props.findActiveDhcp(dhcp.config.interface_name)
</s> add this.props.findActiveDhcp(interface_name) </s> remove <div className="col">
<StaticLeases staticLeases={dhcp.staticLeases} />
</s> add <div className="col-12">
<StaticLeases
staticLeases={dhcp.staticLeases}
isModalOpen={dhcp.isModalOpen}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
processingAdding={dhcp.processingAdding}
processingDeleting={dhcp.processingDeleting}
/>
</div>
<div className="col-12">
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => this.props.toggleLeaseModal()}
>
<Trans>dhcp_add_static_lease</Trans>
</button> </s> remove if (values.interface_name) {
dispatch(findActiveDhcpRequest());
try {
const activeDhcp = await apiClient.findActiveDhcp(values.interface_name);
dispatch(findActiveDhcpSuccess(activeDhcp));
if (!activeDhcp.found) {
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure());
}
} else {
dispatch(addErrorToast({ error: 'dhcp_found' }));
}
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(findActiveDhcpFailure());
}
} else {
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure());
}
</s> add dispatch(findActiveDhcp(values.interface_name));
try {
await apiClient.setDhcpConfig(updatedConfig);
dispatch(setDhcpConfigSuccess(updatedConfig));
dispatch(addSuccessToast('dhcp_config_saved'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setDhcpConfigFailure()); </s> remove if (config.enabled) {
try {
await apiClient.setDhcpConfig({ ...config, enabled: false });
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast('disabled_dhcp'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
} else {
dispatch(findActiveDhcpRequest());
try {
const activeDhcp = await apiClient.findActiveDhcp(config.interface_name);
dispatch(findActiveDhcpSuccess(activeDhcp));
if (!activeDhcp.found) {
try {
await apiClient.setDhcpConfig({ ...config, enabled: true });
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast('enabled_dhcp'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
} else {
dispatch(addErrorToast({ error: 'dhcp_found' }));
}
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(findActiveDhcpFailure());
}
</s> add if (!values.enabled) {
config = { ...values, enabled: true };
successMessage = 'enabled_dhcp';
dispatch(findActiveDhcp(values.interface_name));
}
try {
await apiClient.setDhcpConfig(config);
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast(successMessage));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
};
export const toggleLeaseModal = createAction('TOGGLE_LEASE_MODAL');
export const addStaticLeaseRequest = createAction('ADD_STATIC_LEASE_REQUEST');
export const addStaticLeaseFailure = createAction('ADD_STATIC_LEASE_FAILURE');
export const addStaticLeaseSuccess = createAction('ADD_STATIC_LEASE_SUCCESS');
export const addStaticLease = config => async (dispatch) => {
dispatch(addStaticLeaseRequest());
try {
await apiClient.addStaticLease(config);
dispatch(addStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_added', { key: config.hostname })));
dispatch(toggleLeaseModal());
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addStaticLeaseFailure());
}
};
export const removeStaticLeaseRequest = createAction('REMOVE_STATIC_LEASE_REQUEST');
export const removeStaticLeaseFailure = createAction('REMOVE_STATIC_LEASE_FAILURE');
export const removeStaticLeaseSuccess = createAction('REMOVE_STATIC_LEASE_SUCCESS');
export const removeStaticLease = config => async (dispatch) => {
dispatch(removeStaticLeaseRequest());
try {
await apiClient.removeStaticLease(config);
dispatch(removeStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_deleted', { key: config.hostname })));
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeStaticLeaseFailure()); </s> remove import { Field, reduxForm } from 'redux-form';
import { withNamespaces } from 'react-i18next';
</s> add import { Field, reduxForm, formValueSelector } from 'redux-form';
import { Trans, withNamespaces } from 'react-i18next'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/components/Settings/Dhcp/index.js |
<div className="col-12">
<StaticLeases
staticLeases={dhcp.staticLeases}
isModalOpen={dhcp.isModalOpen}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
processingAdding={dhcp.processingAdding}
processingDeleting={dhcp.processingDeleting}
/>
</div>
<div className="col-12">
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => this.props.toggleLeaseModal()}
>
<Trans>dhcp_add_static_lease</Trans>
</button> | <mask> </div>
<mask> </Card>
<mask> <Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<mask> <div className="row">
<mask> <div className="col">
<mask> <StaticLeases staticLeases={dhcp.staticLeases} />
<mask> </div>
<mask> </div>
<mask> </Card>
<mask> </Fragment>
<mask> }
</s> + client: handle static leases form </s> remove <Interface
onChange={this.handleFormSubmit}
initialValues={{ interface_name }}
interfaces={dhcp.interfaces}
processing={dhcp.processingInterfaces}
enabled={dhcp.config.enabled}
/>
</s> add </s> remove initialValues={{ ...values }}
</s> add initialValues={{
interface_name,
...values,
}} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/components/Settings/Dhcp/index.js |
addStaticLease: PropTypes.func,
removeStaticLease: PropTypes.func,
toggleLeaseModal: PropTypes.func, | <mask> getDhcpStatus: PropTypes.func,
<mask> setDhcpConfig: PropTypes.func,
<mask> findActiveDhcp: PropTypes.func,
<mask> handleSubmit: PropTypes.func,
<mask> t: PropTypes.func,
<mask> };
<mask>
<mask> export default withNamespaces()(Dhcp);
</s> + client: handle static leases form | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/components/Settings/Dhcp/index.js |
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal} | <mask> getDhcpStatus={this.props.getDhcpStatus}
<mask> findActiveDhcp={this.props.findActiveDhcp}
<mask> setDhcpConfig={this.props.setDhcpConfig}
<mask> />
<mask> </div>
<mask> </div>
<mask> </div>
<mask> )}
</s> + client: handle static leases form </s> remove <div className="col">
<StaticLeases staticLeases={dhcp.staticLeases} />
</s> add <div className="col-12">
<StaticLeases
staticLeases={dhcp.staticLeases}
isModalOpen={dhcp.isModalOpen}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
processingAdding={dhcp.processingAdding}
processingDeleting={dhcp.processingDeleting}
/>
</div>
<div className="col-12">
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => this.props.toggleLeaseModal()}
>
<Trans>dhcp_add_static_lease</Trans>
</button> </s> remove initialValues={{ ...values }}
</s> add initialValues={{
interface_name,
...values,
}} </s> remove <Interface
onChange={this.handleFormSubmit}
initialValues={{ interface_name }}
interfaces={dhcp.interfaces}
processing={dhcp.processingInterfaces}
enabled={dhcp.config.enabled}
/>
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/components/Settings/index.js |
addStaticLease,
removeStaticLease,
toggleLeaseModal, | <mask> getDhcpInterfaces,
<mask> setDhcpConfig,
<mask> findActiveDhcp,
<mask> } from '../actions';
<mask> import {
<mask> getTlsStatus,
<mask> setTlsConfig,
</s> + client: handle static leases form </s> remove import { Field, reduxForm } from 'redux-form';
import { withNamespaces } from 'react-i18next';
</s> add import { Field, reduxForm, formValueSelector } from 'redux-form';
import { Trans, withNamespaces } from 'react-i18next'; </s> remove import StaticLeases from './StaticLeases';
import Interface from './Interface';
</s> add import StaticLeases from './StaticLeases/index'; </s> remove this.props.setDhcpConfig(values);
</s> add if (values.interface_name) {
this.props.setDhcpConfig(values);
} </s> remove const Form = (props) => {
</s> add const renderInterfaces = (interfaces => (
Object.keys(interfaces).map((item) => {
const option = interfaces[item];
const { name } = option;
const onlyIPv6 = option.ip_addresses.every(ip => ip.includes(':'));
let interfaceIP = option.ip_addresses[0];
if (!onlyIPv6) {
option.ip_addresses.forEach((ip) => {
if (!ip.includes(':')) {
interfaceIP = ip;
}
});
}
return (
<option value={name} key={name} disabled={onlyIPv6}>
{name} - {interfaceIP}
</option>
);
})
));
const renderInterfaceValues = (interfaceValues => (
<ul className="list-unstyled mt-1 mb-0">
<li>
<span className="interface__title">MTU: </span>
{interfaceValues.mtu}
</li>
<li>
<span className="interface__title"><Trans>dhcp_hardware_address</Trans>: </span>
{interfaceValues.hardware_address}
</li>
<li>
<span className="interface__title"><Trans>dhcp_ip_addresses</Trans>: </span>
{
interfaceValues.ip_addresses
.map(ip => <span key={ip} className="interface__ip">{ip}</span>)
}
</li>
</ul>
));
let Form = (props) => { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/containers/Settings.js |
addStaticLease,
removeStaticLease,
toggleLeaseModal, | <mask> updateClient,
<mask> deleteClient,
<mask> toggleClientModal,
<mask> };
<mask>
<mask> export default connect(
<mask> mapStateToProps,
<mask> mapDispatchToProps,
</s> + client: handle static leases form </s> remove // TODO rewrite findActiveDhcp part
</s> add </s> remove if (config.enabled) {
try {
await apiClient.setDhcpConfig({ ...config, enabled: false });
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast('disabled_dhcp'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
} else {
dispatch(findActiveDhcpRequest());
try {
const activeDhcp = await apiClient.findActiveDhcp(config.interface_name);
dispatch(findActiveDhcpSuccess(activeDhcp));
if (!activeDhcp.found) {
try {
await apiClient.setDhcpConfig({ ...config, enabled: true });
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast('enabled_dhcp'));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
} else {
dispatch(addErrorToast({ error: 'dhcp_found' }));
}
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(findActiveDhcpFailure());
}
</s> add if (!values.enabled) {
config = { ...values, enabled: true };
successMessage = 'enabled_dhcp';
dispatch(findActiveDhcp(values.interface_name));
}
try {
await apiClient.setDhcpConfig(config);
dispatch(toggleDhcpSuccess());
dispatch(addSuccessToast(successMessage));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleDhcpFailure());
}
};
export const toggleLeaseModal = createAction('TOGGLE_LEASE_MODAL');
export const addStaticLeaseRequest = createAction('ADD_STATIC_LEASE_REQUEST');
export const addStaticLeaseFailure = createAction('ADD_STATIC_LEASE_FAILURE');
export const addStaticLeaseSuccess = createAction('ADD_STATIC_LEASE_SUCCESS');
export const addStaticLease = config => async (dispatch) => {
dispatch(addStaticLeaseRequest());
try {
await apiClient.addStaticLease(config);
dispatch(addStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_added', { key: config.hostname })));
dispatch(toggleLeaseModal());
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addStaticLeaseFailure());
}
};
export const removeStaticLeaseRequest = createAction('REMOVE_STATIC_LEASE_REQUEST');
export const removeStaticLeaseFailure = createAction('REMOVE_STATIC_LEASE_FAILURE');
export const removeStaticLeaseSuccess = createAction('REMOVE_STATIC_LEASE_SUCCESS');
export const removeStaticLease = config => async (dispatch) => {
dispatch(removeStaticLeaseRequest());
try {
await apiClient.removeStaticLease(config);
dispatch(removeStaticLeaseSuccess());
dispatch(addSuccessToast(t('dhcp_lease_deleted', { key: config.hostname })));
dispatch(getDhcpStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeStaticLeaseFailure()); | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/containers/Settings.js |
processingAdding: false,
processingDeleting: false, | <mask> processingInterfaces: false,
<mask> processingDhcp: false,
<mask> processingConfig: false,
<mask> config: {
<mask> enabled: false,
<mask> },
<mask> check: null,
<mask> leases: [],
</s> + client: handle static leases form </s> remove // TODO rewrite findActiveDhcp part
export const toggleDhcp = config => async (dispatch) => {
</s> add export const toggleDhcp = values => async (dispatch) => { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/reducers/index.js |
isModalOpen: false, | <mask> leases: [],
<mask> staticLeases: [],
<mask> });
<mask>
<mask> export default combineReducers({
<mask> settings,
<mask> dashboard,
</s> + client: handle static leases form </s> remove // TODO rewrite findActiveDhcp part
export const toggleDhcp = config => async (dispatch) => {
</s> add export const toggleDhcp = values => async (dispatch) => { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a | client/src/reducers/index.js |
"name": "dashboard",
"version": "0.1.0",
"private": true,
"scripts": {
"build-dev": "cross-env BUILD_ENV=dev webpack --config webpack.dev.js",
"watch": "cross-env BUILD_ENV=dev webpack --config webpack.dev.js --watch",
"build-prod": "cross-env BUILD_ENV=prod webpack --config webpack.prod.js",
"lint": "eslint src"
},
"dependencies": {
"@nivo/line": "^0.49.1",
"axios": "^0.19.2",
"classnames": "^2.2.6",
"date-fns": "^1.29.0",
"i18next": "^19.4.4",
"i18next-browser-languagedetector": "^4.2.0",
"lodash": "^4.17.15",
"nanoid": "^3.1.9",
"prop-types": "^15.7.2",
"react": "^16.13.1",
"react-click-outside": "^3.0.1",
"react-dom": "^16.13.1",
"react-i18next": "^11.4.0",
"react-modal": "^3.11.2",
"react-redux": "^7.2.0",
"react-redux-loading-bar": "^4.6.0",
"react-router-dom": "^5.2.0",
"react-router-hash-link": "^1.2.2",
"react-select": "^3.1.0",
"react-table": "^6.11.4",
"react-transition-group": "^4.4.1",
"redux": "^4.0.5",
"redux-actions": "^2.6.5",
"redux-form": "^8.3.5",
"redux-thunk": "^2.3.0",
"url-polyfill": "^1.1.9"
},
"devDependencies": {
"@babel/core": "^7.9.6",
"@babel/plugin-proposal-class-properties": "^7.8.3",
"@babel/plugin-proposal-object-rest-spread": "^7.9.6",
"@babel/plugin-transform-runtime": "^7.9.6",
"@babel/preset-env": "^7.9.6",
"@babel/preset-react": "^7.9.4",
"autoprefixer": "^9.8.0",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.1.0",
"clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^6.0.1",
"cross-env": "^7.0.2",
"css-loader": "^3.5.3",
"eslint": "^6.8.0",
"eslint-config-airbnb": "^18.1.0",
"eslint-import-resolver-webpack": "^0.12.1",
"eslint-loader": "^4.0.2",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.20.0",
"eslint-plugin-react-hooks": "^2.5.0",
"file-loader": "6.0.0",
"html-webpack-plugin": "^4.3.0",
"mini-css-extract-plugin": "^0.9.0",
"path": "^0.12.7",
"postcss-flexbugs-fixes": "4.2.1",
"postcss-loader": "^3.0.0",
"style-loader": "^1.2.1",
"stylelint": "^13.5.0",
"stylelint-webpack-plugin": "2.0.0",
"url-loader": "^4.1.0",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.11",
"webpack-dev-server": "^3.11.0",
"webpack-merge": "^4.2.2"
},
"browserslist": {
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
],
"production": [
">1%",
"last 4 versions",
"Firefox ESR",
"not ie < 9"
]
} | <mask> {
<mask> "name": "dashboard",
<mask> "version": "0.1.0",
<mask> "private": true,
<mask> "scripts": {
<mask> "build-dev": "cross-env NODE_ENV=development webpack --config webpack.dev.js",
<mask> "watch": "cross-env NODE_ENV=development webpack --config webpack.dev.js --watch",
<mask> "build-prod": "cross-env NODE_ENV=production webpack --config webpack.prod.js",
<mask> "lint": "eslint client/"
<mask> },
<mask> "dependencies": {
<mask> "@nivo/line": "^0.49.1",
<mask> "axios": "^0.19.0",
<mask> "classnames": "^2.2.6",
<mask> "date-fns": "^1.29.0",
<mask> "i18next": "^12.0.0",
<mask> "i18next-browser-languagedetector": "^2.2.3",
<mask> "lodash": "^4.17.15",
<mask> "nanoid": "^1.2.3",
<mask> "prop-types": "^15.7.2",
<mask> "react": "^16.4.0",
<mask> "react-click-outside": "^3.0.1",
<mask> "react-dom": "^16.4.0",
<mask> "react-i18next": "^8.2.0",
<mask> "react-modal": "^3.4.5",
<mask> "react-redux": "^5.0.7",
<mask> "react-redux-loading-bar": "^4.0.7",
<mask> "react-router-dom": "^4.2.2",
<mask> "react-router-hash-link": "^1.2.2",
<mask> "react-select": "^3.0.8",
<mask> "react-table": "^6.10.3",
<mask> "react-transition-group": "^2.4.0",
<mask> "redux": "^4.0.0",
<mask> "redux-actions": "^2.4.0",
<mask> "redux-form": "^7.4.2",
<mask> "redux-thunk": "^2.3.0",
<mask> "url-polyfill": "^1.1.7"
<mask> },
<mask> "devDependencies": {
<mask> "autoprefixer": "^8.6.3",
<mask> "babel-core": "6.26.0",
<mask> "babel-eslint": "^8.2.3",
<mask> "babel-loader": "7.1.2",
<mask> "babel-plugin-transform-runtime": "^6.23.0",
<mask> "babel-preset-env": "^1.7.0",
<mask> "babel-preset-react": "^6.24.1",
<mask> "babel-preset-stage-2": "^6.24.1",
<mask> "babel-runtime": "6.26.0",
<mask> "clean-webpack-plugin": "^0.1.19",
<mask> "compression-webpack-plugin": "^1.1.11",
<mask> "copy-webpack-plugin": "^4.6.0",
<mask> "cross-env": "^7.0.2",
<mask> "css-loader": "^2.1.1",
<mask> "eslint": "^4.19.1",
<mask> "eslint-config-airbnb-base": "^12.1.0",
<mask> "eslint-config-react-app": "^2.1.0",
<mask> "eslint-import-resolver-webpack": "^0.12.1",
<mask> "eslint-loader": "1.9.0",
<mask> "eslint-plugin-import": "^2.12.0",
<mask> "eslint-plugin-jsx-a11y": "5.1.1",
<mask> "eslint-plugin-react": "^7.9.1",
<mask> "extract-text-webpack-plugin": "^3.0.2",
<mask> "file-loader": "1.1.5",
<mask> "html-webpack-plugin": "^3.2.0",
<mask> "postcss-flexbugs-fixes": "3.2.0",
<mask> "postcss-import": "^11.1.0",
<mask> "postcss-loader": "^2.1.5",
<mask> "postcss-mixins": "^6.2.0",
<mask> "postcss-preset-env": "^5.1.0",
<mask> "postcss-svg": "^2.4.0",
<mask> "style-loader": "^0.21.0",
<mask> "stylelint": "^9.10.1",
<mask> "stylelint-webpack-plugin": "0.10.4",
<mask> "svg-url-loader": "^2.3.2",
<mask> "uglifyjs-webpack-plugin": "^1.2.7",
<mask> "url-loader": "^1.0.1",
<mask> "webpack": "3.8.1",
<mask> "webpack-dev-server": "^3.1.14",
<mask> "webpack-merge": "^4.1.3"
<mask> }
<mask> }
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove }}
/>
);
</s> add },
}}
/>; </s> remove </div>
))}
</div>
)}
theme={{
tooltip: {
container: {
padding: '0',
background: '#333',
borderRadius: '4px',
},
</s> add </div>
))}
</div>
)}
theme={{
tooltip: {
container: {
padding: '0',
background: '#333',
borderRadius: '4px', </s> remove accessor: row => this.props.normalizedTopClients.configured[row.name] || 0,
</s> add accessor: (row) => this.props.normalizedTopClients.configured[row.name] || 0, </s> remove accessor: row => this.props.normalizedTopClients.auto[row.ip] || 0,
</s> add accessor: (row) => this.props.normalizedTopClients.auto[row.ip] || 0, </s> remove const onBlur = event => createOnBlurHandler(event, input, normalizeOnBlur);
</s> add const onBlur = (event) => createOnBlurHandler(event, input, normalizeOnBlur); | [
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"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"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/package.json |
import i18next from 'i18next'; | <mask> import { createAction } from 'redux-actions';
<mask> import { t } from 'i18next';
<mask>
<mask> import apiClient from '../api/Api';
<mask> import { addErrorToast, addSuccessToast } from './index';
<mask> import { normalizeTextarea } from '../helpers/helpers';
<mask> import { ACTION } from '../helpers/constants';
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { addErrorToast, addSuccessToast } from './index';
</s> add </s> remove import { t } from 'i18next';
</s> add import i18next from 'i18next'; </s> remove import { t } from 'i18next';
</s> add import i18next from 'i18next'; </s> remove import { t } from 'i18next';
</s> add import i18next from 'i18next'; </s> remove import { addErrorToast, addSuccessToast } from './index';
</s> add import { addErrorToast, addSuccessToast } from './toasts'; | [
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/access.js |
<mask> import { createAction } from 'redux-actions';
<mask> import { t } from 'i18next';
<mask>
<mask> import apiClient from '../api/Api';
<mask> import { addErrorToast, addSuccessToast } from './index';
<mask> import { normalizeTextarea } from '../helpers/helpers';
<mask> import { ACTION } from '../helpers/constants';
<mask>
<mask> export const getAccessListRequest = createAction('GET_ACCESS_LIST_REQUEST');
<mask> export const getAccessListFailure = createAction('GET_ACCESS_LIST_FAILURE');
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { t } from 'i18next';
</s> add import i18next from 'i18next'; </s> remove import { t } from 'i18next';
</s> add import i18next from 'i18next'; </s> remove import { t } from 'i18next';
</s> add import i18next from 'i18next'; </s> remove import { addErrorToast, addSuccessToast } from './index';
</s> add import { addErrorToast, addSuccessToast } from './toasts'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/access.js |
|
import { addErrorToast, addSuccessToast } from './toasts'; | <mask> import { normalizeTextarea } from '../helpers/helpers';
<mask> import { ACTION } from '../helpers/constants';
<mask>
<mask> export const getAccessListRequest = createAction('GET_ACCESS_LIST_REQUEST');
<mask> export const getAccessListFailure = createAction('GET_ACCESS_LIST_FAILURE');
<mask> export const getAccessListSuccess = createAction('GET_ACCESS_LIST_SUCCESS');
<mask>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { addErrorToast, addSuccessToast } from './index';
</s> add </s> remove import { t } from 'i18next';
</s> add import i18next from 'i18next'; </s> remove import { normalizeTextarea, sortClients, isVersionGreater } from '../helpers/helpers';
import { SETTINGS_NAMES, CHECK_TIMEOUT } from '../helpers/constants';
</s> add import { isVersionGreater, normalizeTextarea, sortClients } from '../helpers/helpers';
import { CHECK_TIMEOUT, SETTINGS_NAMES } from '../helpers/constants'; </s> remove import { addErrorToast, addSuccessToast } from './index';
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/access.js |
export const setAccessList = (config) => async (dispatch) => { | <mask> export const setAccessListRequest = createAction('SET_ACCESS_LIST_REQUEST');
<mask> export const setAccessListFailure = createAction('SET_ACCESS_LIST_FAILURE');
<mask> export const setAccessListSuccess = createAction('SET_ACCESS_LIST_SUCCESS');
<mask>
<mask> export const setAccessList = config => async (dispatch) => {
<mask> dispatch(setAccessListRequest());
<mask> try {
<mask> const { allowed_clients, disallowed_clients, blocked_hosts } = config;
<mask>
<mask> const values = {
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export const validateTlsConfig = config => async (dispatch) => {
</s> add export const validateTlsConfig = (config) => async (dispatch) => { </s> remove export const testUpstream = config => async (dispatch) => {
</s> add export const testUpstream = (config) => async (dispatch) => { </s> remove export const setAllSettings = values => async (dispatch) => {
</s> add export const setAllSettings = (values) => async (dispatch) => { </s> remove export const checkConfig = values => async (dispatch) => {
</s> add export const checkConfig = (values) => async (dispatch) => { </s> remove export const refreshFilters = config => async (dispatch) => {
</s> add export const refreshFilters = (config) => async (dispatch) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/access.js |
updatedDisallowedClients = updatedDisallowedClients.filter((client) => client !== ip); | <mask> } = await apiClient.getAccessList();
<mask> let updatedDisallowedClients = disallowed_clients || [];
<mask>
<mask> if (type === ACTION.unblock && updatedDisallowedClients.includes(ip)) {
<mask> updatedDisallowedClients = updatedDisallowedClients.filter(client => client !== ip);
<mask> } else if (type === ACTION.block && !updatedDisallowedClients.includes(ip)) {
<mask> updatedDisallowedClients.push(ip);
<mask> }
<mask>
<mask> const values = {
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove dispatch(addSuccessToast(t('client_unblocked', { ip })));
</s> add dispatch(addSuccessToast(i18next.t('client_unblocked', { ip }))); </s> remove dispatch(addSuccessToast(t('client_blocked', { ip })));
</s> add dispatch(addSuccessToast(i18next.t('client_blocked', { ip }))); </s> remove } else if (value && (value < 80 || value > 65535)) {
</s> add }
if (value && (value < 80 || value > 65535)) { </s> remove } else if (interval === 72 || interval === 168) {
</s> add } if (interval === 72 || interval === 168) { </s> remove .filter(service => values.blocked_services[service]);
</s> add .filter((service) => values.blocked_services[service]); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/access.js |
dispatch(addSuccessToast(i18next.t('client_unblocked', { ip }))); | <mask> await apiClient.setAccessList(values);
<mask> dispatch(toggleClientBlockSuccess(values));
<mask>
<mask> if (type === ACTION.unblock) {
<mask> dispatch(addSuccessToast(t('client_unblocked', { ip })));
<mask> } else if (type === ACTION.block) {
<mask> dispatch(addSuccessToast(t('client_blocked', { ip })));
<mask> }
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove dispatch(addSuccessToast(t('client_blocked', { ip })));
</s> add dispatch(addSuccessToast(i18next.t('client_blocked', { ip }))); </s> remove dispatch(addSuccessToast(t('client_updated', { key: name })));
</s> add dispatch(addSuccessToast(i18next.t('client_updated', { key: name }))); </s> remove dispatch(addSuccessToast(t('client_added', { key: config.name })));
</s> add dispatch(addSuccessToast(i18next.t('client_added', { key: config.name }))); </s> remove dispatch(addSuccessToast(t('client_deleted', { key: config.name })));
</s> add dispatch(addSuccessToast(i18next.t('client_deleted', { key: config.name }))); </s> remove dispatch(addSuccessToast(t('rewrite_deleted', { key: config.domain })));
</s> add dispatch(addSuccessToast(i18next.t('rewrite_deleted', { key: config.domain }))); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/access.js |
dispatch(addSuccessToast(i18next.t('client_blocked', { ip }))); | <mask>
<mask> if (type === ACTION.unblock) {
<mask> dispatch(addSuccessToast(t('client_unblocked', { ip })));
<mask> } else if (type === ACTION.block) {
<mask> dispatch(addSuccessToast(t('client_blocked', { ip })));
<mask> }
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(toggleClientBlockFailure());
<mask> }
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove dispatch(addSuccessToast(t('client_unblocked', { ip })));
</s> add dispatch(addSuccessToast(i18next.t('client_unblocked', { ip }))); </s> remove dispatch(addSuccessToast(t('client_updated', { key: name })));
</s> add dispatch(addSuccessToast(i18next.t('client_updated', { key: name }))); </s> remove dispatch(addSuccessToast(t('rewrite_deleted', { key: config.domain })));
</s> add dispatch(addSuccessToast(i18next.t('rewrite_deleted', { key: config.domain }))); </s> remove dispatch(addSuccessToast(t('client_added', { key: config.name })));
</s> add dispatch(addSuccessToast(i18next.t('client_added', { key: config.name }))); </s> remove dispatch(addSuccessToast(t('client_deleted', { key: config.name })));
</s> add dispatch(addSuccessToast(i18next.t('client_deleted', { key: config.name }))); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/access.js |
import i18next from 'i18next'; | <mask> import { createAction } from 'redux-actions';
<mask> import { t } from 'i18next';
<mask> import apiClient from '../api/Api';
<mask> import { addErrorToast, addSuccessToast, getClients } from './index';
<mask>
<mask> export const toggleClientModal = createAction('TOGGLE_CLIENT_MODAL');
<mask>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { addErrorToast, addSuccessToast, getClients } from './index';
</s> add import { getClients } from './index';
import { addErrorToast, addSuccessToast } from './toasts'; </s> remove import { t } from 'i18next';
</s> add import i18next from 'i18next'; </s> remove import { t } from 'i18next';
</s> add import i18next from 'i18next'; </s> remove import { t } from 'i18next';
</s> add import i18next from 'i18next'; </s> remove import { addErrorToast, addSuccessToast } from './index';
</s> add import { addErrorToast, addSuccessToast } from './toasts'; | [
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/clients.js |
import { getClients } from './index';
import { addErrorToast, addSuccessToast } from './toasts'; | <mask> import { createAction } from 'redux-actions';
<mask> import { t } from 'i18next';
<mask> import apiClient from '../api/Api';
<mask> import { addErrorToast, addSuccessToast, getClients } from './index';
<mask>
<mask> export const toggleClientModal = createAction('TOGGLE_CLIENT_MODAL');
<mask>
<mask> export const addClientRequest = createAction('ADD_CLIENT_REQUEST');
<mask> export const addClientFailure = createAction('ADD_CLIENT_FAILURE');
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { t } from 'i18next';
</s> add import i18next from 'i18next'; </s> remove import { t } from 'i18next';
</s> add import i18next from 'i18next'; </s> remove import { t } from 'i18next';
</s> add import i18next from 'i18next'; </s> remove import { addErrorToast, addSuccessToast } from './index';
</s> add import { addErrorToast, addSuccessToast } from './toasts'; </s> remove import { t } from 'i18next';
</s> add import i18next from 'i18next'; | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/clients.js |
export const addClient = (config) => async (dispatch) => { | <mask> export const addClientRequest = createAction('ADD_CLIENT_REQUEST');
<mask> export const addClientFailure = createAction('ADD_CLIENT_FAILURE');
<mask> export const addClientSuccess = createAction('ADD_CLIENT_SUCCESS');
<mask>
<mask> export const addClient = config => async (dispatch) => {
<mask> dispatch(addClientRequest());
<mask> try {
<mask> await apiClient.addClient(config);
<mask> dispatch(addClientSuccess());
<mask> dispatch(toggleClientModal());
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove dispatch(addSuccessToast(t('client_added', { key: config.name })));
</s> add dispatch(addSuccessToast(i18next.t('client_added', { key: config.name }))); </s> remove import { addErrorToast, addSuccessToast, getClients } from './index';
</s> add import { getClients } from './index';
import { addErrorToast, addSuccessToast } from './toasts'; </s> remove export const setStatsConfig = config => async (dispatch) => {
</s> add export const setStatsConfig = (config) => async (dispatch) => { </s> remove export const deleteRewrite = config => async (dispatch) => {
</s> add export const deleteRewrite = (config) => async (dispatch) => { </s> remove export const setLogsConfig = config => async (dispatch) => {
</s> add export const setLogsConfig = (config) => async (dispatch) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/clients.js |
dispatch(addSuccessToast(i18next.t('client_added', { key: config.name }))); | <mask> try {
<mask> await apiClient.addClient(config);
<mask> dispatch(addClientSuccess());
<mask> dispatch(toggleClientModal());
<mask> dispatch(addSuccessToast(t('client_added', { key: config.name })));
<mask> dispatch(getClients());
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(addClientFailure());
<mask> }
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove dispatch(addSuccessToast(t('client_deleted', { key: config.name })));
</s> add dispatch(addSuccessToast(i18next.t('client_deleted', { key: config.name }))); </s> remove dispatch(addSuccessToast(t('client_updated', { key: name })));
</s> add dispatch(addSuccessToast(i18next.t('client_updated', { key: name }))); </s> remove dispatch(addSuccessToast(t('rewrite_deleted', { key: config.domain })));
</s> add dispatch(addSuccessToast(i18next.t('rewrite_deleted', { key: config.domain }))); </s> remove dispatch(addSuccessToast(t('rewrite_added', { key: config.domain })));
</s> add dispatch(addSuccessToast(i18next.t('rewrite_added', { key: config.domain }))); </s> remove dispatch(addSuccessToast(t('dhcp_lease_deleted', { key: name })));
</s> add dispatch(addSuccessToast(i18next.t('dhcp_lease_deleted', { key: name }))); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/clients.js |
export const deleteClient = (config) => async (dispatch) => { | <mask> export const deleteClientRequest = createAction('DELETE_CLIENT_REQUEST');
<mask> export const deleteClientFailure = createAction('DELETE_CLIENT_FAILURE');
<mask> export const deleteClientSuccess = createAction('DELETE_CLIENT_SUCCESS');
<mask>
<mask> export const deleteClient = config => async (dispatch) => {
<mask> dispatch(deleteClientRequest());
<mask> try {
<mask> await apiClient.deleteClient(config);
<mask> dispatch(deleteClientSuccess());
<mask> dispatch(addSuccessToast(t('client_deleted', { key: config.name })));
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove dispatch(addSuccessToast(t('client_deleted', { key: config.name })));
</s> add dispatch(addSuccessToast(i18next.t('client_deleted', { key: config.name }))); </s> remove dispatch(addSuccessToast(t('client_added', { key: config.name })));
</s> add dispatch(addSuccessToast(i18next.t('client_added', { key: config.name }))); </s> remove export const deleteRewrite = config => async (dispatch) => {
</s> add export const deleteRewrite = (config) => async (dispatch) => { </s> remove export const addClient = config => async (dispatch) => {
</s> add export const addClient = (config) => async (dispatch) => { </s> remove export const addRewrite = config => async (dispatch) => {
</s> add export const addRewrite = (config) => async (dispatch) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/clients.js |
dispatch(addSuccessToast(i18next.t('client_deleted', { key: config.name }))); | <mask> dispatch(deleteClientRequest());
<mask> try {
<mask> await apiClient.deleteClient(config);
<mask> dispatch(deleteClientSuccess());
<mask> dispatch(addSuccessToast(t('client_deleted', { key: config.name })));
<mask> dispatch(getClients());
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(deleteClientFailure());
<mask> }
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove dispatch(addSuccessToast(t('client_added', { key: config.name })));
</s> add dispatch(addSuccessToast(i18next.t('client_added', { key: config.name }))); </s> remove dispatch(addSuccessToast(t('client_updated', { key: name })));
</s> add dispatch(addSuccessToast(i18next.t('client_updated', { key: name }))); </s> remove dispatch(addSuccessToast(t('rewrite_deleted', { key: config.domain })));
</s> add dispatch(addSuccessToast(i18next.t('rewrite_deleted', { key: config.domain }))); </s> remove dispatch(addSuccessToast(t('rewrite_added', { key: config.domain })));
</s> add dispatch(addSuccessToast(i18next.t('rewrite_added', { key: config.domain }))); </s> remove dispatch(addSuccessToast(t('dhcp_lease_added', { key: name })));
</s> add dispatch(addSuccessToast(i18next.t('dhcp_lease_added', { key: name }))); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/clients.js |
dispatch(addSuccessToast(i18next.t('client_updated', { key: name }))); | <mask>
<mask> await apiClient.updateClient(data);
<mask> dispatch(updateClientSuccess());
<mask> dispatch(toggleClientModal());
<mask> dispatch(addSuccessToast(t('client_updated', { key: name })));
<mask> dispatch(getClients());
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(updateClientFailure());
<mask> }
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove dispatch(addSuccessToast(t('client_added', { key: config.name })));
</s> add dispatch(addSuccessToast(i18next.t('client_added', { key: config.name }))); </s> remove dispatch(addSuccessToast(t('client_deleted', { key: config.name })));
</s> add dispatch(addSuccessToast(i18next.t('client_deleted', { key: config.name }))); </s> remove dispatch(addSuccessToast(t('dhcp_lease_added', { key: name })));
</s> add dispatch(addSuccessToast(i18next.t('dhcp_lease_added', { key: name }))); </s> remove dispatch(addSuccessToast(t('dhcp_lease_deleted', { key: name })));
</s> add dispatch(addSuccessToast(i18next.t('dhcp_lease_deleted', { key: name }))); </s> remove dispatch(addSuccessToast(t('rewrite_added', { key: config.domain })));
</s> add dispatch(addSuccessToast(i18next.t('rewrite_added', { key: config.domain }))); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/clients.js |
<mask> import { createAction } from 'redux-actions';
<mask>
<mask> import apiClient from '../api/Api';
<mask> import { addErrorToast, addSuccessToast } from './index';
<mask> import { normalizeTextarea } from '../helpers/helpers';
<mask>
<mask> export const getDnsConfigRequest = createAction('GET_DNS_CONFIG_REQUEST');
<mask> export const getDnsConfigFailure = createAction('GET_DNS_CONFIG_FAILURE');
<mask> export const getDnsConfigSuccess = createAction('GET_DNS_CONFIG_SUCCESS');
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { addErrorToast, addSuccessToast } from './index';
</s> add </s> remove import { t } from 'i18next';
</s> add import i18next from 'i18next'; </s> remove import { addErrorToast, addSuccessToast } from './index';
</s> add </s> remove import { addErrorToast, addSuccessToast } from './index';
import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo } from '../helpers/helpers';
</s> add import {
normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo,
} from '../helpers/helpers';
import { addErrorToast, addSuccessToast } from './toasts'; | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/dnsConfig.js |
|
import { addErrorToast, addSuccessToast } from './toasts'; | <mask> import apiClient from '../api/Api';
<mask> import { normalizeTextarea } from '../helpers/helpers';
<mask>
<mask> export const getDnsConfigRequest = createAction('GET_DNS_CONFIG_REQUEST');
<mask> export const getDnsConfigFailure = createAction('GET_DNS_CONFIG_FAILURE');
<mask> export const getDnsConfigSuccess = createAction('GET_DNS_CONFIG_SUCCESS');
<mask>
<mask> export const getDnsConfig = () => async (dispatch) => {
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { addErrorToast, addSuccessToast } from './index';
</s> add </s> remove import { addErrorToast, addSuccessToast } from './index';
</s> add </s> remove
export const addErrorToast = createAction('ADD_ERROR_TOAST');
export const addSuccessToast = createAction('ADD_SUCCESS_TOAST');
export const addNoticeToast = createAction('ADD_NOTICE_TOAST');
export const removeToast = createAction('REMOVE_TOAST');
</s> add import { addErrorToast, addNoticeToast, addSuccessToast } from './toasts'; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/dnsConfig.js |
export const setDnsConfig = (config) => async (dispatch) => { | <mask> export const setDnsConfigRequest = createAction('SET_DNS_CONFIG_REQUEST');
<mask> export const setDnsConfigFailure = createAction('SET_DNS_CONFIG_FAILURE');
<mask> export const setDnsConfigSuccess = createAction('SET_DNS_CONFIG_SUCCESS');
<mask>
<mask> export const setDnsConfig = config => async (dispatch) => {
<mask> dispatch(setDnsConfigRequest());
<mask> try {
<mask> const data = { ...config };
<mask>
<mask> let hasDnsSettings = false;
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export const validateTlsConfig = config => async (dispatch) => {
</s> add export const validateTlsConfig = (config) => async (dispatch) => { </s> remove export const testUpstream = config => async (dispatch) => {
</s> add export const testUpstream = (config) => async (dispatch) => { </s> remove export const refreshFilters = config => async (dispatch) => {
</s> add export const refreshFilters = (config) => async (dispatch) => { </s> remove export const setAllSettings = values => async (dispatch) => {
</s> add export const setAllSettings = (values) => async (dispatch) => { </s> remove export const toggleDhcp = values => async (dispatch) => {
</s> add export const toggleDhcp = (values) => async (dispatch) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/dnsConfig.js |
<mask> import { createAction } from 'redux-actions';
<mask> import apiClient from '../api/Api';
<mask> import { addErrorToast, addSuccessToast } from './index';
<mask> import { redirectToCurrentProtocol } from '../helpers/helpers';
<mask>
<mask> export const getTlsStatusRequest = createAction('GET_TLS_STATUS_REQUEST');
<mask> export const getTlsStatusFailure = createAction('GET_TLS_STATUS_FAILURE');
<mask> export const getTlsStatusSuccess = createAction('GET_TLS_STATUS_SUCCESS');
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { addErrorToast, addSuccessToast } from './index';
</s> add </s> remove import { addErrorToast, addSuccessToast } from './index';
import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo } from '../helpers/helpers';
</s> add import {
normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo,
} from '../helpers/helpers';
import { addErrorToast, addSuccessToast } from './toasts'; </s> remove import { addErrorToast, addSuccessToast } from './index';
</s> add </s> remove import { addErrorToast, addSuccessToast } from './index';
</s> add import { addErrorToast, addSuccessToast } from './toasts'; | [
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/encryption.js |
|
import { addErrorToast, addSuccessToast } from './toasts'; | <mask> import { createAction } from 'redux-actions';
<mask> import apiClient from '../api/Api';
<mask> import { redirectToCurrentProtocol } from '../helpers/helpers';
<mask>
<mask> export const getTlsStatusRequest = createAction('GET_TLS_STATUS_REQUEST');
<mask> export const getTlsStatusFailure = createAction('GET_TLS_STATUS_FAILURE');
<mask> export const getTlsStatusSuccess = createAction('GET_TLS_STATUS_SUCCESS');
<mask>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { addErrorToast, addSuccessToast } from './index';
</s> add </s> remove import { addErrorToast, addSuccessToast } from './index';
</s> add </s> remove import { addErrorToast, addSuccessToast } from './index';
</s> add </s> remove import { addErrorToast, addSuccessToast } from './index';
import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo } from '../helpers/helpers';
</s> add import {
normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo,
} from '../helpers/helpers';
import { addErrorToast, addSuccessToast } from './toasts'; </s> remove import { normalizeTextarea, sortClients, isVersionGreater } from '../helpers/helpers';
import { SETTINGS_NAMES, CHECK_TIMEOUT } from '../helpers/constants';
</s> add import { isVersionGreater, normalizeTextarea, sortClients } from '../helpers/helpers';
import { CHECK_TIMEOUT, SETTINGS_NAMES } from '../helpers/constants'; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/encryption.js |
export const setTlsConfig = (config) => async (dispatch, getState) => { | <mask> export const setTlsConfigRequest = createAction('SET_TLS_CONFIG_REQUEST');
<mask> export const setTlsConfigFailure = createAction('SET_TLS_CONFIG_FAILURE');
<mask> export const setTlsConfigSuccess = createAction('SET_TLS_CONFIG_SUCCESS');
<mask>
<mask> export const setTlsConfig = config => async (dispatch, getState) => {
<mask> dispatch(setTlsConfigRequest());
<mask> try {
<mask> const { httpPort } = getState().dashboard;
<mask> const values = { ...config };
<mask> values.certificate_chain = btoa(values.certificate_chain);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export const validateTlsConfig = config => async (dispatch) => {
</s> add export const validateTlsConfig = (config) => async (dispatch) => { </s> remove export const setDhcpConfig = values => async (dispatch, getState) => {
</s> add export const setDhcpConfig = (values) => async (dispatch, getState) => { </s> remove export const setFiltersConfig = config => async (dispatch, getState) => {
</s> add export const setFiltersConfig = (config) => async (dispatch, getState) => { </s> remove export const getLogs = config => async (dispatch, getState) => {
</s> add export const getLogs = (config) => async (dispatch, getState) => { </s> remove export const testUpstream = config => async (dispatch) => {
</s> add export const testUpstream = (config) => async (dispatch) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/encryption.js |
export const validateTlsConfig = (config) => async (dispatch) => { | <mask> export const validateTlsConfigRequest = createAction('VALIDATE_TLS_CONFIG_REQUEST');
<mask> export const validateTlsConfigFailure = createAction('VALIDATE_TLS_CONFIG_FAILURE');
<mask> export const validateTlsConfigSuccess = createAction('VALIDATE_TLS_CONFIG_SUCCESS');
<mask>
<mask> export const validateTlsConfig = config => async (dispatch) => {
<mask> dispatch(validateTlsConfigRequest());
<mask> try {
<mask> const values = { ...config };
<mask> values.certificate_chain = btoa(values.certificate_chain);
<mask> values.private_key = btoa(values.private_key);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export const setTlsConfig = config => async (dispatch, getState) => {
</s> add export const setTlsConfig = (config) => async (dispatch, getState) => { </s> remove export const testUpstream = config => async (dispatch) => {
</s> add export const testUpstream = (config) => async (dispatch) => { </s> remove export const setAllSettings = values => async (dispatch) => {
</s> add export const setAllSettings = (values) => async (dispatch) => { </s> remove export const setDnsConfig = config => async (dispatch) => {
</s> add export const setDnsConfig = (config) => async (dispatch) => { </s> remove export const setAccessList = config => async (dispatch) => {
</s> add export const setAccessList = (config) => async (dispatch) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/encryption.js |
import i18next from 'i18next'; | <mask> import { createAction } from 'redux-actions';
<mask> import { showLoading, hideLoading } from 'react-redux-loading-bar';
<mask> import { t } from 'i18next';
<mask>
<mask> import { normalizeFilteringStatus, normalizeRulesTextarea } from '../helpers/helpers';
<mask> import { addErrorToast, addSuccessToast } from './index';
<mask> import apiClient from '../api/Api';
<mask>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { addErrorToast, addSuccessToast } from './index';
</s> add </s> remove import { t } from 'i18next';
</s> add import i18next from 'i18next'; </s> remove import { t } from 'i18next';
</s> add import i18next from 'i18next'; </s> remove import { addErrorToast, addSuccessToast } from './index';
</s> add </s> remove import { t } from 'i18next';
</s> add import i18next from 'i18next'; | [
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4 | client/src/actions/filtering.js |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.