docstring_tokens stringlengths 18 16.9k | code_tokens stringlengths 75 1.81M | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|
keep add keep keep keep keep keep keep | <mask> "sort"
<mask> "strings"
<mask> )
<mask>
<mask> func clamp(value, low, high int) int {
<mask> if value < low {
<mask> return low
<mask> }
</s> API /stats_top -- show only top entries for last 3 minutes </s> add func getTime(entry map[string]interface{}) time.Time {
t, ok := entry["time"]
if !ok {
return time.Time{}
}
tstr, ok := t.(string)
if !ok {
return time.Time{}
}
value, err := time.Parse(time.RFC3339, tstr)
if err != nil {
return time.Time{}
}
return value
}
</s> add time := getTime(entry)
if time.Before(notBefore) {
// skip if the entry is before specified cutoff
continue
} </s> add now := time.Now()
timeWindow := time.Minute * 3
notBefore := now.Add(timeWindow * -1) | https://github.com/AdguardTeam/AdGuardHome/commit/8198b65f29f83e2ff51d4c0f89a7b7dcbe9c2fc1 | helpers.go |
keep add keep keep keep keep keep | <mask> }
<mask>
<mask> // -------------------------------------------------
<mask> // helper functions for parsing parameters from body
<mask> // -------------------------------------------------
<mask> func parseParametersFromBody(r io.Reader) (map[string]string, error) {
<mask> parameters := map[string]string{}
</s> API /stats_top -- show only top entries for last 3 minutes </s> add time := getTime(entry)
if time.Before(notBefore) {
// skip if the entry is before specified cutoff
continue
} </s> add now := time.Now()
timeWindow := time.Minute * 3
notBefore := now.Add(timeWindow * -1) </s> add "time" | https://github.com/AdguardTeam/AdGuardHome/commit/8198b65f29f83e2ff51d4c0f89a7b7dcbe9c2fc1 | helpers.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> Neighbors() (ns []Neighbor)
<mask> }
<mask>
<mask> // NewARPDB returns the ARPDB properly initialized for the OS.
<mask> func NewARPDB() (arp ARPDB, err error) {
<mask> arp = newARPDB()
<mask>
<mask> err = arp.Refresh()
<mask> if err != nil {
<mask> return nil, fmt.Errorf("arpdb initial refresh: %w", err)
<mask> }
<mask>
<mask> return arp, nil
<mask> }
<mask>
<mask> // Empty ARPDB implementation
<mask>
<mask> // EmptyARPDB is the ARPDB implementation that does nothing.
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> add func TestNewARPDB(t *testing.T) {
var a ARPDB
require.NotPanics(t, func() {
a = NewARPDB()
})
assert.NotNil(t, a)
}
</s> remove s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
</s> add s.sysResolvers, err = aghnet.NewSystemResolvers(nil) </s> remove }
if len(ifaces) == 0 {
</s> add } else if len(ifaces) == 0 { </s> remove // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
defer log.OnPanic("systemResolvers")
// TODO(e.burkov): Implement a functionality to stop ticker.
for range tickCh {
err := sr.refresh()
if err != nil {
log.Error("systemResolvers: error in refreshing goroutine: %s", err)
continue
}
log.Debug("systemResolvers: local addresses cache is refreshed")
}
}
</s> add </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) </s> remove refreshIvl time.Duration,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/arpdb.go |
keep keep keep add keep keep keep keep | <mask> "net"
<mask> )
<mask>
<mask> const arpAOutput = `
<mask> hostname.one (192.168.1.2) at ab:cd:ef:ab:cd:ef on en0 ifscope [ethernet]
<mask> hostname.two (::ffff:ffff) at ef:cd:ab:ef:cd:ab on em0 expires in 1198 seconds [ethernet]
<mask> ? (::1234) at aa:bb:cc:dd:ee:ff on ej0 expires in 1918 seconds [ethernet]
<mask> `
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> add ? (::1234) at aa:bb:cc:dd:ee:ff on ej0 expires in 1918 seconds [ethernet] </s> add invalid.mac (1.2.3.4) at 12:34:56:78:910 on el0 ifscope [ethernet]
invalid.ip (1.2.3.4.5) at ab:cd:ef:ab:cd:12 on ek0 ifscope [ethernet]
invalid.fmt 1 at 12:cd:ef:ab:cd:ef on er0 ifscope [ethernet] </s> add 1.2.3.4.5 dev enp0s3 lladdr aa:bb:cc:dd:ee:ff DELAY
1.2.3.4 dev enp0s3 lladdr 12:34:56:78:910 DELAY </s> add 1.2.3.4.5 0x1 0x2 aa:bb:cc:dd:ee:ff * wan
1.2.3.4 0x1 0x2 12:34:56:78:910 * wan </s> add 1.2.3.4.5 aa:bb:cc:dd:ee:ff em0 permanent
1.2.3.4 12:34:56:78:910 em0 permanent </s> remove "time"
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/arpdb_bsd_test.go |
keep add keep keep keep keep keep | <mask> hostname.one (192.168.1.2) at ab:cd:ef:ab:cd:ef on en0 ifscope [ethernet]
<mask> hostname.two (::ffff:ffff) at ef:cd:ab:ef:cd:ab on em0 expires in 1198 seconds [ethernet]
<mask> `
<mask>
<mask> var wantNeighs = []Neighbor{{
<mask> Name: "hostname.one",
<mask> IP: net.IPv4(192, 168, 1, 2),
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> add invalid.mac (1.2.3.4) at 12:34:56:78:910 on el0 ifscope [ethernet]
invalid.ip (1.2.3.4.5) at ab:cd:ef:ab:cd:12 on ek0 ifscope [ethernet]
invalid.fmt 1 at 12:cd:ef:ab:cd:ef on er0 ifscope [ethernet] </s> add invalid.mac (1.2.3.4) at 12:34:56:78:910 on el0 ifscope [ethernet]
invalid.ip (1.2.3.4.5) at ab:cd:ef:ab:cd:12 on ek0 ifscope [ethernet]
invalid.fmt 1 at 12:cd:ef:ab:cd:ef on er0 ifscope [ethernet] </s> add 1.2.3.4.5 dev enp0s3 lladdr aa:bb:cc:dd:ee:ff DELAY
1.2.3.4 dev enp0s3 lladdr 12:34:56:78:910 DELAY </s> add 1.2.3.4.5 aa:bb:cc:dd:ee:ff em0 permanent
1.2.3.4 12:34:56:78:910 em0 permanent </s> add 1.2.3.4.5 0x1 0x2 aa:bb:cc:dd:ee:ff * wan
1.2.3.4 0x1 0x2 12:34:56:78:910 * wan </s> add }, {
Name: "",
IP: net.ParseIP("::1234"),
MAC: net.HardwareAddr{0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF}, | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/arpdb_bsd_test.go |
keep keep add keep | <mask> Name: "hostname.two",
<mask> IP: net.ParseIP("::ffff:ffff"),
<mask> MAC: net.HardwareAddr{0xEF, 0xCD, 0xAB, 0xEF, 0xCD, 0xAB},
<mask> }}
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> add ? (::1234) at aa:bb:cc:dd:ee:ff on ej0 expires in 1918 seconds [ethernet] </s> add 1.2.3.4.5 aa:bb:cc:dd:ee:ff em0 permanent
1.2.3.4 12:34:56:78:910 em0 permanent </s> add 1.2.3.4.5 dev enp0s3 lladdr aa:bb:cc:dd:ee:ff DELAY
1.2.3.4 dev enp0s3 lladdr 12:34:56:78:910 DELAY </s> remove var arpdb aghnet.ARPDB
arpdb, err = aghnet.NewARPDB()
if err != nil {
log.Info("warning: creating arpdb: %s; using stub", err)
arpdb = aghnet.EmptyARPDB{}
}
</s> add arpdb := aghnet.NewARPDB() </s> remove import (
"time"
"github.com/AdguardTeam/golibs/log"
)
</s> add </s> remove resolver *net.Resolver
hostGenFunc HostGenFunc
// addrs is the set that contains cached local resolvers' addresses.
addrs *stringutil.Set
</s> add // addrsLock protects addrs. | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/arpdb_bsd_test.go |
keep keep keep add keep keep keep keep keep | <mask> )
<mask>
<mask> const arpAOutputWrt = `
<mask> IP address HW type Flags HW address Mask Device
<mask> 192.168.1.2 0x1 0x2 ab:cd:ef:ab:cd:ef * wan
<mask> ::ffff:ffff 0x1 0x2 ef:cd:ab:ef:cd:ab * wan`
<mask>
<mask> const arpAOutput = `
<mask> invalid.mac (1.2.3.4) at 12:34:56:78:910 on el0 ifscope [ethernet]
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove 0.0.0.0 0x0 0x0 00:00:00:00:00:00 * unspec </s> add </s> add invalid.mac (1.2.3.4) at 12:34:56:78:910 on el0 ifscope [ethernet]
invalid.ip (1.2.3.4.5) at ab:cd:ef:ab:cd:12 on ek0 ifscope [ethernet]
invalid.fmt 1 at 12:cd:ef:ab:cd:ef on er0 ifscope [ethernet] </s> add invalid.mac (1.2.3.4) at 12:34:56:78:910 on el0 ifscope [ethernet]
invalid.ip (1.2.3.4.5) at ab:cd:ef:ab:cd:12 on ek0 ifscope [ethernet]
invalid.fmt 1 at 12:cd:ef:ab:cd:ef on er0 ifscope [ethernet] </s> add 1.2.3.4.5 aa:bb:cc:dd:ee:ff em0 permanent
1.2.3.4 12:34:56:78:910 em0 permanent </s> add ? (::1234) at aa:bb:cc:dd:ee:ff on ej0 expires in 1918 seconds [ethernet] </s> add 1.2.3.4.5 dev enp0s3 lladdr aa:bb:cc:dd:ee:ff DELAY
1.2.3.4 dev enp0s3 lladdr 12:34:56:78:910 DELAY | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/arpdb_linux_test.go |
keep add keep keep keep keep | <mask>
<mask> const arpAOutput = `
<mask> ? (192.168.1.2) at ab:cd:ef:ab:cd:ef on en0 ifscope [ethernet]
<mask> ? (::ffff:ffff) at ef:cd:ab:ef:cd:ab on em0 expires in 100 seconds [ethernet]`
<mask>
<mask> const ipNeighOutput = `
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> add invalid.mac (1.2.3.4) at 12:34:56:78:910 on el0 ifscope [ethernet]
invalid.ip (1.2.3.4.5) at ab:cd:ef:ab:cd:12 on ek0 ifscope [ethernet]
invalid.fmt 1 at 12:cd:ef:ab:cd:ef on er0 ifscope [ethernet] </s> add ? (::1234) at aa:bb:cc:dd:ee:ff on ej0 expires in 1918 seconds [ethernet] </s> add 1.2.3.4.5 dev enp0s3 lladdr aa:bb:cc:dd:ee:ff DELAY
1.2.3.4 dev enp0s3 lladdr 12:34:56:78:910 DELAY </s> add 1.2.3.4.5 0x1 0x2 aa:bb:cc:dd:ee:ff * wan
1.2.3.4 0x1 0x2 12:34:56:78:910 * wan </s> add 1.2.3.4.5 aa:bb:cc:dd:ee:ff em0 permanent
1.2.3.4 12:34:56:78:910 em0 permanent </s> remove 0.0.0.0 0x0 0x0 00:00:00:00:00:00 * unspec </s> add | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/arpdb_linux_test.go |
keep keep add keep keep keep keep keep | <mask> ? (::ffff:ffff) at ef:cd:ab:ef:cd:ab on em0 expires in 100 seconds [ethernet]`
<mask>
<mask> const ipNeighOutput = `
<mask> 192.168.1.2 dev enp0s3 lladdr ab:cd:ef:ab:cd:ef DELAY
<mask> ::ffff:ffff dev enp0s3 lladdr ef:cd:ab:ef:cd:ab router STALE`
<mask>
<mask> var wantNeighs = []Neighbor{{
<mask> IP: net.IPv4(192, 168, 1, 2),
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> add ? (::1234) at aa:bb:cc:dd:ee:ff on ej0 expires in 1918 seconds [ethernet] </s> add 1.2.3.4.5 aa:bb:cc:dd:ee:ff em0 permanent
1.2.3.4 12:34:56:78:910 em0 permanent </s> add invalid.mac (1.2.3.4) at 12:34:56:78:910 on el0 ifscope [ethernet]
invalid.ip (1.2.3.4.5) at ab:cd:ef:ab:cd:12 on ek0 ifscope [ethernet]
invalid.fmt 1 at 12:cd:ef:ab:cd:ef on er0 ifscope [ethernet] </s> add invalid.mac (1.2.3.4) at 12:34:56:78:910 on el0 ifscope [ethernet]
invalid.ip (1.2.3.4.5) at ab:cd:ef:ab:cd:12 on ek0 ifscope [ethernet]
invalid.fmt 1 at 12:cd:ef:ab:cd:ef on er0 ifscope [ethernet] </s> add 1.2.3.4.5 0x1 0x2 aa:bb:cc:dd:ee:ff * wan
1.2.3.4 0x1 0x2 12:34:56:78:910 * wan </s> remove 0.0.0.0 0x0 0x0 00:00:00:00:00:00 * unspec </s> add | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/arpdb_linux_test.go |
keep keep keep add keep keep keep keep keep keep | <mask> )
<mask>
<mask> const arpAOutput = `
<mask> Host Ethernet Address Netif Expire Flags
<mask> 192.168.1.2 ab:cd:ef:ab:cd:ef em0 19m56s
<mask> ::ffff:ffff ef:cd:ab:ef:cd:ab em0 permanent l
<mask> `
<mask>
<mask> var wantNeighs = []Neighbor{{
<mask> IP: net.IPv4(192, 168, 1, 2),
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> add 1.2.3.4.5 dev enp0s3 lladdr aa:bb:cc:dd:ee:ff DELAY
1.2.3.4 dev enp0s3 lladdr 12:34:56:78:910 DELAY </s> add ? (::1234) at aa:bb:cc:dd:ee:ff on ej0 expires in 1918 seconds [ethernet] </s> add 1.2.3.4.5 0x1 0x2 aa:bb:cc:dd:ee:ff * wan
1.2.3.4 0x1 0x2 12:34:56:78:910 * wan </s> add invalid.mac (1.2.3.4) at 12:34:56:78:910 on el0 ifscope [ethernet]
invalid.ip (1.2.3.4.5) at ab:cd:ef:ab:cd:12 on ek0 ifscope [ethernet]
invalid.fmt 1 at 12:cd:ef:ab:cd:ef on er0 ifscope [ethernet] </s> add invalid.mac (1.2.3.4) at 12:34:56:78:910 on el0 ifscope [ethernet]
invalid.ip (1.2.3.4.5) at ab:cd:ef:ab:cd:12 on ek0 ifscope [ethernet]
invalid.fmt 1 at 12:cd:ef:ab:cd:ef on er0 ifscope [ethernet] </s> remove 0.0.0.0 0x0 0x0 00:00:00:00:00:00 * unspec </s> add | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/arpdb_openbsd_test.go |
keep keep add keep keep keep keep keep keep | <mask> "strings"
<mask> "sync"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/testutil"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> add "github.com/AdguardTeam/golibs/errors" </s> remove "time"
</s> add </s> remove "time"
</s> add </s> remove "time"
</s> add </s> remove func createTestSystemResolversImp(
</s> add func createTestSystemResolversImpl( </s> add func TestNewARPDB(t *testing.T) {
var a ARPDB
require.NotPanics(t, func() {
a = NewARPDB()
})
assert.NotNil(t, a)
}
| https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/arpdb_test.go |
keep keep add keep keep keep keep keep | <mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> // TestARPDB is the mock implementation of ARPDB to use in tests.
<mask> type TestARPDB struct {
<mask> OnRefresh func() (err error)
<mask> OnNeighbors func() (ns []Neighbor)
<mask> }
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove func NewARPDB() (arp ARPDB, err error) {
arp = newARPDB()
err = arp.Refresh()
if err != nil {
return nil, fmt.Errorf("arpdb initial refresh: %w", err)
}
return arp, nil
</s> add func NewARPDB() (arp ARPDB) {
return newARPDB() </s> remove // Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use.
</s> add // Get returns the slice of local resolvers' addresses. It must be safe for
// concurrent use. </s> remove resolver *net.Resolver
hostGenFunc HostGenFunc
// addrs is the set that contains cached local resolvers' addresses.
addrs *stringutil.Set
</s> add // addrsLock protects addrs. </s> add // addrs is the set that contains cached local resolvers' addresses.
addrs *stringutil.Set
// resolver is used to fetch the resolvers' addresses.
resolver *net.Resolver
// hostGenFunc generates hosts to resolve.
hostGenFunc HostGenFunc </s> remove var ipStr string
</s> add </s> remove // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
defer log.OnPanic("systemResolvers")
// TODO(e.burkov): Implement a functionality to stop ticker.
for range tickCh {
err := sr.refresh()
if err != nil {
log.Error("systemResolvers: error in refreshing goroutine: %s", err)
continue
}
log.Debug("systemResolvers: local addresses cache is refreshed")
}
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/arpdb_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> log.Debug("%s: added ip-host pair %q-%q", hostsContainerPref, ip, h)
<mask> }
<mask> }
<mask>
<mask> // writeRules writes the actual rule for the qtype and the PTR for the
<mask> // host-ip pair into internal builders.
<mask> func (hp *hostsParser) writeRules(host string, ip net.IP) (rule, rulePtr string) {
<mask> arpa, err := netutil.IPToReversedAddr(ip)
<mask> if err != nil {
<mask> return "", ""
<mask> }
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
</s> add s.sysResolvers, err = aghnet.NewSystemResolvers(nil) </s> remove func NewARPDB() (arp ARPDB, err error) {
arp = newARPDB()
err = arp.Refresh()
if err != nil {
return nil, fmt.Errorf("arpdb initial refresh: %w", err)
}
return arp, nil
</s> add func NewARPDB() (arp ARPDB) {
return newARPDB() </s> remove // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
defer log.OnPanic("systemResolvers")
// TODO(e.burkov): Implement a functionality to stop ticker.
for range tickCh {
err := sr.refresh()
if err != nil {
log.Error("systemResolvers: error in refreshing goroutine: %s", err)
continue
}
log.Debug("systemResolvers: local addresses cache is refreshed")
}
}
</s> add </s> remove ipStr = parts[0]
</s> add host = parts[0] </s> remove refreshIvl time.Duration,
</s> add </s> remove // Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use.
</s> add // Get returns the slice of local resolvers' addresses. It must be safe for
// concurrent use. | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/hostscontainer.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> func GetValidNetInterfacesForWeb() ([]*NetInterface, error) {
<mask> ifaces, err := net.Interfaces()
<mask> if err != nil {
<mask> return nil, fmt.Errorf("couldn't get interfaces: %w", err)
<mask> }
<mask> if len(ifaces) == 0 {
<mask> return nil, errors.Error("couldn't find any legible interface")
<mask> }
<mask>
<mask> var netInterfaces []*NetInterface
<mask>
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove if refreshIvl > 0 {
ticker := time.NewTicker(refreshIvl)
go refreshWithTicker(sr, ticker.C)
}
</s> add </s> remove s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
</s> add s.sysResolvers, err = aghnet.NewSystemResolvers(nil) </s> remove func NewARPDB() (arp ARPDB, err error) {
arp = newARPDB()
err = arp.Refresh()
if err != nil {
return nil, fmt.Errorf("arpdb initial refresh: %w", err)
}
return arp, nil
</s> add func NewARPDB() (arp ARPDB) {
return newARPDB() </s> remove var arpdb aghnet.ARPDB
arpdb, err = aghnet.NewARPDB()
if err != nil {
log.Info("warning: creating arpdb: %s; using stub", err)
arpdb = aghnet.EmptyARPDB{}
}
</s> add arpdb := aghnet.NewARPDB() </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) </s> remove if net.ParseIP(ipStr) == nil {
</s> add if _, err = netutil.ParseIP(host); err != nil { | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/net.go |
keep keep add keep keep keep keep keep keep | <mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/AdguardTeam/golibs/testutil"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> add "testing/iotest" </s> remove "time"
</s> add </s> remove "time"
</s> add </s> remove func createTestSystemResolversImp(
</s> add func createTestSystemResolversImpl( </s> add func TestNewARPDB(t *testing.T) {
var a ARPDB
require.NotPanics(t, func() {
a = NewARPDB()
})
assert.NotNil(t, a)
}
</s> remove refreshDur time.Duration,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/net_test.go |
keep keep replace replace replace replace replace replace keep keep keep keep keep | <mask> package aghnet
<mask>
<mask> import (
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> // DefaultRefreshIvl is the default period of time between refreshing cached
<mask> // addresses.
<mask> // const DefaultRefreshIvl = 5 * time.Minute
<mask>
<mask> // HostGenFunc is the signature for functions generating fake hostnames. The
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove resolver *net.Resolver
hostGenFunc HostGenFunc
// addrs is the set that contains cached local resolvers' addresses.
addrs *stringutil.Set
</s> add // addrsLock protects addrs. </s> add // addrs is the set that contains cached local resolvers' addresses.
addrs *stringutil.Set
// resolver is used to fetch the resolvers' addresses.
resolver *net.Resolver
// hostGenFunc generates hosts to resolve.
hostGenFunc HostGenFunc </s> remove "time"
</s> add </s> remove // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
defer log.OnPanic("systemResolvers")
// TODO(e.burkov): Implement a functionality to stop ticker.
for range tickCh {
err := sr.refresh()
if err != nil {
log.Error("systemResolvers: error in refreshing goroutine: %s", err)
continue
}
log.Debug("systemResolvers: local addresses cache is refreshed")
}
}
</s> add </s> remove // Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use.
</s> add // Get returns the slice of local resolvers' addresses. It must be safe for
// concurrent use. </s> remove refreshIvl time.Duration,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers.go |
keep keep keep keep replace replace keep replace replace keep keep keep | <mask> type HostGenFunc func() (host string)
<mask>
<mask> // SystemResolvers helps to work with local resolvers' addresses provided by OS.
<mask> type SystemResolvers interface {
<mask> // Get returns the slice of local resolvers' addresses. It should be
<mask> // safe for concurrent use.
<mask> Get() (rs []string)
<mask> // refresh refreshes the local resolvers' addresses cache. It should be
<mask> // safe for concurrent use.
<mask> refresh() (err error)
<mask> }
<mask>
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
defer log.OnPanic("systemResolvers")
// TODO(e.burkov): Implement a functionality to stop ticker.
for range tickCh {
err := sr.refresh()
if err != nil {
log.Error("systemResolvers: error in refreshing goroutine: %s", err)
continue
}
log.Debug("systemResolvers: local addresses cache is refreshed")
}
}
</s> add </s> add // addrs is the set that contains cached local resolvers' addresses.
addrs *stringutil.Set
// resolver is used to fetch the resolvers' addresses.
resolver *net.Resolver
// hostGenFunc generates hosts to resolve.
hostGenFunc HostGenFunc </s> remove refreshIvl time.Duration,
</s> add </s> remove resolver *net.Resolver
hostGenFunc HostGenFunc
// addrs is the set that contains cached local resolvers' addresses.
addrs *stringutil.Set
</s> add // addrsLock protects addrs. </s> add // refresh implements the SystemResolvers interface for *systemResolvers. | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers.go |
keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep replace keep keep | <mask>
<mask> // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
<mask> func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
<mask> defer log.OnPanic("systemResolvers")
<mask>
<mask> // TODO(e.burkov): Implement a functionality to stop ticker.
<mask> for range tickCh {
<mask> err := sr.refresh()
<mask> if err != nil {
<mask> log.Error("systemResolvers: error in refreshing goroutine: %s", err)
<mask>
<mask> continue
<mask> }
<mask>
<mask> log.Debug("systemResolvers: local addresses cache is refreshed")
<mask> }
<mask> }
<mask>
<mask> // NewSystemResolvers returns a SystemResolvers with the cache refresh rate
<mask> // defined by refreshIvl. It disables auto-resfreshing if refreshIvl is 0. If
<mask> // nil is passed for hostGenFunc, the default generator will be used.
<mask> func NewSystemResolvers(
<mask> refreshIvl time.Duration,
<mask> hostGenFunc HostGenFunc,
<mask> ) (sr SystemResolvers, err error) {
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove // refresh refreshes the local resolvers' addresses cache. It should be
// safe for concurrent use.
</s> add // refresh refreshes the local resolvers' addresses cache. It must be safe
// for concurrent use. </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) </s> remove // Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use.
</s> add // Get returns the slice of local resolvers' addresses. It must be safe for
// concurrent use. </s> remove func NewARPDB() (arp ARPDB, err error) {
arp = newARPDB()
err = arp.Refresh()
if err != nil {
return nil, fmt.Errorf("arpdb initial refresh: %w", err)
}
return arp, nil
</s> add func NewARPDB() (arp ARPDB) {
return newARPDB() </s> remove resolver *net.Resolver
hostGenFunc HostGenFunc
// addrs is the set that contains cached local resolvers' addresses.
addrs *stringutil.Set
</s> add // addrsLock protects addrs. | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers.go |
keep keep keep keep replace keep keep keep keep keep | <mask> func NewSystemResolvers(
<mask> refreshIvl time.Duration,
<mask> hostGenFunc HostGenFunc,
<mask> ) (sr SystemResolvers, err error) {
<mask> sr = newSystemResolvers(refreshIvl, hostGenFunc)
<mask>
<mask> // Fill cache.
<mask> err = sr.refresh()
<mask> if err != nil {
<mask> return nil, err
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove refreshIvl time.Duration,
</s> add </s> remove if refreshIvl > 0 {
ticker := time.NewTicker(refreshIvl)
go refreshWithTicker(sr, ticker.C)
}
</s> add </s> remove // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
defer log.OnPanic("systemResolvers")
// TODO(e.burkov): Implement a functionality to stop ticker.
for range tickCh {
err := sr.refresh()
if err != nil {
log.Error("systemResolvers: error in refreshing goroutine: %s", err)
continue
}
log.Debug("systemResolvers: local addresses cache is refreshed")
}
}
</s> add </s> remove func newSystemResolvers(refreshIvl time.Duration, hostGenFunc HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(hostGenFunc HostGenFunc) (sr SystemResolvers) { </s> remove refreshDur time.Duration,
</s> add </s> remove }
if len(ifaces) == 0 {
</s> add } else if len(ifaces) == 0 { | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers.go |
keep keep keep keep replace replace replace replace replace replace keep keep | <mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> if refreshIvl > 0 {
<mask> ticker := time.NewTicker(refreshIvl)
<mask>
<mask> go refreshWithTicker(sr, ticker.C)
<mask> }
<mask>
<mask> return sr, nil
<mask> }
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove }
if len(ifaces) == 0 {
</s> add } else if len(ifaces) == 0 { </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) </s> remove if net.ParseIP(ipStr) == nil {
</s> add if _, err = netutil.ParseIP(host); err != nil { </s> remove var arpdb aghnet.ARPDB
arpdb, err = aghnet.NewARPDB()
if err != nil {
log.Info("warning: creating arpdb: %s; using stub", err)
arpdb = aghnet.EmptyARPDB{}
}
</s> add arpdb := aghnet.NewARPDB() </s> remove s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
</s> add s.sysResolvers, err = aghnet.NewSystemResolvers(nil) </s> remove func NewARPDB() (arp ARPDB, err error) {
arp = newARPDB()
err = arp.Refresh()
if err != nil {
return nil, fmt.Errorf("arpdb initial refresh: %w", err)
}
return arp, nil
</s> add func NewARPDB() (arp ARPDB) {
return newARPDB() | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> }
<mask>
<mask> // systemResolvers is a default implementation of SystemResolvers interface.
<mask> type systemResolvers struct {
<mask> resolver *net.Resolver
<mask> hostGenFunc HostGenFunc
<mask>
<mask> // addrs is the set that contains cached local resolvers' addresses.
<mask> addrs *stringutil.Set
<mask> addrsLock sync.RWMutex
<mask> }
<mask>
<mask> const (
<mask> // errBadAddrPassed is returned when dialFunc can't parse an IP address.
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> add // addrs is the set that contains cached local resolvers' addresses.
addrs *stringutil.Set
// resolver is used to fetch the resolvers' addresses.
resolver *net.Resolver
// hostGenFunc generates hosts to resolve.
hostGenFunc HostGenFunc </s> remove import (
"time"
"github.com/AdguardTeam/golibs/log"
)
</s> add </s> remove // Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use.
</s> add // Get returns the slice of local resolvers' addresses. It must be safe for
// concurrent use. </s> add func TestNewARPDB(t *testing.T) {
var a ARPDB
require.NotPanics(t, func() {
a = NewARPDB()
})
assert.NotNil(t, a)
}
</s> remove refreshIvl time.Duration,
</s> add </s> remove // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
defer log.OnPanic("systemResolvers")
// TODO(e.burkov): Implement a functionality to stop ticker.
for range tickCh {
err := sr.refresh()
if err != nil {
log.Error("systemResolvers: error in refreshing goroutine: %s", err)
continue
}
log.Debug("systemResolvers: local addresses cache is refreshed")
}
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others.go |
keep keep add keep keep keep keep | <mask> type systemResolvers struct {
<mask> // addrsLock protects addrs.
<mask> addrsLock sync.RWMutex
<mask> }
<mask>
<mask> const (
<mask> // errBadAddrPassed is returned when dialFunc can't parse an IP address.
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove resolver *net.Resolver
hostGenFunc HostGenFunc
// addrs is the set that contains cached local resolvers' addresses.
addrs *stringutil.Set
</s> add // addrsLock protects addrs. </s> remove func newSystemResolvers(refreshIvl time.Duration, _ HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(_ HostGenFunc) (sr SystemResolvers) { </s> remove import (
"time"
"github.com/AdguardTeam/golibs/log"
)
</s> add </s> add func TestNewARPDB(t *testing.T) {
var a ARPDB
require.NotPanics(t, func() {
a = NewARPDB()
})
assert.NotNil(t, a)
}
</s> add 1.2.3.4.5 0x1 0x2 aa:bb:cc:dd:ee:ff * wan
1.2.3.4 0x1 0x2 12:34:56:78:910 * wan </s> remove refreshIvl time.Duration,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others.go |
keep keep add keep keep keep keep keep | <mask> errUnexpectedHostFormat errors.Error = "unexpected host format"
<mask> )
<mask>
<mask> func (sr *systemResolvers) refresh() (err error) {
<mask> defer func() { err = errors.Annotate(err, "systemResolvers: %w") }()
<mask>
<mask> _, err = sr.resolver.LookupHost(context.Background(), sr.hostGenFunc())
<mask> dnserr := &net.DNSError{}
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove var ipStr string
</s> add </s> remove _, err := NewSystemResolvers(0, func() string {
</s> add _, err := NewSystemResolvers(func() string { </s> remove if net.ParseIP(ipStr) == nil {
</s> add if _, err = netutil.ParseIP(host); err != nil { </s> add func TestNewARPDB(t *testing.T) {
var a ARPDB
require.NotPanics(t, func() {
a = NewARPDB()
})
assert.NotNil(t, a)
}
</s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) </s> remove func newSystemResolvers(refreshIvl time.Duration, _ HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(_ HostGenFunc) (sr SystemResolvers) { | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> return err
<mask> }
<mask>
<mask> func newSystemResolvers(refreshIvl time.Duration, hostGenFunc HostGenFunc) (sr SystemResolvers) {
<mask> if hostGenFunc == nil {
<mask> hostGenFunc = defaultHostGen
<mask> }
<mask> s := &systemResolvers{
<mask> resolver: &net.Resolver{
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove func newSystemResolvers(refreshIvl time.Duration, _ HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(_ HostGenFunc) (sr SystemResolvers) { </s> remove refreshDur time.Duration,
</s> add </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) </s> remove if net.ParseIP(ipStr) == nil {
</s> add if _, err = netutil.ParseIP(host); err != nil { </s> remove }
if len(ifaces) == 0 {
</s> add } else if len(ifaces) == 0 { </s> remove refreshDur time.Duration,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others.go |
keep keep keep keep replace keep keep keep replace keep | <mask> // validateDialedHost validated the host used by resolvers in dialFunc.
<mask> func validateDialedHost(host string) (err error) {
<mask> defer func() { err = errors.Annotate(err, "parsing %q: %w", host) }()
<mask>
<mask> var ipStr string
<mask> parts := strings.Split(host, "%")
<mask> switch len(parts) {
<mask> case 1:
<mask> ipStr = host
<mask> case 2:
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove ipStr = parts[0]
</s> add host = parts[0] </s> add // refresh implements the SystemResolvers interface for *systemResolvers. </s> add func TestNewARPDB(t *testing.T) {
var a ARPDB
require.NotPanics(t, func() {
a = NewARPDB()
})
assert.NotNil(t, a)
}
</s> remove _, err := NewSystemResolvers(0, func() string {
</s> add _, err := NewSystemResolvers(func() string { </s> remove // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
defer log.OnPanic("systemResolvers")
// TODO(e.burkov): Implement a functionality to stop ticker.
for range tickCh {
err := sr.refresh()
if err != nil {
log.Error("systemResolvers: error in refreshing goroutine: %s", err)
continue
}
log.Debug("systemResolvers: local addresses cache is refreshed")
}
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others.go |
keep keep replace keep keep keep keep replace keep keep keep | <mask> case 2:
<mask> // Remove the zone and check the IP address part.
<mask> ipStr = parts[0]
<mask> default:
<mask> return errUnexpectedHostFormat
<mask> }
<mask>
<mask> if net.ParseIP(ipStr) == nil {
<mask> return errBadAddrPassed
<mask> }
<mask>
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove ipStr = host
</s> add // host </s> remove var ipStr string
</s> add </s> remove // writeRules writes the actual rule for the qtype and the PTR for the
// host-ip pair into internal builders.
</s> add // writeRules writes the actual rule for the qtype and the PTR for the host-ip
// pair into internal builders. </s> remove }
if len(ifaces) == 0 {
</s> add } else if len(ifaces) == 0 { </s> remove s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
</s> add s.sysResolvers, err = aghnet.NewSystemResolvers(nil) | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> import (
<mask> "context"
<mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove "time"
</s> add </s> add "github.com/AdguardTeam/golibs/errors" </s> add "testing/iotest" </s> remove import (
"time"
"github.com/AdguardTeam/golibs/log"
)
</s> add </s> remove func createTestSystemResolversImp(
</s> add func createTestSystemResolversImpl( </s> remove "time"
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others_test.go |
keep replace keep replace keep keep | <mask>
<mask> func createTestSystemResolversImp(
<mask> t *testing.T,
<mask> refreshDur time.Duration,
<mask> hostGenFunc HostGenFunc,
<mask> ) (imp *systemResolvers) {
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove refreshDur time.Duration,
</s> add </s> remove sr := createTestSystemResolvers(t, refreshDur, hostGenFunc)
</s> add sr := createTestSystemResolvers(t, hostGenFunc)
require.IsType(t, (*systemResolvers)(nil), sr) </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) </s> remove func newSystemResolvers(refreshIvl time.Duration, hostGenFunc HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(hostGenFunc HostGenFunc) (sr SystemResolvers) { </s> remove func newSystemResolvers(refreshIvl time.Duration, _ HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(_ HostGenFunc) (sr SystemResolvers) { | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others_test.go |
keep replace keep replace replace replace replace replace | <mask>
<mask> sr := createTestSystemResolvers(t, refreshDur, hostGenFunc)
<mask>
<mask> var ok bool
<mask> imp, ok = sr.(*systemResolvers)
<mask> require.True(t, ok)
<mask>
<mask> return imp
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove refreshDur time.Duration,
</s> add </s> remove sr := createTestSystemResolvers(t, 0, nil)
assert.NotEmpty(t, sr.Get())
</s> add sr := createTestSystemResolvers(t, nil)
var rs []string
require.NotPanics(t, func() {
rs = sr.Get()
})
assert.NotEmpty(t, rs) </s> remove sr := createTestSystemResolvers(t, 0, nil)
</s> add sr := createTestSystemResolvers(t, nil) </s> remove imp := createTestSystemResolversImp(t, 0, nil)
</s> add imp := createTestSystemResolversImpl(t, nil) </s> remove sr, err = NewSystemResolvers(refreshDur, hostGenFunc)
</s> add sr, err = NewSystemResolvers(hostGenFunc) | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> func TestSystemResolvers_Refresh(t *testing.T) {
<mask> t.Run("expected_error", func(t *testing.T) {
<mask> sr := createTestSystemResolvers(t, 0, nil)
<mask>
<mask> assert.NoError(t, sr.refresh())
<mask> })
<mask>
<mask> t.Run("unexpected_error", func(t *testing.T) {
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove var ok bool
imp, ok = sr.(*systemResolvers)
require.True(t, ok)
return imp
</s> add return sr.(*systemResolvers) </s> remove _, err := NewSystemResolvers(0, func() string {
</s> add _, err := NewSystemResolvers(func() string { </s> remove sr := createTestSystemResolvers(t, 0, nil)
assert.NotEmpty(t, sr.Get())
</s> add sr := createTestSystemResolvers(t, nil)
var rs []string
require.NotPanics(t, func() {
rs = sr.Get()
})
assert.NotEmpty(t, rs) </s> remove imp := createTestSystemResolversImp(t, 0, nil)
</s> add imp := createTestSystemResolversImpl(t, nil) </s> add func TestNewARPDB(t *testing.T) {
var a ARPDB
require.NotPanics(t, func() {
a = NewARPDB()
})
assert.NotNil(t, a)
}
</s> remove sr := createTestSystemResolvers(t, refreshDur, hostGenFunc)
</s> add sr := createTestSystemResolvers(t, hostGenFunc)
require.IsType(t, (*systemResolvers)(nil), sr) | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> assert.NoError(t, sr.refresh())
<mask> })
<mask>
<mask> t.Run("unexpected_error", func(t *testing.T) {
<mask> _, err := NewSystemResolvers(0, func() string {
<mask> return "127.0.0.1::123"
<mask> })
<mask> assert.Error(t, err)
<mask> })
<mask> }
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove sr := createTestSystemResolvers(t, 0, nil)
</s> add sr := createTestSystemResolvers(t, nil) </s> remove imp := createTestSystemResolversImp(t, 0, nil)
</s> add imp := createTestSystemResolversImpl(t, nil) </s> remove sr := createTestSystemResolvers(t, 0, nil)
assert.NotEmpty(t, sr.Get())
</s> add sr := createTestSystemResolvers(t, nil)
var rs []string
require.NotPanics(t, func() {
rs = sr.Get()
})
assert.NotEmpty(t, rs) </s> add func TestNewARPDB(t *testing.T) {
var a ARPDB
require.NotPanics(t, func() {
a = NewARPDB()
})
assert.NotNil(t, a)
}
</s> remove var ok bool
imp, ok = sr.(*systemResolvers)
require.True(t, ok)
return imp
</s> add return sr.(*systemResolvers) </s> add // refresh implements the SystemResolvers interface for *systemResolvers. | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> })
<mask> }
<mask>
<mask> func TestSystemResolvers_DialFunc(t *testing.T) {
<mask> imp := createTestSystemResolversImp(t, 0, nil)
<mask>
<mask> testCases := []struct {
<mask> want error
<mask> name string
<mask> address string
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove _, err := NewSystemResolvers(0, func() string {
</s> add _, err := NewSystemResolvers(func() string { </s> remove sr := createTestSystemResolvers(t, 0, nil)
</s> add sr := createTestSystemResolvers(t, nil) </s> remove var ok bool
imp, ok = sr.(*systemResolvers)
require.True(t, ok)
return imp
</s> add return sr.(*systemResolvers) </s> remove name: "valid",
</s> add name: "valid_ipv4", </s> remove sr := createTestSystemResolvers(t, 0, nil)
assert.NotEmpty(t, sr.Get())
</s> add sr := createTestSystemResolvers(t, nil)
var rs []string
require.NotPanics(t, func() {
rs = sr.Get()
})
assert.NotEmpty(t, rs) </s> remove ipStr = host
</s> add // host | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> name string
<mask> address string
<mask> }{{
<mask> want: errFakeDial,
<mask> name: "valid",
<mask> address: "127.0.0.1",
<mask> }, {
<mask> want: errFakeDial,
<mask> name: "valid_ipv6_port",
<mask> address: "[::1]:53",
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove imp := createTestSystemResolversImp(t, 0, nil)
</s> add imp := createTestSystemResolversImpl(t, nil) </s> remove _, err := NewSystemResolvers(0, func() string {
</s> add _, err := NewSystemResolvers(func() string { </s> remove ipStr = host
</s> add // host </s> remove var ipStr string
</s> add </s> add }, {
Name: "",
IP: net.ParseIP("::1234"),
MAC: net.HardwareAddr{0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF}, </s> remove 0.0.0.0 0x0 0x0 00:00:00:00:00:00 * unspec </s> add | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> package aghnet
<mask>
<mask> import (
<mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove "time"
</s> add </s> remove import (
"time"
"github.com/AdguardTeam/golibs/log"
)
</s> add </s> add "github.com/AdguardTeam/golibs/errors" </s> add "testing/iotest" </s> remove func createTestSystemResolversImp(
</s> add func createTestSystemResolversImpl( </s> remove "time"
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> )
<mask>
<mask> func createTestSystemResolvers(
<mask> t *testing.T,
<mask> refreshDur time.Duration,
<mask> hostGenFunc HostGenFunc,
<mask> ) (sr SystemResolvers) {
<mask> t.Helper()
<mask>
<mask> var err error
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove func createTestSystemResolversImp(
</s> add func createTestSystemResolversImpl( </s> remove refreshDur time.Duration,
</s> add </s> remove sr, err = NewSystemResolvers(refreshDur, hostGenFunc)
</s> add sr, err = NewSystemResolvers(hostGenFunc) </s> remove func newSystemResolvers(refreshIvl time.Duration, hostGenFunc HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(hostGenFunc HostGenFunc) (sr SystemResolvers) { </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) </s> remove func newSystemResolvers(refreshIvl time.Duration, _ HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(_ HostGenFunc) (sr SystemResolvers) { | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> ) (sr SystemResolvers) {
<mask> t.Helper()
<mask>
<mask> var err error
<mask> sr, err = NewSystemResolvers(refreshDur, hostGenFunc)
<mask> require.NoError(t, err)
<mask> require.NotNil(t, sr)
<mask>
<mask> return sr
<mask> }
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove refreshDur time.Duration,
</s> add </s> remove sr := createTestSystemResolvers(t, refreshDur, hostGenFunc)
</s> add sr := createTestSystemResolvers(t, hostGenFunc)
require.IsType(t, (*systemResolvers)(nil), sr) </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) </s> remove func newSystemResolvers(refreshIvl time.Duration, hostGenFunc HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(hostGenFunc HostGenFunc) (sr SystemResolvers) { </s> remove var ok bool
imp, ok = sr.(*systemResolvers)
require.True(t, ok)
return imp
</s> add return sr.(*systemResolvers) </s> remove func newSystemResolvers(refreshIvl time.Duration, _ HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(_ HostGenFunc) (sr SystemResolvers) { | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> return sr
<mask> }
<mask>
<mask> func TestSystemResolvers_Get(t *testing.T) {
<mask> sr := createTestSystemResolvers(t, 0, nil)
<mask> assert.NotEmpty(t, sr.Get())
<mask> }
<mask>
<mask> // TODO(e.burkov): Write tests for refreshWithTicker.
<mask> //
<mask> // See https://github.com/AdguardTeam/AdGuardHome/issues/2846.
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove sr := createTestSystemResolvers(t, 0, nil)
</s> add sr := createTestSystemResolvers(t, nil) </s> remove var ok bool
imp, ok = sr.(*systemResolvers)
require.True(t, ok)
return imp
</s> add return sr.(*systemResolvers) </s> remove imp := createTestSystemResolversImp(t, 0, nil)
</s> add imp := createTestSystemResolversImpl(t, nil) </s> remove sr := createTestSystemResolvers(t, refreshDur, hostGenFunc)
</s> add sr := createTestSystemResolvers(t, hostGenFunc)
require.IsType(t, (*systemResolvers)(nil), sr) </s> remove // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
defer log.OnPanic("systemResolvers")
// TODO(e.burkov): Implement a functionality to stop ticker.
for range tickCh {
err := sr.refresh()
if err != nil {
log.Error("systemResolvers: error in refreshing goroutine: %s", err)
continue
}
log.Debug("systemResolvers: local addresses cache is refreshed")
}
}
</s> add </s> remove s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
</s> add s.sysResolvers, err = aghnet.NewSystemResolvers(nil) | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "net"
<mask> "os/exec"
<mask> "strings"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> add "testing/iotest" </s> remove import (
"time"
"github.com/AdguardTeam/golibs/log"
)
</s> add </s> add "github.com/AdguardTeam/golibs/errors" </s> remove "time"
</s> add </s> remove "time"
</s> add </s> add invalid.mac (1.2.3.4) at 12:34:56:78:910 on el0 ifscope [ethernet]
invalid.ip (1.2.3.4.5) at ab:cd:ef:ab:cd:12 on ek0 ifscope [ethernet]
invalid.fmt 1 at 12:cd:ef:ab:cd:ef on er0 ifscope [ethernet] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_windows.go |
keep keep keep keep replace keep keep keep keep keep | <mask> addrs []string
<mask> addrsLock sync.RWMutex
<mask> }
<mask>
<mask> func newSystemResolvers(refreshIvl time.Duration, _ HostGenFunc) (sr SystemResolvers) {
<mask> return &systemResolvers{}
<mask> }
<mask>
<mask> func (sr *systemResolvers) Get() (rs []string) {
<mask> sr.addrsLock.RLock()
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove func newSystemResolvers(refreshIvl time.Duration, hostGenFunc HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(hostGenFunc HostGenFunc) (sr SystemResolvers) { </s> remove refreshDur time.Duration,
</s> add </s> remove resolver *net.Resolver
hostGenFunc HostGenFunc
// addrs is the set that contains cached local resolvers' addresses.
addrs *stringutil.Set
</s> add // addrsLock protects addrs. </s> add // addrs is the set that contains cached local resolvers' addresses.
addrs *stringutil.Set
// resolver is used to fetch the resolvers' addresses.
resolver *net.Resolver
// hostGenFunc generates hosts to resolve.
hostGenFunc HostGenFunc </s> remove sr, err = NewSystemResolvers(refreshDur, hostGenFunc)
</s> add sr, err = NewSystemResolvers(hostGenFunc) </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_windows.go |
keep keep keep replace | <mask> IP address HW type Flags HW address Mask Device
<mask> 192.168.1.2 0x1 0x2 ab:cd:ef:ab:cd:ef * wan
<mask> ::ffff:ffff 0x1 0x0 ef:cd:ab:ef:cd:ab * br-lan
<mask> 0.0.0.0 0x0 0x0 00:00:00:00:00:00 * unspec </s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> add 1.2.3.4.5 0x1 0x2 aa:bb:cc:dd:ee:ff * wan
1.2.3.4 0x1 0x2 12:34:56:78:910 * wan </s> add 1.2.3.4.5 aa:bb:cc:dd:ee:ff em0 permanent
1.2.3.4 12:34:56:78:910 em0 permanent </s> add 1.2.3.4.5 dev enp0s3 lladdr aa:bb:cc:dd:ee:ff DELAY
1.2.3.4 dev enp0s3 lladdr 12:34:56:78:910 DELAY </s> remove import (
"time"
"github.com/AdguardTeam/golibs/log"
)
</s> add </s> remove ipStr = parts[0]
</s> add host = parts[0] </s> remove ipStr = host
</s> add // host | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/testdata/proc_net_arp |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> // TODO(e.burkov): Enable the refresher after the actual implementation
<mask> // passes the public testing.
<mask> s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("initializing system resolvers: %w", err)
<mask> }
<mask>
<mask> if p.DHCPServer != nil {
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove func NewARPDB() (arp ARPDB, err error) {
arp = newARPDB()
err = arp.Refresh()
if err != nil {
return nil, fmt.Errorf("arpdb initial refresh: %w", err)
}
return arp, nil
</s> add func NewARPDB() (arp ARPDB) {
return newARPDB() </s> remove }
if len(ifaces) == 0 {
</s> add } else if len(ifaces) == 0 { </s> remove if refreshIvl > 0 {
ticker := time.NewTicker(refreshIvl)
go refreshWithTicker(sr, ticker.C)
}
</s> add </s> remove // writeRules writes the actual rule for the qtype and the PTR for the
// host-ip pair into internal builders.
</s> add // writeRules writes the actual rule for the qtype and the PTR for the host-ip
// pair into internal builders. </s> remove // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
defer log.OnPanic("systemResolvers")
// TODO(e.burkov): Implement a functionality to stop ticker.
for range tickCh {
err := sr.refresh()
if err != nil {
log.Error("systemResolvers: error in refreshing goroutine: %s", err)
continue
}
log.Debug("systemResolvers: local addresses cache is refreshed")
}
}
</s> add </s> remove if net.ParseIP(ipStr) == nil {
</s> add if _, err = netutil.ParseIP(host); err != nil { | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/dnsforward/dnsforward.go |
keep keep keep add keep keep keep keep | <mask> return objs
<mask> }
<mask>
<mask> func (clients *clientsContainer) periodicUpdate() {
<mask> for {
<mask> clients.Reload()
<mask> time.Sleep(clientsUpdatePeriod)
<mask> }
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove func NewARPDB() (arp ARPDB, err error) {
arp = newARPDB()
err = arp.Refresh()
if err != nil {
return nil, fmt.Errorf("arpdb initial refresh: %w", err)
}
return arp, nil
</s> add func NewARPDB() (arp ARPDB) {
return newARPDB() </s> remove // writeRules writes the actual rule for the qtype and the PTR for the
// host-ip pair into internal builders.
</s> add // writeRules writes the actual rule for the qtype and the PTR for the host-ip
// pair into internal builders. </s> remove sr := createTestSystemResolvers(t, 0, nil)
assert.NotEmpty(t, sr.Get())
</s> add sr := createTestSystemResolvers(t, nil)
var rs []string
require.NotPanics(t, func() {
rs = sr.Get()
})
assert.NotEmpty(t, rs) </s> remove func newSystemResolvers(refreshIvl time.Duration, _ HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(_ HostGenFunc) (sr SystemResolvers) { </s> remove func newSystemResolvers(refreshIvl time.Duration, hostGenFunc HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(hostGenFunc HostGenFunc) (sr SystemResolvers) { </s> remove }
if len(ifaces) == 0 {
</s> add } else if len(ifaces) == 0 { | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/home/clients.go |
keep keep keep keep replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> return err
<mask> }
<mask> }
<mask>
<mask> var arpdb aghnet.ARPDB
<mask> arpdb, err = aghnet.NewARPDB()
<mask> if err != nil {
<mask> log.Info("warning: creating arpdb: %s; using stub", err)
<mask>
<mask> arpdb = aghnet.EmptyARPDB{}
<mask> }
<mask>
<mask> Context.clients.Init(config.Clients, Context.dhcpServer, Context.etcHosts, arpdb)
<mask>
<mask> if args.bindPort != 0 {
<mask> uc := aghalg.UniqChecker{}
<mask> addPorts(
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove }
if len(ifaces) == 0 {
</s> add } else if len(ifaces) == 0 { </s> remove if refreshIvl > 0 {
ticker := time.NewTicker(refreshIvl)
go refreshWithTicker(sr, ticker.C)
}
</s> add </s> remove s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
</s> add s.sysResolvers, err = aghnet.NewSystemResolvers(nil) </s> remove if net.ParseIP(ipStr) == nil {
</s> add if _, err = netutil.ParseIP(host); err != nil { </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) </s> remove func NewARPDB() (arp ARPDB, err error) {
arp = newARPDB()
err = arp.Refresh()
if err != nil {
return nil, fmt.Errorf("arpdb initial refresh: %w", err)
}
return arp, nil
</s> add func NewARPDB() (arp ARPDB) {
return newARPDB() | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/home/home.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> "version": "3.2.0",
<mask> "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz",
<mask> "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo="
<mask> },
<mask> "alertifyjs": {
<mask> "version": "1.11.1",
<mask> "resolved": "https://registry.npmjs.org/alertifyjs/-/alertifyjs-1.11.1.tgz",
<mask> "integrity": "sha512-8rw5zvMlg0Idltq15OOU9tGabYVA/I8JTNIM5ICUXqvrdPb7cfl+sSkTv9pDc6bbB8p9L85GtmOG7SUSv+bugQ=="
<mask> },
<mask> "align-text": {
<mask> "version": "0.1.4",
<mask> "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
<mask> "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
<mask> "dev": true,
</s> Show toast on failed request </s> add "nanoid": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-1.2.3.tgz",
"integrity": "sha512-BAnxAdaihzMoszwhqRy8FPOX+dijs7esUEUYTIQ1KsOSKmCVNYnitAMmBDFxYzA6VQYvuUKw7o2K1AcMBTGzIg=="
}, </s> add "dom-helpers": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.3.1.tgz",
"integrity": "sha512-2Sm+JaYn74OiTM2wHvxJOo3roiq/h25Yi69Fqk269cNUwIXsCvATB6CRSFC9Am/20G2b28hGv/+7NiWydIrPvg=="
}, </s> add "react-transition-group": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.4.0.tgz",
"integrity": "sha512-Xv5d55NkJUxUzLCImGSanK8Cl/30sgpOEMGc5m86t8+kZwrPxPCPcFqyx83kkr+5Lz5gs6djuvE5By+gce+VjA==",
"requires": {
"dom-helpers": "^3.3.1",
"loose-envify": "^1.3.1",
"prop-types": "^15.6.2",
"react-lifecycles-compat": "^3.0.4"
}
}, </s> remove "alertifyjs": "^1.11.1",
</s> add </s> remove alertify.error(`Failed to load statistics with status code ${error.response.status}`);
dispatch(getTopStatsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getTopStatsFailure(error)); </s> remove alertify.error(`Failed to load query log with status code ${error.response.status}`);
dispatch(getLogsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getLogsFailure(error)); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/package-lock.json |
keep keep keep add keep keep keep keep keep | <mask> "dev": true
<mask> }
<mask> }
<mask> },
<mask> "dom-serializer": {
<mask> "version": "0.1.0",
<mask> "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
<mask> "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
<mask> "dev": true,
</s> Show toast on failed request </s> add "nanoid": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-1.2.3.tgz",
"integrity": "sha512-BAnxAdaihzMoszwhqRy8FPOX+dijs7esUEUYTIQ1KsOSKmCVNYnitAMmBDFxYzA6VQYvuUKw7o2K1AcMBTGzIg=="
}, </s> remove "alertifyjs": {
"version": "1.11.1",
"resolved": "https://registry.npmjs.org/alertifyjs/-/alertifyjs-1.11.1.tgz",
"integrity": "sha512-8rw5zvMlg0Idltq15OOU9tGabYVA/I8JTNIM5ICUXqvrdPb7cfl+sSkTv9pDc6bbB8p9L85GtmOG7SUSv+bugQ=="
},
</s> add </s> add "react-transition-group": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.4.0.tgz",
"integrity": "sha512-Xv5d55NkJUxUzLCImGSanK8Cl/30sgpOEMGc5m86t8+kZwrPxPCPcFqyx83kkr+5Lz5gs6djuvE5By+gce+VjA==",
"requires": {
"dom-helpers": "^3.3.1",
"loose-envify": "^1.3.1",
"prop-types": "^15.6.2",
"react-lifecycles-compat": "^3.0.4"
}
}, </s> add import nanoid from 'nanoid'; </s> remove alertify.error(`Failed to load statistics with status code ${error.response.status}`);
dispatch(getTopStatsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getTopStatsFailure(error)); </s> remove alertify.error(`Failed to load query log with status code ${error.response.status}`);
dispatch(getLogsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getLogsFailure(error)); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/package-lock.json |
keep keep keep add keep keep keep keep | <mask> "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
<mask> "dev": true,
<mask> "optional": true
<mask> },
<mask> "nanomatch": {
<mask> "version": "1.2.13",
<mask> "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
<mask> "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
</s> Show toast on failed request </s> add "dom-helpers": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.3.1.tgz",
"integrity": "sha512-2Sm+JaYn74OiTM2wHvxJOo3roiq/h25Yi69Fqk269cNUwIXsCvATB6CRSFC9Am/20G2b28hGv/+7NiWydIrPvg=="
}, </s> remove "alertifyjs": {
"version": "1.11.1",
"resolved": "https://registry.npmjs.org/alertifyjs/-/alertifyjs-1.11.1.tgz",
"integrity": "sha512-8rw5zvMlg0Idltq15OOU9tGabYVA/I8JTNIM5ICUXqvrdPb7cfl+sSkTv9pDc6bbB8p9L85GtmOG7SUSv+bugQ=="
},
</s> add </s> add "react-transition-group": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.4.0.tgz",
"integrity": "sha512-Xv5d55NkJUxUzLCImGSanK8Cl/30sgpOEMGc5m86t8+kZwrPxPCPcFqyx83kkr+5Lz5gs6djuvE5By+gce+VjA==",
"requires": {
"dom-helpers": "^3.3.1",
"loose-envify": "^1.3.1",
"prop-types": "^15.6.2",
"react-lifecycles-compat": "^3.0.4"
}
}, </s> add import nanoid from 'nanoid'; </s> remove "alertifyjs": "^1.11.1",
</s> add </s> remove alertify.error(`Failed to load statistics with status code ${error.response.status}`);
dispatch(getTopStatsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getTopStatsFailure(error)); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/package-lock.json |
keep add keep keep keep keep keep keep | <mask> }
<mask> },
<mask> "read-cache": {
<mask> "version": "1.0.0",
<mask> "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
<mask> "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
<mask> "dev": true,
<mask> "requires": {
</s> Show toast on failed request </s> add "dom-helpers": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.3.1.tgz",
"integrity": "sha512-2Sm+JaYn74OiTM2wHvxJOo3roiq/h25Yi69Fqk269cNUwIXsCvATB6CRSFC9Am/20G2b28hGv/+7NiWydIrPvg=="
}, </s> remove "alertifyjs": {
"version": "1.11.1",
"resolved": "https://registry.npmjs.org/alertifyjs/-/alertifyjs-1.11.1.tgz",
"integrity": "sha512-8rw5zvMlg0Idltq15OOU9tGabYVA/I8JTNIM5ICUXqvrdPb7cfl+sSkTv9pDc6bbB8p9L85GtmOG7SUSv+bugQ=="
},
</s> add </s> add "nanoid": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-1.2.3.tgz",
"integrity": "sha512-BAnxAdaihzMoszwhqRy8FPOX+dijs7esUEUYTIQ1KsOSKmCVNYnitAMmBDFxYzA6VQYvuUKw7o2K1AcMBTGzIg=="
}, </s> remove alertify.error(`Failed to load statistics with status code ${error.response.status}`);
dispatch(getTopStatsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getTopStatsFailure(error)); </s> remove alertify.error(`Failed to load query log with status code ${error.response.status}`);
dispatch(getLogsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getLogsFailure(error)); </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/package-lock.json |
keep keep keep keep replace keep keep keep keep keep | <mask> "lint": "eslint frontend/"
<mask> },
<mask> "dependencies": {
<mask> "@nivo/line": "^0.42.1",
<mask> "alertifyjs": "^1.11.1",
<mask> "axios": "^0.18.0",
<mask> "classnames": "^2.2.6",
<mask> "date-fns": "^1.29.0",
<mask> "file-saver": "^1.3.8",
<mask> "lodash": "^4.17.10",
</s> Show toast on failed request </s> add "nanoid": "^1.2.3", </s> remove "alertifyjs": {
"version": "1.11.1",
"resolved": "https://registry.npmjs.org/alertifyjs/-/alertifyjs-1.11.1.tgz",
"integrity": "sha512-8rw5zvMlg0Idltq15OOU9tGabYVA/I8JTNIM5ICUXqvrdPb7cfl+sSkTv9pDc6bbB8p9L85GtmOG7SUSv+bugQ=="
},
</s> add </s> add "dom-helpers": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.3.1.tgz",
"integrity": "sha512-2Sm+JaYn74OiTM2wHvxJOo3roiq/h25Yi69Fqk269cNUwIXsCvATB6CRSFC9Am/20G2b28hGv/+7NiWydIrPvg=="
}, </s> add "nanoid": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-1.2.3.tgz",
"integrity": "sha512-BAnxAdaihzMoszwhqRy8FPOX+dijs7esUEUYTIQ1KsOSKmCVNYnitAMmBDFxYzA6VQYvuUKw7o2K1AcMBTGzIg=="
}, </s> add "react-transition-group": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.4.0.tgz",
"integrity": "sha512-Xv5d55NkJUxUzLCImGSanK8Cl/30sgpOEMGc5m86t8+kZwrPxPCPcFqyx83kkr+5Lz5gs6djuvE5By+gce+VjA==",
"requires": {
"dom-helpers": "^3.3.1",
"loose-envify": "^1.3.1",
"prop-types": "^15.6.2",
"react-lifecycles-compat": "^3.0.4"
}
}, </s> remove alertify.error(`Failed to load statistics with status code ${error.response.status}`);
dispatch(getTopStatsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getTopStatsFailure(error)); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/package.json |
keep add keep keep keep keep keep | <mask> "file-saver": "^1.3.8",
<mask> "lodash": "^4.17.10",
<mask> "prop-types": "^15.6.1",
<mask> "react": "^16.4.0",
<mask> "react-click-outside": "^3.0.1",
<mask> "react-dom": "^16.4.0",
<mask> "react-modal": "^3.4.5",
</s> Show toast on failed request </s> remove "alertifyjs": "^1.11.1",
</s> add </s> add "react-transition-group": "^2.4.0", </s> add "react-transition-group": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.4.0.tgz",
"integrity": "sha512-Xv5d55NkJUxUzLCImGSanK8Cl/30sgpOEMGc5m86t8+kZwrPxPCPcFqyx83kkr+5Lz5gs6djuvE5By+gce+VjA==",
"requires": {
"dom-helpers": "^3.3.1",
"loose-envify": "^1.3.1",
"prop-types": "^15.6.2",
"react-lifecycles-compat": "^3.0.4"
}
}, </s> add toasts, </s> add dispatch(addErrorToast({ error })); </s> remove alertify.error(`Failed to load query log with status code ${error.response.status}`);
dispatch(getLogsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getLogsFailure(error)); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/package.json |
keep keep keep add keep keep keep keep keep | <mask> "react-modal": "^3.4.5",
<mask> "react-redux": "^5.0.7",
<mask> "react-router-dom": "^4.2.2",
<mask> "react-table": "^6.8.6",
<mask> "redux": "^4.0.0",
<mask> "redux-actions": "^2.4.0",
<mask> "redux-thunk": "^2.3.0",
<mask> "svg-url-loader": "^2.3.2",
<mask> "tabler-react": "^1.10.0",
</s> Show toast on failed request </s> add "nanoid": "^1.2.3", </s> add toasts, </s> add dispatch(addErrorToast({ error })); </s> remove alertify.error(`Failed to load query log with status code ${error.response.status}`);
dispatch(getLogsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getLogsFailure(error)); </s> remove alertify.error(`Failed to load statistics with status code ${error.response.status}`);
dispatch(getTopStatsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getTopStatsFailure(error)); </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/package.json |
keep keep replace keep keep keep keep keep | <mask> import { createAction } from 'redux-actions';
<mask> import round from 'lodash/round';
<mask> import alertify from 'alertifyjs';
<mask>
<mask> import { normalizeHistory, normalizeFilteringStatus, normalizeLogs } from '../helpers/helpers';
<mask> import Api from '../api/Api';
<mask>
<mask> const apiClient = new Api();
</s> Show toast on failed request </s> add import nanoid from 'nanoid'; </s> add import Toasts from '../Toasts'; </s> remove import 'alertifyjs/build/css/alertify.min.css';
</s> add </s> remove import '../ui/Alertify.css';
</s> add </s> add export const addErrorToast = createAction('ADD_ERROR_TOAST');
export const addSuccessToast = createAction('ADD_SUCCESS_TOAST');
export const removeToast = createAction('REMOVE_TOAST');
</s> remove const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
</s> add try {
const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
} catch (error) {
throw new Error(`${this.baseUrl}/${path} | ${error.response.data} | ${error.response.status}`);
} | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
keep add keep keep keep keep keep | <mask> const apiClient = new Api();
<mask>
<mask> export const toggleSettingStatus = createAction('SETTING_STATUS_TOGGLE');
<mask> export const showSettingsFailure = createAction('SETTINGS_FAILURE_SHOW');
<mask>
<mask> export const toggleSetting = (settingKey, status) => async (dispatch) => {
<mask> switch (settingKey) {
</s> Show toast on failed request </s> remove import alertify from 'alertifyjs';
</s> add </s> remove const disableButton = <button type="button" className="btn btn-outline-secondary btn-sm mr-2" onClick={() => this.props.disableDns()}>Disable DNS</button>;
</s> add </s> remove const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
</s> add try {
const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
} catch (error) {
throw new Error(`${this.baseUrl}/${path} | ${error.response.data} | ${error.response.status}`);
} </s> add import nanoid from 'nanoid'; </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
keep keep keep add keep keep keep keep keep keep | <mask> };
<mask> dispatch(initSettingsSuccess({ settingsList: newSettingsList }));
<mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(initSettingsFailure());
<mask> }
<mask> };
<mask>
<mask> export const dnsStatusRequest = createAction('DNS_STATUS_REQUEST');
<mask> export const dnsStatusFailure = createAction('DNS_STATUS_FAILURE');
</s> Show toast on failed request </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
keep keep keep add keep keep keep keep keep keep | <mask> const dnsStatus = await apiClient.getGlobalStatus();
<mask> dispatch(dnsStatusSuccess(dnsStatus));
<mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(initSettingsFailure());
<mask> }
<mask> };
<mask>
<mask> export const enableDnsRequest = createAction('ENABLE_DNS_REQUEST');
<mask> export const enableDnsFailure = createAction('ENABLE_DNS_FAILURE');
</s> Show toast on failed request </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> remove alertify.error(`Failed to disable DNS with status code ${error.response.status}`);
dispatch(disableDnsFailure());
</s> add dispatch(disableDnsFailure(error));
dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
keep keep keep add keep keep keep keep keep keep | <mask> await apiClient.startGlobalFiltering();
<mask> dispatch(enableDnsSuccess());
<mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(enableDnsFailure());
<mask> }
<mask> };
<mask>
<mask> export const disableDnsRequest = createAction('DISABLE_DNS_REQUEST');
<mask> export const disableDnsFailure = createAction('DISABLE_DNS_FAILURE');
</s> Show toast on failed request </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> remove alertify.error(`Failed to disable DNS with status code ${error.response.status}`);
dispatch(disableDnsFailure());
</s> add dispatch(disableDnsFailure(error));
dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
keep keep keep keep replace replace keep keep keep keep keep | <mask> await apiClient.stopGlobalFiltering();
<mask> dispatch(disableDnsSuccess());
<mask> } catch (error) {
<mask> console.error(error);
<mask> alertify.error(`Failed to disable DNS with status code ${error.response.status}`);
<mask> dispatch(disableDnsFailure());
<mask> }
<mask> };
<mask>
<mask> export const getStatsRequest = createAction('GET_STATS_REQUEST');
<mask> export const getStatsFailure = createAction('GET_STATS_FAILURE');
</s> Show toast on failed request </s> remove alertify.error(`Failed to load statistics with status code ${error.response.status}`);
dispatch(getTopStatsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getTopStatsFailure(error)); </s> remove alertify.error(`Failed to load query log with status code ${error.response.status}`);
dispatch(getLogsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getLogsFailure(error)); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> remove const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
</s> add try {
const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
} catch (error) {
throw new Error(`${this.baseUrl}/${path} | ${error.response.data} | ${error.response.status}`);
} | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
keep keep keep add keep keep keep keep keep | <mask>
<mask> dispatch(getStatsSuccess(processedStats));
<mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(getStatsFailure());
<mask> }
<mask> };
<mask>
<mask> export const getTopStatsRequest = createAction('GET_TOP_STATS_REQUEST');
</s> Show toast on failed request </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
keep keep keep keep replace replace keep keep keep keep keep | <mask> try {
<mask> const stats = await apiClient.getGlobalStatsTop();
<mask> dispatch(getTopStatsSuccess(stats));
<mask> } catch (error) {
<mask> alertify.error(`Failed to load statistics with status code ${error.response.status}`);
<mask> dispatch(getTopStatsFailure());
<mask> }
<mask> }
<mask> }, 100);
<mask> };
<mask>
</s> Show toast on failed request </s> remove alertify.error(`Failed to load query log with status code ${error.response.status}`);
dispatch(getLogsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getLogsFailure(error)); </s> remove alertify.error(`Failed to disable DNS with status code ${error.response.status}`);
dispatch(disableDnsFailure());
</s> add dispatch(disableDnsFailure(error));
dispatch(addErrorToast({ error })); </s> remove const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
</s> add try {
const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
} catch (error) {
throw new Error(`${this.baseUrl}/${path} | ${error.response.data} | ${error.response.status}`);
} </s> add dispatch(addErrorToast({ error })); </s> add "dom-helpers": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.3.1.tgz",
"integrity": "sha512-2Sm+JaYn74OiTM2wHvxJOo3roiq/h25Yi69Fqk269cNUwIXsCvATB6CRSFC9Am/20G2b28hGv/+7NiWydIrPvg=="
}, </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
keep keep keep keep replace replace keep keep keep keep keep | <mask> try {
<mask> const logs = normalizeLogs(await apiClient.getQueryLog());
<mask> dispatch(getLogsSuccess(logs));
<mask> } catch (error) {
<mask> alertify.error(`Failed to load query log with status code ${error.response.status}`);
<mask> dispatch(getLogsFailure());
<mask> }
<mask> }
<mask> }, 100);
<mask> };
<mask>
</s> Show toast on failed request </s> remove alertify.error(`Failed to load statistics with status code ${error.response.status}`);
dispatch(getTopStatsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getTopStatsFailure(error)); </s> remove alertify.error(`Failed to disable DNS with status code ${error.response.status}`);
dispatch(disableDnsFailure());
</s> add dispatch(disableDnsFailure(error));
dispatch(addErrorToast({ error })); </s> remove const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
</s> add try {
const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
} catch (error) {
throw new Error(`${this.baseUrl}/${path} | ${error.response.data} | ${error.response.status}`);
} </s> add "dom-helpers": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.3.1.tgz",
"integrity": "sha512-2Sm+JaYn74OiTM2wHvxJOo3roiq/h25Yi69Fqk269cNUwIXsCvATB6CRSFC9Am/20G2b28hGv/+7NiWydIrPvg=="
}, </s> add "react-transition-group": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.4.0.tgz",
"integrity": "sha512-Xv5d55NkJUxUzLCImGSanK8Cl/30sgpOEMGc5m86t8+kZwrPxPCPcFqyx83kkr+5Lz5gs6djuvE5By+gce+VjA==",
"requires": {
"dom-helpers": "^3.3.1",
"loose-envify": "^1.3.1",
"prop-types": "^15.6.2",
"react-lifecycles-compat": "^3.0.4"
}
}, </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
keep keep add keep keep keep keep keep | <mask> dispatch(toggleLogStatusSuccess());
<mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(toggleLogStatusFailure());
<mask> }
<mask> };
<mask>
<mask> export const setRulesRequest = createAction('SET_RULES_REQUEST');
</s> Show toast on failed request </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
keep add keep keep keep keep keep | <mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(setRulesFailure());
<mask> }
<mask> };
<mask>
<mask> export const getFilteringStatusRequest = createAction('GET_FILTERING_STATUS_REQUEST');
</s> Show toast on failed request </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
keep add keep keep keep keep | <mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(getFilteringStatusFailure());
<mask> }
<mask> };
<mask>
</s> Show toast on failed request </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
keep keep add keep keep keep keep keep | <mask> dispatch(getFilteringStatus());
<mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(toggleFilterFailure());
<mask> }
<mask> };
<mask>
<mask> export const refreshFiltersRequest = createAction('FILTERING_REFRESH_REQUEST');
</s> Show toast on failed request </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
keep add keep keep keep keep | <mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(refreshFiltersFailure());
<mask> }
<mask> };
<mask>
</s> Show toast on failed request </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
keep keep keep add keep keep keep keep keep | <mask> const normalizedHistory = normalizeHistory(statsHistory);
<mask> dispatch(getStatsHistorySuccess(normalizedHistory));
<mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(getStatsHistoryFailure());
<mask> }
<mask> };
<mask>
<mask> export const addFilterRequest = createAction('ADD_FILTER_REQUEST');
</s> Show toast on failed request </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
keep keep keep add keep keep keep keep | <mask> dispatch(addFilterSuccess(url));
<mask> dispatch(getFilteringStatus());
<mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(addFilterFailure());
<mask> }
<mask> };
<mask>
</s> Show toast on failed request </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
keep keep keep add keep keep keep keep | <mask> dispatch(removeFilterSuccess(url));
<mask> dispatch(getFilteringStatus());
<mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(removeFilterFailure());
<mask> }
<mask> };
<mask>
</s> Show toast on failed request </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
keep keep keep add keep keep keep keep keep keep | <mask> data = await apiClient.downloadQueryLog();
<mask> dispatch(downloadQueryLogSuccess());
<mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(downloadQueryLogFailure());
<mask> }
<mask> return data;
<mask> };
<mask>
<mask> export const handleUpstreamChange = createAction('HANDLE_UPSTREAM_CHANGE');
</s> Show toast on failed request </s> remove const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
</s> add try {
const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
} catch (error) {
throw new Error(`${this.baseUrl}/${path} | ${error.response.data} | ${error.response.status}`);
} </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> remove alertify.error(`Failed to disable DNS with status code ${error.response.status}`);
dispatch(disableDnsFailure());
</s> add dispatch(disableDnsFailure(error));
dispatch(addErrorToast({ error })); </s> remove alertify.error(`Failed to load statistics with status code ${error.response.status}`);
dispatch(getTopStatsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getTopStatsFailure(error)); </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
keep add keep keep keep | <mask> } catch (error) {
<mask> console.error(error);
<mask> dispatch(setUpstreamFailure());
<mask> }
<mask> };
</s> Show toast on failed request </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/actions/index.js |
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep | <mask> export default class Api {
<mask> baseUrl = 'control';
<mask>
<mask> async makeRequest(path, method = 'POST', config) {
<mask> const response = await axios({
<mask> url: `${this.baseUrl}/${path}`,
<mask> method,
<mask> ...config,
<mask> });
<mask> return response.data;
<mask> }
<mask>
<mask> // Global methods
<mask> GLOBAL_RESTART = { path: 'restart', method: 'POST' };
<mask> GLOBAL_START = { path: 'start', method: 'POST' };
</s> Show toast on failed request </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> remove alertify.error(`Failed to load statistics with status code ${error.response.status}`);
dispatch(getTopStatsFailure());
</s> add console.error(error);
dispatch(addErrorToast({ error }));
dispatch(getTopStatsFailure(error)); </s> add dispatch(addErrorToast({ error })); </s> remove import alertify from 'alertifyjs';
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/api/Api.js |
keep keep keep keep replace keep keep replace keep | <mask> import { HashRouter, Route } from 'react-router-dom';
<mask> import PropTypes from 'prop-types';
<mask>
<mask> import 'react-table/react-table.css';
<mask> import 'alertifyjs/build/css/alertify.min.css';
<mask> import '../ui/Tabler.css';
<mask> import '../ui/ReactTable.css';
<mask> import '../ui/Alertify.css';
<mask> import './index.css';
</s> Show toast on failed request </s> add import Toasts from '../Toasts'; </s> remove import alertify from 'alertifyjs';
</s> add </s> add import nanoid from 'nanoid'; </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/components/App/index.js |
keep keep keep add keep keep keep keep keep keep | <mask> import Settings from '../../containers/Settings';
<mask> import Filters from '../../containers/Filters';
<mask> import Logs from '../../containers/Logs';
<mask> import Footer from '../ui/Footer';
<mask>
<mask> import Status from '../ui/Status';
<mask>
<mask> class App extends Component {
<mask> componentDidMount() {
<mask> this.props.getDnsStatus();
</s> Show toast on failed request </s> remove import '../ui/Alertify.css';
</s> add </s> remove import alertify from 'alertifyjs';
</s> add </s> remove import 'alertifyjs/build/css/alertify.min.css';
</s> add </s> add import nanoid from 'nanoid'; </s> remove const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
</s> add try {
const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
} catch (error) {
throw new Error(`${this.baseUrl}/${path} | ${error.response.data} | ${error.response.status}`);
} </s> add "react-transition-group": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.4.0.tgz",
"integrity": "sha512-Xv5d55NkJUxUzLCImGSanK8Cl/30sgpOEMGc5m86t8+kZwrPxPCPcFqyx83kkr+5Lz5gs6djuvE5By+gce+VjA==",
"requires": {
"dom-helpers": "^3.3.1",
"loose-envify": "^1.3.1",
"prop-types": "^15.6.2",
"react-lifecycles-compat": "^3.0.4"
}
}, | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/components/App/index.js |
keep add keep keep keep keep keep | <mask> </div>
<mask> <Footer />
<mask> </Fragment>
<mask> </HashRouter>
<mask> );
<mask> }
<mask> }
</s> Show toast on failed request </s> remove {disableButton}
</s> add </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/components/App/index.js |
keep add keep keep keep | <mask> dashboard: PropTypes.object,
<mask> isCoreRunning: PropTypes.bool,
<mask> };
<mask>
<mask> export default App;
</s> Show toast on failed request </s> remove const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
</s> add try {
const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
} catch (error) {
throw new Error(`${this.baseUrl}/${path} | ${error.response.data} | ${error.response.status}`);
} </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/components/App/index.js |
keep keep keep keep replace keep keep keep keep keep | <mask> dashboard.processingStats ||
<mask> dashboard.processingStatsHistory ||
<mask> dashboard.processingTopStats;
<mask>
<mask> const disableButton = <button type="button" className="btn btn-outline-secondary btn-sm mr-2" onClick={() => this.props.disableDns()}>Disable DNS</button>;
<mask> const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.componentDidMount()}>Refresh statistics</button>;
<mask> const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.componentDidMount()}></button>;
<mask>
<mask> return (
<mask> <Fragment>
</s> Show toast on failed request </s> add export const addErrorToast = createAction('ADD_ERROR_TOAST');
export const addSuccessToast = createAction('ADD_SUCCESS_TOAST');
export const removeToast = createAction('REMOVE_TOAST');
</s> remove {disableButton}
</s> add </s> add import nanoid from 'nanoid'; </s> add dispatch(addErrorToast({ error })); </s> remove const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
</s> add try {
const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
} catch (error) {
throw new Error(`${this.baseUrl}/${path} | ${error.response.data} | ${error.response.status}`);
} </s> add dispatch(addErrorToast({ error })); | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/components/Dashboard/index.js |
keep keep keep keep replace keep keep keep keep keep | <mask> return (
<mask> <Fragment>
<mask> <PageTitle title="Dashboard">
<mask> <div className="page-title__actions">
<mask> {disableButton}
<mask> {refreshFullButton}
<mask> </div>
<mask> </PageTitle>
<mask> {dashboardProcessing && <Loading />}
<mask> {!dashboardProcessing &&
</s> Show toast on failed request </s> remove const disableButton = <button type="button" className="btn btn-outline-secondary btn-sm mr-2" onClick={() => this.props.disableDns()}>Disable DNS</button>;
</s> add </s> add <Toasts /> </s> add dispatch(addErrorToast({ error })); </s> remove const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
</s> add try {
const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
} catch (error) {
throw new Error(`${this.baseUrl}/${path} | ${error.response.data} | ${error.response.status}`);
} </s> add toasts, </s> remove import alertify from 'alertifyjs';
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/components/Dashboard/index.js |
keep add keep keep keep keep keep | <mask> import { combineReducers } from 'redux';
<mask> import { handleActions } from 'redux-actions';
<mask>
<mask> import * as actions from '../actions';
<mask>
<mask> const settings = handleActions({
<mask> [actions.initSettingsRequest]: state => ({ ...state, processing: true }),
</s> Show toast on failed request </s> remove import alertify from 'alertifyjs';
</s> add </s> add import Toasts from '../Toasts'; </s> remove import 'alertifyjs/build/css/alertify.min.css';
</s> add </s> remove import '../ui/Alertify.css';
</s> add </s> add "dom-helpers": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.3.1.tgz",
"integrity": "sha512-2Sm+JaYn74OiTM2wHvxJOo3roiq/h25Yi69Fqk269cNUwIXsCvATB6CRSFC9Am/20G2b28hGv/+7NiWydIrPvg=="
}, </s> add export const addErrorToast = createAction('ADD_ERROR_TOAST');
export const addSuccessToast = createAction('ADD_SUCCESS_TOAST');
export const removeToast = createAction('REMOVE_TOAST');
| https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/reducers/index.js |
keep keep keep add keep | <mask> settings,
<mask> dashboard,
<mask> queryLogs,
<mask> filtering,
<mask> });
</s> Show toast on failed request </s> remove const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
</s> add try {
const response = await axios({
url: `${this.baseUrl}/${path}`,
method,
...config,
});
return response.data;
} catch (error) {
throw new Error(`${this.baseUrl}/${path} | ${error.response.data} | ${error.response.status}`);
} </s> add "dom-helpers": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.3.1.tgz",
"integrity": "sha512-2Sm+JaYn74OiTM2wHvxJOo3roiq/h25Yi69Fqk269cNUwIXsCvATB6CRSFC9Am/20G2b28hGv/+7NiWydIrPvg=="
}, </s> add "nanoid": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-1.2.3.tgz",
"integrity": "sha512-BAnxAdaihzMoszwhqRy8FPOX+dijs7esUEUYTIQ1KsOSKmCVNYnitAMmBDFxYzA6VQYvuUKw7o2K1AcMBTGzIg=="
}, </s> add "react-transition-group": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.4.0.tgz",
"integrity": "sha512-Xv5d55NkJUxUzLCImGSanK8Cl/30sgpOEMGc5m86t8+kZwrPxPCPcFqyx83kkr+5Lz5gs6djuvE5By+gce+VjA==",
"requires": {
"dom-helpers": "^3.3.1",
"loose-envify": "^1.3.1",
"prop-types": "^15.6.2",
"react-lifecycles-compat": "^3.0.4"
}
}, </s> remove "alertifyjs": "^1.11.1",
</s> add </s> add "nanoid": "^1.2.3", | https://github.com/AdguardTeam/AdGuardHome/commit/828bb40084963436aeb2c39fa2f5c75a8b17e983 | client/src/reducers/index.js |
keep keep keep add keep keep keep keep | <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/bluele/gcache"
<mask> "golang.org/x/net/publicsuffix"
<mask> )
<mask>
</s> * dnsfilter: use urlfilter package
+ new config setting 'filtering_temp_filename'
* remove AddRules(), modify New() </s> add if d.rulesStorage != nil {
d.rulesStorage.Close()
d.rulesStorage = nil
} </s> add if filters != nil {
err := d.initFiltering(filters)
if err != nil {
log.Error("Can't initialize filtering subsystem: %s", err)
d.Destroy()
return nil
}
}
</s> remove func New(c *Config) *Dnsfilter {
</s> add func New(c *Config, filters map[int]string) *Dnsfilter { </s> remove // AddRules is a convinience function to add an array of filters in one call
func (d *Dnsfilter) AddRules(filters []Filter) error {
</s> add // Initialize urlfilter objects
func (d *Dnsfilter) initFiltering(filters map[int]string) error {
var err error
d.rulesStorage, err = urlfilter.NewRuleStorage(d.FilteringTempFilename)
if err != nil {
return err
}
d.filteringEngine = urlfilter.NewDNSEngine(filters, d.rulesStorage) </s> add rulesStorage *urlfilter.RulesStorage
filteringEngine *urlfilter.DNSEngine
</s> remove ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address
</s> add FilteringTempFilename string `yaml:"filtering_temp_filename"` // temporary file for storing unused filtering rules
ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address | https://github.com/AdguardTeam/AdGuardHome/commit/829415da5b714b83d07c28728f3ba12e85b6692c | dnsfilter/dnsfilter.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> const enableDelayedCompilation = true // flag for debugging, must be true in production for faster performance
<mask>
<mask> // Config allows you to configure DNS filtering with New() or just change variables directly.
<mask> type Config struct {
<mask> ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
<mask> ParentalEnabled bool `yaml:"parental_enabled"`
<mask> SafeSearchEnabled bool `yaml:"safesearch_enabled"`
<mask> SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
<mask> ResolverAddress string // DNS server address
<mask> }
<mask>
<mask> type privateConfig struct {
<mask> parentalServer string // access via methods
<mask> safeBrowsingServer string // access via methods
</s> * dnsfilter: use urlfilter package
+ new config setting 'filtering_temp_filename'
* remove AddRules(), modify New() </s> remove func New(c *Config) *Dnsfilter {
</s> add func New(c *Config, filters map[int]string) *Dnsfilter { </s> add rulesStorage *urlfilter.RulesStorage
filteringEngine *urlfilter.DNSEngine
</s> add if filters != nil {
err := d.initFiltering(filters)
if err != nil {
log.Error("Can't initialize filtering subsystem: %s", err)
d.Destroy()
return nil
}
}
</s> remove // AddRules is a convinience function to add an array of filters in one call
func (d *Dnsfilter) AddRules(filters []Filter) error {
</s> add // Initialize urlfilter objects
func (d *Dnsfilter) initFiltering(filters map[int]string) error {
var err error
d.rulesStorage, err = urlfilter.NewRuleStorage(d.FilteringTempFilename)
if err != nil {
return err
}
d.filteringEngine = urlfilter.NewDNSEngine(filters, d.rulesStorage) </s> add if d.rulesStorage != nil {
d.rulesStorage.Close()
d.rulesStorage = nil
} </s> add "github.com/AdguardTeam/urlfilter" | https://github.com/AdguardTeam/AdGuardHome/commit/829415da5b714b83d07c28728f3ba12e85b6692c | dnsfilter/dnsfilter.go |
keep keep add keep keep keep keep | <mask>
<mask> // Dnsfilter holds added rules and performs hostname matches against the rules
<mask> type Dnsfilter struct {
<mask> // HTTP lookups for safebrowsing and parental
<mask> client http.Client // handle for http client -- single instance as recommended by docs
<mask> transport *http.Transport // handle for http transport used by http client
<mask>
</s> * dnsfilter: use urlfilter package
+ new config setting 'filtering_temp_filename'
* remove AddRules(), modify New() </s> remove // AddRules is a convinience function to add an array of filters in one call
func (d *Dnsfilter) AddRules(filters []Filter) error {
</s> add // Initialize urlfilter objects
func (d *Dnsfilter) initFiltering(filters map[int]string) error {
var err error
d.rulesStorage, err = urlfilter.NewRuleStorage(d.FilteringTempFilename)
if err != nil {
return err
}
d.filteringEngine = urlfilter.NewDNSEngine(filters, d.rulesStorage) </s> remove ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address
</s> add FilteringTempFilename string `yaml:"filtering_temp_filename"` // temporary file for storing unused filtering rules
ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address </s> remove func New(c *Config) *Dnsfilter {
</s> add func New(c *Config, filters map[int]string) *Dnsfilter { </s> add if filters != nil {
err := d.initFiltering(filters)
if err != nil {
log.Error("Can't initialize filtering subsystem: %s", err)
d.Destroy()
return nil
}
}
</s> add if d.rulesStorage != nil {
d.rulesStorage.Close()
d.rulesStorage = nil
} </s> add "github.com/AdguardTeam/urlfilter" | https://github.com/AdguardTeam/AdGuardHome/commit/829415da5b714b83d07c28728f3ba12e85b6692c | dnsfilter/dnsfilter.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> //
<mask> // Adding rule and matching against the rules
<mask> //
<mask>
<mask> // AddRules is a convinience function to add an array of filters in one call
<mask> func (d *Dnsfilter) AddRules(filters []Filter) error {
<mask> return nil
<mask> }
<mask>
<mask> // matchHost is a low-level way to check only if hostname is filtered by rules, skipping expensive safebrowsing and parental lookups
<mask> func (d *Dnsfilter) matchHost(host string) (Result, error) {
</s> * dnsfilter: use urlfilter package
+ new config setting 'filtering_temp_filename'
* remove AddRules(), modify New() </s> add rulesStorage *urlfilter.RulesStorage
filteringEngine *urlfilter.DNSEngine
</s> remove func New(c *Config) *Dnsfilter {
</s> add func New(c *Config, filters map[int]string) *Dnsfilter { </s> add if filters != nil {
err := d.initFiltering(filters)
if err != nil {
log.Error("Can't initialize filtering subsystem: %s", err)
d.Destroy()
return nil
}
}
</s> add if d.rulesStorage != nil {
d.rulesStorage.Close()
d.rulesStorage = nil
} </s> remove ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address
</s> add FilteringTempFilename string `yaml:"filtering_temp_filename"` // temporary file for storing unused filtering rules
ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address </s> add "github.com/AdguardTeam/urlfilter" | https://github.com/AdguardTeam/AdGuardHome/commit/829415da5b714b83d07c28728f3ba12e85b6692c | dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> // New creates properly initialized DNS Filter that is ready to be used
<mask> func New(c *Config) *Dnsfilter {
<mask> d := new(Dnsfilter)
<mask>
<mask> // Customize the Transport to have larger connection pool,
<mask> // We are not (re)using http.DefaultTransport because of race conditions found by tests
<mask> d.transport = &http.Transport{
</s> * dnsfilter: use urlfilter package
+ new config setting 'filtering_temp_filename'
* remove AddRules(), modify New() </s> remove // AddRules is a convinience function to add an array of filters in one call
func (d *Dnsfilter) AddRules(filters []Filter) error {
</s> add // Initialize urlfilter objects
func (d *Dnsfilter) initFiltering(filters map[int]string) error {
var err error
d.rulesStorage, err = urlfilter.NewRuleStorage(d.FilteringTempFilename)
if err != nil {
return err
}
d.filteringEngine = urlfilter.NewDNSEngine(filters, d.rulesStorage) </s> add if filters != nil {
err := d.initFiltering(filters)
if err != nil {
log.Error("Can't initialize filtering subsystem: %s", err)
d.Destroy()
return nil
}
}
</s> remove ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address
</s> add FilteringTempFilename string `yaml:"filtering_temp_filename"` // temporary file for storing unused filtering rules
ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address </s> add if d.rulesStorage != nil {
d.rulesStorage.Close()
d.rulesStorage = nil
} </s> add rulesStorage *urlfilter.RulesStorage
filteringEngine *urlfilter.DNSEngine
</s> add "github.com/AdguardTeam/urlfilter" | https://github.com/AdguardTeam/AdGuardHome/commit/829415da5b714b83d07c28728f3ba12e85b6692c | dnsfilter/dnsfilter.go |
keep keep keep add keep keep keep keep keep | <mask> if c != nil {
<mask> d.Config = *c
<mask> }
<mask>
<mask> return d
<mask> }
<mask>
<mask> // Destroy is optional if you want to tidy up goroutines without waiting for them to die off
<mask> // right now it closes idle HTTP connections if there are any
</s> * dnsfilter: use urlfilter package
+ new config setting 'filtering_temp_filename'
* remove AddRules(), modify New() </s> remove // AddRules is a convinience function to add an array of filters in one call
func (d *Dnsfilter) AddRules(filters []Filter) error {
</s> add // Initialize urlfilter objects
func (d *Dnsfilter) initFiltering(filters map[int]string) error {
var err error
d.rulesStorage, err = urlfilter.NewRuleStorage(d.FilteringTempFilename)
if err != nil {
return err
}
d.filteringEngine = urlfilter.NewDNSEngine(filters, d.rulesStorage) </s> remove func New(c *Config) *Dnsfilter {
</s> add func New(c *Config, filters map[int]string) *Dnsfilter { </s> add if d.rulesStorage != nil {
d.rulesStorage.Close()
d.rulesStorage = nil
} </s> remove ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address
</s> add FilteringTempFilename string `yaml:"filtering_temp_filename"` // temporary file for storing unused filtering rules
ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address </s> add rulesStorage *urlfilter.RulesStorage
filteringEngine *urlfilter.DNSEngine
</s> add "github.com/AdguardTeam/urlfilter" | https://github.com/AdguardTeam/AdGuardHome/commit/829415da5b714b83d07c28728f3ba12e85b6692c | dnsfilter/dnsfilter.go |
keep add keep keep keep keep keep | <mask> d.transport.CloseIdleConnections()
<mask> }
<mask> }
<mask>
<mask> //
<mask> // config manipulation helpers
<mask> //
</s> * dnsfilter: use urlfilter package
+ new config setting 'filtering_temp_filename'
* remove AddRules(), modify New() </s> remove func New(c *Config) *Dnsfilter {
</s> add func New(c *Config, filters map[int]string) *Dnsfilter { </s> remove // AddRules is a convinience function to add an array of filters in one call
func (d *Dnsfilter) AddRules(filters []Filter) error {
</s> add // Initialize urlfilter objects
func (d *Dnsfilter) initFiltering(filters map[int]string) error {
var err error
d.rulesStorage, err = urlfilter.NewRuleStorage(d.FilteringTempFilename)
if err != nil {
return err
}
d.filteringEngine = urlfilter.NewDNSEngine(filters, d.rulesStorage) </s> add if filters != nil {
err := d.initFiltering(filters)
if err != nil {
log.Error("Can't initialize filtering subsystem: %s", err)
d.Destroy()
return nil
}
}
</s> remove ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address
</s> add FilteringTempFilename string `yaml:"filtering_temp_filename"` // temporary file for storing unused filtering rules
ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address </s> add rulesStorage *urlfilter.RulesStorage
filteringEngine *urlfilter.DNSEngine
</s> add "github.com/AdguardTeam/urlfilter" | https://github.com/AdguardTeam/AdGuardHome/commit/829415da5b714b83d07c28728f3ba12e85b6692c | dnsfilter/dnsfilter.go |
add keep keep keep keep keep | <mask> import whotracksmeDb from './whotracksme.json';
<mask> import adguardDb from './adguard.json';
<mask> import { REPOSITORY } from '../constants';
<mask>
<mask> /**
<mask> @typedef TrackerData
</s> Pull request: whotracksme tracker links
Merge in DNS/adguard-home from 4416-ui-tracker-href to master
Squashed commit of the following:
commit 979ea82a3b4d2c2a895b81aacd613fb7e5bec586
Merge: 4fe6328b 12ee287d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 19 15:03:13 2022 +0200
Merge remote-tracking branch 'origin/master' into 4416-ui-tracker-href
commit 4fe6328b276e697a2aa351c6543d2efe6d2dc2e1
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 19 14:08:10 2022 +0200
whotracksme tracker links </s> remove url: `https://whotracks.me/trackers/${trackerData.id}.html`,
</s> add url: getWhotracksmeUrl(trackerData.id), </s> add /**
* Gets link to tracker page on whotracks.me.
*
* @param trackerId
* @return {string}
*/
const getWhotracksmeUrl = (trackerId) => {
const websiteId = whotracksmeWebsites.websites[trackerId];
if (websiteId) {
// Overrides links to websites.
return `https://whotracks.me/websites/${websiteId}.html`;
}
return `https://whotracks.me/trackers/${trackerId}.html`;
};
| https://github.com/AdguardTeam/AdGuardHome/commit/82af43039c78b49908151c09175a5161dd911601 | client/src/helpers/trackers/trackers.js |
keep keep add keep keep keep keep keep keep | <mask> ADGUARD: 2,
<mask> };
<mask>
<mask> /**
<mask> * Gets the source metadata for the specified tracker
<mask> * @param {TrackerData} trackerData tracker data
<mask> * @returns {source} source metadata or null if no matching tracker found
<mask> */
<mask> export const getSourceData = (trackerData) => {
</s> Pull request: whotracksme tracker links
Merge in DNS/adguard-home from 4416-ui-tracker-href to master
Squashed commit of the following:
commit 979ea82a3b4d2c2a895b81aacd613fb7e5bec586
Merge: 4fe6328b 12ee287d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 19 15:03:13 2022 +0200
Merge remote-tracking branch 'origin/master' into 4416-ui-tracker-href
commit 4fe6328b276e697a2aa351c6543d2efe6d2dc2e1
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 19 14:08:10 2022 +0200
whotracksme tracker links </s> remove url: `https://whotracks.me/trackers/${trackerData.id}.html`,
</s> add url: getWhotracksmeUrl(trackerData.id), </s> add import whotracksmeWebsites from './whotracksme_web.json'; | https://github.com/AdguardTeam/AdGuardHome/commit/82af43039c78b49908151c09175a5161dd911601 | client/src/helpers/trackers/trackers.js |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> if (trackerData.source === sources.WHOTRACKSME) {
<mask> return {
<mask> name: 'Whotracks.me',
<mask> url: `https://whotracks.me/trackers/${trackerData.id}.html`,
<mask> };
<mask> }
<mask> if (trackerData.source === sources.ADGUARD) {
<mask> return {
<mask> name: 'AdGuard',
</s> Pull request: whotracksme tracker links
Merge in DNS/adguard-home from 4416-ui-tracker-href to master
Squashed commit of the following:
commit 979ea82a3b4d2c2a895b81aacd613fb7e5bec586
Merge: 4fe6328b 12ee287d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 19 15:03:13 2022 +0200
Merge remote-tracking branch 'origin/master' into 4416-ui-tracker-href
commit 4fe6328b276e697a2aa351c6543d2efe6d2dc2e1
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 19 14:08:10 2022 +0200
whotracksme tracker links </s> add /**
* Gets link to tracker page on whotracks.me.
*
* @param trackerId
* @return {string}
*/
const getWhotracksmeUrl = (trackerId) => {
const websiteId = whotracksmeWebsites.websites[trackerId];
if (websiteId) {
// Overrides links to websites.
return `https://whotracks.me/websites/${websiteId}.html`;
}
return `https://whotracks.me/trackers/${trackerId}.html`;
};
</s> add import whotracksmeWebsites from './whotracksme_web.json'; | https://github.com/AdguardTeam/AdGuardHome/commit/82af43039c78b49908151c09175a5161dd911601 | client/src/helpers/trackers/trackers.js |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> }
<mask>
<mask> // field ordering is important -- yaml fields will mirror ordering from here
<mask> type coreDNSConfig struct {
<mask> binaryFile string
<mask> coreFile string
<mask> Filters []filter `yaml:"-"`
<mask> Port int `yaml:"port"`
<mask> ProtectionEnabled bool `yaml:"protection_enabled"`
<mask> FilteringEnabled bool `yaml:"filtering_enabled"`
<mask> SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
<mask> SafeSearchEnabled bool `yaml:"safesearch_enabled"`
<mask> ParentalEnabled bool `yaml:"parental_enabled"`
<mask> ParentalSensitivity int `yaml:"parental_sensitivity"`
<mask> BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"`
<mask> QueryLogEnabled bool `yaml:"querylog_enabled"`
<mask> Ratelimit int `yaml:"ratelimit"`
<mask> RefuseAny bool `yaml:"refuse_any"`
<mask> Pprof string `yaml:"-"`
<mask> Cache string `yaml:"-"`
<mask> Prometheus string `yaml:"-"`
<mask> BootstrapDNS string `yaml:"bootstrap_dns"`
<mask> UpstreamDNS []string `yaml:"upstream_dns"`
<mask> }
<mask>
<mask> // field ordering is important -- yaml fields will mirror ordering from here
<mask> type filter struct {
<mask> Enabled bool `json:"enabled"`
</s> Move filtering setting fields from main app to dnsforward. </s> add type FilteringConfig struct {
ProtectionEnabled bool `yaml:"protection_enabled"`
FilteringEnabled bool `yaml:"filtering_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
ParentalEnabled bool `yaml:"parental_enabled"`
ParentalSensitivity int `yaml:"parental_sensitivity"`
BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"`
}
</s> add FilteringConfig </s> remove Port: 53,
binaryFile: "coredns", // only filename, no path
coreFile: "Corefile", // only filename, no path
ProtectionEnabled: true,
FilteringEnabled: true,
SafeBrowsingEnabled: false,
BlockedResponseTTL: 10, // in seconds
QueryLogEnabled: true,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: "8.8.8.8:53",
UpstreamDNS: defaultDNS,
Cache: "cache",
Prometheus: "prometheus :9153",
</s> add Port: 53,
binaryFile: "coredns", // only filename, no path
coreFile: "Corefile", // only filename, no path
FilteringConfig: dnsforward.FilteringConfig{
ProtectionEnabled: true,
FilteringEnabled: true,
SafeBrowsingEnabled: false,
BlockedResponseTTL: 10, // in seconds
},
QueryLogEnabled: true,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: "8.8.8.8:53",
UpstreamDNS: defaultDNS,
Cache: "cache",
Prometheus: "prometheus :9153", | https://github.com/AdguardTeam/AdGuardHome/commit/8316d39b4282599681a827a50d6541c5cb4987ed | config.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> ourConfigFilename: "AdGuardHome.yaml",
<mask> BindPort: 3000,
<mask> BindHost: "127.0.0.1",
<mask> CoreDNS: coreDNSConfig{
<mask> Port: 53,
<mask> binaryFile: "coredns", // only filename, no path
<mask> coreFile: "Corefile", // only filename, no path
<mask> ProtectionEnabled: true,
<mask> FilteringEnabled: true,
<mask> SafeBrowsingEnabled: false,
<mask> BlockedResponseTTL: 10, // in seconds
<mask> QueryLogEnabled: true,
<mask> Ratelimit: 20,
<mask> RefuseAny: true,
<mask> BootstrapDNS: "8.8.8.8:53",
<mask> UpstreamDNS: defaultDNS,
<mask> Cache: "cache",
<mask> Prometheus: "prometheus :9153",
<mask> },
<mask> Filters: []filter{
<mask> {Filter: dnsforward.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard Simplified Domain Names filter"},
<mask> {Filter: dnsforward.Filter{ID: 2}, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway"},
<mask> {Filter: dnsforward.Filter{ID: 3}, Enabled: false, URL: "https://hosts-file.net/ad_servers.txt", Name: "hpHosts - Ad and Tracking servers only"},
</s> Move filtering setting fields from main app to dnsforward. </s> add type FilteringConfig struct {
ProtectionEnabled bool `yaml:"protection_enabled"`
FilteringEnabled bool `yaml:"filtering_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
ParentalEnabled bool `yaml:"parental_enabled"`
ParentalSensitivity int `yaml:"parental_sensitivity"`
BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"`
}
</s> add FilteringConfig </s> remove binaryFile string
coreFile string
Filters []filter `yaml:"-"`
Port int `yaml:"port"`
ProtectionEnabled bool `yaml:"protection_enabled"`
FilteringEnabled bool `yaml:"filtering_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
ParentalEnabled bool `yaml:"parental_enabled"`
ParentalSensitivity int `yaml:"parental_sensitivity"`
BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"`
QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RefuseAny bool `yaml:"refuse_any"`
Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"`
</s> add binaryFile string
coreFile string
Filters []filter `yaml:"-"`
Port int `yaml:"port"`
dnsforward.FilteringConfig `yaml:",inline"`
QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RefuseAny bool `yaml:"refuse_any"`
Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"` | https://github.com/AdguardTeam/AdGuardHome/commit/8316d39b4282599681a827a50d6541c5cb4987ed | config.go |
keep keep keep add keep keep keep keep | <mask> fmt.Fprintf(os.Stderr, "%s:%d %s() -> RUnlock() -> done\n", path.Base(file), line, path.Base(f.Name()))
<mask> }
<mask> */
<mask>
<mask> // The zero ServerConfig is empty and ready for use.
<mask> type ServerConfig struct {
<mask> UDPListenAddr *net.UDPAddr // if nil, then default is is used (port 53 on *)
<mask> BlockedResponseTTL uint32 // if 0, then default is used (3600)
</s> Move filtering setting fields from main app to dnsforward. </s> add FilteringConfig </s> remove binaryFile string
coreFile string
Filters []filter `yaml:"-"`
Port int `yaml:"port"`
ProtectionEnabled bool `yaml:"protection_enabled"`
FilteringEnabled bool `yaml:"filtering_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
ParentalEnabled bool `yaml:"parental_enabled"`
ParentalSensitivity int `yaml:"parental_sensitivity"`
BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"`
QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RefuseAny bool `yaml:"refuse_any"`
Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"`
</s> add binaryFile string
coreFile string
Filters []filter `yaml:"-"`
Port int `yaml:"port"`
dnsforward.FilteringConfig `yaml:",inline"`
QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RefuseAny bool `yaml:"refuse_any"`
Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"` </s> remove Port: 53,
binaryFile: "coredns", // only filename, no path
coreFile: "Corefile", // only filename, no path
ProtectionEnabled: true,
FilteringEnabled: true,
SafeBrowsingEnabled: false,
BlockedResponseTTL: 10, // in seconds
QueryLogEnabled: true,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: "8.8.8.8:53",
UpstreamDNS: defaultDNS,
Cache: "cache",
Prometheus: "prometheus :9153",
</s> add Port: 53,
binaryFile: "coredns", // only filename, no path
coreFile: "Corefile", // only filename, no path
FilteringConfig: dnsforward.FilteringConfig{
ProtectionEnabled: true,
FilteringEnabled: true,
SafeBrowsingEnabled: false,
BlockedResponseTTL: 10, // in seconds
},
QueryLogEnabled: true,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: "8.8.8.8:53",
UpstreamDNS: defaultDNS,
Cache: "cache",
Prometheus: "prometheus :9153", | https://github.com/AdguardTeam/AdGuardHome/commit/8316d39b4282599681a827a50d6541c5cb4987ed | dnsforward/dnsforward.go |
keep keep keep add keep keep keep keep keep keep | <mask> UDPListenAddr *net.UDPAddr // if nil, then default is is used (port 53 on *)
<mask> BlockedResponseTTL uint32 // if 0, then default is used (3600)
<mask> Upstreams []Upstream
<mask> Filters []Filter
<mask> }
<mask>
<mask> var defaultValues = ServerConfig{
<mask> UDPListenAddr: &net.UDPAddr{Port: 53},
<mask> BlockedResponseTTL: 3600,
<mask> Upstreams: []Upstream{
</s> Move filtering setting fields from main app to dnsforward. </s> add type FilteringConfig struct {
ProtectionEnabled bool `yaml:"protection_enabled"`
FilteringEnabled bool `yaml:"filtering_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
ParentalEnabled bool `yaml:"parental_enabled"`
ParentalSensitivity int `yaml:"parental_sensitivity"`
BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"`
}
</s> remove binaryFile string
coreFile string
Filters []filter `yaml:"-"`
Port int `yaml:"port"`
ProtectionEnabled bool `yaml:"protection_enabled"`
FilteringEnabled bool `yaml:"filtering_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
ParentalEnabled bool `yaml:"parental_enabled"`
ParentalSensitivity int `yaml:"parental_sensitivity"`
BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"`
QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RefuseAny bool `yaml:"refuse_any"`
Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"`
</s> add binaryFile string
coreFile string
Filters []filter `yaml:"-"`
Port int `yaml:"port"`
dnsforward.FilteringConfig `yaml:",inline"`
QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RefuseAny bool `yaml:"refuse_any"`
Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"` </s> remove Port: 53,
binaryFile: "coredns", // only filename, no path
coreFile: "Corefile", // only filename, no path
ProtectionEnabled: true,
FilteringEnabled: true,
SafeBrowsingEnabled: false,
BlockedResponseTTL: 10, // in seconds
QueryLogEnabled: true,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: "8.8.8.8:53",
UpstreamDNS: defaultDNS,
Cache: "cache",
Prometheus: "prometheus :9153",
</s> add Port: 53,
binaryFile: "coredns", // only filename, no path
coreFile: "Corefile", // only filename, no path
FilteringConfig: dnsforward.FilteringConfig{
ProtectionEnabled: true,
FilteringEnabled: true,
SafeBrowsingEnabled: false,
BlockedResponseTTL: 10, // in seconds
},
QueryLogEnabled: true,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: "8.8.8.8:53",
UpstreamDNS: defaultDNS,
Cache: "cache",
Prometheus: "prometheus :9153", | https://github.com/AdguardTeam/AdGuardHome/commit/8316d39b4282599681a827a50d6541c5cb4987ed | dnsforward/dnsforward.go |
keep keep keep replace keep replace replace replace replace replace keep | <mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // Server is the main way to start a DNS server
<mask> // Example:
<mask> // s := dnsforward.Server{}
<mask> // err := s.Start(nil) // will start a DNS server listening on default port 53, in a goroutine
<mask> // err := s.Reconfigure(ServerConfig{UDPListenAddr: &net.UDPAddr{Port: 53535}}) // will reconfigure running DNS server to listen on UDP port 53535
<mask> // err := s.Stop() // will stop listening on port 53535 and cancel all goroutines
<mask> // err := s.Start(nil) // will start listening again, on port 53535, in a goroutine
<mask> //
</s> Update docs for formatting in godoc. </s> remove // pool := TLSPool{Address: "tls://1.1.1.1:853"}
// netConn, err := pool.Get()
// if err != nil {panic(err)}
// c := dns.Conn{Conn: netConn}
// q := dns.Msg{}
// q.SetQuestion("google.com.", dns.TypeA)
// log.Println(q)
// err = c.WriteMsg(&q)
// if err != nil {panic(err)}
// r, err := c.ReadMsg()
// if err != nil {panic(err)}
// log.Println(r)
// pool.Put(c.Conn)
</s> add // pool := TLSPool{Address: "tls://1.1.1.1:853"}
// netConn, err := pool.Get()
// if err != nil {panic(err)}
// c := dns.Conn{Conn: netConn}
// q := dns.Msg{}
// q.SetQuestion("google.com.", dns.TypeA)
// log.Println(q)
// err = c.WriteMsg(&q)
// if err != nil {panic(err)}
// r, err := c.ReadMsg()
// if err != nil {panic(err)}
// log.Println(r)
// pool.Put(c.Conn) </s> remove // upstream TLS pool.
</s> add // Upstream TLS pool. | https://github.com/AdguardTeam/AdGuardHome/commit/8396dc2fdb90711ba3394b975347a262afe22ae7 | dnsforward/dnsforward.go |
keep keep replace keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep | <mask> )
<mask>
<mask> // upstream TLS pool.
<mask> //
<mask> // Example:
<mask> // pool := TLSPool{Address: "tls://1.1.1.1:853"}
<mask> // netConn, err := pool.Get()
<mask> // if err != nil {panic(err)}
<mask> // c := dns.Conn{Conn: netConn}
<mask> // q := dns.Msg{}
<mask> // q.SetQuestion("google.com.", dns.TypeA)
<mask> // log.Println(q)
<mask> // err = c.WriteMsg(&q)
<mask> // if err != nil {panic(err)}
<mask> // r, err := c.ReadMsg()
<mask> // if err != nil {panic(err)}
<mask> // log.Println(r)
<mask> // pool.Put(c.Conn)
<mask> type TLSPool struct {
<mask> Address string
<mask> parsedAddress *url.URL
<mask> parsedAddressMutex sync.RWMutex
</s> Update docs for formatting in godoc. </s> remove // s := dnsforward.Server{}
// err := s.Start(nil) // will start a DNS server listening on default port 53, in a goroutine
// err := s.Reconfigure(ServerConfig{UDPListenAddr: &net.UDPAddr{Port: 53535}}) // will reconfigure running DNS server to listen on UDP port 53535
// err := s.Stop() // will stop listening on port 53535 and cancel all goroutines
// err := s.Start(nil) // will start listening again, on port 53535, in a goroutine
</s> add // s := dnsforward.Server{}
// err := s.Start(nil) // will start a DNS server listening on default port 53, in a goroutine
// err := s.Reconfigure(ServerConfig{UDPListenAddr: &net.UDPAddr{Port: 53535}}) // will reconfigure running DNS server to listen on UDP port 53535
// err := s.Stop() // will stop listening on port 53535 and cancel all goroutines
// err := s.Start(nil) // will start listening again, on port 53535, in a goroutine </s> remove // Server is the main way to start a DNS server
</s> add // Server is the main way to start a DNS server.
// | https://github.com/AdguardTeam/AdGuardHome/commit/8396dc2fdb90711ba3394b975347a262afe22ae7 | dnsforward/upstream_pool.go |
keep keep replace replace keep replace keep keep keep keep | <mask>
<mask> import (
<mask> "crypto/tls"
<mask> "fmt"
<mask> "net"
<mask> "path"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
</s> Pull request: dnsforward: do not check client srv name unless asked
Merge in DNS/adguard-home from 2664-non-strict-sni to master
Updates #2664.
Squashed commit of the following:
commit e8d625fe3b1f06f97328809a3330b37e5bd578d7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 14:46:52 2021 +0300
all: imp doc
commit 10537b8bdf126eca9608353e57d92edba632232a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 14:30:25 2021 +0300
dnsforward: do not check client srv name unless asked </s> remove const maxDomainPartLen = 64
// ValidateClientID returns an error if clientID is not a valid client ID.
func ValidateClientID(clientID string) (err error) {
if len(clientID) > maxDomainPartLen {
return fmt.Errorf("client id %q is too long, max: %d", clientID, maxDomainPartLen)
}
for i, r := range clientID {
if (r >= 'a' && r <= 'z') || (r >= '0' && r <= '9') || r == '-' {
continue
}
return fmt.Errorf("invalid char %q at index %d in client id %q", r, i, clientID)
}
return nil
}
// clientIDFromClientServerName extracts and validates a client ID. hostSrvName
// is the server name of the host. cliSrvName is the server name as sent by the
// client.
func clientIDFromClientServerName(hostSrvName, cliSrvName string) (clientID string, err error) {
if hostSrvName == cliSrvName {
return "", nil
}
if !strings.HasSuffix(cliSrvName, hostSrvName) {
return "", fmt.Errorf("client server name %q doesn't match host server name %q", cliSrvName, hostSrvName)
}
clientID = cliSrvName[:len(cliSrvName)-len(hostSrvName)-1]
err = ValidateClientID(clientID)
if err != nil {
return "", fmt.Errorf("invalid client id: %w", err)
}
return clientID, nil
}
// processClientIDHTTPS extracts the client's ID from the path of the
// client's DNS-over-HTTPS request.
func processClientIDHTTPS(ctx *dnsContext) (rc resultCode) {
pctx := ctx.proxyCtx
r := pctx.HTTPRequest
if r == nil {
ctx.err = fmt.Errorf("proxy ctx http request of proto %s is nil", pctx.Proto)
return resultCodeError
}
origPath := r.URL.Path
parts := strings.Split(path.Clean(origPath), "/")
if parts[0] == "" {
parts = parts[1:]
}
if len(parts) == 0 || parts[0] != "dns-query" {
ctx.err = fmt.Errorf("client id check: invalid path %q", origPath)
return resultCodeError
}
clientID := ""
switch len(parts) {
case 1:
// Just /dns-query, no client ID.
return resultCodeSuccess
case 2:
clientID = parts[1]
default:
ctx.err = fmt.Errorf("client id check: invalid path %q: extra parts", origPath)
return resultCodeError
}
err := ValidateClientID(clientID)
if err != nil {
ctx.err = fmt.Errorf("client id check: invalid client id: %w", err)
return resultCodeError
}
ctx.clientID = clientID
return resultCodeSuccess
}
// tlsConn is a narrow interface for *tls.Conn to simplify testing.
type tlsConn interface {
ConnectionState() (cs tls.ConnectionState)
}
// quicSession is a narrow interface for quic.Session to simplify testing.
type quicSession interface {
ConnectionState() (cs quic.ConnectionState)
}
// processClientID extracts the client's ID from the server name of the client's
// DOT or DOQ request or the path of the client's DOH.
func processClientID(ctx *dnsContext) (rc resultCode) {
pctx := ctx.proxyCtx
proto := pctx.Proto
if proto == proxy.ProtoHTTPS {
return processClientIDHTTPS(ctx)
} else if proto != proxy.ProtoTLS && proto != proxy.ProtoQUIC {
return resultCodeSuccess
}
hostSrvName := ctx.srv.conf.TLSConfig.ServerName
if hostSrvName == "" {
return resultCodeSuccess
}
cliSrvName := ""
if proto == proxy.ProtoTLS {
conn := pctx.Conn
tc, ok := conn.(tlsConn)
if !ok {
ctx.err = fmt.Errorf("proxy ctx conn of proto %s is %T, want *tls.Conn", proto, conn)
return resultCodeError
}
cliSrvName = tc.ConnectionState().ServerName
} else if proto == proxy.ProtoQUIC {
qs, ok := pctx.QUICSession.(quicSession)
if !ok {
ctx.err = fmt.Errorf("proxy ctx quic session of proto %s is %T, want quic.Session", proto, pctx.QUICSession)
return resultCodeError
}
cliSrvName = qs.ConnectionState().ServerName
}
clientID, err := clientIDFromClientServerName(hostSrvName, cliSrvName)
if err != nil {
ctx.err = fmt.Errorf("client id check: %w", err)
return resultCodeError
}
ctx.clientID = clientID
return resultCodeSuccess
}
</s> add </s> remove "github.com/lucas-clemente/quic-go"
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/841bb9bc35786c710414706ef38c2830024fbfed | internal/dnsforward/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/util"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/lucas-clemente/quic-go"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // To transfer information between modules
<mask> type dnsContext struct {
</s> Pull request: dnsforward: do not check client srv name unless asked
Merge in DNS/adguard-home from 2664-non-strict-sni to master
Updates #2664.
Squashed commit of the following:
commit e8d625fe3b1f06f97328809a3330b37e5bd578d7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 14:46:52 2021 +0300
all: imp doc
commit 10537b8bdf126eca9608353e57d92edba632232a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 14:30:25 2021 +0300
dnsforward: do not check client srv name unless asked </s> remove const maxDomainPartLen = 64
// ValidateClientID returns an error if clientID is not a valid client ID.
func ValidateClientID(clientID string) (err error) {
if len(clientID) > maxDomainPartLen {
return fmt.Errorf("client id %q is too long, max: %d", clientID, maxDomainPartLen)
}
for i, r := range clientID {
if (r >= 'a' && r <= 'z') || (r >= '0' && r <= '9') || r == '-' {
continue
}
return fmt.Errorf("invalid char %q at index %d in client id %q", r, i, clientID)
}
return nil
}
// clientIDFromClientServerName extracts and validates a client ID. hostSrvName
// is the server name of the host. cliSrvName is the server name as sent by the
// client.
func clientIDFromClientServerName(hostSrvName, cliSrvName string) (clientID string, err error) {
if hostSrvName == cliSrvName {
return "", nil
}
if !strings.HasSuffix(cliSrvName, hostSrvName) {
return "", fmt.Errorf("client server name %q doesn't match host server name %q", cliSrvName, hostSrvName)
}
clientID = cliSrvName[:len(cliSrvName)-len(hostSrvName)-1]
err = ValidateClientID(clientID)
if err != nil {
return "", fmt.Errorf("invalid client id: %w", err)
}
return clientID, nil
}
// processClientIDHTTPS extracts the client's ID from the path of the
// client's DNS-over-HTTPS request.
func processClientIDHTTPS(ctx *dnsContext) (rc resultCode) {
pctx := ctx.proxyCtx
r := pctx.HTTPRequest
if r == nil {
ctx.err = fmt.Errorf("proxy ctx http request of proto %s is nil", pctx.Proto)
return resultCodeError
}
origPath := r.URL.Path
parts := strings.Split(path.Clean(origPath), "/")
if parts[0] == "" {
parts = parts[1:]
}
if len(parts) == 0 || parts[0] != "dns-query" {
ctx.err = fmt.Errorf("client id check: invalid path %q", origPath)
return resultCodeError
}
clientID := ""
switch len(parts) {
case 1:
// Just /dns-query, no client ID.
return resultCodeSuccess
case 2:
clientID = parts[1]
default:
ctx.err = fmt.Errorf("client id check: invalid path %q: extra parts", origPath)
return resultCodeError
}
err := ValidateClientID(clientID)
if err != nil {
ctx.err = fmt.Errorf("client id check: invalid client id: %w", err)
return resultCodeError
}
ctx.clientID = clientID
return resultCodeSuccess
}
// tlsConn is a narrow interface for *tls.Conn to simplify testing.
type tlsConn interface {
ConnectionState() (cs tls.ConnectionState)
}
// quicSession is a narrow interface for quic.Session to simplify testing.
type quicSession interface {
ConnectionState() (cs quic.ConnectionState)
}
// processClientID extracts the client's ID from the server name of the client's
// DOT or DOQ request or the path of the client's DOH.
func processClientID(ctx *dnsContext) (rc resultCode) {
pctx := ctx.proxyCtx
proto := pctx.Proto
if proto == proxy.ProtoHTTPS {
return processClientIDHTTPS(ctx)
} else if proto != proxy.ProtoTLS && proto != proxy.ProtoQUIC {
return resultCodeSuccess
}
hostSrvName := ctx.srv.conf.TLSConfig.ServerName
if hostSrvName == "" {
return resultCodeSuccess
}
cliSrvName := ""
if proto == proxy.ProtoTLS {
conn := pctx.Conn
tc, ok := conn.(tlsConn)
if !ok {
ctx.err = fmt.Errorf("proxy ctx conn of proto %s is %T, want *tls.Conn", proto, conn)
return resultCodeError
}
cliSrvName = tc.ConnectionState().ServerName
} else if proto == proxy.ProtoQUIC {
qs, ok := pctx.QUICSession.(quicSession)
if !ok {
ctx.err = fmt.Errorf("proxy ctx quic session of proto %s is %T, want quic.Session", proto, pctx.QUICSession)
return resultCodeError
}
cliSrvName = qs.ConnectionState().ServerName
}
clientID, err := clientIDFromClientServerName(hostSrvName, cliSrvName)
if err != nil {
ctx.err = fmt.Errorf("client id check: %w", err)
return resultCodeError
}
ctx.clientID = clientID
return resultCodeSuccess
}
</s> add </s> remove "path"
</s> add </s> remove "crypto/tls"
"fmt"
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/841bb9bc35786c710414706ef38c2830024fbfed | internal/dnsforward/dns.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> ctx.proxyCtx.Res = resp
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> const maxDomainPartLen = 64
<mask>
<mask> // ValidateClientID returns an error if clientID is not a valid client ID.
<mask> func ValidateClientID(clientID string) (err error) {
<mask> if len(clientID) > maxDomainPartLen {
<mask> return fmt.Errorf("client id %q is too long, max: %d", clientID, maxDomainPartLen)
<mask> }
<mask>
<mask> for i, r := range clientID {
<mask> if (r >= 'a' && r <= 'z') || (r >= '0' && r <= '9') || r == '-' {
<mask> continue
<mask> }
<mask>
<mask> return fmt.Errorf("invalid char %q at index %d in client id %q", r, i, clientID)
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
<mask> // clientIDFromClientServerName extracts and validates a client ID. hostSrvName
<mask> // is the server name of the host. cliSrvName is the server name as sent by the
<mask> // client.
<mask> func clientIDFromClientServerName(hostSrvName, cliSrvName string) (clientID string, err error) {
<mask> if hostSrvName == cliSrvName {
<mask> return "", nil
<mask> }
<mask>
<mask> if !strings.HasSuffix(cliSrvName, hostSrvName) {
<mask> return "", fmt.Errorf("client server name %q doesn't match host server name %q", cliSrvName, hostSrvName)
<mask> }
<mask>
<mask> clientID = cliSrvName[:len(cliSrvName)-len(hostSrvName)-1]
<mask> err = ValidateClientID(clientID)
<mask> if err != nil {
<mask> return "", fmt.Errorf("invalid client id: %w", err)
<mask> }
<mask>
<mask> return clientID, nil
<mask> }
<mask>
<mask> // processClientIDHTTPS extracts the client's ID from the path of the
<mask> // client's DNS-over-HTTPS request.
<mask> func processClientIDHTTPS(ctx *dnsContext) (rc resultCode) {
<mask> pctx := ctx.proxyCtx
<mask> r := pctx.HTTPRequest
<mask> if r == nil {
<mask> ctx.err = fmt.Errorf("proxy ctx http request of proto %s is nil", pctx.Proto)
<mask>
<mask> return resultCodeError
<mask> }
<mask>
<mask> origPath := r.URL.Path
<mask> parts := strings.Split(path.Clean(origPath), "/")
<mask> if parts[0] == "" {
<mask> parts = parts[1:]
<mask> }
<mask>
<mask> if len(parts) == 0 || parts[0] != "dns-query" {
<mask> ctx.err = fmt.Errorf("client id check: invalid path %q", origPath)
<mask>
<mask> return resultCodeError
<mask> }
<mask>
<mask> clientID := ""
<mask> switch len(parts) {
<mask> case 1:
<mask> // Just /dns-query, no client ID.
<mask> return resultCodeSuccess
<mask> case 2:
<mask> clientID = parts[1]
<mask> default:
<mask> ctx.err = fmt.Errorf("client id check: invalid path %q: extra parts", origPath)
<mask>
<mask> return resultCodeError
<mask> }
<mask>
<mask> err := ValidateClientID(clientID)
<mask> if err != nil {
<mask> ctx.err = fmt.Errorf("client id check: invalid client id: %w", err)
<mask>
<mask> return resultCodeError
<mask> }
<mask>
<mask> ctx.clientID = clientID
<mask>
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> // tlsConn is a narrow interface for *tls.Conn to simplify testing.
<mask> type tlsConn interface {
<mask> ConnectionState() (cs tls.ConnectionState)
<mask> }
<mask>
<mask> // quicSession is a narrow interface for quic.Session to simplify testing.
<mask> type quicSession interface {
<mask> ConnectionState() (cs quic.ConnectionState)
<mask> }
<mask>
<mask> // processClientID extracts the client's ID from the server name of the client's
<mask> // DOT or DOQ request or the path of the client's DOH.
<mask> func processClientID(ctx *dnsContext) (rc resultCode) {
<mask> pctx := ctx.proxyCtx
<mask> proto := pctx.Proto
<mask> if proto == proxy.ProtoHTTPS {
<mask> return processClientIDHTTPS(ctx)
<mask> } else if proto != proxy.ProtoTLS && proto != proxy.ProtoQUIC {
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> hostSrvName := ctx.srv.conf.TLSConfig.ServerName
<mask> if hostSrvName == "" {
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> cliSrvName := ""
<mask> if proto == proxy.ProtoTLS {
<mask> conn := pctx.Conn
<mask> tc, ok := conn.(tlsConn)
<mask> if !ok {
<mask> ctx.err = fmt.Errorf("proxy ctx conn of proto %s is %T, want *tls.Conn", proto, conn)
<mask>
<mask> return resultCodeError
<mask> }
<mask>
<mask> cliSrvName = tc.ConnectionState().ServerName
<mask> } else if proto == proxy.ProtoQUIC {
<mask> qs, ok := pctx.QUICSession.(quicSession)
<mask> if !ok {
<mask> ctx.err = fmt.Errorf("proxy ctx quic session of proto %s is %T, want quic.Session", proto, pctx.QUICSession)
<mask>
<mask> return resultCodeError
<mask> }
<mask>
<mask> cliSrvName = qs.ConnectionState().ServerName
<mask> }
<mask>
<mask> clientID, err := clientIDFromClientServerName(hostSrvName, cliSrvName)
<mask> if err != nil {
<mask> ctx.err = fmt.Errorf("client id check: %w", err)
<mask>
<mask> return resultCodeError
<mask> }
<mask>
<mask> ctx.clientID = clientID
<mask>
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> // Respond to PTR requests if the target IP address is leased by our DHCP server
<mask> func processInternalIPAddrs(ctx *dnsContext) (rc resultCode) {
<mask> s := ctx.srv
<mask> req := ctx.proxyCtx.Req
<mask> if req.Question[0].Qtype != dns.TypePTR {
</s> Pull request: dnsforward: do not check client srv name unless asked
Merge in DNS/adguard-home from 2664-non-strict-sni to master
Updates #2664.
Squashed commit of the following:
commit e8d625fe3b1f06f97328809a3330b37e5bd578d7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 14:46:52 2021 +0300
all: imp doc
commit 10537b8bdf126eca9608353e57d92edba632232a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 14:30:25 2021 +0300
dnsforward: do not check client srv name unless asked </s> remove "github.com/lucas-clemente/quic-go"
</s> add </s> remove "path"
</s> add </s> remove "crypto/tls"
"fmt"
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/841bb9bc35786c710414706ef38c2830024fbfed | internal/dnsforward/dns.go |
keep keep keep add keep keep keep keep keep | <mask> (r >= 'A' && r <= 'Z') ||
<mask> (r >= '0' && r <= '9')
<mask> }
<mask>
<mask> // isValidHostRune returns true if r is a valid rune for a hostname label.
<mask> func isValidHostRune(r rune) (ok bool) {
<mask> return r == '-' || IsValidHostOuterRune(r)
<mask> }
<mask>
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove err := os.Remove(s.conf.DBFilePath)
</s> add err = os.Remove(s.conf.DBFilePath) </s> remove s.Stop()
</s> add err := s.Stop()
if err != nil {
httpError(r, w, http.StatusInternalServerError, "stopping dhcp: %s", err)
return
} </s> remove // ResetLeases - reset leases
func (s *v6Server) ResetLeases(ll []*Lease) {
</s> add // ResetLeases resets leases.
func (s *v6Server) ResetLeases(leases []*Lease) (err error) {
defer func() { err = errors.Annotate(err, "dhcpv4: %w") }()
</s> remove lj := Lease{}
err := json.NewDecoder(r.Body).Decode(&lj)
</s> add l := &Lease{}
err := json.NewDecoder(r.Body).Decode(l) </s> remove lj := Lease{}
err := json.NewDecoder(r.Body).Decode(&lj)
</s> add l := &Lease{}
err := json.NewDecoder(r.Body).Decode(l) </s> remove conf := dhcpServerConfigJSON{}
</s> add conf := &dhcpServerConfigJSON{} | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/aghnet/addr.go |
keep keep add keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> func repeatStr(b *strings.Builder, s string, n int) {
<mask> for i := 0; i < n; i++ {
<mask> _, _ = b.WriteString(s)
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> remove func (s *v6Server) rmDynamicLease(lease Lease) error {
</s> add func (s *v6Server) rmDynamicLease(lease *Lease) (err error) { </s> remove log.Error("dhcp: invalid DB: %v", err)
return
</s> add return fmt.Errorf("decoding db: %w", err) </s> remove
// JoinHostPort is a convinient wrapper for net.JoinHostPort with port of type
// int.
func JoinHostPort(host string, port int) (hostport string) {
return net.JoinHostPort(host, strconv.Itoa(port))
}
</s> add </s> remove func Create(conf ServerConfig) *Server {
s := &Server{}
</s> add func Create(conf ServerConfig) (s *Server, err error) {
s = &Server{} </s> remove result = append(result, *lease)
</s> add leases = append(leases, l.Clone()) </s> add // JoinHostPort is a convinient wrapper for net.JoinHostPort with port of type
// int.
func JoinHostPort(host string, port int) (hostport string) {
return net.JoinHostPort(host, strconv.Itoa(port))
}
| https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/aghnet/addr_test.go |
keep keep keep keep replace replace replace replace replace replace | <mask> }
<mask>
<mask> return addrs, nil
<mask> }
<mask>
<mask> // JoinHostPort is a convinient wrapper for net.JoinHostPort with port of type
<mask> // int.
<mask> func JoinHostPort(host string, port int) (hostport string) {
<mask> return net.JoinHostPort(host, strconv.Itoa(port))
<mask> }
</s> Pull request: dhcpd: add purge, imp code
Updates #1691.
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code </s> add // JoinHostPort is a convinient wrapper for net.JoinHostPort with port of type
// int.
func JoinHostPort(host string, port int) (hostport string) {
return net.JoinHostPort(host, strconv.Itoa(port))
}
</s> remove Leases(flags int) []Lease
</s> add Leases(flags GetLeasesFlags) (leases []*Lease) </s> add func TestJoinHostPort(t *testing.T) {
assert.Equal(t, ":0", JoinHostPort("", 0))
assert.Equal(t, "host:12345", JoinHostPort("host", 12345))
assert.Equal(t, "1.2.3.4:12345", JoinHostPort("1.2.3.4", 12345))
assert.Equal(t, "[1234::5678]:12345", JoinHostPort("1234::5678", 12345))
assert.Equal(t, "[1234::5678%lo]:12345", JoinHostPort("1234::5678%lo", 12345))
}
</s> remove func (s *v6Server) rmDynamicLease(lease Lease) error {
</s> add func (s *v6Server) rmDynamicLease(lease *Lease) (err error) { </s> add return nil </s> remove func (s *v4Server) rmLease(lease Lease) (err error) {
</s> add func (s *v4Server) rmLease(lease *Lease) (err error) { | https://github.com/AdguardTeam/AdGuardHome/commit/84e71e912e9f8808b396f171cc97b0a0d6f43814 | internal/aghnet/net.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.