docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
DNSProtocol: dnsp,
ServerName: host, | <mask> return
<mask> }
<mask>
<mask> d := &dnsSettings{
<mask> DNSProtocol: dnsp,
<mask> ServerName: host,
<mask> ServerAddresses: dnsIPs,
<mask> }
<mask>
<mask> mobileconfig, err := encodeMobileConfig(d, clientID)
<mask> if err != nil {
<mask> respondJSONError(w, http.StatusInternalServerError, err.Error())
</s> Pull request: home: rollback serveraddresses in mobileconfig
Updates #3607.
Squashed commit of the following:
commit 1f0a970b4265a59819ec139e51c98dc9376d995b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Sep 30 13:26:49 2021 +0300
home: rollback serveraddresses in mobileconfig </s> remove dnsIPs, err := collectDNSIPs()
if err != nil {
// Don't add a lot of formatting, since the error is already
// wrapped by collectDNSIPs.
respondJSONError(w, http.StatusInternalServerError, err.Error())
return
}
</s> add </s> remove
// collectDNSIPs returns a slice of IP addresses the server is listening
// on, including the addresses on all interfaces in cases of unspecified IPs but
// excluding loopback addresses.
func collectDNSIPs() (ips []net.IP, err error) {
// TODO(a.garipov): This really shouldn't be a function that parses
// a list of strings. Instead, we need a function that returns this
// data as []net.IP or []*netutil.IPPort. Maybe someday.
addrs, err := collectDNSAddresses()
if err != nil {
return nil, err
}
for _, addr := range addrs {
ip := net.ParseIP(addr)
if ip != nil && !ip.IsLoopback() {
ips = append(ips, ip)
}
}
return ips, nil
}
</s> add </s> remove assert.NotEmpty(t, s.ServerAddresses)
</s> add </s> remove assert.NotEmpty(t, s.ServerAddresses)
</s> add </s> remove assert.NotEmpty(t, s.ServerAddresses)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a4e078271cec4efad5aea95a32dc46a3d86ea9ca | internal/home/mobileconfig.go |
<mask>
<mask> func handleMobileConfigDoT(w http.ResponseWriter, r *http.Request) {
<mask> handleMobileConfig(w, r, dnsProtoTLS)
<mask> }
<mask>
<mask> // collectDNSIPs returns a slice of IP addresses the server is listening
<mask> // on, including the addresses on all interfaces in cases of unspecified IPs but
<mask> // excluding loopback addresses.
<mask> func collectDNSIPs() (ips []net.IP, err error) {
<mask> // TODO(a.garipov): This really shouldn't be a function that parses
<mask> // a list of strings. Instead, we need a function that returns this
<mask> // data as []net.IP or []*netutil.IPPort. Maybe someday.
<mask> addrs, err := collectDNSAddresses()
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> for _, addr := range addrs {
<mask> ip := net.ParseIP(addr)
<mask> if ip != nil && !ip.IsLoopback() {
<mask> ips = append(ips, ip)
<mask> }
<mask> }
<mask>
<mask> return ips, nil
<mask> }
</s> Pull request: home: rollback serveraddresses in mobileconfig
Updates #3607.
Squashed commit of the following:
commit 1f0a970b4265a59819ec139e51c98dc9376d995b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Sep 30 13:26:49 2021 +0300
home: rollback serveraddresses in mobileconfig </s> remove dnsIPs, err := collectDNSIPs()
if err != nil {
// Don't add a lot of formatting, since the error is already
// wrapped by collectDNSIPs.
respondJSONError(w, http.StatusInternalServerError, err.Error())
return
}
</s> add </s> remove DNSProtocol: dnsp,
ServerName: host,
ServerAddresses: dnsIPs,
</s> add DNSProtocol: dnsp,
ServerName: host, </s> remove assert.NotEmpty(t, s.ServerAddresses)
</s> add </s> remove assert.NotEmpty(t, s.ServerAddresses)
</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",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/a4e078271cec4efad5aea95a32dc46a3d86ea9ca | internal/home/mobileconfig.go | |
<mask>
<mask> s := mc.PayloadContent[0].DNSSettings
<mask> require.NotNil(t, s)
<mask>
<mask> assert.NotEmpty(t, s.ServerAddresses)
<mask> assert.Empty(t, s.ServerName)
<mask> assert.Equal(t, "https://example.org/dns-query", s.ServerURL)
<mask> })
<mask>
<mask> t.Run("error_no_host", func(t *testing.T) {
</s> Pull request: home: rollback serveraddresses in mobileconfig
Updates #3607.
Squashed commit of the following:
commit 1f0a970b4265a59819ec139e51c98dc9376d995b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Sep 30 13:26:49 2021 +0300
home: rollback serveraddresses in mobileconfig </s> remove assert.NotEmpty(t, s.ServerAddresses)
</s> add </s> remove DNSProtocol: dnsp,
ServerName: host,
ServerAddresses: dnsIPs,
</s> add DNSProtocol: dnsp,
ServerName: host, </s> remove
// collectDNSIPs returns a slice of IP addresses the server is listening
// on, including the addresses on all interfaces in cases of unspecified IPs but
// excluding loopback addresses.
func collectDNSIPs() (ips []net.IP, err error) {
// TODO(a.garipov): This really shouldn't be a function that parses
// a list of strings. Instead, we need a function that returns this
// data as []net.IP or []*netutil.IPPort. Maybe someday.
addrs, err := collectDNSAddresses()
if err != nil {
return nil, err
}
for _, addr := range addrs {
ip := net.ParseIP(addr)
if ip != nil && !ip.IsLoopback() {
ips = append(ips, ip)
}
}
return ips, nil
}
</s> add </s> remove dnsIPs, err := collectDNSIPs()
if err != nil {
// Don't add a lot of formatting, since the error is already
// wrapped by collectDNSIPs.
respondJSONError(w, http.StatusInternalServerError, err.Error())
return
}
</s> add </s> remove assert.NotEmpty(t, s.ServerAddresses)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a4e078271cec4efad5aea95a32dc46a3d86ea9ca | internal/home/mobileconfig_test.go | |
<mask>
<mask> s := mc.PayloadContent[0].DNSSettings
<mask> require.NotNil(t, s)
<mask>
<mask> assert.NotEmpty(t, s.ServerAddresses)
<mask> assert.Empty(t, s.ServerName)
<mask> assert.Equal(t, "https://example.org/dns-query/cli42", s.ServerURL)
<mask> })
<mask> }
<mask>
</s> Pull request: home: rollback serveraddresses in mobileconfig
Updates #3607.
Squashed commit of the following:
commit 1f0a970b4265a59819ec139e51c98dc9376d995b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Sep 30 13:26:49 2021 +0300
home: rollback serveraddresses in mobileconfig </s> remove dnsIPs, err := collectDNSIPs()
if err != nil {
// Don't add a lot of formatting, since the error is already
// wrapped by collectDNSIPs.
respondJSONError(w, http.StatusInternalServerError, err.Error())
return
}
</s> add </s> remove DNSProtocol: dnsp,
ServerName: host,
ServerAddresses: dnsIPs,
</s> add DNSProtocol: dnsp,
ServerName: host, </s> remove assert.NotEmpty(t, s.ServerAddresses)
</s> add </s> remove
// collectDNSIPs returns a slice of IP addresses the server is listening
// on, including the addresses on all interfaces in cases of unspecified IPs but
// excluding loopback addresses.
func collectDNSIPs() (ips []net.IP, err error) {
// TODO(a.garipov): This really shouldn't be a function that parses
// a list of strings. Instead, we need a function that returns this
// data as []net.IP or []*netutil.IPPort. Maybe someday.
addrs, err := collectDNSAddresses()
if err != nil {
return nil, err
}
for _, addr := range addrs {
ip := net.ParseIP(addr)
if ip != nil && !ip.IsLoopback() {
ips = append(ips, ip)
}
}
return ips, nil
}
</s> add </s> remove assert.NotEmpty(t, s.ServerAddresses)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a4e078271cec4efad5aea95a32dc46a3d86ea9ca | internal/home/mobileconfig_test.go | |
<mask>
<mask> s := mc.PayloadContent[0].DNSSettings
<mask> require.NotNil(t, s)
<mask>
<mask> assert.NotEmpty(t, s.ServerAddresses)
<mask> assert.Equal(t, "example.org", s.ServerName)
<mask> assert.Empty(t, s.ServerURL)
<mask> })
<mask>
<mask> t.Run("error_no_host", func(t *testing.T) {
</s> Pull request: home: rollback serveraddresses in mobileconfig
Updates #3607.
Squashed commit of the following:
commit 1f0a970b4265a59819ec139e51c98dc9376d995b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Sep 30 13:26:49 2021 +0300
home: rollback serveraddresses in mobileconfig </s> remove assert.NotEmpty(t, s.ServerAddresses)
</s> add </s> remove DNSProtocol: dnsp,
ServerName: host,
ServerAddresses: dnsIPs,
</s> add DNSProtocol: dnsp,
ServerName: host, </s> remove
// collectDNSIPs returns a slice of IP addresses the server is listening
// on, including the addresses on all interfaces in cases of unspecified IPs but
// excluding loopback addresses.
func collectDNSIPs() (ips []net.IP, err error) {
// TODO(a.garipov): This really shouldn't be a function that parses
// a list of strings. Instead, we need a function that returns this
// data as []net.IP or []*netutil.IPPort. Maybe someday.
addrs, err := collectDNSAddresses()
if err != nil {
return nil, err
}
for _, addr := range addrs {
ip := net.ParseIP(addr)
if ip != nil && !ip.IsLoopback() {
ips = append(ips, ip)
}
}
return ips, nil
}
</s> add </s> remove dnsIPs, err := collectDNSIPs()
if err != nil {
// Don't add a lot of formatting, since the error is already
// wrapped by collectDNSIPs.
respondJSONError(w, http.StatusInternalServerError, err.Error())
return
}
</s> add </s> remove assert.NotEmpty(t, s.ServerAddresses)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a4e078271cec4efad5aea95a32dc46a3d86ea9ca | internal/home/mobileconfig_test.go | |
<mask>
<mask> s := mc.PayloadContent[0].DNSSettings
<mask> require.NotNil(t, s)
<mask>
<mask> assert.NotEmpty(t, s.ServerAddresses)
<mask> assert.Equal(t, "cli42.example.org", s.ServerName)
<mask> assert.Empty(t, s.ServerURL)
<mask> })
<mask> }
</s> Pull request: home: rollback serveraddresses in mobileconfig
Updates #3607.
Squashed commit of the following:
commit 1f0a970b4265a59819ec139e51c98dc9376d995b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Sep 30 13:26:49 2021 +0300
home: rollback serveraddresses in mobileconfig </s> remove dnsIPs, err := collectDNSIPs()
if err != nil {
// Don't add a lot of formatting, since the error is already
// wrapped by collectDNSIPs.
respondJSONError(w, http.StatusInternalServerError, err.Error())
return
}
</s> add </s> remove DNSProtocol: dnsp,
ServerName: host,
ServerAddresses: dnsIPs,
</s> add DNSProtocol: dnsp,
ServerName: host, </s> remove assert.NotEmpty(t, s.ServerAddresses)
</s> add </s> remove
// collectDNSIPs returns a slice of IP addresses the server is listening
// on, including the addresses on all interfaces in cases of unspecified IPs but
// excluding loopback addresses.
func collectDNSIPs() (ips []net.IP, err error) {
// TODO(a.garipov): This really shouldn't be a function that parses
// a list of strings. Instead, we need a function that returns this
// data as []net.IP or []*netutil.IPPort. Maybe someday.
addrs, err := collectDNSAddresses()
if err != nil {
return nil, err
}
for _, addr := range addrs {
ip := net.ParseIP(addr)
if ip != nil && !ip.IsLoopback() {
ips = append(ips, ip)
}
}
return ips, nil
}
</s> add </s> remove assert.NotEmpty(t, s.ServerAddresses)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a4e078271cec4efad5aea95a32dc46a3d86ea9ca | internal/home/mobileconfig_test.go | |
import { getPercent } from '../../helpers/helpers'; | <mask>
<mask> import Card from '../ui/Card';
<mask> import Cell from '../ui/Cell';
<mask>
<mask> import { getPercent, getClientName } from '../../helpers/helpers';
<mask> import { STATUS_COLORS } from '../../helpers/constants';
<mask>
<mask> const getClientsPercentColor = (percent) => {
<mask> if (percent > 50) {
<mask> return STATUS_COLORS.green;
</s> + client: add whois info to dashboard and logs </s> remove import { formatTime, formatDateTime, getClientName } from '../../helpers/helpers';
</s> add import { formatTime, formatDateTime } from '../../helpers/helpers'; </s> remove export const getClientName = (clients, ip) => {
</s> add const formatWhois = (whois) => {
if (!whois) {
return '';
}
const keys = Object.keys(whois);
if (keys.length > 0) {
return (
keys.map(key => whois[key])
);
}
return '';
};
export const getClientInfo = (clients, ip) => { </s> remove return (client && client.name) || '';
</s> add if (!client) {
return '';
}
const { name, whois_info } = client;
const formattedWhois = formatWhois(whois_info);
const whois = formattedWhois && formattedWhois.length > 0 && formattedWhois.join(' | ');
return { name, whois }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/components/Dashboard/Clients.js |
import { formatClientCell } from '../../helpers/formatClientCell'; | <mask> import { getPercent } from '../../helpers/helpers';
<mask> import { STATUS_COLORS } from '../../helpers/constants';
<mask>
<mask> const getClientsPercentColor = (percent) => {
<mask> if (percent > 50) {
<mask> return STATUS_COLORS.green;
<mask> } else if (percent > 10) {
</s> + client: add whois info to dashboard and logs </s> remove import { getPercent, getClientName } from '../../helpers/helpers';
</s> add import { getPercent } from '../../helpers/helpers'; </s> remove import { formatTime, formatDateTime, getClientName } from '../../helpers/helpers';
</s> add import { formatTime, formatDateTime } from '../../helpers/helpers'; </s> remove export const getClientName = (clients, ip) => {
</s> add const formatWhois = (whois) => {
if (!whois) {
return '';
}
const keys = Object.keys(whois);
if (keys.length > 0) {
return (
keys.map(key => whois[key])
);
}
return '';
};
export const getClientInfo = (clients, ip) => { </s> remove return (client && client.name) || '';
</s> add if (!client) {
return '';
}
const { name, whois_info } = client;
const formattedWhois = formatWhois(whois_info);
const whois = formattedWhois && formattedWhois.length > 0 && formattedWhois.join(' | ');
return { name, whois }; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/components/Dashboard/Clients.js |
const countCell = dnsQueries => | <mask> }
<mask> return STATUS_COLORS.red;
<mask> };
<mask>
<mask> const ipCell = (clients, autoClients) =>
<mask> function cell(row) {
<mask> let client;
<mask> const { value } = row;
<mask> const clientName = getClientName(clients, value) || getClientName(autoClients, value);
<mask>
</s> + client: add whois info to dashboard and logs </s> remove let client;
</s> add </s> remove const clientName = getClientName(clients, value) || getClientName(autoClients, value);
if (clientName) {
client = (
<span>
{clientName} <small>({value})</small>
</span>
);
} else {
client = value;
}
</s> add const percent = getPercent(dnsQueries, value);
const percentColor = getClientsPercentColor(percent); </s> remove const countCell = dnsQueries =>
</s> add const clientCell = (clients, autoClients) => </s> remove const clientName =
getClientName(dashboard.clients, value) || getClientName(dashboard.autoClients, value);
let client = value;
if (clientName) {
client = (
<span>
{clientName} <small>({value})</small>
</span>
);
}
</s> add </s> remove const percent = getPercent(dnsQueries, value);
const percentColor = getClientsPercentColor(percent);
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/components/Dashboard/Clients.js |
<mask> };
<mask>
<mask> const ipCell = (clients, autoClients) =>
<mask> function cell(row) {
<mask> let client;
<mask> const { value } = row;
<mask> const clientName = getClientName(clients, value) || getClientName(autoClients, value);
<mask>
<mask> if (clientName) {
<mask> client = (
</s> + client: add whois info to dashboard and logs </s> remove const ipCell = (clients, autoClients) =>
</s> add const countCell = dnsQueries => </s> remove const clientName = getClientName(clients, value) || getClientName(autoClients, value);
if (clientName) {
client = (
<span>
{clientName} <small>({value})</small>
</span>
);
} else {
client = value;
}
</s> add const percent = getPercent(dnsQueries, value);
const percentColor = getClientsPercentColor(percent); </s> remove const clientName =
getClientName(dashboard.clients, value) || getClientName(dashboard.autoClients, value);
let client = value;
if (clientName) {
client = (
<span>
{clientName} <small>({value})</small>
</span>
);
}
</s> add </s> remove const countCell = dnsQueries =>
</s> add const clientCell = (clients, autoClients) => </s> remove const percent = getPercent(dnsQueries, value);
const percentColor = getClientsPercentColor(percent);
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/components/Dashboard/Clients.js | |
const percent = getPercent(dnsQueries, value);
const percentColor = getClientsPercentColor(percent); | <mask> const ipCell = (clients, autoClients) =>
<mask> function cell(row) {
<mask> let client;
<mask> const { value } = row;
<mask> const clientName = getClientName(clients, value) || getClientName(autoClients, value);
<mask>
<mask> if (clientName) {
<mask> client = (
<mask> <span>
<mask> {clientName} <small>({value})</small>
<mask> </span>
<mask> );
<mask> } else {
<mask> client = value;
<mask> }
<mask>
<mask> return (
<mask> <div className="logs__row logs__row--overflow">
<mask> <span className="logs__text" title={value}>
<mask> {client}
</s> + client: add whois info to dashboard and logs </s> remove let client;
</s> add </s> remove return (
<div className="logs__row logs__row--overflow">
<span className="logs__text" title={value}>
{client}
</span>
</div>
);
</s> add return <Cell value={value} percent={percent} color={percentColor} />; </s> remove const clientName =
getClientName(dashboard.clients, value) || getClientName(dashboard.autoClients, value);
let client = value;
if (clientName) {
client = (
<span>
{clientName} <small>({value})</small>
</span>
);
}
</s> add </s> remove const ipCell = (clients, autoClients) =>
</s> add const countCell = dnsQueries => </s> remove const countCell = dnsQueries =>
</s> add const clientCell = (clients, autoClients) => | [
"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/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/components/Dashboard/Clients.js |
return <Cell value={value} percent={percent} color={percentColor} />; | <mask> } else {
<mask> client = value;
<mask> }
<mask>
<mask> return (
<mask> <div className="logs__row logs__row--overflow">
<mask> <span className="logs__text" title={value}>
<mask> {client}
<mask> </span>
<mask> </div>
<mask> );
<mask> };
<mask>
<mask> const countCell = dnsQueries =>
<mask> function cell(row) {
<mask> const { value } = row;
</s> + client: add whois info to dashboard and logs </s> remove const clientName = getClientName(clients, value) || getClientName(autoClients, value);
if (clientName) {
client = (
<span>
{clientName} <small>({value})</small>
</span>
);
} else {
client = value;
}
</s> add const percent = getPercent(dnsQueries, value);
const percentColor = getClientsPercentColor(percent); </s> remove const countCell = dnsQueries =>
</s> add const clientCell = (clients, autoClients) => </s> remove const ipCell = (clients, autoClients) =>
</s> add const countCell = dnsQueries => </s> remove const clientName =
getClientName(dashboard.clients, value) || getClientName(dashboard.autoClients, value);
let client = value;
if (clientName) {
client = (
<span>
{clientName} <small>({value})</small>
</span>
);
}
</s> add </s> remove const percent = getPercent(dnsQueries, value);
const percentColor = getClientsPercentColor(percent);
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/components/Dashboard/Clients.js |
const clientCell = (clients, autoClients) => | <mask> </div>
<mask> );
<mask> };
<mask>
<mask> const countCell = dnsQueries =>
<mask> function cell(row) {
<mask> const { value } = row;
<mask> const percent = getPercent(dnsQueries, value);
<mask> const percentColor = getClientsPercentColor(percent);
<mask>
</s> + client: add whois info to dashboard and logs </s> remove const percent = getPercent(dnsQueries, value);
const percentColor = getClientsPercentColor(percent);
</s> add </s> remove const clientName = getClientName(clients, value) || getClientName(autoClients, value);
if (clientName) {
client = (
<span>
{clientName} <small>({value})</small>
</span>
);
} else {
client = value;
}
</s> add const percent = getPercent(dnsQueries, value);
const percentColor = getClientsPercentColor(percent); </s> remove return <Cell value={value} percent={percent} color={percentColor} />;
</s> add return (
<div className="logs__row logs__row--overflow logs__row--column">
{formatClientCell(value, clients, autoClients)}
</div>
); </s> remove const ipCell = (clients, autoClients) =>
</s> add const countCell = dnsQueries => </s> remove return (
<div className="logs__row logs__row--overflow">
<span className="logs__text" title={value}>
{client}
</span>
</div>
);
</s> add return <Cell value={value} percent={percent} color={percentColor} />; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/components/Dashboard/Clients.js |
<mask>
<mask> const countCell = dnsQueries =>
<mask> function cell(row) {
<mask> const { value } = row;
<mask> const percent = getPercent(dnsQueries, value);
<mask> const percentColor = getClientsPercentColor(percent);
<mask>
<mask> return <Cell value={value} percent={percent} color={percentColor} />;
<mask> };
<mask>
<mask> const Clients = ({
</s> + client: add whois info to dashboard and logs </s> remove return <Cell value={value} percent={percent} color={percentColor} />;
</s> add return (
<div className="logs__row logs__row--overflow logs__row--column">
{formatClientCell(value, clients, autoClients)}
</div>
); </s> remove const countCell = dnsQueries =>
</s> add const clientCell = (clients, autoClients) => </s> remove return (
<div className="logs__row logs__row--overflow">
<span className="logs__text" title={value}>
{client}
</span>
</div>
);
</s> add return <Cell value={value} percent={percent} color={percentColor} />; </s> remove const ipCell = (clients, autoClients) =>
</s> add const countCell = dnsQueries => </s> remove const clientName = getClientName(clients, value) || getClientName(autoClients, value);
if (clientName) {
client = (
<span>
{clientName} <small>({value})</small>
</span>
);
} else {
client = value;
}
</s> add const percent = getPercent(dnsQueries, value);
const percentColor = getClientsPercentColor(percent); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/components/Dashboard/Clients.js | |
return (
<div className="logs__row logs__row--overflow logs__row--column">
{formatClientCell(value, clients, autoClients)}
</div>
); | <mask> const { value } = row;
<mask> const percent = getPercent(dnsQueries, value);
<mask> const percentColor = getClientsPercentColor(percent);
<mask>
<mask> return <Cell value={value} percent={percent} color={percentColor} />;
<mask> };
<mask>
<mask> const Clients = ({
<mask> t, refreshButton, topClients, subtitle, clients, autoClients, dnsQueries,
<mask> }) => (
</s> + client: add whois info to dashboard and logs </s> remove const percent = getPercent(dnsQueries, value);
const percentColor = getClientsPercentColor(percent);
</s> add </s> remove return (
<div className="logs__row logs__row--overflow">
<span className="logs__text" title={value}>
{client}
</span>
</div>
);
</s> add return <Cell value={value} percent={percent} color={percentColor} />; </s> remove const countCell = dnsQueries =>
</s> add const clientCell = (clients, autoClients) => </s> remove const clientName = getClientName(clients, value) || getClientName(autoClients, value);
if (clientName) {
client = (
<span>
{clientName} <small>({value})</small>
</span>
);
} else {
client = value;
}
</s> add const percent = getPercent(dnsQueries, value);
const percentColor = getClientsPercentColor(percent); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/components/Dashboard/Clients.js |
Cell: clientCell(clients, autoClients), | <mask> Header: 'IP',
<mask> accessor: 'ip',
<mask> sortMethod: (a, b) =>
<mask> parseInt(a.replace(/\./g, ''), 10) - parseInt(b.replace(/\./g, ''), 10),
<mask> Cell: ipCell(clients, autoClients),
<mask> },
<mask> {
<mask> Header: <Trans>requests_count</Trans>,
<mask> accessor: 'count',
<mask> Cell: countCell(dnsQueries),
</s> + client: add whois info to dashboard and logs </s> remove maxWidth: 220,
minWidth: 220,
</s> add maxWidth: 240,
minWidth: 240, </s> remove minWidth: 210,
</s> add minWidth: 180, </s> remove return (client && client.name) || '';
</s> add if (!client) {
return '';
}
const { name, whois_info } = client;
const formattedWhois = formatWhois(whois_info);
const whois = formattedWhois && formattedWhois.length > 0 && formattedWhois.join(' | ');
return { name, whois }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/components/Dashboard/Clients.js |
<mask> justify-content: center;
<mask> }
<mask>
<mask> .logs__row--column {
<mask> align-items: flex-start;
<mask> flex-direction: column;
<mask> }
<mask>
<mask> .logs__row--overflow {
<mask> overflow: hidden;
</s> + client: add whois info to dashboard and logs </s> remove import { formatTime, formatDateTime, getClientName } from '../../helpers/helpers';
</s> add import { formatTime, formatDateTime } from '../../helpers/helpers'; </s> remove import { getPercent, getClientName } from '../../helpers/helpers';
</s> add import { getPercent } from '../../helpers/helpers'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/components/Logs/Logs.css | |
align-items: flex-start;
justify-content: center; | <mask> }
<mask>
<mask> .logs__row--column {
<mask> flex-direction: column;
<mask> }
<mask>
<mask> .logs__row--overflow {
<mask> overflow: hidden;
<mask> }
<mask>
</s> + client: add whois info to dashboard and logs </s> remove align-items: flex-start;
</s> add </s> remove import { formatTime, formatDateTime, getClientName } from '../../helpers/helpers';
</s> add import { formatTime, formatDateTime } from '../../helpers/helpers'; </s> remove import { getPercent, getClientName } from '../../helpers/helpers';
</s> add import { getPercent } from '../../helpers/helpers'; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/components/Logs/Logs.css |
line-height: 1.4; | <mask> }
<mask>
<mask> .logs__text--wrap {
<mask> white-space: normal;
<mask> }
<mask>
<mask> .logs__row .tooltip-custom {
<mask> top: 0;
<mask> margin-left: 0;
</s> + client: add whois info to dashboard and logs </s> remove import { formatTime, formatDateTime, getClientName } from '../../helpers/helpers';
</s> add import { formatTime, formatDateTime } from '../../helpers/helpers'; </s> remove align-items: flex-start;
</s> add </s> remove import { getPercent, getClientName } from '../../helpers/helpers';
</s> add import { getPercent } from '../../helpers/helpers'; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/components/Logs/Logs.css |
import { formatTime, formatDateTime } from '../../helpers/helpers'; | <mask> import endsWith from 'lodash/endsWith';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import { HashLink as Link } from 'react-router-hash-link';
<mask>
<mask> import { formatTime, formatDateTime, getClientName } from '../../helpers/helpers';
<mask> import { SERVICES, FILTERED_STATUS } from '../../helpers/constants';
<mask> import { getTrackerData } from '../../helpers/trackers/trackers';
<mask> import PageTitle from '../ui/PageTitle';
<mask> import Card from '../ui/Card';
<mask> import Loading from '../ui/Loading';
</s> + client: add whois info to dashboard and logs </s> remove import { getPercent, getClientName } from '../../helpers/helpers';
</s> add import { getPercent } from '../../helpers/helpers'; </s> remove align-items: flex-start;
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/components/Logs/index.js |
import { formatClientCell } from '../../helpers/formatClientCell';
| <mask>
<mask> import { formatTime, formatDateTime } from '../../helpers/helpers';
<mask> import { SERVICES, FILTERED_STATUS } from '../../helpers/constants';
<mask> import { getTrackerData } from '../../helpers/trackers/trackers';
<mask> import PageTitle from '../ui/PageTitle';
<mask> import Card from '../ui/Card';
<mask> import Loading from '../ui/Loading';
<mask> import PopoverFiltered from '../ui/PopoverFilter';
<mask> import Popover from '../ui/Popover';
<mask> import './Logs.css';
</s> + client: add whois info to dashboard and logs </s> remove import { formatTime, formatDateTime, getClientName } from '../../helpers/helpers';
</s> add import { formatTime, formatDateTime } from '../../helpers/helpers'; </s> remove import { getPercent, getClientName } from '../../helpers/helpers';
</s> add import { getPercent } from '../../helpers/helpers'; </s> remove align-items: flex-start;
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/components/Logs/index.js |
const { clients, autoClients } = dashboard; | <mask> getClientCell = ({ original, value }) => {
<mask> const { dashboard } = this.props;
<mask> const { reason, domain } = original;
<mask> const isFiltered = this.checkFiltered(reason);
<mask> const isRewrite = this.checkRewrite(reason);
<mask>
</s> + client: add whois info to dashboard and logs </s> remove const clientName =
getClientName(dashboard.clients, value) || getClientName(dashboard.autoClients, value);
let client = value;
if (clientName) {
client = (
<span>
{clientName} <small>({value})</small>
</span>
);
}
</s> add </s> remove const percent = getPercent(dnsQueries, value);
const percentColor = getClientsPercentColor(percent);
</s> add </s> remove return <Cell value={value} percent={percent} color={percentColor} />;
</s> add return (
<div className="logs__row logs__row--overflow logs__row--column">
{formatClientCell(value, clients, autoClients)}
</div>
); </s> remove const countCell = dnsQueries =>
</s> add const clientCell = (clients, autoClients) => </s> remove const ipCell = (clients, autoClients) =>
</s> add const countCell = dnsQueries => | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/components/Logs/index.js |
<mask> const { dashboard } = this.props;
<mask> const { reason, domain } = original;
<mask> const isFiltered = this.checkFiltered(reason);
<mask> const isRewrite = this.checkRewrite(reason);
<mask> const clientName =
<mask> getClientName(dashboard.clients, value) || getClientName(dashboard.autoClients, value);
<mask> let client = value;
<mask>
<mask> if (clientName) {
<mask> client = (
<mask> <span>
<mask> {clientName} <small>({value})</small>
<mask> </span>
<mask> );
<mask> }
<mask>
<mask> return (
<mask> <Fragment>
<mask> <div className="logs__row">{client}</div>
<mask> {isRewrite ? (
</s> + client: add whois info to dashboard and logs </s> remove const clientName = getClientName(clients, value) || getClientName(autoClients, value);
if (clientName) {
client = (
<span>
{clientName} <small>({value})</small>
</span>
);
} else {
client = value;
}
</s> add const percent = getPercent(dnsQueries, value);
const percentColor = getClientsPercentColor(percent); </s> remove let client;
</s> add </s> remove return (
<div className="logs__row logs__row--overflow">
<span className="logs__text" title={value}>
{client}
</span>
</div>
);
</s> add return <Cell value={value} percent={percent} color={percentColor} />; </s> remove const ipCell = (clients, autoClients) =>
</s> add const countCell = dnsQueries => | [
"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/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/components/Logs/index.js | |
<div className="logs__row logs__row--overflow logs__row--column">
{formatClientCell(value, clients, autoClients)}
</div> | <mask> }
<mask>
<mask> return (
<mask> <Fragment>
<mask> <div className="logs__row">{client}</div>
<mask> {isRewrite ? (
<mask> <div className="logs__action">
<mask> <Link to="/dns#rewrites" className="btn btn-sm btn-outline-primary">
<mask> <Trans>configure</Trans>
<mask> </Link>
</s> + client: add whois info to dashboard and logs </s> remove const clientName =
getClientName(dashboard.clients, value) || getClientName(dashboard.autoClients, value);
let client = value;
if (clientName) {
client = (
<span>
{clientName} <small>({value})</small>
</span>
);
}
</s> add </s> remove return (
<div className="logs__row logs__row--overflow">
<span className="logs__text" title={value}>
{client}
</span>
</div>
);
</s> add return <Cell value={value} percent={percent} color={percentColor} />; </s> remove return <Cell value={value} percent={percent} color={percentColor} />;
</s> add return (
<div className="logs__row logs__row--overflow logs__row--column">
{formatClientCell(value, clients, autoClients)}
</div>
); </s> remove const clientName = getClientName(clients, value) || getClientName(autoClients, value);
if (clientName) {
client = (
<span>
{clientName} <small>({value})</small>
</span>
);
} else {
client = value;
}
</s> add const percent = getPercent(dnsQueries, value);
const percentColor = getClientsPercentColor(percent); </s> remove export const getClientName = (clients, ip) => {
</s> add const formatWhois = (whois) => {
if (!whois) {
return '';
}
const keys = Object.keys(whois);
if (keys.length > 0) {
return (
keys.map(key => whois[key])
);
}
return '';
};
export const getClientInfo = (clients, ip) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/components/Logs/index.js |
maxWidth: 240,
minWidth: 240, | <mask> },
<mask> {
<mask> Header: t('client_table_header'),
<mask> accessor: 'client',
<mask> maxWidth: 220,
<mask> minWidth: 220,
<mask> Cell: this.getClientCell,
<mask> },
<mask> ];
<mask>
<mask> if (logs) {
</s> + client: add whois info to dashboard and logs </s> remove minWidth: 210,
</s> add minWidth: 180, </s> remove Cell: ipCell(clients, autoClients),
</s> add Cell: clientCell(clients, autoClients), </s> remove import { getPercent, getClientName } from '../../helpers/helpers';
</s> add import { getPercent } from '../../helpers/helpers'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/components/Logs/index.js |
minWidth: 180, | <mask> },
<mask> {
<mask> Header: this.props.t('blocked_services'),
<mask> accessor: 'blocked_services',
<mask> minWidth: 210,
<mask> Cell: (row) => {
<mask> const { value, original } = row;
<mask>
<mask> if (original.use_global_blocked_services) {
<mask> return <Trans>settings_global</Trans>;
</s> + client: add whois info to dashboard and logs </s> remove maxWidth: 220,
minWidth: 220,
</s> add maxWidth: 240,
minWidth: 240, </s> remove Cell: ipCell(clients, autoClients),
</s> add Cell: clientCell(clients, autoClients), </s> remove export const getClientName = (clients, ip) => {
</s> add const formatWhois = (whois) => {
if (!whois) {
return '';
}
const keys = Object.keys(whois);
if (keys.length > 0) {
return (
keys.map(key => whois[key])
);
}
return '';
};
export const getClientInfo = (clients, ip) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/components/Settings/Clients/ClientsTable.js |
minWidth: 120, | <mask> {
<mask> Header: this.props.t('requests_count'),
<mask> accessor: 'statistics',
<mask> Cell: (row) => {
<mask> const clientIP = row.original.ip;
<mask> const clientStats = clientIP && this.getStats(clientIP, this.props.topClients);
<mask>
</s> + client: add whois info to dashboard and logs </s> remove minWidth: 210,
</s> add minWidth: 180, </s> remove return (client && client.name) || '';
</s> add if (!client) {
return '';
}
const { name, whois_info } = client;
const formattedWhois = formatWhois(whois_info);
const whois = formattedWhois && formattedWhois.length > 0 && formattedWhois.join(' | ');
return { name, whois }; </s> remove Cell: ipCell(clients, autoClients),
</s> add Cell: clientCell(clients, autoClients), </s> remove export const getClientName = (clients, ip) => {
</s> add const formatWhois = (whois) => {
if (!whois) {
return '';
}
const keys = Object.keys(whois);
if (keys.length > 0) {
return (
keys.map(key => whois[key])
);
}
return '';
};
export const getClientInfo = (clients, ip) => { </s> remove maxWidth: 220,
minWidth: 220,
</s> add maxWidth: 240,
minWidth: 240, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/components/Settings/Clients/ClientsTable.js |
const formatWhois = (whois) => {
if (!whois) {
return '';
}
const keys = Object.keys(whois);
if (keys.length > 0) {
return (
keys.map(key => whois[key])
);
}
return '';
};
export const getClientInfo = (clients, ip) => { | <mask> };
<mask>
<mask> export const normalizeTextarea = text => text && text.replace(/[;, ]/g, '\n').split('\n').filter(n => n);
<mask>
<mask> export const getClientName = (clients, ip) => {
<mask> const client = clients.find(item => ip === item.ip);
<mask> return (client && client.name) || '';
<mask> };
<mask>
<mask> export const sortClients = (clients) => {
</s> + client: add whois info to dashboard and logs </s> remove return (client && client.name) || '';
</s> add if (!client) {
return '';
}
const { name, whois_info } = client;
const formattedWhois = formatWhois(whois_info);
const whois = formattedWhois && formattedWhois.length > 0 && formattedWhois.join(' | ');
return { name, whois }; </s> remove const ipCell = (clients, autoClients) =>
</s> add const countCell = dnsQueries => </s> remove let client;
</s> add </s> remove const countCell = dnsQueries =>
</s> add const clientCell = (clients, autoClients) => | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/helpers/helpers.js |
if (!client) {
return '';
}
const { name, whois_info } = client;
const formattedWhois = formatWhois(whois_info);
const whois = formattedWhois && formattedWhois.length > 0 && formattedWhois.join(' | ');
return { name, whois }; | <mask> export const normalizeTextarea = text => text && text.replace(/[;, ]/g, '\n').split('\n').filter(n => n);
<mask>
<mask> export const getClientName = (clients, ip) => {
<mask> const client = clients.find(item => ip === item.ip);
<mask> return (client && client.name) || '';
<mask> };
<mask>
<mask> export const sortClients = (clients) => {
<mask> const compare = (a, b) => {
<mask> const nameA = a.name.toUpperCase();
</s> + client: add whois info to dashboard and logs </s> remove export const getClientName = (clients, ip) => {
</s> add const formatWhois = (whois) => {
if (!whois) {
return '';
}
const keys = Object.keys(whois);
if (keys.length > 0) {
return (
keys.map(key => whois[key])
);
}
return '';
};
export const getClientInfo = (clients, ip) => { </s> remove const ipCell = (clients, autoClients) =>
</s> add const countCell = dnsQueries => </s> remove let client;
</s> add </s> remove const countCell = dnsQueries =>
</s> add const clientCell = (clients, autoClients) => | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a52715e0863af0a9e1b26dbf96fc7cced02ae4f6 | client/src/helpers/helpers.js |
temporaryConfig := config.CoreDNS
temporaryConfig.FilterFile = filepath.Join(config.ourBinaryDir, config.CoreDNS.FilterFile) | <mask>
<mask> var configBytes bytes.Buffer
<mask> // run the template
<mask> err = t.Execute(&configBytes, &temporaryConfig)
<mask> if err != nil {
<mask> log.Printf("Couldn't generate DNS config: %s", err)
</s> Stop requiring current working directory to be the location of AdGuardHome.
Fixes #381. </s> remove err = t.Execute(&configBytes, config.CoreDNS)
</s> add err = t.Execute(&configBytes, &temporaryConfig) </s> remove
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/coremain"
</s> add </s> remove "sync"
</s> add "os"
"path/filepath"
"sync" // Include all plugins. </s> remove // Include all plugins.
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a528ed9f947d42f4324cd4f2263a015d34d7341f | config.go |
err = t.Execute(&configBytes, &temporaryConfig) | <mask> }
<mask>
<mask> var configBytes bytes.Buffer
<mask> // run the template
<mask> err = t.Execute(&configBytes, config.CoreDNS)
<mask> if err != nil {
<mask> log.Printf("Couldn't generate DNS config: %s", err)
<mask> return "", err
<mask> }
<mask> configtext := configBytes.String()
</s> Stop requiring current working directory to be the location of AdGuardHome.
Fixes #381. </s> remove
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/coremain"
</s> add </s> remove "sync"
</s> add "os"
"path/filepath"
"sync" // Include all plugins. </s> remove // Include all plugins.
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a528ed9f947d42f4324cd4f2263a015d34d7341f | config.go |
"os"
"path/filepath"
"sync" // Include all plugins. | <mask>
<mask> import (
<mask> "fmt"
<mask> "log"
<mask> "sync"
<mask>
<mask> // Include all plugins.
<mask> _ "github.com/AdguardTeam/AdGuardHome/coredns_plugin"
<mask> _ "github.com/coredns/coredns/plugin/auto"
<mask> _ "github.com/coredns/coredns/plugin/autopath"
</s> Stop requiring current working directory to be the location of AdGuardHome.
Fixes #381. </s> remove // Include all plugins.
</s> add </s> remove
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/coremain"
</s> add </s> remove err = t.Execute(&configBytes, config.CoreDNS)
</s> add err = t.Execute(&configBytes, &temporaryConfig) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a528ed9f947d42f4324cd4f2263a015d34d7341f | coredns.go |
<mask> "fmt"
<mask> "log"
<mask> "sync"
<mask>
<mask> // Include all plugins.
<mask> _ "github.com/AdguardTeam/AdGuardHome/coredns_plugin"
<mask> _ "github.com/coredns/coredns/plugin/auto"
<mask> _ "github.com/coredns/coredns/plugin/autopath"
<mask> _ "github.com/coredns/coredns/plugin/bind"
<mask> _ "github.com/coredns/coredns/plugin/cache"
</s> Stop requiring current working directory to be the location of AdGuardHome.
Fixes #381. </s> remove "sync"
</s> add "os"
"path/filepath"
"sync" // Include all plugins. </s> remove
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/coremain"
</s> add </s> remove err = t.Execute(&configBytes, config.CoreDNS)
</s> add err = t.Execute(&configBytes, &temporaryConfig) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a528ed9f947d42f4324cd4f2263a015d34d7341f | coredns.go | |
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/coremain" | <mask> "path/filepath"
<mask> "sync" // Include all plugins.
<mask>
<mask> _ "github.com/AdguardTeam/AdGuardHome/coredns_plugin"
<mask> _ "github.com/coredns/coredns/plugin/auto"
<mask> _ "github.com/coredns/coredns/plugin/autopath"
<mask> _ "github.com/coredns/coredns/plugin/bind"
<mask> _ "github.com/coredns/coredns/plugin/cache"
<mask> _ "github.com/coredns/coredns/plugin/chaos"
<mask> _ "github.com/coredns/coredns/plugin/debug"
</s> Stop requiring current working directory to be the location of AdGuardHome.
Fixes #381. </s> remove // Include all plugins.
</s> add </s> remove "sync"
</s> add "os"
"path/filepath"
"sync" // Include all plugins. </s> remove
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/coremain"
</s> add </s> remove err = t.Execute(&configBytes, config.CoreDNS)
</s> add err = t.Execute(&configBytes, &temporaryConfig) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a528ed9f947d42f4324cd4f2263a015d34d7341f | coredns.go |
<mask> _ "github.com/coredns/coredns/plugin/template"
<mask> _ "github.com/coredns/coredns/plugin/tls"
<mask> _ "github.com/coredns/coredns/plugin/whoami"
<mask> _ "github.com/mholt/caddy/onevent"
<mask>
<mask> "github.com/coredns/coredns/core/dnsserver"
<mask> "github.com/coredns/coredns/coremain"
<mask> )
<mask>
<mask> // Directives are registered in the order they should be
<mask> // executed.
<mask> //
</s> Stop requiring current working directory to be the location of AdGuardHome.
Fixes #381. </s> remove // Include all plugins.
</s> add </s> remove "sync"
</s> add "os"
"path/filepath"
"sync" // Include all plugins. </s> remove err = t.Execute(&configBytes, config.CoreDNS)
</s> add err = t.Execute(&configBytes, &temporaryConfig) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a528ed9f947d42f4324cd4f2263a015d34d7341f | coredns.go | |
configpath := filepath.Join(config.ourBinaryDir, config.CoreDNS.coreFile)
os.Args = os.Args[:1]
os.Args = append(os.Args, "-conf")
os.Args = append(os.Args, configpath)
| <mask> isCoreDNSRunningLock.Unlock()
<mask>
<mask> err := writeCoreDNSConfig()
<mask> if err != nil {
<mask> errortext := fmt.Errorf("Unable to write coredns config: %s", err)
<mask> log.Println(errortext)
<mask> return errortext
</s> Stop requiring current working directory to be the location of AdGuardHome.
Fixes #381. </s> remove err = t.Execute(&configBytes, config.CoreDNS)
</s> add err = t.Execute(&configBytes, &temporaryConfig) </s> remove
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/coremain"
</s> add </s> remove // Include all plugins.
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a528ed9f947d42f4324cd4f2263a015d34d7341f | coredns.go |
// clientServerName returns the TLS server name based on the protocol. For
// DNS-over-HTTPS requests, it will return the hostname part of the Host header
// if there is one. | <mask>
<mask> return clientID, nil
<mask> }
<mask>
<mask> // clientServerName returns the TLS server name based on the protocol.
<mask> func clientServerName(pctx *proxy.DNSContext, proto proxy.Proto) (srvName string, err error) {
<mask> switch proto {
<mask> case proxy.ProtoHTTPS:
<mask> srvName = pctx.HTTPRequest.TLS.ServerName
<mask> case proxy.ProtoQUIC:
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove srvName = pctx.HTTPRequest.TLS.ServerName
</s> add r := pctx.HTTPRequest
if connState := r.TLS; connState != nil {
srvName = connState.ServerName
} else if r.Host != "" {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} </s> remove httpReq = newHTTPReq(tc.cliSrvName)
</s> add httpReq = newHTTPReq(tc.cliSrvName, tc.inclHTTPTLS) </s> remove func newHTTPReq(cliSrvName string) (r *http.Request) {
</s> add func newHTTPReq(cliSrvName string, inclTLS bool) (r *http.Request) { </s> remove hostSrvName string
</s> add confSrvName string | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid.go |
r := pctx.HTTPRequest
if connState := r.TLS; connState != nil {
srvName = connState.ServerName
} else if r.Host != "" {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} | <mask> // clientServerName returns the TLS server name based on the protocol.
<mask> func clientServerName(pctx *proxy.DNSContext, proto proxy.Proto) (srvName string, err error) {
<mask> switch proto {
<mask> case proxy.ProtoHTTPS:
<mask> srvName = pctx.HTTPRequest.TLS.ServerName
<mask> case proxy.ProtoQUIC:
<mask> qConn := pctx.QUICConnection
<mask> conn, ok := qConn.(quicConnection)
<mask> if !ok {
<mask> return "", fmt.Errorf("pctx conn of proto %s is %T, want quic.Connection", proto, qConn)
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove // clientServerName returns the TLS server name based on the protocol.
</s> add // clientServerName returns the TLS server name based on the protocol. For
// DNS-over-HTTPS requests, it will return the hostname part of the Host header
// if there is one. </s> remove httpReq = newHTTPReq(tc.cliSrvName)
</s> add httpReq = newHTTPReq(tc.cliSrvName, tc.inclHTTPTLS) </s> remove hostSrvName string
</s> add confSrvName string </s> remove func newHTTPReq(cliSrvName string) (r *http.Request) {
</s> add func newHTTPReq(cliSrvName string, inclTLS bool) (r *http.Request) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid.go |
confSrvName string | <mask> func TestServer_clientIDFromDNSContext(t *testing.T) {
<mask> testCases := []struct {
<mask> name string
<mask> proto proxy.Proto
<mask> hostSrvName string
<mask> cliSrvName string
<mask> wantClientID string
<mask> wantErrMsg string
<mask> strictSNI bool
<mask> }{{
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove },
</s> add } </s> remove srvName = pctx.HTTPRequest.TLS.ServerName
</s> add r := pctx.HTTPRequest
if connState := r.TLS; connState != nil {
srvName = connState.ServerName
} else if r.Host != "" {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} </s> remove hostSrvName: "",
</s> add confSrvName: "", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
inclHTTPTLS bool | <mask> confSrvName string
<mask> cliSrvName string
<mask> wantClientID string
<mask> wantErrMsg string
<mask> strictSNI bool
<mask> }{{
<mask> name: "udp",
<mask> proto: proxy.ProtoUDP,
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName string
</s> add confSrvName string </s> remove hostSrvName: "",
</s> add confSrvName: "", </s> remove srvName = pctx.HTTPRequest.TLS.ServerName
</s> add r := pctx.HTTPRequest
if connState := r.TLS; connState != nil {
srvName = connState.ServerName
} else if r.Host != "" {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
confSrvName: "", | <mask> strictSNI bool
<mask> }{{
<mask> name: "udp",
<mask> proto: proxy.ProtoUDP,
<mask> hostSrvName: "",
<mask> cliSrvName: "",
<mask> wantClientID: "",
<mask> wantErrMsg: "",
<mask> strictSNI: false,
<mask> }, {
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
inclHTTPTLS: false, | <mask> confSrvName: "",
<mask> cliSrvName: "",
<mask> wantClientID: "",
<mask> wantErrMsg: "",
<mask> strictSNI: false,
<mask> }, {
<mask> name: "tls_no_clientid",
<mask> proto: proxy.ProtoTLS,
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "",
</s> add confSrvName: "", | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
confSrvName: "example.com", | <mask> strictSNI: false,
<mask> }, {
<mask> name: "tls_no_clientid",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "example.com",
<mask> wantClientID: "",
<mask> wantErrMsg: "",
<mask> strictSNI: true,
<mask> }, {
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
inclHTTPTLS: false, | <mask> cliSrvName: "example.com",
<mask> wantClientID: "",
<mask> wantErrMsg: "",
<mask> strictSNI: true,
<mask> }, {
<mask> name: "tls_no_client_server_name",
<mask> proto: proxy.ProtoTLS,
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
confSrvName: "example.com", | <mask> strictSNI: true,
<mask> }, {
<mask> name: "tls_no_client_server_name",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "",
<mask> wantClientID: "",
<mask> wantErrMsg: `clientid check: client server name "" ` +
<mask> `doesn't match host server name "example.com"`,
<mask> strictSNI: true,
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
inclHTTPTLS: false,
strictSNI: true, | <mask> cliSrvName: "",
<mask> wantClientID: "",
<mask> wantErrMsg: `clientid check: client server name "" ` +
<mask> `doesn't match host server name "example.com"`,
<mask> strictSNI: true,
<mask> }, {
<mask> name: "tls_no_client_server_name_no_strict",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "",
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
confSrvName: "example.com", | <mask> strictSNI: true,
<mask> }, {
<mask> name: "tls_no_client_server_name_no_strict",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "",
<mask> wantClientID: "",
<mask> wantErrMsg: "",
<mask> strictSNI: false,
<mask> }, {
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
inclHTTPTLS: false, | <mask> wantClientID: "",
<mask> wantErrMsg: "",
<mask> strictSNI: false,
<mask> }, {
<mask> name: "tls_clientid",
<mask> proto: proxy.ProtoTLS,
<mask> confSrvName: "example.com",
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
confSrvName: "example.com", | <mask> strictSNI: false,
<mask> }, {
<mask> name: "tls_clientid",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "cli.example.com",
<mask> wantClientID: "cli",
<mask> wantErrMsg: "",
<mask> strictSNI: true,
<mask> }, {
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
inclHTTPTLS: false, | <mask> cliSrvName: "cli.example.com",
<mask> wantClientID: "cli",
<mask> wantErrMsg: "",
<mask> strictSNI: true,
<mask> }, {
<mask> name: "tls_clientid_hostname_error",
<mask> proto: proxy.ProtoTLS,
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
confSrvName: "example.com", | <mask> strictSNI: true,
<mask> }, {
<mask> name: "tls_clientid_hostname_error",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "cli.example.net",
<mask> wantClientID: "",
<mask> wantErrMsg: `clientid check: client server name "cli.example.net" ` +
<mask> `doesn't match host server name "example.com"`,
<mask> strictSNI: true,
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
inclHTTPTLS: false,
strictSNI: true, | <mask> cliSrvName: "cli.example.net",
<mask> wantClientID: "",
<mask> wantErrMsg: `clientid check: client server name "cli.example.net" ` +
<mask> `doesn't match host server name "example.com"`,
<mask> strictSNI: true,
<mask> }, {
<mask> name: "tls_invalid_clientid",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "!!!.example.com",
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
confSrvName: "example.com", | <mask> strictSNI: true,
<mask> }, {
<mask> name: "tls_invalid_clientid",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "!!!.example.com",
<mask> wantClientID: "",
<mask> wantErrMsg: `clientid check: invalid clientid "!!!": ` +
<mask> `bad domain name label rune '!'`,
<mask> strictSNI: true,
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
inclHTTPTLS: false,
strictSNI: true, | <mask> cliSrvName: "!!!.example.com",
<mask> wantClientID: "",
<mask> wantErrMsg: `clientid check: invalid clientid "!!!": ` +
<mask> `bad domain name label rune '!'`,
<mask> strictSNI: true,
<mask> }, {
<mask> name: "tls_clientid_too_long",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: `abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmno` +
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
confSrvName: "example.com", | <mask> strictSNI: true,
<mask> }, {
<mask> name: "tls_clientid_too_long",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: `abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmno` +
<mask> `pqrstuvwxyz0123456789.example.com`,
<mask> wantClientID: "",
<mask> wantErrMsg: `clientid check: invalid clientid "abcdefghijklmno` +
<mask> `pqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789": ` +
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
inclHTTPTLS: false,
strictSNI: true, | <mask> wantClientID: "",
<mask> wantErrMsg: `clientid check: invalid clientid "abcdefghijklmno` +
<mask> `pqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789": ` +
<mask> `domain name label is too long: got 72, max 63`,
<mask> strictSNI: true,
<mask> }, {
<mask> name: "quic_clientid",
<mask> proto: proxy.ProtoQUIC,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "cli.example.com",
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
confSrvName: "example.com", | <mask> strictSNI: true,
<mask> }, {
<mask> name: "quic_clientid",
<mask> proto: proxy.ProtoQUIC,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "cli.example.com",
<mask> wantClientID: "cli",
<mask> wantErrMsg: "",
<mask> strictSNI: true,
<mask> }, {
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
inclHTTPTLS: false, | <mask> wantClientID: "cli",
<mask> wantErrMsg: "",
<mask> strictSNI: true,
<mask> }, {
<mask> name: "tls_clientid_issue3437",
<mask> proto: proxy.ProtoTLS,
<mask> confSrvName: "example.com",
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
confSrvName: "example.com", | <mask> strictSNI: true,
<mask> }, {
<mask> name: "tls_clientid_issue3437",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "cli.myexample.com",
<mask> wantClientID: "",
<mask> wantErrMsg: `clientid check: client server name "cli.myexample.com" ` +
<mask> `doesn't match host server name "example.com"`,
<mask> strictSNI: true,
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
inclHTTPTLS: false,
strictSNI: true, | <mask> cliSrvName: "cli.myexample.com",
<mask> wantClientID: "",
<mask> wantErrMsg: `clientid check: client server name "cli.myexample.com" ` +
<mask> `doesn't match host server name "example.com"`,
<mask> strictSNI: true,
<mask> }, {
<mask> name: "tls_case",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "InSeNsItIvE.example.com",
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
confSrvName: "example.com", | <mask> strictSNI: true,
<mask> }, {
<mask> name: "tls_case",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "InSeNsItIvE.example.com",
<mask> wantClientID: "insensitive",
<mask> wantErrMsg: ``,
<mask> strictSNI: true,
<mask> }, {
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
inclHTTPTLS: false, | <mask> cliSrvName: "InSeNsItIvE.example.com",
<mask> wantClientID: "insensitive",
<mask> wantErrMsg: ``,
<mask> strictSNI: true,
<mask> }, {
<mask> name: "quic_case",
<mask> proto: proxy.ProtoQUIC,
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove strictSNI: true,
</s> add inclHTTPTLS: false,
strictSNI: true, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
confSrvName: "example.com", | <mask> strictSNI: true,
<mask> }, {
<mask> name: "quic_case",
<mask> proto: proxy.ProtoQUIC,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "InSeNsItIvE.example.com",
<mask> wantClientID: "insensitive",
<mask> wantErrMsg: ``,
<mask> strictSNI: true,
<mask> }, {
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
inclHTTPTLS: false, | <mask> cliSrvName: "InSeNsItIvE.example.com",
<mask> wantClientID: "insensitive",
<mask> wantErrMsg: ``,
<mask> strictSNI: true,
<mask> }, {
<mask> name: "https_no_clientid",
<mask> proto: proxy.ProtoHTTPS,
<mask> confSrvName: "example.com",
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
confSrvName: "example.com", | <mask> strictSNI: true,
<mask> }, {
<mask> name: "https_no_clientid",
<mask> proto: proxy.ProtoHTTPS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "example.com",
<mask> wantClientID: "",
<mask> wantErrMsg: "",
<mask> strictSNI: true,
<mask> }, {
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
inclHTTPTLS: true, | <mask> wantClientID: "",
<mask> wantErrMsg: "",
<mask> strictSNI: true,
<mask> }, {
<mask> name: "https_clientid",
<mask> proto: proxy.ProtoHTTPS,
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
confSrvName: "example.com", | <mask> strictSNI: true,
<mask> }, {
<mask> name: "https_clientid",
<mask> proto: proxy.ProtoHTTPS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "cli.example.com",
<mask> wantClientID: "cli",
<mask> wantErrMsg: "",
<mask> strictSNI: true,
<mask> }}
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", </s> remove hostSrvName: "example.com",
</s> add confSrvName: "example.com", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
ServerName: tc.confSrvName, | <mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> tlsConf := TLSConfig{
<mask> ServerName: tc.hostSrvName,
<mask> StrictSNICheck: tc.strictSNI,
<mask> }
<mask>
<mask> srv := &Server{
<mask> conf: ServerConfig{TLSConfig: tlsConf},
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove },
</s> add } </s> remove hostSrvName string
</s> add confSrvName string </s> remove func newHTTPReq(cliSrvName string) (r *http.Request) {
</s> add func newHTTPReq(cliSrvName string, inclTLS bool) (r *http.Request) { </s> remove srvName = pctx.HTTPRequest.TLS.ServerName
</s> add r := pctx.HTTPRequest
if connState := r.TLS; connState != nil {
srvName = connState.ServerName
} else if r.Host != "" {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
httpReq = newHTTPReq(tc.cliSrvName, tc.inclHTTPTLS) | <mask> )
<mask>
<mask> switch tc.proto {
<mask> case proxy.ProtoHTTPS:
<mask> httpReq = newHTTPReq(tc.cliSrvName)
<mask> case proxy.ProtoQUIC:
<mask> qconn = testQUICConnection{
<mask> serverName: tc.cliSrvName,
<mask> }
<mask> case proxy.ProtoTLS:
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove srvName = pctx.HTTPRequest.TLS.ServerName
</s> add r := pctx.HTTPRequest
if connState := r.TLS; connState != nil {
srvName = connState.ServerName
} else if r.Host != "" {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} </s> remove // clientServerName returns the TLS server name based on the protocol.
</s> add // clientServerName returns the TLS server name based on the protocol. For
// DNS-over-HTTPS requests, it will return the hostname part of the Host header
// if there is one. </s> remove TLS: &tls.ConnectionState{
</s> add }
if inclTLS {
r.TLS = &tls.ConnectionState{ </s> remove return &http.Request{
</s> add r = &http.Request{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
func newHTTPReq(cliSrvName string, inclTLS bool) (r *http.Request) { | <mask> }
<mask> }
<mask>
<mask> // newHTTPReq is a helper to create HTTP requests for tests.
<mask> func newHTTPReq(cliSrvName string) (r *http.Request) {
<mask> u := &url.URL{
<mask> Path: "/dns-query",
<mask> }
<mask>
<mask> return &http.Request{
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove return &http.Request{
</s> add r = &http.Request{ </s> remove },
</s> add } </s> remove srvName = pctx.HTTPRequest.TLS.ServerName
</s> add r := pctx.HTTPRequest
if connState := r.TLS; connState != nil {
srvName = connState.ServerName
} else if r.Host != "" {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} </s> remove // clientServerName returns the TLS server name based on the protocol.
</s> add // clientServerName returns the TLS server name based on the protocol. For
// DNS-over-HTTPS requests, it will return the hostname part of the Host header
// if there is one. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
r = &http.Request{ | <mask> u := &url.URL{
<mask> Path: "/dns-query",
<mask> }
<mask>
<mask> return &http.Request{
<mask> ProtoMajor: 1,
<mask> ProtoMinor: 1,
<mask> URL: u,
<mask> Host: cliSrvName,
<mask> TLS: &tls.ConnectionState{
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove TLS: &tls.ConnectionState{
</s> add }
if inclTLS {
r.TLS = &tls.ConnectionState{ </s> remove },
</s> add } </s> remove func newHTTPReq(cliSrvName string) (r *http.Request) {
</s> add func newHTTPReq(cliSrvName string, inclTLS bool) (r *http.Request) { </s> remove srvName = pctx.HTTPRequest.TLS.ServerName
</s> add r := pctx.HTTPRequest
if connState := r.TLS; connState != nil {
srvName = connState.ServerName
} else if r.Host != "" {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
}
if inclTLS {
r.TLS = &tls.ConnectionState{ | <mask> ProtoMajor: 1,
<mask> ProtoMinor: 1,
<mask> URL: u,
<mask> Host: cliSrvName,
<mask> TLS: &tls.ConnectionState{
<mask> ServerName: cliSrvName,
<mask> },
<mask> }
<mask> }
<mask>
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove return &http.Request{
</s> add r = &http.Request{ </s> remove },
</s> add } </s> remove ServerName: tc.hostSrvName,
</s> add ServerName: tc.confSrvName, </s> remove func newHTTPReq(cliSrvName string) (r *http.Request) {
</s> add func newHTTPReq(cliSrvName string, inclTLS bool) (r *http.Request) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
} | <mask> URL: u,
<mask> Host: cliSrvName,
<mask> TLS: &tls.ConnectionState{
<mask> ServerName: cliSrvName,
<mask> },
<mask> }
<mask> }
<mask>
<mask> func TestClientIDFromDNSContextHTTPS(t *testing.T) {
<mask> testCases := []struct {
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove TLS: &tls.ConnectionState{
</s> add }
if inclTLS {
r.TLS = &tls.ConnectionState{ </s> remove return &http.Request{
</s> add r = &http.Request{ </s> remove ServerName: tc.hostSrvName,
</s> add ServerName: tc.confSrvName, </s> remove hostSrvName string
</s> add confSrvName string | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
return r | <mask> }
<mask> }
<mask> }
<mask>
<mask> func TestClientIDFromDNSContextHTTPS(t *testing.T) {
<mask> testCases := []struct {
<mask> name string
<mask> path string
</s> Pull request 1742: 5518-doh-panic
Updates #5425.
Updates #5518.
Squashed commit of the following:
commit 74873bd47bab569d0a45361f2d87c0e33e0ed3fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:54:44 2023 +0300
dnsforward: use Host when available
commit 4eee3d655ec7eb84e0327dcf30603578772609e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 20 17:24:24 2023 +0300
dnsforward: fix panic on unencrypted doh </s> remove },
</s> add } </s> remove hostSrvName string
</s> add confSrvName string </s> remove ServerName: tc.hostSrvName,
</s> add ServerName: tc.confSrvName, </s> remove func newHTTPReq(cliSrvName string) (r *http.Request) {
</s> add func newHTTPReq(cliSrvName string, inclTLS bool) (r *http.Request) { </s> remove srvName = pctx.HTTPRequest.TLS.ServerName
</s> add r := pctx.HTTPRequest
if connState := r.TLS; connState != nil {
srvName = connState.ServerName
} else if r.Host != "" {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a556ce8fb872284fe9d20dbe2109458cd50629ff | internal/dnsforward/clientid_test.go |
github.com/AdguardTeam/dnsproxy v0.42.2 | <mask>
<mask> go 1.17
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.42.1
<mask> github.com/AdguardTeam/golibs v0.10.8
<mask> github.com/AdguardTeam/urlfilter v0.16.0
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.3
<mask> github.com/digineo/go-ipset/v2 v2.2.1
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove github.com/fsnotify/fsnotify v1.5.1
</s> add github.com/fsnotify/fsnotify v1.5.4 </s> remove github.com/AdguardTeam/dnsproxy v0.42.1 h1:RZAtW75cvMX1d9Mibg0CA343V7VWV5PLrXsLhBZfdYc=
github.com/AdguardTeam/dnsproxy v0.42.1/go.mod h1:thHuk3599mgmucsv5J9HR9lBVQHnf4YleE08EbxNrN0=
</s> add github.com/AdguardTeam/dnsproxy v0.42.2 h1:aBhbuvqg/rZN8Rab5ILSfPFJDkiTviWXXcceJgajnNs=
github.com/AdguardTeam/dnsproxy v0.42.2/go.mod h1:thHuk3599mgmucsv5J9HR9lBVQHnf4YleE08EbxNrN0= </s> remove honnef.co/go/tools v0.3.0
</s> add honnef.co/go/tools v0.3.1 </s> remove github.com/google/go-cmp v0.5.7 // indirect
</s> add github.com/google/go-cmp v0.5.8 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | go.mod |
github.com/fsnotify/fsnotify v1.5.4 | <mask> github.com/AdguardTeam/urlfilter v0.16.0
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.3
<mask> github.com/digineo/go-ipset/v2 v2.2.1
<mask> github.com/fsnotify/fsnotify v1.5.1
<mask> github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534
<mask> github.com/google/go-cmp v0.5.7
<mask> github.com/google/gopacket v1.1.19
<mask> github.com/google/renameio v1.0.1
<mask> github.com/insomniacslk/dhcp v0.0.0-20220405050111-12fbdcb11b41
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove github.com/AdguardTeam/dnsproxy v0.42.1
</s> add github.com/AdguardTeam/dnsproxy v0.42.2 </s> remove github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
</s> add </s> remove github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
</s> add </s> remove github.com/google/go-cmp v0.5.7 // indirect
</s> add github.com/google/go-cmp v0.5.8 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | go.mod |
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 | <mask> github.com/stretchr/testify v1.7.0
<mask> github.com/ti-mo/netfilter v0.4.0
<mask> go.etcd.io/bbolt v1.3.6
<mask> golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
<mask> golang.org/x/net v0.0.0-20220412020605-290c469a71a5
<mask> golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0
<mask> gopkg.in/yaml.v2 v2.4.0
<mask> howett.net/plist v1.0.0
<mask> )
<mask>
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
</s> add golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect </s> remove golang.org/x/net v0.0.0-20220412020605-290c469a71a5 h1:bRb386wvrE+oBNdF1d/Xh9mQrfQ4ecYhW5qJ5GvTGT4=
golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
</s> add golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 h1:HVyaeDAYux4pnY+D/SiwmLOR36ewZ4iGQIIrtnuCjFA=
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= </s> remove golang.org/x/exp/typeparams v0.0.0-20220407100705-7b9b53b0aca4 // indirect
</s> add golang.org/x/exp/typeparams v0.0.0-20220426173459-3bcf042a4bf5 // indirect </s> remove golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
</s> add </s> remove golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 h1:xHms4gcpe1YE7A3yIllJXP16CMAGuqwO2lX1mTyyRRc=
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | go.mod |
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect | <mask> github.com/pkg/errors v0.9.1 // indirect
<mask> github.com/pmezard/go-difflib v1.0.0 // indirect
<mask> github.com/stretchr/objx v0.1.1 // indirect
<mask> github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect
<mask> golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
<mask> golang.org/x/text v0.3.7 // indirect
<mask> golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a // indirect
<mask> golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
<mask> gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a // indirect
</s> add golang.org/x/tools v0.1.11-0.20220426200323-dcaea06afc12 // indirect </s> remove golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
</s> add golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect </s> remove golang.org/x/exp/typeparams v0.0.0-20220407100705-7b9b53b0aca4 // indirect
</s> add golang.org/x/exp/typeparams v0.0.0-20220426173459-3bcf042a4bf5 // indirect </s> remove github.com/google/go-cmp v0.5.7 // indirect
</s> add github.com/google/go-cmp v0.5.8 // indirect </s> remove golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a h1:ofrrl6c6NG5/IOSx/R1cyiQxxjqlur0h/TvbUhkH0II=
golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
</s> add golang.org/x/tools v0.1.11-0.20220426200323-dcaea06afc12 h1:pODAJF0uBqx6zFa1MYaiTobVo5FzCbnTVUXeO8o71fE=
golang.org/x/tools v0.1.11-0.20220426200323-dcaea06afc12/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | go.mod |
golang.org/x/tools v0.1.11-0.20220426200323-dcaea06afc12 // indirect | <mask> github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect
<mask> golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
<mask> golang.org/x/text v0.3.7 // indirect
<mask> golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a // indirect
<mask> golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
<mask> gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
<mask> gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
<mask> )
<mask>
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect </s> remove golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
</s> add golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect </s> remove golang.org/x/exp/typeparams v0.0.0-20220407100705-7b9b53b0aca4 // indirect
</s> add golang.org/x/exp/typeparams v0.0.0-20220426173459-3bcf042a4bf5 // indirect </s> remove github.com/google/go-cmp v0.5.7 // indirect
</s> add github.com/google/go-cmp v0.5.8 // indirect </s> remove golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a h1:ofrrl6c6NG5/IOSx/R1cyiQxxjqlur0h/TvbUhkH0II=
golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
</s> add golang.org/x/tools v0.1.11-0.20220426200323-dcaea06afc12 h1:pODAJF0uBqx6zFa1MYaiTobVo5FzCbnTVUXeO8o71fE=
golang.org/x/tools v0.1.11-0.20220426200323-dcaea06afc12/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | go.mod |
github.com/AdguardTeam/dnsproxy v0.42.2 h1:aBhbuvqg/rZN8Rab5ILSfPFJDkiTviWXXcceJgajnNs=
github.com/AdguardTeam/dnsproxy v0.42.2/go.mod h1:thHuk3599mgmucsv5J9HR9lBVQHnf4YleE08EbxNrN0= | <mask> dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
<mask> dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
<mask> dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
<mask> git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
<mask> github.com/AdguardTeam/dnsproxy v0.42.1 h1:RZAtW75cvMX1d9Mibg0CA343V7VWV5PLrXsLhBZfdYc=
<mask> github.com/AdguardTeam/dnsproxy v0.42.1/go.mod h1:thHuk3599mgmucsv5J9HR9lBVQHnf4YleE08EbxNrN0=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
<mask> github.com/AdguardTeam/golibs v0.10.8 h1:diU9gP9qG1qeLbAkzIwfUerpHSqzR6zaBgzvRMR/m6Q=
<mask> github.com/AdguardTeam/golibs v0.10.8/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove github.com/AdguardTeam/dnsproxy v0.42.1
</s> add github.com/AdguardTeam/dnsproxy v0.42.2 </s> remove github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
</s> add </s> remove golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
</s> add </s> remove golang.org/x/net v0.0.0-20220412020605-290c469a71a5 h1:bRb386wvrE+oBNdF1d/Xh9mQrfQ4ecYhW5qJ5GvTGT4=
golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
</s> add golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 h1:HVyaeDAYux4pnY+D/SiwmLOR36ewZ4iGQIIrtnuCjFA=
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | go.sum |
<mask> github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
<mask> github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
<mask> github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
<mask> github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
<mask> github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
<mask> github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
<mask> github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
<mask> github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
<mask> github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
<mask> github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY=
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove github.com/fsnotify/fsnotify v1.5.1
</s> add github.com/fsnotify/fsnotify v1.5.4 </s> remove golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a h1:ofrrl6c6NG5/IOSx/R1cyiQxxjqlur0h/TvbUhkH0II=
golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
</s> add golang.org/x/tools v0.1.11-0.20220426200323-dcaea06afc12 h1:pODAJF0uBqx6zFa1MYaiTobVo5FzCbnTVUXeO8o71fE=
golang.org/x/tools v0.1.11-0.20220426200323-dcaea06afc12/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= </s> remove github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | go.sum | |
github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= | <mask> github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
<mask> github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
<mask> github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
<mask> github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
<mask> github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
<mask> github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
<mask> github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
<mask> github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY=
<mask> github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
</s> add </s> remove github.com/fsnotify/fsnotify v1.5.1
</s> add github.com/fsnotify/fsnotify v1.5.4 </s> remove golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a h1:ofrrl6c6NG5/IOSx/R1cyiQxxjqlur0h/TvbUhkH0II=
golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
</s> add golang.org/x/tools v0.1.11-0.20220426200323-dcaea06afc12 h1:pODAJF0uBqx6zFa1MYaiTobVo5FzCbnTVUXeO8o71fE=
golang.org/x/tools v0.1.11-0.20220426200323-dcaea06afc12/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= </s> remove github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | go.sum |
<mask> golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
<mask> golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
<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 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
<mask> golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
<mask> golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove golang.org/x/net v0.0.0-20220412020605-290c469a71a5 h1:bRb386wvrE+oBNdF1d/Xh9mQrfQ4ecYhW5qJ5GvTGT4=
golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
</s> add golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 h1:HVyaeDAYux4pnY+D/SiwmLOR36ewZ4iGQIIrtnuCjFA=
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= </s> remove golang.org/x/net v0.0.0-20220412020605-290c469a71a5
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
</s> add golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 </s> remove golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect </s> remove golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
</s> add golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | go.sum | |
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= | <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/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
</s> add </s> remove golang.org/x/net v0.0.0-20220412020605-290c469a71a5 h1:bRb386wvrE+oBNdF1d/Xh9mQrfQ4ecYhW5qJ5GvTGT4=
golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
</s> add golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 h1:HVyaeDAYux4pnY+D/SiwmLOR36ewZ4iGQIIrtnuCjFA=
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= </s> remove golang.org/x/net v0.0.0-20220412020605-290c469a71a5
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
</s> add golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 </s> remove golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect </s> remove golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
</s> add golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | go.sum |
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 h1:HVyaeDAYux4pnY+D/SiwmLOR36ewZ4iGQIIrtnuCjFA=
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= | <mask> golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
<mask> golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
<mask> golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
<mask> golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
<mask> golang.org/x/net v0.0.0-20220412020605-290c469a71a5 h1:bRb386wvrE+oBNdF1d/Xh9mQrfQ4ecYhW5qJ5GvTGT4=
<mask> golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
<mask> golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
<mask> golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
<mask> golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
<mask> golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
<mask> golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw=
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove golang.org/x/net v0.0.0-20220412020605-290c469a71a5
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
</s> add golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 </s> remove golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
</s> add </s> remove honnef.co/go/tools v0.3.0 h1:2LdYUZ7CIxnYgskbUZfY7FPggmqnh6shBqfWa8Tn3XU=
honnef.co/go/tools v0.3.0/go.mod h1:vlRD9XErLMGT+mDuofSr0mMMquscM/1nQqtRSsh6m70=
</s> add honnef.co/go/tools v0.3.1 h1:1kJlrWJLkaGXgcaeosRXViwviqjI7nkBvU2+sZW0AYc=
honnef.co/go/tools v0.3.1/go.mod h1:vlRD9XErLMGT+mDuofSr0mMMquscM/1nQqtRSsh6m70= </s> remove github.com/fsnotify/fsnotify v1.5.1
</s> add github.com/fsnotify/fsnotify v1.5.4 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | go.sum |
<mask> golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
<mask> golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 h1:xHms4gcpe1YE7A3yIllJXP16CMAGuqwO2lX1mTyyRRc=
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/net v0.0.0-20220412020605-290c469a71a5
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
</s> add golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 </s> remove golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
</s> add golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect </s> remove golang.org/x/exp/typeparams v0.0.0-20220407100705-7b9b53b0aca4 // indirect
</s> add golang.org/x/exp/typeparams v0.0.0-20220426173459-3bcf042a4bf5 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | go.sum | |
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 h1:xHms4gcpe1YE7A3yIllJXP16CMAGuqwO2lX1mTyyRRc=
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | <mask> golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
</s> add </s> remove golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 h1:xHms4gcpe1YE7A3yIllJXP16CMAGuqwO2lX1mTyyRRc=
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/net v0.0.0-20220412020605-290c469a71a5
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
</s> add golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 </s> remove golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
</s> add golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect </s> remove golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a // indirect
</s> add golang.org/x/tools v0.1.11-0.20220426200323-dcaea06afc12 // indirect | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | go.sum |
golang.org/x/tools v0.1.11-0.20220426200323-dcaea06afc12 h1:pODAJF0uBqx6zFa1MYaiTobVo5FzCbnTVUXeO8o71fE=
golang.org/x/tools v0.1.11-0.20220426200323-dcaea06afc12/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= | <mask> golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
<mask> golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
<mask> golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
<mask> golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
<mask> golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a h1:ofrrl6c6NG5/IOSx/R1cyiQxxjqlur0h/TvbUhkH0II=
<mask> golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
<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> golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f h1:GGU+dLjvlC3qDwqYgL6UgRmHXhOOgns0bZu2Ty5mm6U=
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a // indirect
</s> add golang.org/x/tools v0.1.11-0.20220426200323-dcaea06afc12 // indirect </s> remove golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect </s> remove honnef.co/go/tools v0.3.0
</s> add honnef.co/go/tools v0.3.1 </s> remove golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
</s> add golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect </s> remove golang.org/x/exp/typeparams v0.0.0-20220407100705-7b9b53b0aca4 // indirect
</s> add golang.org/x/exp/typeparams v0.0.0-20220426173459-3bcf042a4bf5 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | go.sum |
honnef.co/go/tools v0.3.1 | <mask> github.com/kyoh86/looppointer v0.1.7
<mask> github.com/securego/gosec/v2 v2.11.0
<mask> golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
<mask> golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a
<mask> honnef.co/go/tools v0.3.0
<mask> mvdan.cc/gofumpt v0.3.1
<mask> mvdan.cc/unparam v0.0.0-20220316160445-06cc5682983b
<mask> )
<mask>
<mask> require (
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove honnef.co/go/tools v0.3.0 h1:2LdYUZ7CIxnYgskbUZfY7FPggmqnh6shBqfWa8Tn3XU=
honnef.co/go/tools v0.3.0/go.mod h1:vlRD9XErLMGT+mDuofSr0mMMquscM/1nQqtRSsh6m70=
</s> add honnef.co/go/tools v0.3.1 h1:1kJlrWJLkaGXgcaeosRXViwviqjI7nkBvU2+sZW0AYc=
honnef.co/go/tools v0.3.1/go.mod h1:vlRD9XErLMGT+mDuofSr0mMMquscM/1nQqtRSsh6m70= </s> remove golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a // indirect
</s> add golang.org/x/tools v0.1.11-0.20220426200323-dcaea06afc12 // indirect </s> remove github.com/AdguardTeam/dnsproxy v0.42.1
</s> add github.com/AdguardTeam/dnsproxy v0.42.2 </s> remove golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a h1:ofrrl6c6NG5/IOSx/R1cyiQxxjqlur0h/TvbUhkH0II=
golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
</s> add golang.org/x/tools v0.1.11-0.20220426200323-dcaea06afc12 h1:pODAJF0uBqx6zFa1MYaiTobVo5FzCbnTVUXeO8o71fE=
golang.org/x/tools v0.1.11-0.20220426200323-dcaea06afc12/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= </s> remove github.com/google/go-cmp v0.5.7 // indirect
</s> add github.com/google/go-cmp v0.5.8 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | internal/tools/go.mod |
github.com/google/go-cmp v0.5.8 // indirect | <mask>
<mask> require (
<mask> github.com/BurntSushi/toml v1.1.0 // indirect
<mask> github.com/client9/misspell v0.3.4 // indirect
<mask> github.com/google/go-cmp v0.5.7 // indirect
<mask> github.com/google/uuid v1.3.0 // indirect
<mask> github.com/gookit/color v1.5.0 // 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
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove golang.org/x/exp/typeparams v0.0.0-20220407100705-7b9b53b0aca4 // indirect
</s> add golang.org/x/exp/typeparams v0.0.0-20220426173459-3bcf042a4bf5 // indirect </s> remove golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
</s> add golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect </s> remove golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect </s> remove golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a // indirect
</s> add golang.org/x/tools v0.1.11-0.20220426200323-dcaea06afc12 // indirect </s> remove github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | internal/tools/go.mod |
golang.org/x/exp/typeparams v0.0.0-20220426173459-3bcf042a4bf5 // indirect | <mask> github.com/gookit/color v1.5.0 // 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/typeparams v0.0.0-20220407100705-7b9b53b0aca4 // indirect
<mask> golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
<mask> golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
<mask> golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
<mask> gopkg.in/yaml.v2 v2.4.0 // indirect
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
</s> add golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect </s> remove github.com/google/go-cmp v0.5.7 // indirect
</s> add github.com/google/go-cmp v0.5.8 // indirect </s> remove golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect </s> remove golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a // indirect
</s> add golang.org/x/tools v0.1.11-0.20220426200323-dcaea06afc12 // indirect </s> remove golang.org/x/net v0.0.0-20220412020605-290c469a71a5
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
</s> add golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | internal/tools/go.mod |
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect | <mask> github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
<mask> golang.org/x/exp/typeparams v0.0.0-20220407100705-7b9b53b0aca4 // indirect
<mask> golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
<mask> golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
<mask> golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
<mask> gopkg.in/yaml.v2 v2.4.0 // indirect
<mask> )
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove golang.org/x/exp/typeparams v0.0.0-20220407100705-7b9b53b0aca4 // indirect
</s> add golang.org/x/exp/typeparams v0.0.0-20220426173459-3bcf042a4bf5 // indirect </s> remove golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a // indirect
</s> add golang.org/x/tools v0.1.11-0.20220426200323-dcaea06afc12 // indirect </s> remove golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect </s> remove github.com/google/go-cmp v0.5.7 // indirect
</s> add github.com/google/go-cmp v0.5.8 // indirect </s> remove golang.org/x/net v0.0.0-20220412020605-290c469a71a5
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
</s> add golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | internal/tools/go.mod |
<mask> github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
<mask> github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
<mask> github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
<mask> github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
<mask> github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
<mask> github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
<mask> github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
<mask> github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
<mask> github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
<mask> github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove github.com/google/go-cmp v0.5.7 // indirect
</s> add github.com/google/go-cmp v0.5.8 // indirect </s> remove github.com/fsnotify/fsnotify v1.5.1
</s> add github.com/fsnotify/fsnotify v1.5.4 </s> remove github.com/AdguardTeam/dnsproxy v0.42.1 h1:RZAtW75cvMX1d9Mibg0CA343V7VWV5PLrXsLhBZfdYc=
github.com/AdguardTeam/dnsproxy v0.42.1/go.mod h1:thHuk3599mgmucsv5J9HR9lBVQHnf4YleE08EbxNrN0=
</s> add github.com/AdguardTeam/dnsproxy v0.42.2 h1:aBhbuvqg/rZN8Rab5ILSfPFJDkiTviWXXcceJgajnNs=
github.com/AdguardTeam/dnsproxy v0.42.2/go.mod h1:thHuk3599mgmucsv5J9HR9lBVQHnf4YleE08EbxNrN0= </s> remove github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | internal/tools/go.sum | |
github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= | <mask> github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
<mask> github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
<mask> github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
<mask> github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
<mask> github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
<mask> github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
<mask> github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
<mask> github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
</s> add </s> remove github.com/google/go-cmp v0.5.7 // indirect
</s> add github.com/google/go-cmp v0.5.8 // indirect </s> remove github.com/fsnotify/fsnotify v1.5.1
</s> add github.com/fsnotify/fsnotify v1.5.4 </s> remove github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | internal/tools/go.sum |
golang.org/x/exp/typeparams v0.0.0-20220426173459-3bcf042a4bf5 h1:pKfHvPtBtqS0+V/V9Y0cZQa2h8HJV/qSRJiGgYu+LQA=
golang.org/x/exp/typeparams v0.0.0-20220426173459-3bcf042a4bf5/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= | <mask> golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
<mask> golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5 h1:FR+oGxGfbQu1d+jglI3rCkjAjUnhRSZcUxr+DqlDLNo=
<mask> golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
<mask> golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
<mask> golang.org/x/exp/typeparams v0.0.0-20220407100705-7b9b53b0aca4 h1:P5yukcpQfG1ZDKR0pGdaZCVwaNPntMxLFKYg81li58M=
<mask> golang.org/x/exp/typeparams v0.0.0-20220407100705-7b9b53b0aca4/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
<mask> golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
<mask> golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
<mask> golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
<mask> golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
<mask> golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove golang.org/x/exp/typeparams v0.0.0-20220407100705-7b9b53b0aca4 // indirect
</s> add golang.org/x/exp/typeparams v0.0.0-20220426173459-3bcf042a4bf5 // indirect </s> remove golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
</s> add golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect </s> remove honnef.co/go/tools v0.3.0
</s> add honnef.co/go/tools v0.3.1 </s> remove golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
</s> add </s> remove honnef.co/go/tools v0.3.0 h1:2LdYUZ7CIxnYgskbUZfY7FPggmqnh6shBqfWa8Tn3XU=
honnef.co/go/tools v0.3.0/go.mod h1:vlRD9XErLMGT+mDuofSr0mMMquscM/1nQqtRSsh6m70=
</s> add honnef.co/go/tools v0.3.1 h1:1kJlrWJLkaGXgcaeosRXViwviqjI7nkBvU2+sZW0AYc=
honnef.co/go/tools v0.3.1/go.mod h1:vlRD9XErLMGT+mDuofSr0mMMquscM/1nQqtRSsh6m70= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | internal/tools/go.sum |
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 h1:xHms4gcpe1YE7A3yIllJXP16CMAGuqwO2lX1mTyyRRc=
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/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-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
<mask> golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
</s> add </s> remove golang.org/x/net v0.0.0-20220412020605-290c469a71a5
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
</s> add golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 </s> remove golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
</s> add golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect </s> remove golang.org/x/exp/typeparams v0.0.0-20220407100705-7b9b53b0aca4 // indirect
</s> add golang.org/x/exp/typeparams v0.0.0-20220426173459-3bcf042a4bf5 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | internal/tools/go.sum |
honnef.co/go/tools v0.3.1 h1:1kJlrWJLkaGXgcaeosRXViwviqjI7nkBvU2+sZW0AYc=
honnef.co/go/tools v0.3.1/go.mod h1:vlRD9XErLMGT+mDuofSr0mMMquscM/1nQqtRSsh6m70= | <mask> honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
<mask> honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
<mask> honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
<mask> honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
<mask> honnef.co/go/tools v0.3.0 h1:2LdYUZ7CIxnYgskbUZfY7FPggmqnh6shBqfWa8Tn3XU=
<mask> honnef.co/go/tools v0.3.0/go.mod h1:vlRD9XErLMGT+mDuofSr0mMMquscM/1nQqtRSsh6m70=
<mask> mvdan.cc/gofumpt v0.3.1 h1:avhhrOmv0IuvQVK7fvwV91oFSGAk5/6Po8GXTzICeu8=
<mask> mvdan.cc/gofumpt v0.3.1/go.mod h1:w3ymliuxvzVx8DAutBnVyDqYb1Niy/yCJt/lk821YCE=
<mask> mvdan.cc/unparam v0.0.0-20220316160445-06cc5682983b h1:C8Pi6noat8BcrL9WnSRYeQ63fpkJk3hKVHtF5731kIw=
<mask> mvdan.cc/unparam v0.0.0-20220316160445-06cc5682983b/go.mod h1:WqFWCt8MGPoFSYGsQSiIORRlYVhkJsIk+n2MY6rhNbA=
<mask> rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
</s> Pull request: all: upd dnsproxy, tools
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit ea2a88dfd6e3820f0b3319d6aa09313de467e423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 27 14:24:49 2022 +0300
all: upd dnsproxy, tools </s> remove honnef.co/go/tools v0.3.0
</s> add honnef.co/go/tools v0.3.1 </s> remove golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
</s> add </s> remove golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a580149ad67b604a1e3c6e7b3483d856a51c905a | internal/tools/go.sum |
"sync" | <mask> "net"
<mask> "net/http"
<mask> "os"
<mask> "strings"
<mask> "sync/atomic"
<mask> "time"
<mask>
<mask> "github.com/joomcode/errorx"
</s> * dnsfilter: major refactoring
* dnsfilter is controlled by package home, not dnsforward
* move HTTP handlers to dnsfilter/
* apply filtering settings without DNS server restart
* use only 1 goroutine for filters update
* apply new filters quickly (after they are ready to be used) </s> remove "fmt"
</s> add </s> remove "io"
</s> add </s> remove defer d.Destroy()
</s> add defer d.Close() </s> remove defer d.Destroy()
</s> add defer d.Close() | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a59e346d4af2a1ac91ea087a0c465e9a1e593f86 | dnsfilter/dnsfilter.go |
ResolverAddress string `yaml:"-"` // DNS server address | <mask> ParentalEnabled bool `yaml:"parental_enabled"`
<mask> UsePlainHTTP bool `yaml:"-"` // use plain HTTP for requests to parental and safe browsing servers
<mask> SafeSearchEnabled bool `yaml:"safesearch_enabled"`
<mask> SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
<mask> ResolverAddress string // DNS server address
<mask>
<mask> SafeBrowsingCacheSize uint `yaml:"safebrowsing_cache_size"` // (in bytes)
<mask> SafeSearchCacheSize uint `yaml:"safesearch_cache_size"` // (in bytes)
<mask> ParentalCacheSize uint `yaml:"parental_cache_size"` // (in bytes)
<mask> CacheTime uint `yaml:"cache_time"` // Element's TTL (in minutes)
</s> * dnsfilter: major refactoring
* dnsfilter is controlled by package home, not dnsforward
* move HTTP handlers to dnsfilter/
* apply filtering settings without DNS server restart
* use only 1 goroutine for filters update
* apply new filters quickly (after they are ready to be used) </s> remove CacheSize uint `yaml:"cache_size"` // DNS cache size (in bytes)
dnsfilter.Config `yaml:",inline"`
</s> add CacheSize uint `yaml:"cache_size"` // DNS cache size (in bytes)
DnsfilterConf dnsfilter.Config `yaml:",inline"` </s> remove // Filtering callback function
FilterHandler func(clientAddr string, settings *RequestFilteringSettings) `yaml:"-"`
}
</s> add // Called when the configuration is changed by HTTP request
ConfigModified func() `yaml:"-"` </s> remove // Create dnsfilter asynchronously.
// Requests won't be filtered until dnsfilter is created.
// If "restart" command is received while we're creating an old dnsfilter object,
// we delay creation of the new object until the old one is created.
AsyncStartup bool `yaml:"-"`
</s> add // Filtering callback function
FilterHandler func(clientAddr string, settings *dnsfilter.RequestFilteringSettings) `yaml:"-"` </s> remove type privateConfig struct {
parentalServer string // access via methods
safeBrowsingServer string // access via methods
</s> add // Register an HTTP handler
HTTPRegister func(string, string, func(http.ResponseWriter, *http.Request)) `yaml:"-"` </s> remove filteringStarted bool // TRUE if filtering module is started
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a59e346d4af2a1ac91ea087a0c465e9a1e593f86 | dnsfilter/dnsfilter.go |
// Called when the configuration is changed by HTTP request
ConfigModified func() `yaml:"-"` | <mask> CacheTime uint `yaml:"cache_time"` // Element's TTL (in minutes)
<mask>
<mask> Rewrites []RewriteEntry `yaml:"rewrites"`
<mask>
<mask> // Filtering callback function
<mask> FilterHandler func(clientAddr string, settings *RequestFilteringSettings) `yaml:"-"`
<mask> }
<mask>
<mask> type privateConfig struct {
<mask> parentalServer string // access via methods
<mask> safeBrowsingServer string // access via methods
<mask> }
</s> * dnsfilter: major refactoring
* dnsfilter is controlled by package home, not dnsforward
* move HTTP handlers to dnsfilter/
* apply filtering settings without DNS server restart
* use only 1 goroutine for filters update
* apply new filters quickly (after they are ready to be used) </s> remove type privateConfig struct {
parentalServer string // access via methods
safeBrowsingServer string // access via methods
</s> add // Register an HTTP handler
HTTPRegister func(string, string, func(http.ResponseWriter, *http.Request)) `yaml:"-"` </s> remove Config // for direct access by library users, even a = assignment
privateConfig
</s> add parentalServer string // access via methods
safeBrowsingServer string // access via methods
Config // for direct access by library users, even a = assignment
confLock sync.RWMutex
// Channel for passing data to filters-initializer goroutine
filtersInitializerChan chan filtersInitializerParams
filtersInitializerLock sync.Mutex </s> remove ResolverAddress string // DNS server address
</s> add ResolverAddress string `yaml:"-"` // DNS server address </s> remove // Create dnsfilter asynchronously.
// Requests won't be filtered until dnsfilter is created.
// If "restart" command is received while we're creating an old dnsfilter object,
// we delay creation of the new object until the old one is created.
AsyncStartup bool `yaml:"-"`
</s> add // Filtering callback function
FilterHandler func(clientAddr string, settings *dnsfilter.RequestFilteringSettings) `yaml:"-"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a59e346d4af2a1ac91ea087a0c465e9a1e593f86 | dnsfilter/dnsfilter.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.