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
CUSTOM_FILTERING_RULES_ID, FILTERED_STATUS,
<mask> LONG_TIME_FORMAT, <mask> FILTERED_STATUS_TO_META_MAP, <mask> TABLE_DEFAULT_PAGE_SIZE, <mask> SCHEME_TO_PROTOCOL_MAP, <mask> CUSTOM_FILTERING_RULES_ID, <mask> } from '../../helpers/constants'; <mask> import getDateCell from './Cells/getDateCell'; <mask> import getDomainCell from './Cel...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/Table.js
rule, originalResponse,
<mask> upstream, <mask> type, <mask> client_proto, <mask> filterId, <mask> } = rowInfo.original; <mask> <mask> const hasTracker = !!tracker; <mask> <...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/Table.js
const isBlocked = reason === FILTERED_STATUS.FILTERED_BLACK_LIST || reason === FILTERED_STATUS.FILTERED_BLOCKED_SERVICE;
<mask> const formattedElapsedMs = formatElapsedMs(elapsedMs, t); <mask> const isFiltered = checkFiltered(reason); <mask> <mask> const buttonType = isFiltered ? BLOCK_ACTIONS.UNBLOCK : BLOCK_ACTIONS.BLOCK; <mask> const ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/Table.js
const isBlockedByResponse = originalResponse.length > 0 && isBlocked; const status = t(isBlockedByResponse ? 'blocked_by_cname_or_ip' : FILTERED_STATUS_TO_META_MAP[reason]?.label || reason);
<mask> const onToggleBlock = () => { <mask> toggleBlocking(buttonType, domain); <mask> }; <mask> <mask> const status = t(FILTERED_STATUS_TO_META_MAP[reason]?.label || reason); <mask> const ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/Table.js
rule_label: rule,
<mask> elapsed: formattedElapsedMs, <mask> filter, <mask> response_table_header: response?.join('\n'), <mask> original_response: originalResponse?.join('\n'), <mask> [buttonTy...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/Table.js
original_response: originalResponse?.join('\n'),
<mask> rule_label: rule, <mask> response_table_header: response?.join('\n'), <mask> [buttonType]: <div onClick={onToggleBlock} <mask> className="title--border text-center">{t(buttonType...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/Table.js
const detailedDataCurrent = isBlocked ? detailedDataBlocked : detailedData;
<mask> [buttonType]: <div onClick={onToggleBlock} <mask> className="title--border text-center">{t(buttonType)}</div>, <mask> }; <mask> <mask> const detailedDataCurrent = isFiltered ? detailed...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/Table.js
if (!value) { return null; }
<mask> <mask> export const processContent = (data, buttonType) => Object.entries(data) <mask> .map(([key, value]) => { <mask> const isTitle = value === 'title'; <mask> const isButton = key === buttonType; <mask> const isBoolean = typeof value === 'boolean'; <mask> const isHid...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/index.js
<div className="logs__text mw-100" title={value}>
<mask> } <mask> } <mask> <mask> return ( <mask> <div className="logs__text" title={value}> <mask> <> <mask> {nameContainer} <mask> {whoisContainer} <mask> </> <mask> </div> </s> - client: Fix query logs UI issues Close #...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/helpers/formatClientCell.js
const processResponse = (data) => (data ? data.map((response) => {
<mask> } = log; <mask> <mask> const { host: domain, type } = question; <mask> <mask> const response = answer ? answer.map((response) => { <mask> const { value, type, ttl } = response; <mask> return `${type}: ${value} (ttl=${ttl})`; <mask> }) : []; <mask> <mask> const tra...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/helpers/helpers.js
}) : []);
<mask> <mask> const response = answer ? answer.map((response) => { <mask> const { value, type, ttl } = response; <mask> return `${type}: ${value} (ttl=${ttl})`; <mask> }) : []; <mask> <mask> const tracker = getTrackerData(domain); <mask> <mask> return { <mask> time, ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/helpers/helpers.js
response: processResponse(answer),
<mask> return { <mask> time, <mask> domain, <mask> type, <mask> response, <mask> reason, <mask> client, <mask> client_proto, <mask> filterId, <mask> rule, </s> - client: Fix query logs UI issues Close #1828 Squashed commit of the fo...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/helpers/helpers.js
originalResponse: processResponse(original_answer), tracker: getTrackerData(domain),
<mask> rule, <mask> status, <mask> serviceName: service_name, <mask> originalAnswer: original_answer, <mask> tracker, <mask> answer_dnssec, <mask> elapsedMs, <mask> upstream, <mask> }; <mask> }); </s> - client: Fix query logs UI issues Close...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/helpers/helpers.js
"table_statistics": "Requests count (last 24 hours)",
<mask> "client_global_settings": "Use global settings", <mask> "client_deleted": "Client \"{{key}}\" successfully deleted", <mask> "client_added": "Client \"{{key}}\" successfully added", <mask> "client_updated": "Client \"{{key}}\" successfully updated", <mask> "table_statistics": "Statistic...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a8c7329f7d437031760e1f5719cc9f7ed3cc73a
client/src/__locales/en.json
"client_confirm_delete": "Are you sure you want to delete client \"{{key}}\"?", "auto_clients_title": "Clients (runtime)", "auto_clients_desc": "Data on the clients that use AdGuard Home, but not stored in the configuration"
<mask> "client_added": "Client \"{{key}}\" successfully added", <mask> "client_updated": "Client \"{{key}}\" successfully updated", <mask> "table_statistics": "Statistics (last 24 hours)", <mask> "clients_not_found": "No clients found", <mask> "client_confirm_delete": "Are you sure you want t...
[ "keep", "keep", "keep", "keep", "replace", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a8c7329f7d437031760e1f5719cc9f7ed3cc73a
client/src/__locales/en.json
const data = await apiClient.getClients(); const sortedClients = data.clients && sortClients(data.clients); const sortedAutoClients = data.auto_clients && sortClients(data.auto_clients); dispatch(getClientsSuccess({ clients: sortedClients || [], autoClients: sort...
<mask> <mask> export const getClients = () => async (dispatch) => { <mask> dispatch(getClientsRequest()); <mask> try { <mask> const clients = await apiClient.getClients(); <mask> const sortedClients = sortClients(clients); <mask> dispatch(getClientsSuccess(sortedClients)); <mask...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a8c7329f7d437031760e1f5719cc9f7ed3cc73a
client/src/actions/index.js
const clientName = getClientName(this.props.clients, value) || getClientName(this.props.autoClients, value);
<mask> columns = [{ <mask> Header: 'IP', <mask> accessor: 'ip', <mask> Cell: ({ value }) => { <mask> const clientName = getClientName(this.props.clients, value); <mask> let client; <mask> <mask> if (clientName) { <mask> client = <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a8c7329f7d437031760e1f5719cc9f7ed3cc73a
client/src/components/Dashboard/Clients.js
autoClients: PropTypes.array.isRequired,
<mask> topClients: PropTypes.object.isRequired, <mask> dnsQueries: PropTypes.number.isRequired, <mask> refreshButton: PropTypes.node.isRequired, <mask> clients: PropTypes.array.isRequired, <mask> t: PropTypes.func, <mask> }; <mask> <mask> export default withNamespaces()(Clients); </s> + cl...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a8c7329f7d437031760e1f5719cc9f7ed3cc73a
client/src/components/Dashboard/Clients.js
autoClients={dashboard.autoClients}
<mask> dnsQueries={dashboard.stats.dns_queries} <mask> refreshButton={refreshButton} <mask> topClients={dashboard.topStats.top_clients} <mask> clients={dash...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a8c7329f7d437031760e1f5719cc9f7ed3cc73a
client/src/components/Dashboard/index.js
const clientName = getClientName(dashboard.clients, row.value) || getClientName(dashboard.autoClients, row.value);
<mask> maxWidth: 250, <mask> Cell: (row) => { <mask> const { reason } = row.original; <mask> const isFiltered = row ? reason.indexOf('Filtered') === 0 : false; <mask> const clientName = getClientName(dashboard.clients, row.value); <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a8c7329f7d437031760e1f5719cc9f7ed3cc73a
client/src/components/Logs/index.js
import AutoClients from './Clients/AutoClients';
<mask> import Dhcp from './Dhcp'; <mask> import Encryption from './Encryption'; <mask> import Clients from './Clients'; <mask> import Checkbox from '../ui/Checkbox'; <mask> import Loading from '../ui/Loading'; <mask> import PageTitle from '../ui/PageTitle'; <mask> import Card from '../ui/Card'; </s> + client: a...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a8c7329f7d437031760e1f5719cc9f7ed3cc73a
client/src/components/Settings/index.js
<Fragment> <Clients clients={dashboard.clients} topStats={dashboard.topStats} isModalOpen={clients.isModalOpen} ...
<mask> processingTestUpstream={settings.processingTestUpstream} <mask> processingSetUpstream={settings.processingSetUpstream} <mask> /> <mask> {!dashboard.processingTopStats && !da...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a8c7329f7d437031760e1f5719cc9f7ed3cc73a
client/src/components/Settings/index.js
clients: payload.clients, autoClients: payload.autoClients,
<mask> [actions.getClientsFailure]: state => ({ ...state, processingClients: false }), <mask> [actions.getClientsSuccess]: (state, { payload }) => { <mask> const newState = { <mask> ...state, <mask> clients: payload, <mask> processingClients: false, <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a8c7329f7d437031760e1f5719cc9f7ed3cc73a
client/src/reducers/index.js
autoClients: [],
<mask> dnsAddresses: [], <mask> dnsVersion: '', <mask> clients: [], <mask> topStats: [], <mask> }); <mask> <mask> const queryLogs = handleActions({ </s> + client: add runtime clients table </s> remove const clients = await apiClient.getClients(); const sortedClients = sortClient...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a8c7329f7d437031760e1f5719cc9f7ed3cc73a
client/src/reducers/index.js
github.com/AdguardTeam/golibs v0.11.2
<mask> go 1.18 <mask> <mask> require ( <mask> github.com/AdguardTeam/dnsproxy v0.46.2 <mask> github.com/AdguardTeam/golibs v0.11.0 <mask> github.com/AdguardTeam/urlfilter v0.16.0 <mask> github.com/NYTimes/gziphandler v1.1.1 <mask> github.com/ameshkov/dnscrypt/v2 v2.2.5 <mask> github.com/digineo/go-ipset...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
go.mod
github.com/AdguardTeam/golibs v0.11.2 h1:JbQB1Dg2JWStXgHh1QqBbOLWnP4t9oDjppoBH6TVXSE= github.com/AdguardTeam/golibs v0.11.2/go.mod h1:87bN2x4VsTritptE3XZg9l8T6gznWsIxHBcQ1DeRIXA=
<mask> github.com/AdguardTeam/dnsproxy v0.46.2 h1:ZUKM713Ts5meYQqk6cJkUBMCFSWqFPXTgjXkN4RI1Vo= <mask> github.com/AdguardTeam/dnsproxy v0.46.2/go.mod h1:PAmRzFqls0E92XTglyY2ESAqMAzZJhHKErG1ZpRnpjA= <mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4= <mask> github.com/Ad...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
go.sum
// // TODO(a.garipov): Replace with testutil.
<mask> <mask> // DiscardLogOutput runs tests with discarded logger output. <mask> func DiscardLogOutput(m *testing.M) { <mask> // TODO(e.burkov): Refactor code and tests to not use the global mutable <mask> // logger. <mask> log.SetOutput(io.Discard) <mask> <mask> os.Exit(m.Run()) </s> Pull request: 5035...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/aghtest/aghtest.go
"net/netip"
<mask> "encoding/binary" <mask> "net" <mask> "strings" <mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd" </s> Pull request: 5035-dhcp-hosts-netip-addr Updates #5035. Squashed commit of the following: commit 3a272842f738da322abb2bc5306aed94da79304b Author: Ainar Garipov <A.G...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
<mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/AdguardTeam/golibs/netutil" <mask> "github.com/AdguardTeam/golibs/stringutil" <mask> "github.com/miekg/dns" <mask> "golang.org/x/exp/slices" <mask> ) <mask> <mask> //lint:file-ignore SA1019 TODO(a.garipov): Replace [*netutil.IPMap]. <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
<mask> "github.com/miekg/dns" <mask> "golang.org/x/exp/slices" <mask> ) <mask> <mask> //lint:file-ignore SA1019 TODO(a.garipov): Replace [*netutil.IPMap]. <mask> <mask> // To transfer information between modules <mask> type dnsContext struct { <mask> proxyCtx *proxy.DNSContext <mask> <mask> // setts ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
func (s *Server) setTableIPToHost(t ipToHostTable) {
<mask> <mask> s.tableHostToIP = t <mask> } <mask> <mask> func (s *Server) setTableIPToHost(t *netutil.IPMap) { <mask> s.tableIPToHostLock.Lock() <mask> defer s.tableIPToHostLock.Unlock() <mask> <mask> s.tableIPToHost = t <mask> } </s> Pull request: 5035-dhcp-hosts-netip-addr Updates #5035. Squashed ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
<mask> s.tableIPToHost = t <mask> } <mask> <mask> func (s *Server) onDHCPLeaseChanged(flags int) { <mask> var err error <mask> <mask> add := true <mask> switch flags { <mask> case dhcpd.LeaseChangedAdded, <mask> dhcpd.LeaseChangedAddedStatic, <mask> dhcpd.LeaseChangedRemovedStatic: <mask> // Go...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
s.setTableHostToIP(nil) s.setTableIPToHost(nil) return
<mask> dhcpd.LeaseChangedAddedStatic, <mask> dhcpd.LeaseChangedRemovedStatic: <mask> // Go on. <mask> case dhcpd.LeaseChangedRemovedAll: <mask> add = false <mask> default: <mask> return <mask> } <mask> <mask> var hostToIP hostToIPTable </s> Pull request: 5035-dhcp-hosts-netip-addr Updates #50...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
ll := s.dhcpServer.Leases(dhcpd.LeasesAll) hostToIP := make(hostToIPTable, len(ll)) ipToHost := make(ipToHostTable, len(ll)) for _, l := range ll { // TODO(a.garipov): Remove this after we're finished with the client // hostname validations in the DHCP server code. err := netutil.ValidateDomainName(l.Hostnam...
<mask> default: <mask> return <mask> } <mask> <mask> var hostToIP hostToIPTable <mask> var ipToHost *netutil.IPMap <mask> if add { <mask> ll := s.dhcpServer.Leases(dhcpd.LeasesAll) <mask> <mask> hostToIP = make(hostToIPTable, len(ll)) <mask> ipToHost = netutil.NewIPMap(len(ll)) <mask> <mask...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
continue }
<mask> var ipToHost *netutil.IPMap <mask> if add { <mask> ll := s.dhcpServer.Leases(dhcpd.LeasesAll) <mask> <mask> hostToIP = make(hostToIPTable, len(ll)) <mask> ipToHost = netutil.NewIPMap(len(ll)) <mask> <mask> for _, l := range ll { <mask> // TODO(a.garipov): Remove this after we're finished ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
lowhost := strings.ToLower(l.Hostname + "." + s.localDomainSuffix)
<mask> <mask> hostToIP = make(hostToIPTable, len(ll)) <mask> ipToHost = netutil.NewIPMap(len(ll)) <mask> <mask> for _, l := range ll { <mask> // TODO(a.garipov): Remove this after we're finished with the client <mask> // hostname validations in the DHCP server code. <mask> err = netutil.Validat...
[ "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/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
// Assume that we only process IPv4 now. // // TODO(a.garipov): Remove once we switch to netip.Addr more fully. ip, err := netutil.IPToAddr(l.IP, netutil.AddrFamilyIPv4) if err != nil { log.Debug("dnsforward: skipping invalid ip %v from dhcp: %s", l.IP, err)
<mask> err, <mask> ) <mask> } <mask> <mask> lowhost := strings.ToLower(l.Hostname + "." + s.localDomainSuffix) <mask> ip := slices.Clone(l.IP) <mask> <mask> ipToHost.Set(ip, lowhost) <mask> hostToIP[lowhost] = ip <mask> } <mask> </s> Pull request: 5035-dhcp-hosts-netip-addr Upd...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
continue
<mask> <mask> lowhost := strings.ToLower(l.Hostname + "." + s.localDomainSuffix) <mask> ip := slices.Clone(l.IP) <mask> <mask> ipToHost.Set(ip, lowhost) <mask> hostToIP[lowhost] = ip <mask> } <mask> <mask> log.Debug("dns: added %d A/PTR entries from DHCP", ipToHost.Len()) <mask> } <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
ipToHost[ip] = lowhost hostToIP[lowhost] = ip
<mask> ipToHost.Set(ip, lowhost) <mask> hostToIP[lowhost] = ip <mask> } <mask> <mask> log.Debug("dns: added %d A/PTR entries from DHCP", ipToHost.Len()) <mask> } <mask> <mask> s.setTableHostToIP(hostToIP) <mask> s.setTableIPToHost(ipToHost) <mask> } </s> Pull request: 5035-dhcp-hosts-netip-add...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
log.Debug("dnsforward: added %d a and ptr entries from dhcp", len(ipToHost))
<mask> } <mask> <mask> s.setTableHostToIP(hostToIP) <mask> s.setTableIPToHost(ipToHost) <mask> } <mask> <mask> // processDDRQuery responds to Discovery of Designated Resolvers (DDR) SVCB <mask> // queries. The response contains different types of encryption supported by <mask> // current user configurati...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
func (s *Server) dhcpHostToIP(host string) (ip netip.Addr, ok bool) {
<mask> <mask> // dhcpHostToIP tries to get an IP leased by DHCP and returns the copy of <mask> // address since the data inside the internal table may be changed while request <mask> // processing. It's safe for concurrent use. <mask> func (s *Server) dhcpHostToIP(host string) (ip net.IP, ok bool) { <mask> s.t...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
ip, ok = s.tableHostToIP[host]
<mask> func (s *Server) dhcpHostToIP(host string) (ip net.IP, ok bool) { <mask> s.tableHostToIPLock.Lock() <mask> defer s.tableHostToIPLock.Unlock() <mask> <mask> if s.tableHostToIP == nil { <mask> return nil, false <mask> } <mask> <mask> var ipFromTable net.IP <mask> ipFromTable, ok = s.tableHostTo...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
return ip, ok
<mask> if s.tableHostToIP == nil { <mask> return nil, false <mask> } <mask> <mask> var ipFromTable net.IP <mask> ipFromTable, ok = s.tableHostToIP[host] <mask> if !ok { <mask> return nil, false <mask> } <mask> <mask> ip = make(net.IP, len(ipFromTable)) <mask> copy(ip, ipFromTable) <mask> <m...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
log.Debug("dnsforward: %q requests for dhcp host %q", pctx.Addr, reqHost)
<mask> return resultCodeSuccess <mask> } <mask> <mask> if !dctx.isLocalClient { <mask> log.Debug("dns: %q requests for dhcp host %q", pctx.Addr, reqHost) <mask> pctx.Res = s.genNXDomain(req) <mask> <mask> // Do not even put into query log. <mask> return resultCodeFinish <mask> } </s> Pull requ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
log.Debug("dnsforward: no dhcp record for %q", reqHost)
<mask> ip, ok := s.dhcpHostToIP(reqHost) <mask> if !ok { <mask> // Go on and process them with filters, including dnsrewrite ones, and <mask> // possibly route them to a domain-specific upstream. <mask> log.Debug("dns: no dhcp record for %q", reqHost) <mask> <mask> return resultCodeSuccess <mask> } ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
log.Debug("dnsforward: dhcp record for %q is %s", reqHost, ip)
<mask> <mask> return resultCodeSuccess <mask> } <mask> <mask> log.Debug("dns: dhcp record for %q is %s", reqHost, ip) <mask> <mask> resp := s.makeResponse(req) <mask> if q.Qtype == dns.TypeA { <mask> a := &dns.A{ <mask> Hdr: s.hdr(req, dns.TypeA), </s> Pull request: 5035-dhcp-hosts-netip-addr ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
A: ip.AsSlice(),
<mask> resp := s.makeResponse(req) <mask> if q.Qtype == dns.TypeA { <mask> a := &dns.A{ <mask> Hdr: s.hdr(req, dns.TypeA), <mask> A: ip, <mask> } <mask> resp.Answer = append(resp.Answer, a) <mask> } <mask> dctx.proxyCtx.Res = resp <mask> </s> Pull request: 5035-dhcp-hosts-netip-addr Updat...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
log.Debug("dnsforward: parsing reversed addr: %s", err)
<mask> } <mask> <mask> ip, err := netutil.IPFromReversedAddr(q.Name) <mask> if err != nil { <mask> log.Debug("dns: parsing reversed addr: %s", err) <mask> <mask> // DNS-Based Service Discovery uses PTR records having not an ARPA <mask> // format of the domain name in question. Those shouldn't be <m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
log.Debug("dnsforward: validating service domain: %s", err)
<mask> // invalidated. See http://www.dns-sd.org/ServerStaticSetup.html and <mask> // RFC 2782. <mask> name := strings.TrimSuffix(q.Name, ".") <mask> if err = netutil.ValidateSRVDomainName(name); err != nil { <mask> log.Debug("dns: validating service domain: %s", err) <mask> <mask> return resultC...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
log.Debug("dnsforward: request is for a service domain")
<mask> <mask> return resultCodeError <mask> } <mask> <mask> log.Debug("dns: request is for a service domain") <mask> <mask> return resultCodeSuccess <mask> } <mask> <mask> // Restrict an access to local addresses for external clients. We also </s> Pull request: 5035-dhcp-hosts-netip-addr Upd...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
log.Debug("dnsforward: addr %s is not from locally-served network", ip)
<mask> // Restrict an access to local addresses for external clients. We also <mask> // assume that all the DHCP leases we give are locally-served or at least <mask> // don't need to be accessible externally. <mask> if !s.privateNets.Contains(ip) { <mask> log.Debug("dns: addr %s is not from locally-served n...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
log.Debug("dnsforward: %q requests an internal ip", pctx.Addr)
<mask> return resultCodeSuccess <mask> } <mask> <mask> if !dctx.isLocalClient { <mask> log.Debug("dns: %q requests an internal ip", pctx.Addr) <mask> pctx.Res = s.genNXDomain(req) <mask> <mask> // Do not even put into query log. <mask> return resultCodeFinish <mask> } </s> Pull request: 5035-d...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
func (s *Server) ipToDHCPHost(ip netip.Addr) (host string, ok bool) {
<mask> } <mask> <mask> // ipToDHCPHost tries to get a hostname leased by DHCP. It's safe for <mask> // concurrent use. <mask> func (s *Server) ipToDHCPHost(ip net.IP) (host string, ok bool) { <mask> s.tableIPToHostLock.Lock() <mask> defer s.tableIPToHostLock.Unlock() <mask> <mask> if s.tableIPToHost == n...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
host, ok = s.tableIPToHost[ip]
<mask> func (s *Server) ipToDHCPHost(ip net.IP) (host string, ok bool) { <mask> s.tableIPToHostLock.Lock() <mask> defer s.tableIPToHostLock.Unlock() <mask> <mask> if s.tableIPToHost == nil { <mask> return "", false <mask> } <mask> <mask> var v any <mask> v, ok = s.tableIPToHost.Get(ip) <mask> if !...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
return host, ok
<mask> <mask> return "", false <mask> } <mask> <mask> return host, true <mask> } <mask> <mask> // processDHCPAddrs responds to PTR requests if the target IP is leased by the <mask> // DHCP server. <mask> func (s *Server) processDHCPAddrs(dctx *dnsContext) (rc resultCode) { </s> Pull request: 5035-dhcp...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
// TODO(a.garipov): Remove once we switch to netip.Addr more fully. ipAddr, err := netutil.IPToAddrNoMapped(ip) if err != nil { log.Debug("dnsforward: bad reverse ip %v from dhcp: %s", ip, err) return resultCodeSuccess } host, ok := s.ipToDHCPHost(ipAddr)
<mask> if ip == nil { <mask> return resultCodeSuccess <mask> } <mask> <mask> host, ok := s.ipToDHCPHost(ip) <mask> if !ok { <mask> return resultCodeSuccess <mask> } <mask> <mask> log.Debug("dns: dhcp reverse record for %s is %q", ip, host) </s> Pull request: 5035-dhcp-hosts-netip-addr Updates #5...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
log.Debug("dnsforward: dhcp reverse record for %s is %q", ip, host)
<mask> if !ok { <mask> return resultCodeSuccess <mask> } <mask> <mask> log.Debug("dns: dhcp reverse record for %s is %q", ip, host) <mask> <mask> req := pctx.Req <mask> resp := s.makeResponse(req) <mask> ptr := &dns.PTR{ <mask> Hdr: dns.RR_Header{ </s> Pull request: 5035-dhcp-hosts-netip-addr Up...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
log.Debug("dnsforward: dhcp client hostname %q was not filtered", reqHost)
<mask> // Respond with an NXDOMAIN. <mask> // <mask> // TODO(a.garipov): Route such queries to a custom upstream for the <mask> // local domain name if there is one. <mask> log.Debug("dns: dhcp client hostname %q was not filtered", reqHost) <mask> pctx.Res = s.genNXDomain(req) <mask> <mask> retur...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
log.Error("dnsforward: getting custom upstreams for client %s: %s", id, err)
<mask> // Use the ClientID first, since it has a higher priority. <mask> id := stringutil.Coalesce(clientID, ipStringFromAddr(pctx.Addr)) <mask> upsConf, err := customUpsByClient(id) <mask> if err != nil { <mask> log.Error("dns: getting custom upstreams for client %s: %s", id, err) <mask> <mask> return ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
log.Debug("dnsforward: using custom upstreams for client %s", id)
<mask> return <mask> } <mask> <mask> if upsConf != nil { <mask> log.Debug("dns: using custom upstreams for client %s", id) <mask> } <mask> <mask> pctx.CustomUpstreamConfig = upsConf <mask> } <mask> </s> Pull request: 5035-dhcp-hosts-netip-addr Updates #5035. Squashed commit of the following: co...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns.go
"net/netip"
<mask> import ( <mask> "net" <mask> "testing" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest" <mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering" <mask> "github.com/AdguardTeam/dnsproxy/proxy" </s> Pull request: 5035-dhcp-hosts-netip-addr Updates #5035. Squashed commit of ...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns_test.go
"github.com/AdguardTeam/golibs/testutil"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering" <mask> "github.com/AdguardTeam/dnsproxy/proxy" <mask> "github.com/AdguardTeam/dnsproxy/upstream" <mask> "github.com/AdguardTeam/golibs/netutil" <mask> "github.com/miekg/dns" <mask> "github.com/stretchr/testify/assert" <mask> "github.com/stretc...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns_test.go
knownIP := netip.MustParseAddr("1.2.3.4")
<mask> } <mask> } <mask> <mask> func TestServer_ProcessDHCPHosts_localRestriction(t *testing.T) { <mask> knownIP := net.IP{1, 2, 3, 4} <mask> <mask> testCases := []struct { <mask> name string <mask> host string <mask> wantIP net.IP <mask> wantRes resultCode </s> Pull request:...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns_test.go
wantIP netip.Addr
<mask> <mask> testCases := []struct { <mask> name string <mask> host string <mask> wantIP net.IP <mask> wantRes resultCode <mask> isLocalCli bool <mask> }{{ <mask> name: "local_client_success", <mask> host: "example.lan", </s> Pull request: 5035-dhcp-hosts-neti...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns_test.go
wantIP: netip.Addr{},
<mask> isLocalCli: true, <mask> }, { <mask> name: "local_client_unknown_host", <mask> host: "wronghost.lan", <mask> wantIP: nil, <mask> wantRes: resultCodeSuccess, <mask> isLocalCli: true, <mask> }, { <mask> name: "external_client_known_host", <mask> host: "exa...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns_test.go
wantIP: netip.Addr{},
<mask> isLocalCli: true, <mask> }, { <mask> name: "external_client_known_host", <mask> host: "example.lan", <mask> wantIP: nil, <mask> wantRes: resultCodeFinish, <mask> isLocalCli: false, <mask> }, { <mask> name: "external_client_unknown_host", <mask> host: "wr...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns_test.go
wantIP: netip.Addr{},
<mask> isLocalCli: false, <mask> }, { <mask> name: "external_client_unknown_host", <mask> host: "wronghost.lan", <mask> wantIP: nil, <mask> wantRes: resultCodeFinish, <mask> isLocalCli: false, <mask> }} <mask> <mask> for _, tc := range testCases { </s> Pull request: 5035-dh...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns_test.go
if tc.wantIP == (netip.Addr{}) {
<mask> <mask> return <mask> } <mask> <mask> if tc.wantIP == nil { <mask> assert.Nil(t, pctx.Res) <mask> } else { <mask> require.NotNil(t, pctx.Res) <mask> <mask> ans := pctx.Res.Answer </s> Pull request: 5035-dhcp-hosts-netip-addr Updates #5035. Squashed commit of the following:...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns_test.go
a := testutil.RequireTypeAssert[*dns.A](t, ans[0]) ip, err := netutil.IPToAddr(a.A, netutil.AddrFamilyIPv4) require.NoError(t, err) assert.Equal(t, tc.wantIP, ip)
<mask> <mask> ans := pctx.Res.Answer <mask> require.Len(t, ans, 1) <mask> <mask> assert.Equal(t, tc.wantIP, ans[0].(*dns.A).A) <mask> } <mask> }) <mask> } <mask> } <mask> </s> Pull request: 5035-dhcp-hosts-netip-addr Updates #5035. Squashed commit of the following: commit 3a272842f738...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns_test.go
knownIP := netip.MustParseAddr("1.2.3.4")
<mask> examplecom = "example.com" <mask> examplelan = "example." + defaultLocalDomainSuffix <mask> ) <mask> <mask> knownIP := net.IP{1, 2, 3, 4} <mask> testCases := []struct { <mask> name string <mask> host string <mask> suffix string <mask> wantIP net.IP </s> Pull request: 5035-dhcp-...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns_test.go
wantIP netip.Addr
<mask> testCases := []struct { <mask> name string <mask> host string <mask> suffix string <mask> wantIP net.IP <mask> wantRes resultCode <mask> qtyp uint16 <mask> }{{ <mask> name: "success_external", <mask> host: examplecom, </s> Pull request: 5035-dhcp-hosts-netip-addr Up...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns_test.go
wantIP: netip.Addr{},
<mask> }{{ <mask> name: "success_external", <mask> host: examplecom, <mask> suffix: defaultLocalDomainSuffix, <mask> wantIP: nil, <mask> wantRes: resultCodeSuccess, <mask> qtyp: dns.TypeA, <mask> }, { <mask> name: "success_external_non_a", <mask> host: examplecom, </s> Pull...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns_test.go
wantIP: netip.Addr{},
<mask> }, { <mask> name: "success_external_non_a", <mask> host: examplecom, <mask> suffix: defaultLocalDomainSuffix, <mask> wantIP: nil, <mask> wantRes: resultCodeSuccess, <mask> qtyp: dns.TypeCNAME, <mask> }, { <mask> name: "success_internal", <mask> host: examplelan, </s>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns_test.go
wantIP: netip.Addr{},
<mask> }, { <mask> name: "success_internal_unknown", <mask> host: "example-new.lan", <mask> suffix: defaultLocalDomainSuffix, <mask> wantIP: nil, <mask> wantRes: resultCodeSuccess, <mask> qtyp: dns.TypeA, <mask> }, { <mask> name: "success_internal_aaaa", <mask> host: example...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns_test.go
wantIP: netip.Addr{},
<mask> }, { <mask> name: "success_internal_aaaa", <mask> host: examplelan, <mask> suffix: defaultLocalDomainSuffix, <mask> wantIP: nil, <mask> wantRes: resultCodeSuccess, <mask> qtyp: dns.TypeAAAA, <mask> }, { <mask> name: "success_custom_suffix", <mask> host: "example.custo...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns_test.go
} else if tc.wantIP == (netip.Addr{}) {
<mask> require.NotNil(t, pctx.Res) <mask> <mask> ans := pctx.Res.Answer <mask> require.Len(t, ans, 0) <mask> } else if tc.wantIP == nil { <mask> assert.Nil(t, pctx.Res) <mask> } else { <mask> require.NotNil(t, pctx.Res) <mask> <mask> ans := pctx.Res.Answer </s> Pull request: 5...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns_test.go
a := testutil.RequireTypeAssert[*dns.A](t, ans[0]) ip, err := netutil.IPToAddr(a.A, netutil.AddrFamilyIPv4) require.NoError(t, err) assert.Equal(t, tc.wantIP, ip)
<mask> <mask> ans := pctx.Res.Answer <mask> require.Len(t, ans, 1) <mask> <mask> assert.Equal(t, tc.wantIP, ans[0].(*dns.A).A) <mask> } <mask> }) <mask> } <mask> } <mask> </s> Pull request: 5035-dhcp-hosts-netip-addr Updates #5035. Squashed commit of the following: commit 3a272842f738...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dns_test.go
"net/netip"
<mask> import ( <mask> "fmt" <mask> "net" <mask> "net/http" <mask> "runtime" <mask> "strings" <mask> "sync" <mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> Pull request: 5035-dhcp-hosts-netip-addr Updates #5035. Squashed commit of the following: commit 3a2728...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dnsforward.go
<mask> "github.com/AdguardTeam/golibs/stringutil" <mask> "github.com/miekg/dns" <mask> ) <mask> <mask> //lint:file-ignore SA1019 TODO(a.garipov): Replace [*netutil.IPMap]. <mask> <mask> // DefaultTimeout is the default upstream timeout <mask> const DefaultTimeout = 10 * time.Second <mask> <mask> // defa...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dnsforward.go
// hostToIPTable is a convenient type alias for tables of host names to an IP // address. type hostToIPTable = map[string]netip.Addr // ipToHostTable is a convenient type alias for tables of IP addresses to their // host names. For example, for use with PTR queries. type ipToHostTable = map[netip.Addr]string
<mask> var defaultBlockedHosts = []string{"version.bind", "id.server", "hostname.bind"} <mask> <mask> var webRegistered bool <mask> <mask> // hostToIPTable is an alias for the type of Server.tableHostToIP. <mask> type hostToIPTable = map[string]net.IP <mask> <mask> // Server is the main way to start a DNS se...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dnsforward.go
tableIPToHost ipToHostTable
<mask> <mask> tableHostToIP hostToIPTable <mask> tableHostToIPLock sync.Mutex <mask> <mask> // TODO(e.burkov): Use map[netip.Addr]struct{} instead. <mask> tableIPToHost *netutil.IPMap <mask> tableIPToHostLock sync.Mutex <mask> <mask> // clientIDCache is a temporary storage for ClientIDs that ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dnsforward.go
testutil.DiscardLogOutput(m)
<mask> "github.com/stretchr/testify/require" <mask> ) <mask> <mask> func TestMain(m *testing.M) { <mask> aghtest.DiscardLogOutput(m) <mask> } <mask> <mask> const ( <mask> tlsServerName = "testdns.adguard.com" <mask> testMessagesCount = 10 </s> Pull request: 5035-dhcp-hosts-netip-addr Updates #5035...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dnsforward_test.go
ans := resp.Answer[0] assert.Equal(t, dns.TypePTR, ans.Header().Rrtype) assert.Equal(t, "34.12.168.192.in-addr.arpa.", ans.Header().Name) ptr := testutil.RequireTypeAssert[*dns.PTR](t, ans)
<mask> require.NoErrorf(t, err, "%s", addr) <mask> <mask> require.Len(t, resp.Answer, 1) <mask> <mask> assert.Equal(t, dns.TypePTR, resp.Answer[0].Header().Rrtype) <mask> assert.Equal(t, "34.12.168.192.in-addr.arpa.", resp.Answer[0].Header().Name) <mask> <mask> ptr, ok := resp.Answer[0].(*dns.PTR) <mas...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dnsforward_test.go
<mask> <mask> assert.Equal(t, dns.TypePTR, resp.Answer[0].Header().Rrtype) <mask> assert.Equal(t, "34.12.168.192.in-addr.arpa.", resp.Answer[0].Header().Name) <mask> <mask> ptr, ok := resp.Answer[0].(*dns.PTR) <mask> require.True(t, ok) <mask> assert.Equal(t, dns.Fqdn("myhost."+localDomain), ptr.Ptr) <ma...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a935d4ffbd20c48b9f03d3eeb1c2b527e85ca32
internal/dnsforward/dnsforward_test.go
github.com/AdguardTeam/golibs v0.4.3
<mask> go 1.14 <mask> <mask> require ( <mask> github.com/AdguardTeam/dnsproxy v0.33.2 <mask> github.com/AdguardTeam/golibs v0.4.2 <mask> github.com/AdguardTeam/urlfilter v0.12.3 <mask> github.com/NYTimes/gziphandler v1.1.1 <mask> github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a9c6e8a02c6fd7805a6d6100f9e57b2e6bbca8b
go.mod
<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-...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a9c6e8a02c6fd7805a6d6100f9e57b2e6bbca8b
go.sum
github.com/AdguardTeam/golibs v0.4.3 h1:nXTLLLlIyU4BSRF0An5azS0uimSK/YpIMOBAO0/v1RY= github.com/AdguardTeam/golibs v0.4.3/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/dnsproxy v0.33.2/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA= <mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4= <mask> github.com/AdguardTeam/golibs v0.4.2 h1:7M28oTZFoFwNmp8eGPb3ImmYbxGaJLyQXeIFVHjME0o= <mask> github.com/Adgua...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a9c6e8a02c6fd7805a6d6100f9e57b2e6bbca8b
go.sum
<mask> golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= <mask> golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU= <mask> golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt3...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a9c6e8a02c6fd7805a6d6100f9e57b2e6bbca8b
go.sum
<mask> golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4= <mask> golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= <mask> golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9Dt...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a9c6e8a02c6fd7805a6d6100f9e57b2e6bbca8b
go.sum
"bytes"
<mask> package dnsfilter <mask> <mask> import ( <mask> "fmt" <mask> "net" <mask> "strings" <mask> "testing" </s> Pull request: cover with tests Merge in DNS/adguard-home from 2271-cover-with-tests to master Updates #2271. Squashed commit of the following: commit db6440efe05171bc15367a2996521848ca348053...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a9c6e8a02c6fd7805a6d6100f9e57b2e6bbca8b
internal/dnsfilter/dnsfilter_test.go
"strings"
<mask> import ( <mask> "bytes" <mask> "fmt" <mask> "net" <mask> "testing" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/testutil" <mask> "github.com/AdguardTeam/golibs/log" </s> Pull request: cover with tests Merge in DNS/adguard-home from 2271-cover-with-tests to master Updates #2271. S...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a9c6e8a02c6fd7805a6d6100f9e57b2e6bbca8b
internal/dnsfilter/dnsfilter_test.go
"github.com/AdguardTeam/golibs/log"
<mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/testutil" <mask> "github.com/AdguardTeam/urlfilter/rules" <mask> "github.com/miekg/dns" <mask> "github.com/stretchr/testify/assert" <mask> ) </s> Pull request: cover with tests Merge in DNS/adguard-home from 2271-cover-with-tests to master Updates...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a9c6e8a02c6fd7805a6d6100f9e57b2e6bbca8b
internal/dnsfilter/dnsfilter_test.go
logOutput := &bytes.Buffer{} testutil.ReplaceLogWriter(t, logOutput) testutil.ReplaceLogLevel(t, log.DEBUG)
<mask> <mask> func TestSafeBrowsing(t *testing.T) { <mask> d := NewForTest(&Config{SafeBrowsingEnabled: true}, nil) <mask> defer d.Close() <mask> gctx.stats.Safebrowsing.Requests = 0 <mask> d.checkMatch(t, "wmconvirus.narod.ru") </s> Pull request: cover with tests Merge in DNS/adguard-home from 2271-cover-...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a9c6e8a02c6fd7805a6d6100f9e57b2e6bbca8b
internal/dnsfilter/dnsfilter_test.go
assert.True(t, strings.Contains(logOutput.String(), "SafeBrowsing lookup for wmconvirus.narod.ru"))
<mask> d := NewForTest(&Config{SafeBrowsingEnabled: true}, nil) <mask> defer d.Close() <mask> gctx.stats.Safebrowsing.Requests = 0 <mask> d.checkMatch(t, "wmconvirus.narod.ru") <mask> d.checkMatch(t, "test.wmconvirus.narod.ru") <mask> d.checkMatchEmpty(t, "yandex.ru") <mask> d.checkMatchEmpty(t, "pornhub....
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a9c6e8a02c6fd7805a6d6100f9e57b2e6bbca8b
internal/dnsfilter/dnsfilter_test.go
logOutput := &bytes.Buffer{} testutil.ReplaceLogWriter(t, logOutput) testutil.ReplaceLogLevel(t, log.DEBUG)
<mask> <mask> // PARENTAL <mask> <mask> func TestParentalControl(t *testing.T) { <mask> d := NewForTest(&Config{ParentalEnabled: true}, nil) <mask> defer d.Close() <mask> d.checkMatch(t, "pornhub.com") <mask> assert.True(t, strings.Contains(logOutput.String(), "Parental lookup for pornhub.com")) <mask> ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a9c6e8a02c6fd7805a6d6100f9e57b2e6bbca8b
internal/dnsfilter/dnsfilter_test.go
assert.True(t, strings.Contains(logOutput.String(), "Parental lookup for pornhub.com"))
<mask> <mask> d := NewForTest(&Config{ParentalEnabled: true}, nil) <mask> defer d.Close() <mask> d.checkMatch(t, "pornhub.com") <mask> d.checkMatch(t, "www.pornhub.com") <mask> d.checkMatchEmpty(t, "www.yandex.ru") <mask> d.checkMatchEmpty(t, "yandex.ru") <mask> d.checkMatchEmpty(t, "api.jquery.com") <...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a9c6e8a02c6fd7805a6d6100f9e57b2e6bbca8b
internal/dnsfilter/dnsfilter_test.go
"github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "crypto/sha256" <mask> "strings" <mask> "testing" <mask> <mask> "github.com/AdguardTeam/golibs/cache" <mask> "github.com/miekg/dns" <mask> "github.com/stretchr/testify/assert" <mask> ) <mask> </s> Pull request: cover with tests Merge in DNS/adguard-home from 2271-cover-with-tests to master Up...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a9c6e8a02c6fd7805a6d6100f9e57b2e6bbca8b
internal/dnsfilter/sb_pc_test.go
"github.com/miekg/dns"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr" <mask> "github.com/AdguardTeam/golibs/cache" <mask> "github.com/stretchr/testify/assert" <mask> ) <mask> <mask> func TestSafeBrowsingHash(t *testing.T) { <mask> // test hostnameToHashes() <mask> hashes := hostnameToHashes("1.2.3.sub.host.com") <...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a9c6e8a02c6fd7805a6d6100f9e57b2e6bbca8b
internal/dnsfilter/sb_pc_test.go
s.conf.ConfigModified = func() {}
<mask> s.conf.UDPListenAddr = &net.UDPAddr{Port: 0} <mask> s.conf.TCPListenAddr = &net.TCPAddr{Port: 0} <mask> s.conf.UpstreamDNS = []string{"8.8.8.8:53", "8.8.4.4:53"} <mask> s.conf.FilteringConfig.ProtectionEnabled = true <mask> err := s.Prepare(nil) <mask> assert.True(t, err == nil) <mask> return s <m...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a9c6e8a02c6fd7805a6d6100f9e57b2e6bbca8b
internal/dnsforward/dnsforward_test.go
"bytes" "strings"
<mask> <mask> import ( <mask> "testing" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/testutil" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/stretchr/testify/assert" <mask> ) </s> Pull request: cover with tests Merge in DNS/adguard-home from 2271-cover-with-tests to master ...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a9c6e8a02c6fd7805a6d6100f9e57b2e6bbca8b
internal/querylog/decode_test.go