docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
<mask>
<mask> import (
<mask> "bufio"
<mask> "io"
<mask> "io/fs"
<mask> "path"
<mask> "testing"
<mask> "testing/fstest"
<mask>
<mask> "github.com/AdguardTeam/golibs/errors"
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove package aghos
</s> add package aghos_test </s> remove package aghos
</s> add package aghos_test | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghos/filewalker_test.go | |
"github.com/AdguardTeam/AdGuardHome/internal/aghos" | <mask> "testing"
<mask> "testing/fstest"
<mask>
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove "io/fs"
</s> add </s> remove "github.com/AdguardTeam/golibs/errors"
</s> add </s> remove "github.com/AdguardTeam/golibs/errors"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghos/filewalker_test.go |
makeFileWalker := func(_ string) (fw aghos.FileWalker) { | <mask>
<mask> func TestFileWalker_Walk(t *testing.T) {
<mask> const attribute = `000`
<mask>
<mask> makeFileWalker := func(_ string) (fw FileWalker) {
<mask> return func(r io.Reader) (patterns []string, cont bool, err error) {
<mask> s := bufio.NewScanner(r)
<mask> for s.Scan() {
<mask> line := s.Text()
<mask> if line == attribute {
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove ok, err := FileWalker(func(r io.Reader) (patterns []string, cont bool, err error) {
</s> add ok, err := aghos.FileWalker(func(r io.Reader) (patterns []string, cont bool, err error) { </s> remove ok, err := FileWalker(func(r io.Reader) (patterns []string, ok bool, err error) {
</s> add ok, err := aghos.FileWalker(func(r io.Reader) (patterns []string, ok bool, err error) { </s> remove
type errFS struct {
fs.GlobFS
}
const errErrFSOpen errors.Error = "this error is always returned"
func (efs *errFS) Open(name string) (fs.File, error) {
return nil, errErrFSOpen
}
func TestWalkerFunc_CheckFile(t *testing.T) {
emptyFS := fstest.MapFS{}
t.Run("non-existing", func(t *testing.T) {
_, ok, err := checkFile(emptyFS, nil, "lol")
require.NoError(t, err)
assert.True(t, ok)
})
t.Run("invalid_argument", func(t *testing.T) {
_, ok, err := checkFile(&errFS{}, nil, "")
require.ErrorIs(t, err, errErrFSOpen)
assert.False(t, ok)
})
t.Run("ignore_dirs", func(t *testing.T) {
const dirName = "dir"
testFS := fstest.MapFS{
path.Join(dirName, "file"): &fstest.MapFile{Data: []byte{}},
}
patterns, ok, err := checkFile(testFS, nil, dirName)
require.NoError(t, err)
assert.Empty(t, patterns)
assert.True(t, ok)
})
}
</s> add </s> remove // Address always returns an empty string.
func (u *TestErrUpstream) Address() string {
return ""
</s> add // NewErrorUpstream returns an [*UpstreamMock] that returns [ErrUpstream] from
// its Exchange method.
func NewErrorUpstream() (u *UpstreamMock) {
return &UpstreamMock{
OnAddress: func() (addr string) {
return "error.upstream.example"
},
OnExchange: func(_ *dns.Msg) (resp *dns.Msg, err error) {
return nil, errors.Error("test upstream error")
},
} </s> remove const matching = "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghos/filewalker_test.go |
ok, err := aghos.FileWalker(func(r io.Reader) (patterns []string, cont bool, err error) { | <mask>
<mask> f := fstest.MapFS{
<mask> filename: &fstest.MapFile{Data: []byte("[]")},
<mask> }
<mask> ok, err := FileWalker(func(r io.Reader) (patterns []string, cont bool, err error) {
<mask> s := bufio.NewScanner(r)
<mask> for s.Scan() {
<mask> patterns = append(patterns, s.Text())
<mask> }
<mask>
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove ok, err := FileWalker(func(r io.Reader) (patterns []string, ok bool, err error) {
</s> add ok, err := aghos.FileWalker(func(r io.Reader) (patterns []string, ok bool, err error) { </s> remove makeFileWalker := func(_ string) (fw FileWalker) {
</s> add makeFileWalker := func(_ string) (fw aghos.FileWalker) { </s> remove
type errFS struct {
fs.GlobFS
}
const errErrFSOpen errors.Error = "this error is always returned"
func (efs *errFS) Open(name string) (fs.File, error) {
return nil, errErrFSOpen
}
func TestWalkerFunc_CheckFile(t *testing.T) {
emptyFS := fstest.MapFS{}
t.Run("non-existing", func(t *testing.T) {
_, ok, err := checkFile(emptyFS, nil, "lol")
require.NoError(t, err)
assert.True(t, ok)
})
t.Run("invalid_argument", func(t *testing.T) {
_, ok, err := checkFile(&errFS{}, nil, "")
require.ErrorIs(t, err, errErrFSOpen)
assert.False(t, ok)
})
t.Run("ignore_dirs", func(t *testing.T) {
const dirName = "dir"
testFS := fstest.MapFS{
path.Join(dirName, "file"): &fstest.MapFile{Data: []byte{}},
}
patterns, ok, err := checkFile(testFS, nil, dirName)
require.NoError(t, err)
assert.Empty(t, patterns)
assert.True(t, ok)
})
}
</s> add </s> remove Name: ip.String(),
Qtype: dns.TypePTR,
</s> add Name: dns.Fqdn(rev),
Qclass: dns.ClassINET,
Qtype: dns.TypePTR, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghos/filewalker_test.go |
ok, err := aghos.FileWalker(func(r io.Reader) (patterns []string, ok bool, err error) { | <mask> f := fstest.MapFS{
<mask> "mockfile.txt": &fstest.MapFile{Data: []byte(`mockdata`)},
<mask> }
<mask>
<mask> ok, err := FileWalker(func(r io.Reader) (patterns []string, ok bool, err error) {
<mask> return nil, true, rerr
<mask> }).Walk(f, "*")
<mask> require.ErrorIs(t, err, rerr)
<mask>
<mask> assert.False(t, ok)
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove ok, err := FileWalker(func(r io.Reader) (patterns []string, cont bool, err error) {
</s> add ok, err := aghos.FileWalker(func(r io.Reader) (patterns []string, cont bool, err error) { </s> remove
type errFS struct {
fs.GlobFS
}
const errErrFSOpen errors.Error = "this error is always returned"
func (efs *errFS) Open(name string) (fs.File, error) {
return nil, errErrFSOpen
}
func TestWalkerFunc_CheckFile(t *testing.T) {
emptyFS := fstest.MapFS{}
t.Run("non-existing", func(t *testing.T) {
_, ok, err := checkFile(emptyFS, nil, "lol")
require.NoError(t, err)
assert.True(t, ok)
})
t.Run("invalid_argument", func(t *testing.T) {
_, ok, err := checkFile(&errFS{}, nil, "")
require.ErrorIs(t, err, errErrFSOpen)
assert.False(t, ok)
})
t.Run("ignore_dirs", func(t *testing.T) {
const dirName = "dir"
testFS := fstest.MapFS{
path.Join(dirName, "file"): &fstest.MapFile{Data: []byte{}},
}
patterns, ok, err := checkFile(testFS, nil, dirName)
require.NoError(t, err)
assert.Empty(t, patterns)
assert.True(t, ok)
})
}
</s> add </s> remove makeFileWalker := func(_ string) (fw FileWalker) {
</s> add makeFileWalker := func(_ string) (fw aghos.FileWalker) { </s> remove hash = sha256.Sum256([]byte("nonexisting.com"))
</s> add hash = sha256.Sum256([]byte("host.example")) </s> remove // Address always returns an empty string.
func (u *TestErrUpstream) Address() string {
return ""
</s> add // NewErrorUpstream returns an [*UpstreamMock] that returns [ErrUpstream] from
// its Exchange method.
func NewErrorUpstream() (u *UpstreamMock) {
return &UpstreamMock{
OnAddress: func() (addr string) {
return "error.upstream.example"
},
OnExchange: func(_ *dns.Msg) (resp *dns.Msg, err error) {
return nil, errors.Error("test upstream error")
},
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghos/filewalker_test.go |
<mask>
<mask> assert.False(t, ok)
<mask> })
<mask> }
<mask>
<mask> type errFS struct {
<mask> fs.GlobFS
<mask> }
<mask>
<mask> const errErrFSOpen errors.Error = "this error is always returned"
<mask>
<mask> func (efs *errFS) Open(name string) (fs.File, error) {
<mask> return nil, errErrFSOpen
<mask> }
<mask>
<mask> func TestWalkerFunc_CheckFile(t *testing.T) {
<mask> emptyFS := fstest.MapFS{}
<mask>
<mask> t.Run("non-existing", func(t *testing.T) {
<mask> _, ok, err := checkFile(emptyFS, nil, "lol")
<mask> require.NoError(t, err)
<mask>
<mask> assert.True(t, ok)
<mask> })
<mask>
<mask> t.Run("invalid_argument", func(t *testing.T) {
<mask> _, ok, err := checkFile(&errFS{}, nil, "")
<mask> require.ErrorIs(t, err, errErrFSOpen)
<mask>
<mask> assert.False(t, ok)
<mask> })
<mask>
<mask> t.Run("ignore_dirs", func(t *testing.T) {
<mask> const dirName = "dir"
<mask>
<mask> testFS := fstest.MapFS{
<mask> path.Join(dirName, "file"): &fstest.MapFile{Data: []byte{}},
<mask> }
<mask>
<mask> patterns, ok, err := checkFile(testFS, nil, dirName)
<mask> require.NoError(t, err)
<mask>
<mask> assert.Empty(t, patterns)
<mask> assert.True(t, ok)
<mask> })
<mask> }
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove ok, err := FileWalker(func(r io.Reader) (patterns []string, ok bool, err error) {
</s> add ok, err := aghos.FileWalker(func(r io.Reader) (patterns []string, ok bool, err error) { </s> remove const matching = "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true)) </s> remove hash = sha256.Sum256([]byte("nonexisting.com"))
</s> add hash = sha256.Sum256([]byte("host.example")) </s> remove d.checkMatch(t, matching)
d.checkMatch(t, "test."+matching)
</s> add d.checkMatch(t, sbBlocked)
d.checkMatch(t, "test."+sbBlocked) </s> remove ok, err := FileWalker(func(r io.Reader) (patterns []string, cont bool, err error) {
</s> add ok, err := aghos.FileWalker(func(r io.Reader) (patterns []string, cont bool, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghos/filewalker_test.go | |
"testing" | <mask> "encoding/hex"
<mask> "fmt"
<mask> "net"
<mask> "strings"
<mask> "sync"
<mask>
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // Upstream is a mock implementation of upstream.Upstream.
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghtest/upstream.go |
"github.com/AdguardTeam/golibs/errors" | <mask> "net"
<mask> "strings"
<mask> "testing"
<mask>
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> // Additional Upstream Testing Utilities
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove "sync"
</s> add "testing" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghtest/upstream.go |
"github.com/stretchr/testify/require" | <mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // Additional Upstream Testing Utilities
<mask>
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove "sync"
</s> add "testing" </s> remove "github.com/AdguardTeam/golibs/errors"
</s> add </s> remove "github.com/AdguardTeam/golibs/errors"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghtest/upstream.go |
// Additional Upstream Testing Utilities
| <mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> // Upstream is a mock implementation of upstream.Upstream.
<mask> //
<mask> // TODO(a.garipov): Replace with UpstreamMock and rename it to just Upstream.
<mask> type Upstream struct {
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove "sync"
</s> add "testing" </s> remove ex aghtest.Exchanger
</s> add ex upstream.Upstream | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghtest/upstream.go |
//
// TODO(a.garipov): Replace with UpstreamMock and rename it to just Upstream. | <mask>
<mask> // Upstream is a mock implementation of upstream.Upstream.
<mask> type Upstream struct {
<mask> // CName is a map of hostname to canonical name.
<mask> CName map[string][]string
<mask> // IPv4 is a map of hostname to IPv4.
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove "sync"
</s> add "testing" </s> remove ex aghtest.Exchanger
</s> add ex upstream.Upstream </s> remove // Service is the AdGuard Home web service. A nil *Service is a valid service
// that does nothing.
</s> add // Service is the AdGuard Home web service. A nil *Service is a valid
// [agh.Service] that does nothing. | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghtest/upstream.go |
// NewBlockUpstream returns an [*UpstreamMock] that works like an upstream that
// supports hash-based safe-browsing/adult-blocking feature. If shouldBlock is
// true, hostname's actual hash is returned, blocking it. Otherwise, it returns
// a different hash.
func NewBlockUpstream(hostname string, shouldBlock bool) (u *UpstreamMock) {
hash := sha256.Sum256([]byte(hostname))
hashStr := hex.EncodeToString(hash[:])
if !shouldBlock {
hashStr = hex.EncodeToString(hash[:])[:2] + strings.Repeat("ab", 28) | <mask> func (u *Upstream) Address() string {
<mask> return u.Addr
<mask> }
<mask>
<mask> // TestBlockUpstream implements upstream.Upstream interface for replacing real
<mask> // upstream in tests.
<mask> type TestBlockUpstream struct {
<mask> Hostname string
<mask>
<mask> // lock protects reqNum.
<mask> lock sync.RWMutex
<mask> reqNum int
<mask>
<mask> Block bool
<mask> }
<mask>
<mask> // Exchange returns a message unique for TestBlockUpstream's Hostname-Block
<mask> // pair.
<mask> func (u *TestBlockUpstream) Exchange(r *dns.Msg) (*dns.Msg, error) {
<mask> u.lock.Lock()
<mask> defer u.lock.Unlock()
<mask> u.reqNum++
<mask>
<mask> hash := sha256.Sum256([]byte(u.Hostname))
<mask> hashToReturn := hex.EncodeToString(hash[:])
<mask> if !u.Block {
<mask> hashToReturn = hex.EncodeToString(hash[:])[:2] + strings.Repeat("ab", 28)
<mask> }
<mask>
<mask> m := &dns.Msg{}
<mask> m.SetReply(r)
<mask> m.Answer = []dns.RR{
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove return m, nil
}
// Address always returns an empty string.
func (u *TestBlockUpstream) Address() string {
return ""
}
// RequestsCount returns the number of handled requests. It's safe for
// concurrent use.
func (u *TestBlockUpstream) RequestsCount() int {
u.lock.Lock()
defer u.lock.Unlock()
return u.reqNum
}
</s> add return &UpstreamMock{
OnAddress: func() (addr string) {
return "sbpc.upstream.example"
},
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = respTmpl.Copy()
resp.SetReply(req)
resp.Answer[0].(*dns.TXT).Hdr.Name = req.Question[0].Name </s> remove m := &dns.Msg{}
m.SetReply(r)
m.Answer = []dns.RR{
&dns.TXT{
Hdr: dns.RR_Header{
Name: r.Question[0].Name,
},
Txt: []string{
hashToReturn,
},
</s> add ans := &dns.TXT{
Hdr: dns.RR_Header{
Name: "",
Rrtype: dns.TypeTXT,
Class: dns.ClassINET,
Ttl: 60, </s> remove // TestErrUpstream implements upstream.Upstream interface for replacing real
// upstream in tests.
type TestErrUpstream struct {
// The error returned by Exchange may be unwrapped to the Err.
Err error
</s> add return resp, nil
},
} </s> remove // Address always returns an empty string.
func (u *TestErrUpstream) Address() string {
return ""
</s> add // NewErrorUpstream returns an [*UpstreamMock] that returns [ErrUpstream] from
// its Exchange method.
func NewErrorUpstream() (u *UpstreamMock) {
return &UpstreamMock{
OnAddress: func() (addr string) {
return "error.upstream.example"
},
OnExchange: func(_ *dns.Msg) (resp *dns.Msg, err error) {
return nil, errors.Error("test upstream error")
},
} </s> remove ex aghtest.Exchanger
</s> add ex upstream.Upstream | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghtest/upstream.go |
ans := &dns.TXT{
Hdr: dns.RR_Header{
Name: "",
Rrtype: dns.TypeTXT,
Class: dns.ClassINET,
Ttl: 60, | <mask> if !u.Block {
<mask> hashToReturn = hex.EncodeToString(hash[:])[:2] + strings.Repeat("ab", 28)
<mask> }
<mask>
<mask> m := &dns.Msg{}
<mask> m.SetReply(r)
<mask> m.Answer = []dns.RR{
<mask> &dns.TXT{
<mask> Hdr: dns.RR_Header{
<mask> Name: r.Question[0].Name,
<mask> },
<mask> Txt: []string{
<mask> hashToReturn,
<mask> },
<mask> },
<mask> }
<mask>
<mask> return m, nil
<mask> }
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove // TestBlockUpstream implements upstream.Upstream interface for replacing real
// upstream in tests.
type TestBlockUpstream struct {
Hostname string
// lock protects reqNum.
lock sync.RWMutex
reqNum int
Block bool
}
// Exchange returns a message unique for TestBlockUpstream's Hostname-Block
// pair.
func (u *TestBlockUpstream) Exchange(r *dns.Msg) (*dns.Msg, error) {
u.lock.Lock()
defer u.lock.Unlock()
u.reqNum++
hash := sha256.Sum256([]byte(u.Hostname))
hashToReturn := hex.EncodeToString(hash[:])
if !u.Block {
hashToReturn = hex.EncodeToString(hash[:])[:2] + strings.Repeat("ab", 28)
</s> add // NewBlockUpstream returns an [*UpstreamMock] that works like an upstream that
// supports hash-based safe-browsing/adult-blocking feature. If shouldBlock is
// true, hostname's actual hash is returned, blocking it. Otherwise, it returns
// a different hash.
func NewBlockUpstream(hostname string, shouldBlock bool) (u *UpstreamMock) {
hash := sha256.Sum256([]byte(hostname))
hashStr := hex.EncodeToString(hash[:])
if !shouldBlock {
hashStr = hex.EncodeToString(hash[:])[:2] + strings.Repeat("ab", 28) </s> remove return m, nil
}
// Address always returns an empty string.
func (u *TestBlockUpstream) Address() string {
return ""
}
// RequestsCount returns the number of handled requests. It's safe for
// concurrent use.
func (u *TestBlockUpstream) RequestsCount() int {
u.lock.Lock()
defer u.lock.Unlock()
return u.reqNum
}
</s> add return &UpstreamMock{
OnAddress: func() (addr string) {
return "sbpc.upstream.example"
},
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = respTmpl.Copy()
resp.SetReply(req)
resp.Answer[0].(*dns.TXT).Hdr.Name = req.Question[0].Name </s> remove locUpstream := &aghtest.Upstream{
Reverse: map[string][]string{
"1.1.168.192.in-addr.arpa.": {"local.domain"},
"2.1.168.192.in-addr.arpa.": {},
</s> add revLocIPv4, err := netutil.IPToReversedAddr(localIP)
require.NoError(t, err)
locUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "local.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revLocIPv4, localDomainHost),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil </s> remove Name: ip.String(),
Qtype: dns.TypePTR,
</s> add Name: dns.Fqdn(rev),
Qclass: dns.ClassINET,
Qtype: dns.TypePTR, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghtest/upstream.go |
Txt: []string{hashStr},
}
respTmpl := &dns.Msg{
Answer: []dns.RR{ans}, | <mask> Rrtype: dns.TypeTXT,
<mask> Class: dns.ClassINET,
<mask> Ttl: 60,
<mask> },
<mask> }
<mask>
<mask> return &UpstreamMock{
<mask> OnAddress: func() (addr string) {
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove m := &dns.Msg{}
m.SetReply(r)
m.Answer = []dns.RR{
&dns.TXT{
Hdr: dns.RR_Header{
Name: r.Question[0].Name,
},
Txt: []string{
hashToReturn,
},
</s> add ans := &dns.TXT{
Hdr: dns.RR_Header{
Name: "",
Rrtype: dns.TypeTXT,
Class: dns.ClassINET,
Ttl: 60, </s> remove // Address always returns an empty string.
func (u *TestErrUpstream) Address() string {
return ""
</s> add // NewErrorUpstream returns an [*UpstreamMock] that returns [ErrUpstream] from
// its Exchange method.
func NewErrorUpstream() (u *UpstreamMock) {
return &UpstreamMock{
OnAddress: func() (addr string) {
return "error.upstream.example"
},
OnExchange: func(_ *dns.Msg) (resp *dns.Msg, err error) {
return nil, errors.Error("test upstream error")
},
} </s> remove locUpstream := &aghtest.Upstream{
Reverse: map[string][]string{
"1.1.168.192.in-addr.arpa.": {"local.domain"},
"2.1.168.192.in-addr.arpa.": {},
</s> add revLocIPv4, err := netutil.IPToReversedAddr(localIP)
require.NoError(t, err)
locUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "local.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revLocIPv4, localDomainHost),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil </s> remove locUpstream := &aghtest.Upstream{
Reverse: map[string][]string{
"192.168.1.1": {"local.domain"},
"2a00:1450:400c:c06::93": {"ipv6.domain"},
</s> add localIP := net.IP{192, 168, 1, 1}
revIPv4, err := netutil.IPToReversedAddr(localIP)
require.NoError(t, err)
revIPv6, err := netutil.IPToReversedAddr(net.ParseIP("2a00:1450:400c:c06::93"))
require.NoError(t, err)
locUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "local.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revIPv4, "local.domain"),
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revIPv6, "ipv6.domain"),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil </s> remove return m, nil
}
// Address always returns an empty string.
func (u *TestBlockUpstream) Address() string {
return ""
}
// RequestsCount returns the number of handled requests. It's safe for
// concurrent use.
func (u *TestBlockUpstream) RequestsCount() int {
u.lock.Lock()
defer u.lock.Unlock()
return u.reqNum
}
</s> add return &UpstreamMock{
OnAddress: func() (addr string) {
return "sbpc.upstream.example"
},
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = respTmpl.Copy()
resp.SetReply(req)
resp.Answer[0].(*dns.TXT).Hdr.Name = req.Question[0].Name | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghtest/upstream.go |
return &UpstreamMock{
OnAddress: func() (addr string) {
return "sbpc.upstream.example"
},
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = respTmpl.Copy()
resp.SetReply(req)
resp.Answer[0].(*dns.TXT).Hdr.Name = req.Question[0].Name | <mask> },
<mask> },
<mask> }
<mask>
<mask> return m, nil
<mask> }
<mask>
<mask> // Address always returns an empty string.
<mask> func (u *TestBlockUpstream) Address() string {
<mask> return ""
<mask> }
<mask>
<mask> // RequestsCount returns the number of handled requests. It's safe for
<mask> // concurrent use.
<mask> func (u *TestBlockUpstream) RequestsCount() int {
<mask> u.lock.Lock()
<mask> defer u.lock.Unlock()
<mask>
<mask> return u.reqNum
<mask> }
<mask>
<mask> // TestErrUpstream implements upstream.Upstream interface for replacing real
<mask> // upstream in tests.
<mask> type TestErrUpstream struct {
<mask> // The error returned by Exchange may be unwrapped to the Err.
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove // TestErrUpstream implements upstream.Upstream interface for replacing real
// upstream in tests.
type TestErrUpstream struct {
// The error returned by Exchange may be unwrapped to the Err.
Err error
</s> add return resp, nil
},
} </s> remove // Exchange always returns nil Msg and non-nil error.
func (u *TestErrUpstream) Exchange(*dns.Msg) (*dns.Msg, error) {
return nil, fmt.Errorf("errupstream: %w", u.Err)
}
</s> add // ErrUpstream is the error returned from the [*UpstreamMock] created by
// [NewErrorUpstream].
const ErrUpstream errors.Error = "test upstream error" </s> remove // Address always returns an empty string.
func (u *TestErrUpstream) Address() string {
return ""
</s> add // NewErrorUpstream returns an [*UpstreamMock] that returns [ErrUpstream] from
// its Exchange method.
func NewErrorUpstream() (u *UpstreamMock) {
return &UpstreamMock{
OnAddress: func() (addr string) {
return "error.upstream.example"
},
OnExchange: func(_ *dns.Msg) (resp *dns.Msg, err error) {
return nil, errors.Error("test upstream error")
},
} </s> remove // TestBlockUpstream implements upstream.Upstream interface for replacing real
// upstream in tests.
type TestBlockUpstream struct {
Hostname string
// lock protects reqNum.
lock sync.RWMutex
reqNum int
Block bool
}
// Exchange returns a message unique for TestBlockUpstream's Hostname-Block
// pair.
func (u *TestBlockUpstream) Exchange(r *dns.Msg) (*dns.Msg, error) {
u.lock.Lock()
defer u.lock.Unlock()
u.reqNum++
hash := sha256.Sum256([]byte(u.Hostname))
hashToReturn := hex.EncodeToString(hash[:])
if !u.Block {
hashToReturn = hex.EncodeToString(hash[:])[:2] + strings.Repeat("ab", 28)
</s> add // NewBlockUpstream returns an [*UpstreamMock] that works like an upstream that
// supports hash-based safe-browsing/adult-blocking feature. If shouldBlock is
// true, hostname's actual hash is returned, blocking it. Otherwise, it returns
// a different hash.
func NewBlockUpstream(hostname string, shouldBlock bool) (u *UpstreamMock) {
hash := sha256.Sum256([]byte(hostname))
hashStr := hex.EncodeToString(hash[:])
if !shouldBlock {
hashStr = hex.EncodeToString(hash[:])[:2] + strings.Repeat("ab", 28) </s> remove // Start implements the agh.Service interface for *Service. svc may be nil.
</s> add // Start implements the [agh.Service] interface for *Service. svc may be nil. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghtest/upstream.go |
return resp, nil
},
} | <mask>
<mask> return u.reqNum
<mask> }
<mask>
<mask> // TestErrUpstream implements upstream.Upstream interface for replacing real
<mask> // upstream in tests.
<mask> type TestErrUpstream struct {
<mask> // The error returned by Exchange may be unwrapped to the Err.
<mask> Err error
<mask> }
<mask>
<mask> // Exchange always returns nil Msg and non-nil error.
<mask> func (u *TestErrUpstream) Exchange(*dns.Msg) (*dns.Msg, error) {
<mask> return nil, fmt.Errorf("errupstream: %w", u.Err)
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove // Exchange always returns nil Msg and non-nil error.
func (u *TestErrUpstream) Exchange(*dns.Msg) (*dns.Msg, error) {
return nil, fmt.Errorf("errupstream: %w", u.Err)
}
</s> add // ErrUpstream is the error returned from the [*UpstreamMock] created by
// [NewErrorUpstream].
const ErrUpstream errors.Error = "test upstream error" </s> remove return m, nil
}
// Address always returns an empty string.
func (u *TestBlockUpstream) Address() string {
return ""
}
// RequestsCount returns the number of handled requests. It's safe for
// concurrent use.
func (u *TestBlockUpstream) RequestsCount() int {
u.lock.Lock()
defer u.lock.Unlock()
return u.reqNum
}
</s> add return &UpstreamMock{
OnAddress: func() (addr string) {
return "sbpc.upstream.example"
},
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = respTmpl.Copy()
resp.SetReply(req)
resp.Answer[0].(*dns.TXT).Hdr.Name = req.Question[0].Name </s> remove // Address always returns an empty string.
func (u *TestErrUpstream) Address() string {
return ""
</s> add // NewErrorUpstream returns an [*UpstreamMock] that returns [ErrUpstream] from
// its Exchange method.
func NewErrorUpstream() (u *UpstreamMock) {
return &UpstreamMock{
OnAddress: func() (addr string) {
return "error.upstream.example"
},
OnExchange: func(_ *dns.Msg) (resp *dns.Msg, err error) {
return nil, errors.Error("test upstream error")
},
} </s> remove // Start implements the agh.Service interface for *Service. svc may be nil.
</s> add // Start implements the [agh.Service] interface for *Service. svc may be nil. </s> remove // TestBlockUpstream implements upstream.Upstream interface for replacing real
// upstream in tests.
type TestBlockUpstream struct {
Hostname string
// lock protects reqNum.
lock sync.RWMutex
reqNum int
Block bool
}
// Exchange returns a message unique for TestBlockUpstream's Hostname-Block
// pair.
func (u *TestBlockUpstream) Exchange(r *dns.Msg) (*dns.Msg, error) {
u.lock.Lock()
defer u.lock.Unlock()
u.reqNum++
hash := sha256.Sum256([]byte(u.Hostname))
hashToReturn := hex.EncodeToString(hash[:])
if !u.Block {
hashToReturn = hex.EncodeToString(hash[:])[:2] + strings.Repeat("ab", 28)
</s> add // NewBlockUpstream returns an [*UpstreamMock] that works like an upstream that
// supports hash-based safe-browsing/adult-blocking feature. If shouldBlock is
// true, hostname's actual hash is returned, blocking it. Otherwise, it returns
// a different hash.
func NewBlockUpstream(hostname string, shouldBlock bool) (u *UpstreamMock) {
hash := sha256.Sum256([]byte(hostname))
hashStr := hex.EncodeToString(hash[:])
if !shouldBlock {
hashStr = hex.EncodeToString(hash[:])[:2] + strings.Repeat("ab", 28) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghtest/upstream.go |
// ErrUpstream is the error returned from the [*UpstreamMock] created by
// [NewErrorUpstream].
const ErrUpstream errors.Error = "test upstream error" | <mask> // The error returned by Exchange may be unwrapped to the Err.
<mask> Err error
<mask> }
<mask>
<mask> // Exchange always returns nil Msg and non-nil error.
<mask> func (u *TestErrUpstream) Exchange(*dns.Msg) (*dns.Msg, error) {
<mask> return nil, fmt.Errorf("errupstream: %w", u.Err)
<mask> }
<mask>
<mask> // Address always returns an empty string.
<mask> func (u *TestErrUpstream) Address() string {
<mask> return ""
<mask> }
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove // TestErrUpstream implements upstream.Upstream interface for replacing real
// upstream in tests.
type TestErrUpstream struct {
// The error returned by Exchange may be unwrapped to the Err.
Err error
</s> add return resp, nil
},
} </s> remove // Address always returns an empty string.
func (u *TestErrUpstream) Address() string {
return ""
</s> add // NewErrorUpstream returns an [*UpstreamMock] that returns [ErrUpstream] from
// its Exchange method.
func NewErrorUpstream() (u *UpstreamMock) {
return &UpstreamMock{
OnAddress: func() (addr string) {
return "error.upstream.example"
},
OnExchange: func(_ *dns.Msg) (resp *dns.Msg, err error) {
return nil, errors.Error("test upstream error")
},
} </s> remove return m, nil
}
// Address always returns an empty string.
func (u *TestBlockUpstream) Address() string {
return ""
}
// RequestsCount returns the number of handled requests. It's safe for
// concurrent use.
func (u *TestBlockUpstream) RequestsCount() int {
u.lock.Lock()
defer u.lock.Unlock()
return u.reqNum
}
</s> add return &UpstreamMock{
OnAddress: func() (addr string) {
return "sbpc.upstream.example"
},
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = respTmpl.Copy()
resp.SetReply(req)
resp.Answer[0].(*dns.TXT).Hdr.Name = req.Question[0].Name </s> remove // TestBlockUpstream implements upstream.Upstream interface for replacing real
// upstream in tests.
type TestBlockUpstream struct {
Hostname string
// lock protects reqNum.
lock sync.RWMutex
reqNum int
Block bool
}
// Exchange returns a message unique for TestBlockUpstream's Hostname-Block
// pair.
func (u *TestBlockUpstream) Exchange(r *dns.Msg) (*dns.Msg, error) {
u.lock.Lock()
defer u.lock.Unlock()
u.reqNum++
hash := sha256.Sum256([]byte(u.Hostname))
hashToReturn := hex.EncodeToString(hash[:])
if !u.Block {
hashToReturn = hex.EncodeToString(hash[:])[:2] + strings.Repeat("ab", 28)
</s> add // NewBlockUpstream returns an [*UpstreamMock] that works like an upstream that
// supports hash-based safe-browsing/adult-blocking feature. If shouldBlock is
// true, hostname's actual hash is returned, blocking it. Otherwise, it returns
// a different hash.
func NewBlockUpstream(hostname string, shouldBlock bool) (u *UpstreamMock) {
hash := sha256.Sum256([]byte(hostname))
hashStr := hex.EncodeToString(hash[:])
if !shouldBlock {
hashStr = hex.EncodeToString(hash[:])[:2] + strings.Repeat("ab", 28) </s> remove // Start implements the agh.Service interface for *Service. svc may be nil.
</s> add // Start implements the [agh.Service] interface for *Service. svc may be nil. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghtest/upstream.go |
// NewErrorUpstream returns an [*UpstreamMock] that returns [ErrUpstream] from
// its Exchange method.
func NewErrorUpstream() (u *UpstreamMock) {
return &UpstreamMock{
OnAddress: func() (addr string) {
return "error.upstream.example"
},
OnExchange: func(_ *dns.Msg) (resp *dns.Msg, err error) {
return nil, errors.Error("test upstream error")
},
} | <mask> func (u *TestErrUpstream) Exchange(*dns.Msg) (*dns.Msg, error) {
<mask> return nil, fmt.Errorf("errupstream: %w", u.Err)
<mask> }
<mask>
<mask> // Address always returns an empty string.
<mask> func (u *TestErrUpstream) Address() string {
<mask> return ""
<mask> }
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove // Exchange always returns nil Msg and non-nil error.
func (u *TestErrUpstream) Exchange(*dns.Msg) (*dns.Msg, error) {
return nil, fmt.Errorf("errupstream: %w", u.Err)
}
</s> add // ErrUpstream is the error returned from the [*UpstreamMock] created by
// [NewErrorUpstream].
const ErrUpstream errors.Error = "test upstream error" </s> remove // TestErrUpstream implements upstream.Upstream interface for replacing real
// upstream in tests.
type TestErrUpstream struct {
// The error returned by Exchange may be unwrapped to the Err.
Err error
</s> add return resp, nil
},
} </s> remove return m, nil
}
// Address always returns an empty string.
func (u *TestBlockUpstream) Address() string {
return ""
}
// RequestsCount returns the number of handled requests. It's safe for
// concurrent use.
func (u *TestBlockUpstream) RequestsCount() int {
u.lock.Lock()
defer u.lock.Unlock()
return u.reqNum
}
</s> add return &UpstreamMock{
OnAddress: func() (addr string) {
return "sbpc.upstream.example"
},
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = respTmpl.Copy()
resp.SetReply(req)
resp.Answer[0].(*dns.TXT).Hdr.Name = req.Question[0].Name </s> remove // TestBlockUpstream implements upstream.Upstream interface for replacing real
// upstream in tests.
type TestBlockUpstream struct {
Hostname string
// lock protects reqNum.
lock sync.RWMutex
reqNum int
Block bool
}
// Exchange returns a message unique for TestBlockUpstream's Hostname-Block
// pair.
func (u *TestBlockUpstream) Exchange(r *dns.Msg) (*dns.Msg, error) {
u.lock.Lock()
defer u.lock.Unlock()
u.reqNum++
hash := sha256.Sum256([]byte(u.Hostname))
hashToReturn := hex.EncodeToString(hash[:])
if !u.Block {
hashToReturn = hex.EncodeToString(hash[:])[:2] + strings.Repeat("ab", 28)
</s> add // NewBlockUpstream returns an [*UpstreamMock] that works like an upstream that
// supports hash-based safe-browsing/adult-blocking feature. If shouldBlock is
// true, hostname's actual hash is returned, blocking it. Otherwise, it returns
// a different hash.
func NewBlockUpstream(hostname string, shouldBlock bool) (u *UpstreamMock) {
hash := sha256.Sum256([]byte(hostname))
hashStr := hex.EncodeToString(hash[:])
if !shouldBlock {
hashStr = hex.EncodeToString(hash[:])[:2] + strings.Repeat("ab", 28) </s> remove
type errFS struct {
fs.GlobFS
}
const errErrFSOpen errors.Error = "this error is always returned"
func (efs *errFS) Open(name string) (fs.File, error) {
return nil, errErrFSOpen
}
func TestWalkerFunc_CheckFile(t *testing.T) {
emptyFS := fstest.MapFS{}
t.Run("non-existing", func(t *testing.T) {
_, ok, err := checkFile(emptyFS, nil, "lol")
require.NoError(t, err)
assert.True(t, ok)
})
t.Run("invalid_argument", func(t *testing.T) {
_, ok, err := checkFile(&errFS{}, nil, "")
require.ErrorIs(t, err, errErrFSOpen)
assert.False(t, ok)
})
t.Run("ignore_dirs", func(t *testing.T) {
const dirName = "dir"
testFS := fstest.MapFS{
path.Join(dirName, "file"): &fstest.MapFile{Data: []byte{}},
}
patterns, ok, err := checkFile(testFS, nil, dirName)
require.NoError(t, err)
assert.Empty(t, patterns)
assert.True(t, ok)
})
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/aghtest/upstream.go |
"github.com/AdguardTeam/AdGuardHome/internal/aghalg" | <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove "github.com/AdguardTeam/golibs/errors"
</s> add </s> remove package aghos
</s> add package aghos_test </s> remove "github.com/AdguardTeam/golibs/errors"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/dnsforward/dnsforward_test.go |
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/AdguardTeam/golibs/testutil"
<mask> "github.com/AdguardTeam/golibs/timeutil"
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove "github.com/AdguardTeam/golibs/errors"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/dnsforward/dnsforward_test.go | |
sbUps := aghtest.NewBlockUpstream(hostname, true) | <mask>
<mask> func TestBlockedBySafeBrowsing(t *testing.T) {
<mask> const hostname = "wmconvirus.narod.ru"
<mask>
<mask> sbUps := &aghtest.TestBlockUpstream{
<mask> Hostname: hostname,
<mask> Block: true,
<mask> }
<mask> ans4, _ := (&aghtest.TestResolver{}).HostToIPs(hostname)
<mask>
<mask> filterConf := &filtering.Config{
<mask> SafeBrowsingEnabled: true,
<mask> }
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove const matching = "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true)) </s> remove ups := &aghtest.TestBlockUpstream{
Hostname: hostname,
Block: tc.block,
</s> add ups := aghtest.NewBlockUpstream(hostname, tc.block)
var numReq int
onExchange := ups.OnExchange
ups.OnExchange = func(req *dns.Msg) (resp *dns.Msg, err error) {
numReq++
return onExchange(req) </s> remove const matching = "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
d.checkMatch(t, matching)
</s> add </s> remove blocked := "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: blocked,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/dnsforward/dnsforward_test.go |
s.conf.ProtectionEnabled = true | <mask>
<mask> s.conf.UDPListenAddrs = []*net.UDPAddr{{}}
<mask> s.conf.TCPListenAddrs = []*net.TCPAddr{{}}
<mask> s.conf.UpstreamDNS = []string{"127.0.0.1:53"}
<mask> s.conf.FilteringConfig.ProtectionEnabled = true
<mask>
<mask> err = s.Prepare(nil)
<mask> require.NoError(t, err)
<mask>
<mask> err = s.Start()
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove extUpstream := &aghtest.Upstream{
Reverse: map[string][]string{
"1.1.1.1.in-addr.arpa.": {"one.one.one.one"},
</s> add const (
onesHost = "one.one.one.one"
localDomainHost = "local.domain"
)
var (
onesIP = net.IP{1, 1, 1, 1}
localIP = net.IP{192, 168, 1, 1}
)
revExtIPv4, err := netutil.IPToReversedAddr(onesIP)
require.NoError(t, err)
extUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "external.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revExtIPv4, onesHost),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil </s> remove localIP := net.IP{192, 168, 1, 1}
</s> add </s> remove assert.Equal(t, 1, ups.RequestsCount())
</s> add assert.Equal(t, 1, numReq) </s> remove
type errFS struct {
fs.GlobFS
}
const errErrFSOpen errors.Error = "this error is always returned"
func (efs *errFS) Open(name string) (fs.File, error) {
return nil, errErrFSOpen
}
func TestWalkerFunc_CheckFile(t *testing.T) {
emptyFS := fstest.MapFS{}
t.Run("non-existing", func(t *testing.T) {
_, ok, err := checkFile(emptyFS, nil, "lol")
require.NoError(t, err)
assert.True(t, ok)
})
t.Run("invalid_argument", func(t *testing.T) {
_, ok, err := checkFile(&errFS{}, nil, "")
require.ErrorIs(t, err, errErrFSOpen)
assert.False(t, ok)
})
t.Run("ignore_dirs", func(t *testing.T) {
const dirName = "dir"
testFS := fstest.MapFS{
path.Join(dirName, "file"): &fstest.MapFile{Data: []byte{}},
}
patterns, ok, err := checkFile(testFS, nil, dirName)
require.NoError(t, err)
assert.Empty(t, patterns)
assert.True(t, ok)
})
}
</s> add </s> remove locUpstream := &aghtest.Upstream{
Reverse: map[string][]string{
"192.168.1.1": {"local.domain"},
"2a00:1450:400c:c06::93": {"ipv6.domain"},
</s> add localIP := net.IP{192, 168, 1, 1}
revIPv4, err := netutil.IPToReversedAddr(localIP)
require.NoError(t, err)
revIPv6, err := netutil.IPToReversedAddr(net.ParseIP("2a00:1450:400c:c06::93"))
require.NoError(t, err)
locUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "local.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revIPv4, "local.domain"),
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revIPv6, "ipv6.domain"),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/dnsforward/dnsforward_test.go |
const (
onesHost = "one.one.one.one"
localDomainHost = "local.domain"
)
var (
onesIP = net.IP{1, 1, 1, 1}
localIP = net.IP{192, 168, 1, 1}
)
revExtIPv4, err := netutil.IPToReversedAddr(onesIP)
require.NoError(t, err)
extUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "external.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revExtIPv4, onesHost),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil | <mask> }
<mask> }
<mask>
<mask> func TestServer_Exchange(t *testing.T) {
<mask> extUpstream := &aghtest.Upstream{
<mask> Reverse: map[string][]string{
<mask> "1.1.1.1.in-addr.arpa.": {"one.one.one.one"},
<mask> },
<mask> }
<mask> locUpstream := &aghtest.Upstream{
<mask> Reverse: map[string][]string{
<mask> "1.1.168.192.in-addr.arpa.": {"local.domain"},
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove locUpstream := &aghtest.Upstream{
Reverse: map[string][]string{
"1.1.168.192.in-addr.arpa.": {"local.domain"},
"2.1.168.192.in-addr.arpa.": {},
</s> add revLocIPv4, err := netutil.IPToReversedAddr(localIP)
require.NoError(t, err)
locUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "local.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revLocIPv4, localDomainHost),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil </s> remove locUpstream := &aghtest.Upstream{
Reverse: map[string][]string{
"192.168.1.1": {"local.domain"},
"2a00:1450:400c:c06::93": {"ipv6.domain"},
</s> add localIP := net.IP{192, 168, 1, 1}
revIPv4, err := netutil.IPToReversedAddr(localIP)
require.NoError(t, err)
revIPv6, err := netutil.IPToReversedAddr(net.ParseIP("2a00:1450:400c:c06::93"))
require.NoError(t, err)
locUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "local.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revIPv4, "local.domain"),
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revIPv6, "ipv6.domain"),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil </s> remove upstreamErr := errors.Error("upstream error")
errUpstream := &aghtest.TestErrUpstream{
Err: upstreamErr,
}
nonPtrUpstream := &aghtest.TestBlockUpstream{
Hostname: "some-host",
Block: true,
}
</s> add errUpstream := aghtest.NewErrorUpstream()
nonPtrUpstream := aghtest.NewBlockUpstream("some-host", true) </s> remove errUpstream := &aghtest.TestErrUpstream{
Err: errors.Error("1234"),
}
</s> add errUpstream := aghtest.NewErrorUpstream() </s> remove
type errFS struct {
fs.GlobFS
}
const errErrFSOpen errors.Error = "this error is always returned"
func (efs *errFS) Open(name string) (fs.File, error) {
return nil, errErrFSOpen
}
func TestWalkerFunc_CheckFile(t *testing.T) {
emptyFS := fstest.MapFS{}
t.Run("non-existing", func(t *testing.T) {
_, ok, err := checkFile(emptyFS, nil, "lol")
require.NoError(t, err)
assert.True(t, ok)
})
t.Run("invalid_argument", func(t *testing.T) {
_, ok, err := checkFile(&errFS{}, nil, "")
require.ErrorIs(t, err, errErrFSOpen)
assert.False(t, ok)
})
t.Run("ignore_dirs", func(t *testing.T) {
const dirName = "dir"
testFS := fstest.MapFS{
path.Join(dirName, "file"): &fstest.MapFile{Data: []byte{}},
}
patterns, ok, err := checkFile(testFS, nil, dirName)
require.NoError(t, err)
assert.Empty(t, patterns)
assert.True(t, ok)
})
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/dnsforward/dnsforward_test.go |
revLocIPv4, err := netutil.IPToReversedAddr(localIP)
require.NoError(t, err)
locUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "local.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revLocIPv4, localDomainHost),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil | <mask> Reverse: map[string][]string{
<mask> "1.1.1.1.in-addr.arpa.": {"one.one.one.one"},
<mask> },
<mask> }
<mask> locUpstream := &aghtest.Upstream{
<mask> Reverse: map[string][]string{
<mask> "1.1.168.192.in-addr.arpa.": {"local.domain"},
<mask> "2.1.168.192.in-addr.arpa.": {},
<mask> },
<mask> }
<mask> upstreamErr := errors.Error("upstream error")
<mask> errUpstream := &aghtest.TestErrUpstream{
<mask> Err: upstreamErr,
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove upstreamErr := errors.Error("upstream error")
errUpstream := &aghtest.TestErrUpstream{
Err: upstreamErr,
}
nonPtrUpstream := &aghtest.TestBlockUpstream{
Hostname: "some-host",
Block: true,
}
</s> add errUpstream := aghtest.NewErrorUpstream()
nonPtrUpstream := aghtest.NewBlockUpstream("some-host", true) </s> remove extUpstream := &aghtest.Upstream{
Reverse: map[string][]string{
"1.1.1.1.in-addr.arpa.": {"one.one.one.one"},
</s> add const (
onesHost = "one.one.one.one"
localDomainHost = "local.domain"
)
var (
onesIP = net.IP{1, 1, 1, 1}
localIP = net.IP{192, 168, 1, 1}
)
revExtIPv4, err := netutil.IPToReversedAddr(onesIP)
require.NoError(t, err)
extUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "external.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revExtIPv4, onesHost),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil </s> remove locUpstream := &aghtest.Upstream{
Reverse: map[string][]string{
"192.168.1.1": {"local.domain"},
"2a00:1450:400c:c06::93": {"ipv6.domain"},
</s> add localIP := net.IP{192, 168, 1, 1}
revIPv4, err := netutil.IPToReversedAddr(localIP)
require.NoError(t, err)
revIPv6, err := netutil.IPToReversedAddr(net.ParseIP("2a00:1450:400c:c06::93"))
require.NoError(t, err)
locUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "local.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revIPv4, "local.domain"),
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revIPv6, "ipv6.domain"),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil </s> remove errUpstream := &aghtest.TestErrUpstream{
Err: errors.Error("1234"),
}
</s> add errUpstream := aghtest.NewErrorUpstream() </s> remove wantErr: upstreamErr,
</s> add wantErr: aghtest.ErrUpstream, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/dnsforward/dnsforward_test.go |
errUpstream := aghtest.NewErrorUpstream()
nonPtrUpstream := aghtest.NewBlockUpstream("some-host", true) | <mask> "1.1.168.192.in-addr.arpa.": {"local.domain"},
<mask> "2.1.168.192.in-addr.arpa.": {},
<mask> },
<mask> }
<mask> upstreamErr := errors.Error("upstream error")
<mask> errUpstream := &aghtest.TestErrUpstream{
<mask> Err: upstreamErr,
<mask> }
<mask> nonPtrUpstream := &aghtest.TestBlockUpstream{
<mask> Hostname: "some-host",
<mask> Block: true,
<mask> }
<mask>
<mask> srv := NewCustomServer(&proxy.Proxy{
<mask> Config: proxy.Config{
<mask> UpstreamConfig: &proxy.UpstreamConfig{
<mask> Upstreams: []upstream.Upstream{extUpstream},
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove locUpstream := &aghtest.Upstream{
Reverse: map[string][]string{
"1.1.168.192.in-addr.arpa.": {"local.domain"},
"2.1.168.192.in-addr.arpa.": {},
</s> add revLocIPv4, err := netutil.IPToReversedAddr(localIP)
require.NoError(t, err)
locUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "local.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revLocIPv4, localDomainHost),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil </s> remove errUpstream := &aghtest.TestErrUpstream{
Err: errors.Error("1234"),
}
</s> add errUpstream := aghtest.NewErrorUpstream() </s> remove sbUps := &aghtest.TestBlockUpstream{
Hostname: hostname,
Block: true,
}
</s> add sbUps := aghtest.NewBlockUpstream(hostname, true) </s> remove locUpstream := &aghtest.Upstream{
Reverse: map[string][]string{
"192.168.1.1": {"local.domain"},
"2a00:1450:400c:c06::93": {"ipv6.domain"},
</s> add localIP := net.IP{192, 168, 1, 1}
revIPv4, err := netutil.IPToReversedAddr(localIP)
require.NoError(t, err)
revIPv6, err := netutil.IPToReversedAddr(net.ParseIP("2a00:1450:400c:c06::93"))
require.NoError(t, err)
locUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "local.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revIPv4, "local.domain"),
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revIPv6, "ipv6.domain"),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil </s> remove ups := &aghtest.TestBlockUpstream{
Hostname: hostname,
Block: tc.block,
</s> add ups := aghtest.NewBlockUpstream(hostname, tc.block)
var numReq int
onExchange := ups.OnExchange
ups.OnExchange = func(req *dns.Msg) (resp *dns.Msg, err error) {
numReq++
return onExchange(req) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/dnsforward/dnsforward_test.go |
<mask> srv.conf.UsePrivateRDNS = true
<mask>
<mask> srv.privateNets = netutil.SubnetSetFunc(netutil.IsLocallyServed)
<mask>
<mask> localIP := net.IP{192, 168, 1, 1}
<mask> testCases := []struct {
<mask> name string
<mask> want string
<mask> wantErr error
<mask> locUpstream upstream.Upstream
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove errUpstream := &aghtest.TestErrUpstream{
Err: errors.Error("1234"),
}
</s> add errUpstream := aghtest.NewErrorUpstream() </s> remove extUpstream := &aghtest.Upstream{
Reverse: map[string][]string{
"1.1.1.1.in-addr.arpa.": {"one.one.one.one"},
</s> add const (
onesHost = "one.one.one.one"
localDomainHost = "local.domain"
)
var (
onesIP = net.IP{1, 1, 1, 1}
localIP = net.IP{192, 168, 1, 1}
)
revExtIPv4, err := netutil.IPToReversedAddr(onesIP)
require.NoError(t, err)
extUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "external.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revExtIPv4, onesHost),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil </s> remove locUpstream := &aghtest.Upstream{
Reverse: map[string][]string{
"192.168.1.1": {"local.domain"},
"2a00:1450:400c:c06::93": {"ipv6.domain"},
</s> add localIP := net.IP{192, 168, 1, 1}
revIPv4, err := netutil.IPToReversedAddr(localIP)
require.NoError(t, err)
revIPv6, err := netutil.IPToReversedAddr(net.ParseIP("2a00:1450:400c:c06::93"))
require.NoError(t, err)
locUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "local.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revIPv4, "local.domain"),
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revIPv6, "ipv6.domain"),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil </s> remove cliIP: net.IP{192, 168, 1, 1},
</s> add cliIP: localIP, </s> remove wantLog: `rdns: resolving "192.168.1.2": errupstream: 1234`,
</s> add wantLog: `rdns: resolving "192.168.1.2": test upstream error`, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/dnsforward/dnsforward_test.go | |
want: onesHost, | <mask> locUpstream upstream.Upstream
<mask> req net.IP
<mask> }{{
<mask> name: "external_good",
<mask> want: "one.one.one.one",
<mask> wantErr: nil,
<mask> locUpstream: nil,
<mask> req: net.IP{1, 1, 1, 1},
<mask> }, {
<mask> name: "local_good",
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove req: net.IP{1, 1, 1, 1},
</s> add req: onesIP, </s> remove want: "local.domain",
</s> add want: localDomainHost, </s> remove wantErr: upstreamErr,
</s> add wantErr: aghtest.ErrUpstream, </s> remove cliIP: net.IP{192, 168, 1, 1},
</s> add cliIP: localIP, </s> remove wantLog: `rdns: resolving "192.168.1.2": errupstream: 1234`,
</s> add wantLog: `rdns: resolving "192.168.1.2": test upstream error`, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/dnsforward/dnsforward_test.go |
req: onesIP, | <mask> name: "external_good",
<mask> want: "one.one.one.one",
<mask> wantErr: nil,
<mask> locUpstream: nil,
<mask> req: net.IP{1, 1, 1, 1},
<mask> }, {
<mask> name: "local_good",
<mask> want: "local.domain",
<mask> wantErr: nil,
<mask> locUpstream: locUpstream,
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove want: "local.domain",
</s> add want: localDomainHost, </s> remove want: "one.one.one.one",
</s> add want: onesHost, </s> remove wantErr: upstreamErr,
</s> add wantErr: aghtest.ErrUpstream, </s> remove cliIP: net.IP{192, 168, 1, 1},
</s> add cliIP: localIP, </s> remove wantLog: `rdns: resolving "192.168.1.2": errupstream: 1234`,
</s> add wantLog: `rdns: resolving "192.168.1.2": test upstream error`, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/dnsforward/dnsforward_test.go |
want: localDomainHost, | <mask> locUpstream: nil,
<mask> req: net.IP{1, 1, 1, 1},
<mask> }, {
<mask> name: "local_good",
<mask> want: "local.domain",
<mask> wantErr: nil,
<mask> locUpstream: locUpstream,
<mask> req: localIP,
<mask> }, {
<mask> name: "upstream_error",
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove req: net.IP{1, 1, 1, 1},
</s> add req: onesIP, </s> remove want: "one.one.one.one",
</s> add want: onesHost, </s> remove wantErr: upstreamErr,
</s> add wantErr: aghtest.ErrUpstream, </s> remove cliIP: net.IP{192, 168, 1, 1},
</s> add cliIP: localIP, </s> remove wantLog: `rdns: resolving "192.168.1.2": errupstream: 1234`,
</s> add wantLog: `rdns: resolving "192.168.1.2": test upstream error`, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/dnsforward/dnsforward_test.go |
wantErr: aghtest.ErrUpstream, | <mask> req: localIP,
<mask> }, {
<mask> name: "upstream_error",
<mask> want: "",
<mask> wantErr: upstreamErr,
<mask> locUpstream: errUpstream,
<mask> req: localIP,
<mask> }, {
<mask> name: "empty_answer_error",
<mask> want: "",
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove want: "local.domain",
</s> add want: localDomainHost, </s> remove req: net.IP{1, 1, 1, 1},
</s> add req: onesIP, </s> remove want: "one.one.one.one",
</s> add want: onesHost, </s> remove cliIP: net.IP{192, 168, 1, 1},
</s> add cliIP: localIP, </s> remove Hostname: "nonexisting",
</s> add Hostname: "nonexistent.example", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/dnsforward/dnsforward_test.go |
const (
sbBlocked = "wmconvirus.narod.ru"
pcBlocked = "pornhub.com"
)
| <mask> func TestMain(m *testing.M) {
<mask> aghtest.DiscardLogOutput(m)
<mask> }
<mask>
<mask> var setts = Settings{
<mask> ProtectionEnabled: true,
<mask> }
<mask>
<mask> // Helpers.
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove ups := &aghtest.TestErrUpstream{}
</s> add ups := aghtest.NewErrorUpstream() </s> remove ups := &aghtest.TestBlockUpstream{
Hostname: hostname,
Block: tc.block,
</s> add ups := aghtest.NewBlockUpstream(hostname, tc.block)
var numReq int
onExchange := ups.OnExchange
ups.OnExchange = func(req *dns.Msg) (resp *dns.Msg, err error) {
numReq++
return onExchange(req) </s> remove // Start implements the agh.Service interface for *Service. svc may be nil.
</s> add // Start implements the [agh.Service] interface for *Service. svc may be nil. </s> remove sbUps := &aghtest.TestBlockUpstream{
Hostname: hostname,
Block: true,
}
</s> add sbUps := aghtest.NewBlockUpstream(hostname, true) </s> remove extUpstream := &aghtest.Upstream{
Reverse: map[string][]string{
"1.1.1.1.in-addr.arpa.": {"one.one.one.one"},
</s> add const (
onesHost = "one.one.one.one"
localDomainHost = "local.domain"
)
var (
onesIP = net.IP{1, 1, 1, 1}
localIP = net.IP{192, 168, 1, 1}
)
revExtIPv4, err := netutil.IPToReversedAddr(onesIP)
require.NoError(t, err)
extUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "external.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revExtIPv4, onesHost),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go |
<mask> aghtest.ReplaceLogLevel(t, log.DEBUG)
<mask>
<mask> d := newForTest(t, &Config{SafeBrowsingEnabled: true}, nil)
<mask> t.Cleanup(d.Close)
<mask> const matching = "wmconvirus.narod.ru"
<mask> d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
<mask> Hostname: matching,
<mask> Block: true,
<mask> })
<mask> d.checkMatch(t, matching)
<mask>
<mask> require.Contains(t, logOutput.String(), "SafeBrowsing lookup for "+matching)
<mask>
<mask> d.checkMatch(t, "test."+matching)
<mask> d.checkMatchEmpty(t, "yandex.ru")
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove const matching = "pornhub.com"
d.SetParentalUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
</s> add </s> remove require.Contains(t, logOutput.String(), "SafeBrowsing lookup for "+matching)
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
d.checkMatch(t, sbBlocked)
require.Contains(t, logOutput.String(), fmt.Sprintf("safebrowsing lookup for %q", sbBlocked)) </s> remove d.checkMatch(t, matching)
require.Contains(t, logOutput.String(), "Parental lookup for "+matching)
</s> add d.SetParentalUpstream(aghtest.NewBlockUpstream(pcBlocked, true))
d.checkMatch(t, pcBlocked)
require.Contains(t, logOutput.String(), fmt.Sprintf("parental lookup for %q", pcBlocked)) </s> remove d.checkMatch(t, "test."+matching)
</s> add d.checkMatch(t, "test."+sbBlocked) </s> remove d.checkMatchEmpty(t, "pornhub.com")
</s> add d.checkMatchEmpty(t, pcBlocked) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go | |
d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
d.checkMatch(t, sbBlocked)
require.Contains(t, logOutput.String(), fmt.Sprintf("safebrowsing lookup for %q", sbBlocked)) | <mask> Block: true,
<mask> })
<mask> d.checkMatch(t, matching)
<mask>
<mask> require.Contains(t, logOutput.String(), "SafeBrowsing lookup for "+matching)
<mask>
<mask> d.checkMatch(t, "test."+matching)
<mask> d.checkMatchEmpty(t, "yandex.ru")
<mask> d.checkMatchEmpty(t, "pornhub.com")
<mask>
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove d.checkMatchEmpty(t, "pornhub.com")
</s> add d.checkMatchEmpty(t, pcBlocked) </s> remove d.checkMatch(t, "test."+matching)
</s> add d.checkMatch(t, "test."+sbBlocked) </s> remove d.checkMatch(t, matching)
require.Contains(t, logOutput.String(), "Parental lookup for "+matching)
</s> add d.SetParentalUpstream(aghtest.NewBlockUpstream(pcBlocked, true))
d.checkMatch(t, pcBlocked)
require.Contains(t, logOutput.String(), fmt.Sprintf("parental lookup for %q", pcBlocked)) </s> remove const matching = "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
d.checkMatch(t, matching)
</s> add </s> remove d.checkMatch(t, "www."+matching)
</s> add d.checkMatch(t, "www."+pcBlocked) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go |
d.checkMatch(t, "test."+sbBlocked) | <mask> d.checkMatch(t, matching)
<mask>
<mask> require.Contains(t, logOutput.String(), "SafeBrowsing lookup for "+matching)
<mask>
<mask> d.checkMatch(t, "test."+matching)
<mask> d.checkMatchEmpty(t, "yandex.ru")
<mask> d.checkMatchEmpty(t, "pornhub.com")
<mask>
<mask> // Cached result.
<mask> d.safeBrowsingServer = "127.0.0.1"
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove d.checkMatchEmpty(t, "pornhub.com")
</s> add d.checkMatchEmpty(t, pcBlocked) </s> remove require.Contains(t, logOutput.String(), "SafeBrowsing lookup for "+matching)
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
d.checkMatch(t, sbBlocked)
require.Contains(t, logOutput.String(), fmt.Sprintf("safebrowsing lookup for %q", sbBlocked)) </s> remove d.checkMatch(t, "www."+matching)
</s> add d.checkMatch(t, "www."+pcBlocked) </s> remove d.checkMatch(t, matching)
d.checkMatchEmpty(t, "pornhub.com")
</s> add d.checkMatch(t, sbBlocked)
d.checkMatchEmpty(t, pcBlocked) </s> remove const matching = "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
d.checkMatch(t, matching)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go |
d.checkMatchEmpty(t, pcBlocked) | <mask> require.Contains(t, logOutput.String(), "SafeBrowsing lookup for "+matching)
<mask>
<mask> d.checkMatch(t, "test."+matching)
<mask> d.checkMatchEmpty(t, "yandex.ru")
<mask> d.checkMatchEmpty(t, "pornhub.com")
<mask>
<mask> // Cached result.
<mask> d.safeBrowsingServer = "127.0.0.1"
<mask> d.checkMatch(t, matching)
<mask> d.checkMatchEmpty(t, "pornhub.com")
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove d.checkMatch(t, "test."+matching)
</s> add d.checkMatch(t, "test."+sbBlocked) </s> remove require.Contains(t, logOutput.String(), "SafeBrowsing lookup for "+matching)
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
d.checkMatch(t, sbBlocked)
require.Contains(t, logOutput.String(), fmt.Sprintf("safebrowsing lookup for %q", sbBlocked)) </s> remove d.checkMatch(t, matching)
d.checkMatchEmpty(t, "pornhub.com")
</s> add d.checkMatch(t, sbBlocked)
d.checkMatchEmpty(t, pcBlocked) </s> remove d.checkMatch(t, "www."+matching)
</s> add d.checkMatch(t, "www."+pcBlocked) </s> remove d.checkMatch(t, matching)
require.Contains(t, logOutput.String(), "Parental lookup for "+matching)
</s> add d.SetParentalUpstream(aghtest.NewBlockUpstream(pcBlocked, true))
d.checkMatch(t, pcBlocked)
require.Contains(t, logOutput.String(), fmt.Sprintf("parental lookup for %q", pcBlocked)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go |
d.checkMatch(t, sbBlocked)
d.checkMatchEmpty(t, pcBlocked) | <mask> d.checkMatchEmpty(t, "pornhub.com")
<mask>
<mask> // Cached result.
<mask> d.safeBrowsingServer = "127.0.0.1"
<mask> d.checkMatch(t, matching)
<mask> d.checkMatchEmpty(t, "pornhub.com")
<mask> d.safeBrowsingServer = defaultSafebrowsingServer
<mask> }
<mask>
<mask> func TestParallelSB(t *testing.T) {
<mask> d := newForTest(t, &Config{SafeBrowsingEnabled: true}, nil)
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove d.checkMatchEmpty(t, "pornhub.com")
</s> add d.checkMatchEmpty(t, pcBlocked) </s> remove d.checkMatch(t, "test."+matching)
</s> add d.checkMatch(t, "test."+sbBlocked) </s> remove const matching = "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
d.checkMatch(t, matching)
</s> add </s> remove d.checkMatch(t, matching)
</s> add d.checkMatch(t, pcBlocked) </s> remove const matching = "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go |
d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true)) | <mask>
<mask> func TestParallelSB(t *testing.T) {
<mask> d := newForTest(t, &Config{SafeBrowsingEnabled: true}, nil)
<mask> t.Cleanup(d.Close)
<mask> const matching = "wmconvirus.narod.ru"
<mask> d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
<mask> Hostname: matching,
<mask> Block: true,
<mask> })
<mask>
<mask> t.Run("group", func(t *testing.T) {
<mask> for i := 0; i < 100; i++ {
<mask> t.Run(fmt.Sprintf("aaa%d", i), func(t *testing.T) {
<mask> t.Parallel()
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove d.checkMatch(t, matching)
d.checkMatch(t, "test."+matching)
</s> add d.checkMatch(t, sbBlocked)
d.checkMatch(t, "test."+sbBlocked) </s> remove const matching = "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
d.checkMatch(t, matching)
</s> add </s> remove ups := &aghtest.TestErrUpstream{}
</s> add ups := aghtest.NewErrorUpstream() </s> remove const matching = "pornhub.com"
d.SetParentalUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
</s> add </s> remove d.checkMatch(t, matching)
d.checkMatchEmpty(t, "pornhub.com")
</s> add d.checkMatch(t, sbBlocked)
d.checkMatchEmpty(t, pcBlocked) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go |
d.checkMatch(t, sbBlocked)
d.checkMatch(t, "test."+sbBlocked) | <mask> t.Run("group", func(t *testing.T) {
<mask> for i := 0; i < 100; i++ {
<mask> t.Run(fmt.Sprintf("aaa%d", i), func(t *testing.T) {
<mask> t.Parallel()
<mask> d.checkMatch(t, matching)
<mask> d.checkMatch(t, "test."+matching)
<mask> d.checkMatchEmpty(t, "yandex.ru")
<mask> d.checkMatchEmpty(t, "pornhub.com")
<mask> })
<mask> }
<mask> })
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove const matching = "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true)) </s> remove d.checkMatchEmpty(t, "pornhub.com")
</s> add d.checkMatchEmpty(t, pcBlocked) </s> remove require.Contains(t, logOutput.String(), "SafeBrowsing lookup for "+matching)
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
d.checkMatch(t, sbBlocked)
require.Contains(t, logOutput.String(), fmt.Sprintf("safebrowsing lookup for %q", sbBlocked)) </s> remove d.checkMatch(t, matching)
d.checkMatchEmpty(t, "pornhub.com")
</s> add d.checkMatch(t, sbBlocked)
d.checkMatchEmpty(t, pcBlocked) </s> remove d.checkMatchEmpty(t, "pornhub.com")
</s> add d.checkMatchEmpty(t, pcBlocked) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go |
d.checkMatchEmpty(t, pcBlocked) | <mask> t.Parallel()
<mask> d.checkMatch(t, matching)
<mask> d.checkMatch(t, "test."+matching)
<mask> d.checkMatchEmpty(t, "yandex.ru")
<mask> d.checkMatchEmpty(t, "pornhub.com")
<mask> })
<mask> }
<mask> })
<mask> }
<mask>
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove d.checkMatch(t, matching)
d.checkMatch(t, "test."+matching)
</s> add d.checkMatch(t, sbBlocked)
d.checkMatch(t, "test."+sbBlocked) </s> remove require.Contains(t, logOutput.String(), "SafeBrowsing lookup for "+matching)
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
d.checkMatch(t, sbBlocked)
require.Contains(t, logOutput.String(), fmt.Sprintf("safebrowsing lookup for %q", sbBlocked)) </s> remove d.checkMatchEmpty(t, "pornhub.com")
</s> add d.checkMatchEmpty(t, pcBlocked) </s> remove d.checkMatch(t, "test."+matching)
</s> add d.checkMatch(t, "test."+sbBlocked) </s> remove d.checkMatch(t, matching)
require.Contains(t, logOutput.String(), "Parental lookup for "+matching)
</s> add d.SetParentalUpstream(aghtest.NewBlockUpstream(pcBlocked, true))
d.checkMatch(t, pcBlocked)
require.Contains(t, logOutput.String(), fmt.Sprintf("parental lookup for %q", pcBlocked)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go |
<mask> aghtest.ReplaceLogLevel(t, log.DEBUG)
<mask>
<mask> d := newForTest(t, &Config{ParentalEnabled: true}, nil)
<mask> t.Cleanup(d.Close)
<mask> const matching = "pornhub.com"
<mask> d.SetParentalUpstream(&aghtest.TestBlockUpstream{
<mask> Hostname: matching,
<mask> Block: true,
<mask> })
<mask>
<mask> d.checkMatch(t, matching)
<mask> require.Contains(t, logOutput.String(), "Parental lookup for "+matching)
<mask>
<mask> d.checkMatch(t, "www."+matching)
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove const matching = "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
d.checkMatch(t, matching)
</s> add </s> remove d.checkMatch(t, matching)
require.Contains(t, logOutput.String(), "Parental lookup for "+matching)
</s> add d.SetParentalUpstream(aghtest.NewBlockUpstream(pcBlocked, true))
d.checkMatch(t, pcBlocked)
require.Contains(t, logOutput.String(), fmt.Sprintf("parental lookup for %q", pcBlocked)) </s> remove d.checkMatch(t, "www."+matching)
</s> add d.checkMatch(t, "www."+pcBlocked) </s> remove require.Contains(t, logOutput.String(), "SafeBrowsing lookup for "+matching)
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
d.checkMatch(t, sbBlocked)
require.Contains(t, logOutput.String(), fmt.Sprintf("safebrowsing lookup for %q", sbBlocked)) </s> remove const matching = "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go | |
d.SetParentalUpstream(aghtest.NewBlockUpstream(pcBlocked, true))
d.checkMatch(t, pcBlocked)
require.Contains(t, logOutput.String(), fmt.Sprintf("parental lookup for %q", pcBlocked)) | <mask> Hostname: matching,
<mask> Block: true,
<mask> })
<mask>
<mask> d.checkMatch(t, matching)
<mask> require.Contains(t, logOutput.String(), "Parental lookup for "+matching)
<mask>
<mask> d.checkMatch(t, "www."+matching)
<mask> d.checkMatchEmpty(t, "www.yandex.ru")
<mask> d.checkMatchEmpty(t, "yandex.ru")
<mask> d.checkMatchEmpty(t, "api.jquery.com")
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove d.checkMatch(t, "www."+matching)
</s> add d.checkMatch(t, "www."+pcBlocked) </s> remove require.Contains(t, logOutput.String(), "SafeBrowsing lookup for "+matching)
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
d.checkMatch(t, sbBlocked)
require.Contains(t, logOutput.String(), fmt.Sprintf("safebrowsing lookup for %q", sbBlocked)) </s> remove const matching = "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
d.checkMatch(t, matching)
</s> add </s> remove const matching = "pornhub.com"
d.SetParentalUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
</s> add </s> remove d.checkMatchEmpty(t, "pornhub.com")
</s> add d.checkMatchEmpty(t, pcBlocked) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go |
d.checkMatch(t, "www."+pcBlocked) | <mask>
<mask> d.checkMatch(t, matching)
<mask> require.Contains(t, logOutput.String(), "Parental lookup for "+matching)
<mask>
<mask> d.checkMatch(t, "www."+matching)
<mask> d.checkMatchEmpty(t, "www.yandex.ru")
<mask> d.checkMatchEmpty(t, "yandex.ru")
<mask> d.checkMatchEmpty(t, "api.jquery.com")
<mask>
<mask> // Test cached result.
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove d.checkMatch(t, matching)
require.Contains(t, logOutput.String(), "Parental lookup for "+matching)
</s> add d.SetParentalUpstream(aghtest.NewBlockUpstream(pcBlocked, true))
d.checkMatch(t, pcBlocked)
require.Contains(t, logOutput.String(), fmt.Sprintf("parental lookup for %q", pcBlocked)) </s> remove d.checkMatch(t, matching)
</s> add d.checkMatch(t, pcBlocked) </s> remove d.checkMatchEmpty(t, "pornhub.com")
</s> add d.checkMatchEmpty(t, pcBlocked) </s> remove d.checkMatch(t, "test."+matching)
</s> add d.checkMatch(t, "test."+sbBlocked) </s> remove require.Contains(t, logOutput.String(), "SafeBrowsing lookup for "+matching)
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
d.checkMatch(t, sbBlocked)
require.Contains(t, logOutput.String(), fmt.Sprintf("safebrowsing lookup for %q", sbBlocked)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go |
d.checkMatch(t, pcBlocked) | <mask> d.checkMatchEmpty(t, "api.jquery.com")
<mask>
<mask> // Test cached result.
<mask> d.parentalServer = "127.0.0.1"
<mask> d.checkMatch(t, matching)
<mask> d.checkMatchEmpty(t, "yandex.ru")
<mask> }
<mask>
<mask> // Filtering.
<mask>
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove d.checkMatch(t, "www."+matching)
</s> add d.checkMatch(t, "www."+pcBlocked) </s> remove d.checkMatchEmpty(t, "pornhub.com")
</s> add d.checkMatchEmpty(t, pcBlocked) </s> remove d.checkMatch(t, "test."+matching)
</s> add d.checkMatch(t, "test."+sbBlocked) </s> remove d.checkMatch(t, matching)
d.checkMatchEmpty(t, "pornhub.com")
</s> add d.checkMatch(t, sbBlocked)
d.checkMatchEmpty(t, pcBlocked) </s> remove d.checkMatch(t, matching)
require.Contains(t, logOutput.String(), "Parental lookup for "+matching)
</s> add d.SetParentalUpstream(aghtest.NewBlockUpstream(pcBlocked, true))
d.checkMatch(t, pcBlocked)
require.Contains(t, logOutput.String(), fmt.Sprintf("parental lookup for %q", pcBlocked)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go |
host: sbBlocked, | <mask> wantDNSType: dns.TypeA,
<mask> }, {
<mask> name: "sanity",
<mask> rules: "||doubleclick.net^",
<mask> host: "wmconvirus.narod.ru",
<mask> wantIsFiltered: false,
<mask> wantReason: NotFilteredNotFound,
<mask> wantDNSType: dns.TypeA,
<mask> }, {
<mask> name: "blocking",
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove host: "wmconvirus.narod.ru",
</s> add host: sbBlocked, </s> remove host: "pornhub.com",
</s> add host: pcBlocked, </s> remove Hostname: "nonexisting",
</s> add Hostname: "nonexistent.example", </s> remove wantErr: upstreamErr,
</s> add wantErr: aghtest.ErrUpstream, </s> remove want: "local.domain",
</s> add want: localDomainHost, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go |
d.SetParentalUpstream(aghtest.NewBlockUpstream(pcBlocked, true))
d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true)) | <mask> ID: 0, Data: []byte("||example.org^\n"),
<mask> }},
<mask> )
<mask> t.Cleanup(d.Close)
<mask> d.SetParentalUpstream(&aghtest.TestBlockUpstream{
<mask> Hostname: "pornhub.com",
<mask> Block: true,
<mask> })
<mask> d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
<mask> Hostname: "wmconvirus.narod.ru",
<mask> Block: true,
<mask> })
<mask>
<mask> type testCase struct {
<mask> name string
<mask> host string
<mask> before bool
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove const matching = "pornhub.com"
d.SetParentalUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
</s> add </s> remove const matching = "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
d.checkMatch(t, matching)
</s> add </s> remove const matching = "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true)) </s> remove blocked := "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: blocked,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
</s> remove blocked := "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: blocked,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go |
host: pcBlocked, | <mask> before: true,
<mask> wantReason: FilteredBlockList,
<mask> }, {
<mask> name: "parental",
<mask> host: "pornhub.com",
<mask> before: true,
<mask> wantReason: FilteredParental,
<mask> }, {
<mask> name: "safebrowsing",
<mask> host: "wmconvirus.narod.ru",
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove host: "wmconvirus.narod.ru",
</s> add host: sbBlocked, </s> remove host: "wmconvirus.narod.ru",
</s> add host: sbBlocked, </s> remove wantErr: upstreamErr,
</s> add wantErr: aghtest.ErrUpstream, </s> remove want: "local.domain",
</s> add want: localDomainHost, </s> remove d.SetParentalUpstream(&aghtest.TestBlockUpstream{
Hostname: "pornhub.com",
Block: true,
})
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: "wmconvirus.narod.ru",
Block: true,
})
</s> add d.SetParentalUpstream(aghtest.NewBlockUpstream(pcBlocked, true))
d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go |
host: sbBlocked, | <mask> before: true,
<mask> wantReason: FilteredParental,
<mask> }, {
<mask> name: "safebrowsing",
<mask> host: "wmconvirus.narod.ru",
<mask> before: false,
<mask> wantReason: FilteredSafeBrowsing,
<mask> }, {
<mask> name: "additional_rules",
<mask> host: "facebook.com",
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove host: "pornhub.com",
</s> add host: pcBlocked, </s> remove host: "wmconvirus.narod.ru",
</s> add host: sbBlocked, </s> remove wantErr: upstreamErr,
</s> add wantErr: aghtest.ErrUpstream, </s> remove want: "local.domain",
</s> add want: localDomainHost, </s> remove Hostname: "nonexisting",
</s> add Hostname: "nonexistent.example", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go |
d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
| <mask>
<mask> func BenchmarkSafeBrowsing(b *testing.B) {
<mask> d := newForTest(b, &Config{SafeBrowsingEnabled: true}, nil)
<mask> b.Cleanup(d.Close)
<mask> blocked := "wmconvirus.narod.ru"
<mask> d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
<mask> Hostname: blocked,
<mask> Block: true,
<mask> })
<mask> for n := 0; n < b.N; n++ {
<mask> res, err := d.CheckHost(blocked, dns.TypeA, &setts)
<mask> require.NoError(b, err)
<mask>
<mask> assert.True(b, res.IsFiltered, "Expected hostname %s to match", blocked)
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove assert.True(b, res.IsFiltered, "Expected hostname %s to match", blocked)
</s> add assert.Truef(b, res.IsFiltered, "expected hostname %q to match", sbBlocked) </s> remove res, err := d.CheckHost(blocked, dns.TypeA, &setts)
</s> add res, err := d.CheckHost(sbBlocked, dns.TypeA, &setts) </s> remove blocked := "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: blocked,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
</s> remove assert.True(b, res.IsFiltered, "Expected hostname %s to match", blocked)
</s> add assert.Truef(b, res.IsFiltered, "expected hostname %q to match", sbBlocked) </s> remove res, err := d.CheckHost(blocked, dns.TypeA, &setts)
</s> add res, err := d.CheckHost(sbBlocked, dns.TypeA, &setts) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go |
res, err := d.CheckHost(sbBlocked, dns.TypeA, &setts) | <mask> Hostname: blocked,
<mask> Block: true,
<mask> })
<mask> for n := 0; n < b.N; n++ {
<mask> res, err := d.CheckHost(blocked, dns.TypeA, &setts)
<mask> require.NoError(b, err)
<mask>
<mask> assert.True(b, res.IsFiltered, "Expected hostname %s to match", blocked)
<mask> }
<mask> }
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove blocked := "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: blocked,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
</s> remove assert.True(b, res.IsFiltered, "Expected hostname %s to match", blocked)
</s> add assert.Truef(b, res.IsFiltered, "expected hostname %q to match", sbBlocked) </s> remove res, err := d.CheckHost(blocked, dns.TypeA, &setts)
</s> add res, err := d.CheckHost(sbBlocked, dns.TypeA, &setts) </s> remove assert.True(b, res.IsFiltered, "Expected hostname %s to match", blocked)
</s> add assert.Truef(b, res.IsFiltered, "expected hostname %q to match", sbBlocked) </s> remove blocked := "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: blocked,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go |
assert.Truef(b, res.IsFiltered, "expected hostname %q to match", sbBlocked) | <mask> for n := 0; n < b.N; n++ {
<mask> res, err := d.CheckHost(blocked, dns.TypeA, &setts)
<mask> require.NoError(b, err)
<mask>
<mask> assert.True(b, res.IsFiltered, "Expected hostname %s to match", blocked)
<mask> }
<mask> }
<mask>
<mask> func BenchmarkSafeBrowsingParallel(b *testing.B) {
<mask> d := newForTest(b, &Config{SafeBrowsingEnabled: true}, nil)
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove blocked := "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: blocked,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
</s> remove res, err := d.CheckHost(blocked, dns.TypeA, &setts)
</s> add res, err := d.CheckHost(sbBlocked, dns.TypeA, &setts) </s> remove assert.True(b, res.IsFiltered, "Expected hostname %s to match", blocked)
</s> add assert.Truef(b, res.IsFiltered, "expected hostname %q to match", sbBlocked) </s> remove res, err := d.CheckHost(blocked, dns.TypeA, &setts)
</s> add res, err := d.CheckHost(sbBlocked, dns.TypeA, &setts) </s> remove blocked := "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: blocked,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go |
d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
| <mask>
<mask> func BenchmarkSafeBrowsingParallel(b *testing.B) {
<mask> d := newForTest(b, &Config{SafeBrowsingEnabled: true}, nil)
<mask> b.Cleanup(d.Close)
<mask> blocked := "wmconvirus.narod.ru"
<mask> d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
<mask> Hostname: blocked,
<mask> Block: true,
<mask> })
<mask> b.RunParallel(func(pb *testing.PB) {
<mask> for pb.Next() {
<mask> res, err := d.CheckHost(blocked, dns.TypeA, &setts)
<mask> require.NoError(b, err)
<mask>
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove blocked := "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: blocked,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
</s> remove res, err := d.CheckHost(blocked, dns.TypeA, &setts)
</s> add res, err := d.CheckHost(sbBlocked, dns.TypeA, &setts) </s> remove assert.True(b, res.IsFiltered, "Expected hostname %s to match", blocked)
</s> add assert.Truef(b, res.IsFiltered, "expected hostname %q to match", sbBlocked) </s> remove res, err := d.CheckHost(blocked, dns.TypeA, &setts)
</s> add res, err := d.CheckHost(sbBlocked, dns.TypeA, &setts) </s> remove assert.True(b, res.IsFiltered, "Expected hostname %s to match", blocked)
</s> add assert.Truef(b, res.IsFiltered, "expected hostname %q to match", sbBlocked) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go |
res, err := d.CheckHost(sbBlocked, dns.TypeA, &setts) | <mask> Block: true,
<mask> })
<mask> b.RunParallel(func(pb *testing.PB) {
<mask> for pb.Next() {
<mask> res, err := d.CheckHost(blocked, dns.TypeA, &setts)
<mask> require.NoError(b, err)
<mask>
<mask> assert.True(b, res.IsFiltered, "Expected hostname %s to match", blocked)
<mask> }
<mask> })
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove assert.True(b, res.IsFiltered, "Expected hostname %s to match", blocked)
</s> add assert.Truef(b, res.IsFiltered, "expected hostname %q to match", sbBlocked) </s> remove res, err := d.CheckHost(blocked, dns.TypeA, &setts)
</s> add res, err := d.CheckHost(sbBlocked, dns.TypeA, &setts) </s> remove blocked := "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: blocked,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
</s> remove assert.True(b, res.IsFiltered, "Expected hostname %s to match", blocked)
</s> add assert.Truef(b, res.IsFiltered, "expected hostname %q to match", sbBlocked) </s> remove blocked := "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: blocked,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go |
assert.Truef(b, res.IsFiltered, "expected hostname %q to match", sbBlocked) | <mask> for pb.Next() {
<mask> res, err := d.CheckHost(blocked, dns.TypeA, &setts)
<mask> require.NoError(b, err)
<mask>
<mask> assert.True(b, res.IsFiltered, "Expected hostname %s to match", blocked)
<mask> }
<mask> })
<mask> }
<mask>
<mask> func BenchmarkSafeSearch(b *testing.B) {
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove res, err := d.CheckHost(blocked, dns.TypeA, &setts)
</s> add res, err := d.CheckHost(sbBlocked, dns.TypeA, &setts) </s> remove assert.True(b, res.IsFiltered, "Expected hostname %s to match", blocked)
</s> add assert.Truef(b, res.IsFiltered, "expected hostname %q to match", sbBlocked) </s> remove res, err := d.CheckHost(blocked, dns.TypeA, &setts)
</s> add res, err := d.CheckHost(sbBlocked, dns.TypeA, &setts) </s> remove blocked := "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: blocked,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
</s> remove blocked := "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: blocked,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true))
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/filtering_test.go |
defer timer.LogElapsed("safebrowsing lookup for %q", host) | <mask> }
<mask>
<mask> if log.GetLevel() >= log.DEBUG {
<mask> timer := log.StartTimer()
<mask> defer timer.LogElapsed("SafeBrowsing lookup for %s", host)
<mask> }
<mask>
<mask> sctx := &sbCtx{
<mask> host: host,
<mask> svc: "SafeBrowsing",
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove defer timer.LogElapsed("Parental lookup for %s", host)
</s> add defer timer.LogElapsed("parental lookup for %q", host) </s> remove hash = sha256.Sum256([]byte("nonexisting.com"))
</s> add hash = sha256.Sum256([]byte("host.example")) </s> remove // Shutdown implements the agh.Service interface for *Service. svc may be nil.
</s> add // Shutdown implements the [agh.Service] interface for *Service. svc may be
// nil. </s> remove host: "pornhub.com",
</s> add host: pcBlocked, </s> remove host: "wmconvirus.narod.ru",
</s> add host: sbBlocked, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/safebrowsing.go |
defer timer.LogElapsed("parental lookup for %q", host) | <mask> }
<mask>
<mask> if log.GetLevel() >= log.DEBUG {
<mask> timer := log.StartTimer()
<mask> defer timer.LogElapsed("Parental lookup for %s", host)
<mask> }
<mask>
<mask> sctx := &sbCtx{
<mask> host: host,
<mask> svc: "Parental",
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove defer timer.LogElapsed("SafeBrowsing lookup for %s", host)
</s> add defer timer.LogElapsed("safebrowsing lookup for %q", host) </s> remove hash = sha256.Sum256([]byte("nonexisting.com"))
</s> add hash = sha256.Sum256([]byte("host.example")) </s> remove // Shutdown implements the agh.Service interface for *Service. svc may be nil.
</s> add // Shutdown implements the [agh.Service] interface for *Service. svc may be
// nil. </s> remove host: "pornhub.com",
</s> add host: pcBlocked, </s> remove host: "wmconvirus.narod.ru",
</s> add host: sbBlocked, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/safebrowsing.go |
// Match "sub.host.com" from cache. Another hash for "host.example" is not
// in the cache, so get data for it from the server. | <mask> hash = sha256.Sum256([]byte("sub.host.com"))
<mask> c.hashToHost[hash] = "sub.host.com"
<mask> assert.Equal(t, -1, c.getCached())
<mask>
<mask> // match "sub.host.com" from cache,
<mask> // but another hash for "nonexisting.com" is not in cache
<mask> // which means that we must get data from server for it
<mask> c.hashToHost = make(map[[32]byte]string)
<mask> hash = sha256.Sum256([]byte("sub.host.com"))
<mask> c.hashToHost[hash] = "sub.host.com"
<mask> hash = sha256.Sum256([]byte("nonexisting.com"))
<mask> c.hashToHost[hash] = "nonexisting.com"
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove hash = sha256.Sum256([]byte("nonexisting.com"))
c.hashToHost[hash] = "nonexisting.com"
</s> add hash = sha256.Sum256([]byte("host.example"))
c.hashToHost[hash] = "host.example" </s> remove hash = sha256.Sum256([]byte("nonexisting.com"))
</s> add hash = sha256.Sum256([]byte("host.example")) </s> remove // TestBlockUpstream implements upstream.Upstream interface for replacing real
// upstream in tests.
type TestBlockUpstream struct {
Hostname string
// lock protects reqNum.
lock sync.RWMutex
reqNum int
Block bool
}
// Exchange returns a message unique for TestBlockUpstream's Hostname-Block
// pair.
func (u *TestBlockUpstream) Exchange(r *dns.Msg) (*dns.Msg, error) {
u.lock.Lock()
defer u.lock.Unlock()
u.reqNum++
hash := sha256.Sum256([]byte(u.Hostname))
hashToReturn := hex.EncodeToString(hash[:])
if !u.Block {
hashToReturn = hex.EncodeToString(hash[:])[:2] + strings.Repeat("ab", 28)
</s> add // NewBlockUpstream returns an [*UpstreamMock] that works like an upstream that
// supports hash-based safe-browsing/adult-blocking feature. If shouldBlock is
// true, hostname's actual hash is returned, blocking it. Otherwise, it returns
// a different hash.
func NewBlockUpstream(hostname string, shouldBlock bool) (u *UpstreamMock) {
hash := sha256.Sum256([]byte(hostname))
hashStr := hex.EncodeToString(hash[:])
if !shouldBlock {
hashStr = hex.EncodeToString(hash[:])[:2] + strings.Repeat("ab", 28) </s> remove assert.Equal(t, 1, ups.RequestsCount())
</s> add assert.Equal(t, 1, numReq) </s> remove // Service is the AdGuard Home web service. A nil *Service is a valid service
// that does nothing.
</s> add // Service is the AdGuard Home web service. A nil *Service is a valid
// [agh.Service] that does nothing. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/safebrowsing_test.go |
hash = sha256.Sum256([]byte("host.example"))
c.hashToHost[hash] = "host.example" | <mask> // which means that we must get data from server for it
<mask> c.hashToHost = make(map[[32]byte]string)
<mask> hash = sha256.Sum256([]byte("sub.host.com"))
<mask> c.hashToHost[hash] = "sub.host.com"
<mask> hash = sha256.Sum256([]byte("nonexisting.com"))
<mask> c.hashToHost[hash] = "nonexisting.com"
<mask> assert.Empty(t, c.getCached())
<mask>
<mask> hash = sha256.Sum256([]byte("sub.host.com"))
<mask> _, ok := c.hashToHost[hash]
<mask> assert.False(t, ok)
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove // match "sub.host.com" from cache,
// but another hash for "nonexisting.com" is not in cache
// which means that we must get data from server for it
</s> add // Match "sub.host.com" from cache. Another hash for "host.example" is not
// in the cache, so get data for it from the server. </s> remove hash = sha256.Sum256([]byte("nonexisting.com"))
</s> add hash = sha256.Sum256([]byte("host.example")) </s> remove // TestBlockUpstream implements upstream.Upstream interface for replacing real
// upstream in tests.
type TestBlockUpstream struct {
Hostname string
// lock protects reqNum.
lock sync.RWMutex
reqNum int
Block bool
}
// Exchange returns a message unique for TestBlockUpstream's Hostname-Block
// pair.
func (u *TestBlockUpstream) Exchange(r *dns.Msg) (*dns.Msg, error) {
u.lock.Lock()
defer u.lock.Unlock()
u.reqNum++
hash := sha256.Sum256([]byte(u.Hostname))
hashToReturn := hex.EncodeToString(hash[:])
if !u.Block {
hashToReturn = hex.EncodeToString(hash[:])[:2] + strings.Repeat("ab", 28)
</s> add // NewBlockUpstream returns an [*UpstreamMock] that works like an upstream that
// supports hash-based safe-browsing/adult-blocking feature. If shouldBlock is
// true, hostname's actual hash is returned, blocking it. Otherwise, it returns
// a different hash.
func NewBlockUpstream(hostname string, shouldBlock bool) (u *UpstreamMock) {
hash := sha256.Sum256([]byte(hostname))
hashStr := hex.EncodeToString(hash[:])
if !shouldBlock {
hashStr = hex.EncodeToString(hash[:])[:2] + strings.Repeat("ab", 28) </s> remove
type errFS struct {
fs.GlobFS
}
const errErrFSOpen errors.Error = "this error is always returned"
func (efs *errFS) Open(name string) (fs.File, error) {
return nil, errErrFSOpen
}
func TestWalkerFunc_CheckFile(t *testing.T) {
emptyFS := fstest.MapFS{}
t.Run("non-existing", func(t *testing.T) {
_, ok, err := checkFile(emptyFS, nil, "lol")
require.NoError(t, err)
assert.True(t, ok)
})
t.Run("invalid_argument", func(t *testing.T) {
_, ok, err := checkFile(&errFS{}, nil, "")
require.ErrorIs(t, err, errErrFSOpen)
assert.False(t, ok)
})
t.Run("ignore_dirs", func(t *testing.T) {
const dirName = "dir"
testFS := fstest.MapFS{
path.Join(dirName, "file"): &fstest.MapFile{Data: []byte{}},
}
patterns, ok, err := checkFile(testFS, nil, dirName)
require.NoError(t, err)
assert.Empty(t, patterns)
assert.True(t, ok)
})
}
</s> add </s> remove ok, err := FileWalker(func(r io.Reader) (patterns []string, ok bool, err error) {
</s> add ok, err := aghos.FileWalker(func(r io.Reader) (patterns []string, ok bool, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/safebrowsing_test.go |
hash = sha256.Sum256([]byte("host.example")) | <mask> hash = sha256.Sum256([]byte("sub.host.com"))
<mask> _, ok := c.hashToHost[hash]
<mask> assert.False(t, ok)
<mask>
<mask> hash = sha256.Sum256([]byte("nonexisting.com"))
<mask> _, ok = c.hashToHost[hash]
<mask> assert.True(t, ok)
<mask>
<mask> c = &sbCtx{
<mask> svc: "SafeBrowsing",
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove hash = sha256.Sum256([]byte("nonexisting.com"))
c.hashToHost[hash] = "nonexisting.com"
</s> add hash = sha256.Sum256([]byte("host.example"))
c.hashToHost[hash] = "host.example" </s> remove // match "sub.host.com" from cache,
// but another hash for "nonexisting.com" is not in cache
// which means that we must get data from server for it
</s> add // Match "sub.host.com" from cache. Another hash for "host.example" is not
// in the cache, so get data for it from the server. </s> remove
type errFS struct {
fs.GlobFS
}
const errErrFSOpen errors.Error = "this error is always returned"
func (efs *errFS) Open(name string) (fs.File, error) {
return nil, errErrFSOpen
}
func TestWalkerFunc_CheckFile(t *testing.T) {
emptyFS := fstest.MapFS{}
t.Run("non-existing", func(t *testing.T) {
_, ok, err := checkFile(emptyFS, nil, "lol")
require.NoError(t, err)
assert.True(t, ok)
})
t.Run("invalid_argument", func(t *testing.T) {
_, ok, err := checkFile(&errFS{}, nil, "")
require.ErrorIs(t, err, errErrFSOpen)
assert.False(t, ok)
})
t.Run("ignore_dirs", func(t *testing.T) {
const dirName = "dir"
testFS := fstest.MapFS{
path.Join(dirName, "file"): &fstest.MapFile{Data: []byte{}},
}
patterns, ok, err := checkFile(testFS, nil, dirName)
require.NoError(t, err)
assert.Empty(t, patterns)
assert.True(t, ok)
})
}
</s> add </s> remove ok, err := FileWalker(func(r io.Reader) (patterns []string, ok bool, err error) {
</s> add ok, err := aghos.FileWalker(func(r io.Reader) (patterns []string, ok bool, err error) { </s> remove defer timer.LogElapsed("SafeBrowsing lookup for %s", host)
</s> add defer timer.LogElapsed("safebrowsing lookup for %q", host) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/safebrowsing_test.go |
ups := aghtest.NewErrorUpstream() | <mask> func TestSBPC_checkErrorUpstream(t *testing.T) {
<mask> d := newForTest(t, &Config{SafeBrowsingEnabled: true}, nil)
<mask> t.Cleanup(d.Close)
<mask>
<mask> ups := &aghtest.TestErrUpstream{}
<mask>
<mask> d.SetSafeBrowsingUpstream(ups)
<mask> d.SetParentalUpstream(ups)
<mask>
<mask> setts := &Settings{
<mask> ProtectionEnabled: true,
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove const matching = "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true)) </s> remove d.checkMatch(t, matching)
d.checkMatchEmpty(t, "pornhub.com")
</s> add d.checkMatch(t, sbBlocked)
d.checkMatchEmpty(t, pcBlocked) </s> remove const matching = "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
d.checkMatch(t, matching)
</s> add </s> remove const matching = "pornhub.com"
d.SetParentalUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
</s> add </s> remove ups := &aghtest.TestBlockUpstream{
Hostname: hostname,
Block: tc.block,
</s> add ups := aghtest.NewBlockUpstream(hostname, tc.block)
var numReq int
onExchange := ups.OnExchange
ups.OnExchange = func(req *dns.Msg) (resp *dns.Msg, err error) {
numReq++
return onExchange(req) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/safebrowsing_test.go |
ups := aghtest.NewBlockUpstream(hostname, tc.block)
var numReq int
onExchange := ups.OnExchange
ups.OnExchange = func(req *dns.Msg) (resp *dns.Msg, err error) {
numReq++
return onExchange(req) | <mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> // Prepare the upstream.
<mask> ups := &aghtest.TestBlockUpstream{
<mask> Hostname: hostname,
<mask> Block: tc.block,
<mask> }
<mask> d.SetSafeBrowsingUpstream(ups)
<mask> d.SetParentalUpstream(ups)
<mask>
<mask> t.Run(tc.name, func(t *testing.T) {
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove ups := &aghtest.TestErrUpstream{}
</s> add ups := aghtest.NewErrorUpstream() </s> remove sbUps := &aghtest.TestBlockUpstream{
Hostname: hostname,
Block: true,
}
</s> add sbUps := aghtest.NewBlockUpstream(hostname, true) </s> remove const matching = "wmconvirus.narod.ru"
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
</s> add d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true)) </s> remove
type errFS struct {
fs.GlobFS
}
const errErrFSOpen errors.Error = "this error is always returned"
func (efs *errFS) Open(name string) (fs.File, error) {
return nil, errErrFSOpen
}
func TestWalkerFunc_CheckFile(t *testing.T) {
emptyFS := fstest.MapFS{}
t.Run("non-existing", func(t *testing.T) {
_, ok, err := checkFile(emptyFS, nil, "lol")
require.NoError(t, err)
assert.True(t, ok)
})
t.Run("invalid_argument", func(t *testing.T) {
_, ok, err := checkFile(&errFS{}, nil, "")
require.ErrorIs(t, err, errErrFSOpen)
assert.False(t, ok)
})
t.Run("ignore_dirs", func(t *testing.T) {
const dirName = "dir"
testFS := fstest.MapFS{
path.Join(dirName, "file"): &fstest.MapFile{Data: []byte{}},
}
patterns, ok, err := checkFile(testFS, nil, dirName)
require.NoError(t, err)
assert.Empty(t, patterns)
assert.True(t, ok)
})
}
</s> add </s> remove d.checkMatch(t, matching)
d.checkMatch(t, "test."+matching)
</s> add d.checkMatch(t, sbBlocked)
d.checkMatch(t, "test."+sbBlocked) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/safebrowsing_test.go |
assert.Equal(t, 1, numReq) | <mask> assert.Equal(t, 1, tc.testCache.Stats().Count)
<mask> assert.Equal(t, hits, tc.testCache.Stats().Hit)
<mask>
<mask> // There was one request to an upstream.
<mask> assert.Equal(t, 1, ups.RequestsCount())
<mask>
<mask> // Now make the same request to check the cache was used.
<mask> res, err = tc.testFunc(hostname, dns.TypeA, setts)
<mask> require.NoError(t, err)
<mask>
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove assert.Equal(t, 1, ups.RequestsCount())
</s> add assert.Equal(t, 1, numReq) </s> remove // match "sub.host.com" from cache,
// but another hash for "nonexisting.com" is not in cache
// which means that we must get data from server for it
</s> add // Match "sub.host.com" from cache. Another hash for "host.example" is not
// in the cache, so get data for it from the server. </s> remove // Start implements the agh.Service interface for *Service. svc may be nil.
</s> add // Start implements the [agh.Service] interface for *Service. svc may be nil. </s> remove res, err := d.CheckHost(blocked, dns.TypeA, &setts)
</s> add res, err := d.CheckHost(sbBlocked, dns.TypeA, &setts) </s> remove res, err := d.CheckHost(blocked, dns.TypeA, &setts)
</s> add res, err := d.CheckHost(sbBlocked, dns.TypeA, &setts) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/safebrowsing_test.go |
assert.Equal(t, 1, numReq) | <mask> assert.Equal(t, 1, tc.testCache.Stats().Count)
<mask> assert.Equal(t, hits+1, tc.testCache.Stats().Hit)
<mask>
<mask> // Check that there were no additional requests.
<mask> assert.Equal(t, 1, ups.RequestsCount())
<mask> })
<mask>
<mask> purgeCaches(d)
<mask> }
<mask> }
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove assert.Equal(t, 1, ups.RequestsCount())
</s> add assert.Equal(t, 1, numReq) </s> remove // match "sub.host.com" from cache,
// but another hash for "nonexisting.com" is not in cache
// which means that we must get data from server for it
</s> add // Match "sub.host.com" from cache. Another hash for "host.example" is not
// in the cache, so get data for it from the server. </s> remove want: "one.one.one.one",
</s> add want: onesHost, </s> remove want: "local.domain",
</s> add want: localDomainHost, </s> remove req: net.IP{1, 1, 1, 1},
</s> add req: onesIP, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/filtering/safebrowsing_test.go |
"fmt" | <mask> "bytes"
<mask> "encoding/binary"
<mask> "net"
<mask> "sync"
<mask> "testing"
<mask> "time"
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove "sync"
</s> add "testing" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/home/rdns_test.go |
"github.com/AdguardTeam/AdGuardHome/internal/aghalg" | <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/cache"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove "github.com/AdguardTeam/golibs/errors"
</s> add </s> remove "github.com/AdguardTeam/golibs/errors"
</s> add </s> remove package aghos
</s> add package aghos_test | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/home/rdns_test.go |
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/cache"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/AdguardTeam/golibs/stringutil"
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove "github.com/AdguardTeam/golibs/errors"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/home/rdns_test.go | |
ipCache: ipCache,
exchanger: &rDNSExchanger{
ex: aghtest.NewErrorUpstream(),
}, | <mask> ttl := make([]byte, binary.Size(uint64(0)))
<mask> binary.BigEndian.PutUint64(ttl, uint64(time.Now().Add(100*time.Hour).Unix()))
<mask>
<mask> rdns := &RDNS{
<mask> ipCache: ipCache,
<mask> exchanger: &rDNSExchanger{},
<mask> clients: &clientsContainer{
<mask> list: map[string]*Client{},
<mask> idIndex: tc.cliIDIndex,
<mask> ipToRC: netutil.NewIPMap(0),
<mask> allTags: stringutil.NewSet(),
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove ex := &rDNSExchanger{}
</s> add ex := &rDNSExchanger{
ex: aghtest.NewErrorUpstream(),
} </s> remove ex: aghtest.Exchanger{
Ups: tc.ups,
},
</s> add ex: tc.ups, </s> remove upstreamErr := errors.Error("upstream error")
errUpstream := &aghtest.TestErrUpstream{
Err: upstreamErr,
}
nonPtrUpstream := &aghtest.TestBlockUpstream{
Hostname: "some-host",
Block: true,
}
</s> add errUpstream := aghtest.NewErrorUpstream()
nonPtrUpstream := aghtest.NewBlockUpstream("some-host", true) </s> remove ups := &aghtest.TestErrUpstream{}
</s> add ups := aghtest.NewErrorUpstream() </s> remove sbUps := &aghtest.TestBlockUpstream{
Hostname: hostname,
Block: true,
}
</s> add sbUps := aghtest.NewBlockUpstream(hostname, true) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/home/rdns_test.go |
ex upstream.Upstream | <mask> }
<mask>
<mask> // rDNSExchanger is a mock dnsforward.RDNSExchanger implementation for tests.
<mask> type rDNSExchanger struct {
<mask> ex aghtest.Exchanger
<mask> usePrivate bool
<mask> }
<mask>
<mask> // Exchange implements dnsforward.RDNSExchanger interface for *RDNSExchanger.
<mask> func (e *rDNSExchanger) Exchange(ip net.IP) (host string, err error) {
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove Name: ip.String(),
Qtype: dns.TypePTR,
</s> add Name: dns.Fqdn(rev),
Qclass: dns.ClassINET,
Qtype: dns.TypePTR, </s> remove // TestBlockUpstream implements upstream.Upstream interface for replacing real
// upstream in tests.
type TestBlockUpstream struct {
Hostname string
// lock protects reqNum.
lock sync.RWMutex
reqNum int
Block bool
}
// Exchange returns a message unique for TestBlockUpstream's Hostname-Block
// pair.
func (u *TestBlockUpstream) Exchange(r *dns.Msg) (*dns.Msg, error) {
u.lock.Lock()
defer u.lock.Unlock()
u.reqNum++
hash := sha256.Sum256([]byte(u.Hostname))
hashToReturn := hex.EncodeToString(hash[:])
if !u.Block {
hashToReturn = hex.EncodeToString(hash[:])[:2] + strings.Repeat("ab", 28)
</s> add // NewBlockUpstream returns an [*UpstreamMock] that works like an upstream that
// supports hash-based safe-browsing/adult-blocking feature. If shouldBlock is
// true, hostname's actual hash is returned, blocking it. Otherwise, it returns
// a different hash.
func NewBlockUpstream(hostname string, shouldBlock bool) (u *UpstreamMock) {
hash := sha256.Sum256([]byte(hostname))
hashStr := hex.EncodeToString(hash[:])
if !shouldBlock {
hashStr = hex.EncodeToString(hash[:])[:2] + strings.Repeat("ab", 28) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/home/rdns_test.go |
rev, err := netutil.IPToReversedAddr(ip)
if err != nil {
return "", fmt.Errorf("reversing ip: %w", err)
}
| <mask>
<mask> // Exchange implements dnsforward.RDNSExchanger interface for *RDNSExchanger.
<mask> func (e *rDNSExchanger) Exchange(ip net.IP) (host string, err error) {
<mask> req := &dns.Msg{
<mask> Question: []dns.Question{{
<mask> Name: dns.Fqdn(rev),
<mask> Qclass: dns.ClassINET,
<mask> Qtype: dns.TypePTR,
<mask> }},
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove Name: ip.String(),
Qtype: dns.TypePTR,
</s> add Name: dns.Fqdn(rev),
Qclass: dns.ClassINET,
Qtype: dns.TypePTR, </s> remove ex aghtest.Exchanger
</s> add ex upstream.Upstream </s> remove // Shutdown implements the agh.Service interface for *Service. svc may be nil.
</s> add // Shutdown implements the [agh.Service] interface for *Service. svc may be
// nil. </s> remove // TestErrUpstream implements upstream.Upstream interface for replacing real
// upstream in tests.
type TestErrUpstream struct {
// The error returned by Exchange may be unwrapped to the Err.
Err error
</s> add return resp, nil
},
} </s> remove // Start implements the agh.Service interface for *Service. svc may be nil.
</s> add // Start implements the [agh.Service] interface for *Service. svc may be nil. | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/home/rdns_test.go |
Name: dns.Fqdn(rev),
Qclass: dns.ClassINET,
Qtype: dns.TypePTR, | <mask> // Exchange implements dnsforward.RDNSExchanger interface for *RDNSExchanger.
<mask> func (e *rDNSExchanger) Exchange(ip net.IP) (host string, err error) {
<mask> req := &dns.Msg{
<mask> Question: []dns.Question{{
<mask> Name: ip.String(),
<mask> Qtype: dns.TypePTR,
<mask> }},
<mask> }
<mask>
<mask> resp, err := e.ex.Exchange(req)
<mask> if err != nil {
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove ex aghtest.Exchanger
</s> add ex upstream.Upstream </s> remove // Shutdown implements the agh.Service interface for *Service. svc may be nil.
</s> add // Shutdown implements the [agh.Service] interface for *Service. svc may be
// nil. </s> remove // TestErrUpstream implements upstream.Upstream interface for replacing real
// upstream in tests.
type TestErrUpstream struct {
// The error returned by Exchange may be unwrapped to the Err.
Err error
</s> add return resp, nil
},
} </s> remove // Start implements the agh.Service interface for *Service. svc may be nil.
</s> add // Start implements the [agh.Service] interface for *Service. svc may be nil. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/home/rdns_test.go |
ex := &rDNSExchanger{
ex: aghtest.NewErrorUpstream(),
} | <mask> EnableLRU: true,
<mask> MaxCount: defaultRDNSCacheSize,
<mask> })
<mask>
<mask> ex := &rDNSExchanger{}
<mask>
<mask> rdns := &RDNS{
<mask> ipCache: ipCache,
<mask> exchanger: ex,
<mask> }
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove ipCache: ipCache,
exchanger: &rDNSExchanger{},
</s> add ipCache: ipCache,
exchanger: &rDNSExchanger{
ex: aghtest.NewErrorUpstream(),
}, </s> remove ex: aghtest.Exchanger{
Ups: tc.ups,
},
</s> add ex: tc.ups, </s> remove ex aghtest.Exchanger
</s> add ex upstream.Upstream </s> remove res, err := d.CheckHost(blocked, dns.TypeA, &setts)
</s> add res, err := d.CheckHost(sbBlocked, dns.TypeA, &setts) </s> remove d.SetParentalUpstream(&aghtest.TestBlockUpstream{
Hostname: "pornhub.com",
Block: true,
})
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: "wmconvirus.narod.ru",
Block: true,
})
</s> add d.SetParentalUpstream(aghtest.NewBlockUpstream(pcBlocked, true))
d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/home/rdns_test.go |
localIP := net.IP{192, 168, 1, 1}
revIPv4, err := netutil.IPToReversedAddr(localIP)
require.NoError(t, err)
revIPv6, err := netutil.IPToReversedAddr(net.ParseIP("2a00:1450:400c:c06::93"))
require.NoError(t, err)
locUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "local.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revIPv4, "local.domain"),
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revIPv6, "ipv6.domain"),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil | <mask> aghtest.ReplaceLogLevel(t, log.DEBUG)
<mask> w := &bytes.Buffer{}
<mask> aghtest.ReplaceLogWriter(t, w)
<mask>
<mask> locUpstream := &aghtest.Upstream{
<mask> Reverse: map[string][]string{
<mask> "192.168.1.1": {"local.domain"},
<mask> "2a00:1450:400c:c06::93": {"ipv6.domain"},
<mask> },
<mask> }
<mask> errUpstream := &aghtest.TestErrUpstream{
<mask> Err: errors.Error("1234"),
<mask> }
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove errUpstream := &aghtest.TestErrUpstream{
Err: errors.Error("1234"),
}
</s> add errUpstream := aghtest.NewErrorUpstream() </s> remove locUpstream := &aghtest.Upstream{
Reverse: map[string][]string{
"1.1.168.192.in-addr.arpa.": {"local.domain"},
"2.1.168.192.in-addr.arpa.": {},
</s> add revLocIPv4, err := netutil.IPToReversedAddr(localIP)
require.NoError(t, err)
locUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "local.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revLocIPv4, localDomainHost),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil </s> remove extUpstream := &aghtest.Upstream{
Reverse: map[string][]string{
"1.1.1.1.in-addr.arpa.": {"one.one.one.one"},
</s> add const (
onesHost = "one.one.one.one"
localDomainHost = "local.domain"
)
var (
onesIP = net.IP{1, 1, 1, 1}
localIP = net.IP{192, 168, 1, 1}
)
revExtIPv4, err := netutil.IPToReversedAddr(onesIP)
require.NoError(t, err)
extUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "external.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revExtIPv4, onesHost),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil </s> remove upstreamErr := errors.Error("upstream error")
errUpstream := &aghtest.TestErrUpstream{
Err: upstreamErr,
}
nonPtrUpstream := &aghtest.TestBlockUpstream{
Hostname: "some-host",
Block: true,
}
</s> add errUpstream := aghtest.NewErrorUpstream()
nonPtrUpstream := aghtest.NewBlockUpstream("some-host", true) </s> remove const matching = "pornhub.com"
d.SetParentalUpstream(&aghtest.TestBlockUpstream{
Hostname: matching,
Block: true,
})
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/home/rdns_test.go |
errUpstream := aghtest.NewErrorUpstream() | <mask> "192.168.1.1": {"local.domain"},
<mask> "2a00:1450:400c:c06::93": {"ipv6.domain"},
<mask> },
<mask> }
<mask> errUpstream := &aghtest.TestErrUpstream{
<mask> Err: errors.Error("1234"),
<mask> }
<mask>
<mask> testCases := []struct {
<mask> ups upstream.Upstream
<mask> wantLog string
<mask> name string
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove localIP := net.IP{192, 168, 1, 1}
</s> add </s> remove locUpstream := &aghtest.Upstream{
Reverse: map[string][]string{
"192.168.1.1": {"local.domain"},
"2a00:1450:400c:c06::93": {"ipv6.domain"},
</s> add localIP := net.IP{192, 168, 1, 1}
revIPv4, err := netutil.IPToReversedAddr(localIP)
require.NoError(t, err)
revIPv6, err := netutil.IPToReversedAddr(net.ParseIP("2a00:1450:400c:c06::93"))
require.NoError(t, err)
locUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "local.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revIPv4, "local.domain"),
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revIPv6, "ipv6.domain"),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil </s> remove upstreamErr := errors.Error("upstream error")
errUpstream := &aghtest.TestErrUpstream{
Err: upstreamErr,
}
nonPtrUpstream := &aghtest.TestBlockUpstream{
Hostname: "some-host",
Block: true,
}
</s> add errUpstream := aghtest.NewErrorUpstream()
nonPtrUpstream := aghtest.NewBlockUpstream("some-host", true) </s> remove locUpstream := &aghtest.Upstream{
Reverse: map[string][]string{
"1.1.168.192.in-addr.arpa.": {"local.domain"},
"2.1.168.192.in-addr.arpa.": {},
</s> add revLocIPv4, err := netutil.IPToReversedAddr(localIP)
require.NoError(t, err)
locUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "local.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revLocIPv4, localDomainHost),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil </s> remove d.SetParentalUpstream(&aghtest.TestBlockUpstream{
Hostname: "pornhub.com",
Block: true,
})
d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
Hostname: "wmconvirus.narod.ru",
Block: true,
})
</s> add d.SetParentalUpstream(aghtest.NewBlockUpstream(pcBlocked, true))
d.SetSafeBrowsingUpstream(aghtest.NewBlockUpstream(sbBlocked, true)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/home/rdns_test.go |
cliIP: localIP, | <mask> }{{
<mask> ups: locUpstream,
<mask> wantLog: "",
<mask> name: "all_good",
<mask> cliIP: net.IP{192, 168, 1, 1},
<mask> }, {
<mask> ups: errUpstream,
<mask> wantLog: `rdns: resolving "192.168.1.2": errupstream: 1234`,
<mask> name: "resolve_error",
<mask> cliIP: net.IP{192, 168, 1, 2},
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove wantLog: `rdns: resolving "192.168.1.2": errupstream: 1234`,
</s> add wantLog: `rdns: resolving "192.168.1.2": test upstream error`, </s> remove want: "one.one.one.one",
</s> add want: onesHost, </s> remove want: "local.domain",
</s> add want: localDomainHost, </s> remove req: net.IP{1, 1, 1, 1},
</s> add req: onesIP, </s> remove localIP := net.IP{192, 168, 1, 1}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/home/rdns_test.go |
wantLog: `rdns: resolving "192.168.1.2": test upstream error`, | <mask> name: "all_good",
<mask> cliIP: net.IP{192, 168, 1, 1},
<mask> }, {
<mask> ups: errUpstream,
<mask> wantLog: `rdns: resolving "192.168.1.2": errupstream: 1234`,
<mask> name: "resolve_error",
<mask> cliIP: net.IP{192, 168, 1, 2},
<mask> }, {
<mask> ups: locUpstream,
<mask> wantLog: "",
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove cliIP: net.IP{192, 168, 1, 1},
</s> add cliIP: localIP, </s> remove want: "local.domain",
</s> add want: localDomainHost, </s> remove req: net.IP{1, 1, 1, 1},
</s> add req: onesIP, </s> remove wantErr: upstreamErr,
</s> add wantErr: aghtest.ErrUpstream, </s> remove want: "one.one.one.one",
</s> add want: onesHost, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/home/rdns_test.go |
ex: tc.ups, | <mask> }
<mask> ch := make(chan net.IP)
<mask> rdns := &RDNS{
<mask> exchanger: &rDNSExchanger{
<mask> ex: aghtest.Exchanger{
<mask> Ups: tc.ups,
<mask> },
<mask> },
<mask> clients: cc,
<mask> ipCh: ch,
<mask> }
<mask>
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove ipCache: ipCache,
exchanger: &rDNSExchanger{},
</s> add ipCache: ipCache,
exchanger: &rDNSExchanger{
ex: aghtest.NewErrorUpstream(),
}, </s> remove ex := &rDNSExchanger{}
</s> add ex := &rDNSExchanger{
ex: aghtest.NewErrorUpstream(),
} </s> remove m := &dns.Msg{}
m.SetReply(r)
m.Answer = []dns.RR{
&dns.TXT{
Hdr: dns.RR_Header{
Name: r.Question[0].Name,
},
Txt: []string{
hashToReturn,
},
</s> add ans := &dns.TXT{
Hdr: dns.RR_Header{
Name: "",
Rrtype: dns.TypeTXT,
Class: dns.ClassINET,
Ttl: 60, </s> remove locUpstream := &aghtest.Upstream{
Reverse: map[string][]string{
"1.1.168.192.in-addr.arpa.": {"local.domain"},
"2.1.168.192.in-addr.arpa.": {},
</s> add revLocIPv4, err := netutil.IPToReversedAddr(localIP)
require.NoError(t, err)
locUpstream := &aghtest.UpstreamMock{
OnAddress: func() (addr string) { return "local.upstream.example" },
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = aghalg.Coalesce(
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revLocIPv4, localDomainHost),
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
)
return resp, nil </s> remove Hostname: "nonexisting",
</s> add Hostname: "nonexistent.example", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/home/rdns_test.go |
// Service is the AdGuard Home web service. A nil *Service is a valid
// [agh.Service] that does nothing. | <mask> // Timeout is the timeout for all server operations.
<mask> Timeout time.Duration
<mask> }
<mask>
<mask> // Service is the AdGuard Home web service. A nil *Service is a valid service
<mask> // that does nothing.
<mask> type Service struct {
<mask> tls *tls.Config
<mask> servers []*http.Server
<mask> start time.Time
<mask> timeout time.Duration
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove // Start implements the agh.Service interface for *Service. svc may be nil.
</s> add // Start implements the [agh.Service] interface for *Service. svc may be nil. </s> remove // match "sub.host.com" from cache,
// but another hash for "nonexisting.com" is not in cache
// which means that we must get data from server for it
</s> add // Match "sub.host.com" from cache. Another hash for "host.example" is not
// in the cache, so get data for it from the server. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/v1/websvc/websvc.go |
// Start implements the [agh.Service] interface for *Service. svc may be nil. | <mask>
<mask> // type check
<mask> var _ agh.Service = (*Service)(nil)
<mask>
<mask> // Start implements the agh.Service interface for *Service. svc may be nil.
<mask> // After Start exits, all HTTP servers have tried to start, possibly failing and
<mask> // writing error messages to the log.
<mask> func (svc *Service) Start() (err error) {
<mask> if svc == nil {
<mask> return nil
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove // Shutdown implements the agh.Service interface for *Service. svc may be nil.
</s> add // Shutdown implements the [agh.Service] interface for *Service. svc may be
// nil. </s> remove // TestErrUpstream implements upstream.Upstream interface for replacing real
// upstream in tests.
type TestErrUpstream struct {
// The error returned by Exchange may be unwrapped to the Err.
Err error
</s> add return resp, nil
},
} </s> remove // Exchange always returns nil Msg and non-nil error.
func (u *TestErrUpstream) Exchange(*dns.Msg) (*dns.Msg, error) {
return nil, fmt.Errorf("errupstream: %w", u.Err)
}
</s> add // ErrUpstream is the error returned from the [*UpstreamMock] created by
// [NewErrorUpstream].
const ErrUpstream errors.Error = "test upstream error" </s> remove return m, nil
}
// Address always returns an empty string.
func (u *TestBlockUpstream) Address() string {
return ""
}
// RequestsCount returns the number of handled requests. It's safe for
// concurrent use.
func (u *TestBlockUpstream) RequestsCount() int {
u.lock.Lock()
defer u.lock.Unlock()
return u.reqNum
}
</s> add return &UpstreamMock{
OnAddress: func() (addr string) {
return "sbpc.upstream.example"
},
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = respTmpl.Copy()
resp.SetReply(req)
resp.Answer[0].(*dns.TXT).Hdr.Name = req.Question[0].Name </s> remove // Service is the AdGuard Home web service. A nil *Service is a valid service
// that does nothing.
</s> add // Service is the AdGuard Home web service. A nil *Service is a valid
// [agh.Service] that does nothing. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/v1/websvc/websvc.go |
// Shutdown implements the [agh.Service] interface for *Service. svc may be
// nil. | <mask> srv.ErrorLog.Printf("starting srv %s: %s", addr, err)
<mask> }
<mask> }
<mask>
<mask> // Shutdown implements the agh.Service interface for *Service. svc may be nil.
<mask> func (svc *Service) Shutdown(ctx context.Context) (err error) {
<mask> if svc == nil {
<mask> return nil
<mask> }
<mask>
</s> Pull request #1558: add-dnssvc
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests </s> remove // Start implements the agh.Service interface for *Service. svc may be nil.
</s> add // Start implements the [agh.Service] interface for *Service. svc may be nil. </s> remove // TestErrUpstream implements upstream.Upstream interface for replacing real
// upstream in tests.
type TestErrUpstream struct {
// The error returned by Exchange may be unwrapped to the Err.
Err error
</s> add return resp, nil
},
} </s> remove return m, nil
}
// Address always returns an empty string.
func (u *TestBlockUpstream) Address() string {
return ""
}
// RequestsCount returns the number of handled requests. It's safe for
// concurrent use.
func (u *TestBlockUpstream) RequestsCount() int {
u.lock.Lock()
defer u.lock.Unlock()
return u.reqNum
}
</s> add return &UpstreamMock{
OnAddress: func() (addr string) {
return "sbpc.upstream.example"
},
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
resp = respTmpl.Copy()
resp.SetReply(req)
resp.Answer[0].(*dns.TXT).Hdr.Name = req.Question[0].Name </s> remove // Exchange always returns nil Msg and non-nil error.
func (u *TestErrUpstream) Exchange(*dns.Msg) (*dns.Msg, error) {
return nil, fmt.Errorf("errupstream: %w", u.Err)
}
</s> add // ErrUpstream is the error returned from the [*UpstreamMock] created by
// [NewErrorUpstream].
const ErrUpstream errors.Error = "test upstream error" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d4c3a43bcb1ac006fe92a5b5478f61dc60d0bd3f | internal/v1/websvc/websvc.go |
// Init initializes clients container
// Note: this function must be called only once
func (clients *clientsContainer) Init() { | <mask> ipHost map[string]ClientHost // IP -> Hostname
<mask> lock sync.Mutex
<mask> }
<mask>
<mask> var clients clientsContainer
<mask>
<mask> // Initialize clients container
<mask> func clientsInit() {
<mask> if clients.list != nil {
<mask> log.Fatal("clients.list != nil")
<mask> }
<mask> clients.list = make(map[string]*Client)
<mask> clients.ipIndex = make(map[string]*Client)
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove go periodicClientsUpdate()
</s> add go clients.periodicUpdate() </s> remove func clientsGetList() map[string]*Client {
</s> add // GetList returns the pointer to clients list
func (clients *clientsContainer) GetList() map[string]*Client { </s> remove func clientsAddFromHostsFile() {
</s> add func (clients *clientsContainer) addFromHostsFile() { </s> remove func clientExists(ip string) bool {
</s> add // Exists checks if client with this IP already exists
func (clients *clientsContainer) Exists(ip string) bool { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
go clients.periodicUpdate() | <mask> clients.list = make(map[string]*Client)
<mask> clients.ipIndex = make(map[string]*Client)
<mask> clients.ipHost = make(map[string]ClientHost)
<mask>
<mask> go periodicClientsUpdate()
<mask> }
<mask>
<mask> func periodicClientsUpdate() {
<mask> for {
<mask> clientsAddFromHostsFile()
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove func periodicClientsUpdate() {
</s> add func (clients *clientsContainer) periodicUpdate() { </s> remove var clients clientsContainer
// Initialize clients container
func clientsInit() {
</s> add // Init initializes clients container
// Note: this function must be called only once
func (clients *clientsContainer) Init() { </s> remove clientsAddFromHostsFile()
clientsAddFromSystemARP()
</s> add clients.addFromHostsFile()
clients.addFromSystemARP() </s> remove for ip, ch := range clients.ipHost {
</s> add for ip, ch := range config.clients.ipHost { </s> remove func clientsAddFromHostsFile() {
</s> add func (clients *clientsContainer) addFromHostsFile() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
func (clients *clientsContainer) periodicUpdate() { | <mask>
<mask> go periodicClientsUpdate()
<mask> }
<mask>
<mask> func periodicClientsUpdate() {
<mask> for {
<mask> clientsAddFromHostsFile()
<mask> clientsAddFromSystemARP()
<mask> time.Sleep(clientsUpdatePeriod)
<mask> }
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove clientsAddFromHostsFile()
clientsAddFromSystemARP()
</s> add clients.addFromHostsFile()
clients.addFromSystemARP() </s> remove go periodicClientsUpdate()
</s> add go clients.periodicUpdate() </s> remove func clientsGetList() map[string]*Client {
</s> add // GetList returns the pointer to clients list
func (clients *clientsContainer) GetList() map[string]*Client { </s> remove func clientsAddFromHostsFile() {
</s> add func (clients *clientsContainer) addFromHostsFile() { </s> remove func clientsAddFromSystemARP() {
</s> add func (clients *clientsContainer) addFromSystemARP() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
clients.addFromHostsFile()
clients.addFromSystemARP() | <mask> }
<mask>
<mask> func periodicClientsUpdate() {
<mask> for {
<mask> clientsAddFromHostsFile()
<mask> clientsAddFromSystemARP()
<mask> time.Sleep(clientsUpdatePeriod)
<mask> }
<mask> }
<mask>
<mask> func clientsGetList() map[string]*Client {
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove func periodicClientsUpdate() {
</s> add func (clients *clientsContainer) periodicUpdate() { </s> remove func clientsGetList() map[string]*Client {
</s> add // GetList returns the pointer to clients list
func (clients *clientsContainer) GetList() map[string]*Client { </s> remove go periodicClientsUpdate()
</s> add go clients.periodicUpdate() </s> remove func clientExists(ip string) bool {
</s> add // Exists checks if client with this IP already exists
func (clients *clientsContainer) Exists(ip string) bool { </s> remove func clientsAddFromHostsFile() {
</s> add func (clients *clientsContainer) addFromHostsFile() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
// GetList returns the pointer to clients list
func (clients *clientsContainer) GetList() map[string]*Client { | <mask> time.Sleep(clientsUpdatePeriod)
<mask> }
<mask> }
<mask>
<mask> func clientsGetList() map[string]*Client {
<mask> return clients.list
<mask> }
<mask>
<mask> func clientExists(ip string) bool {
<mask> clients.lock.Lock()
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove func clientExists(ip string) bool {
</s> add // Exists checks if client with this IP already exists
func (clients *clientsContainer) Exists(ip string) bool { </s> remove clientsAddFromHostsFile()
clientsAddFromSystemARP()
</s> add clients.addFromHostsFile()
clients.addFromSystemARP() </s> remove // Remove a client
func clientDel(name string) bool {
</s> add // Del removes a client
func (clients *clientsContainer) Del(name string) bool { </s> remove func periodicClientsUpdate() {
</s> add func (clients *clientsContainer) periodicUpdate() { </s> remove if clientExists(ip) {
</s> add if config.clients.Exists(ip) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
// Exists checks if client with this IP already exists
func (clients *clientsContainer) Exists(ip string) bool { | <mask> func clientsGetList() map[string]*Client {
<mask> return clients.list
<mask> }
<mask>
<mask> func clientExists(ip string) bool {
<mask> clients.lock.Lock()
<mask> defer clients.lock.Unlock()
<mask>
<mask> _, ok := clients.ipIndex[ip]
<mask> if ok {
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove func clientsGetList() map[string]*Client {
</s> add // GetList returns the pointer to clients list
func (clients *clientsContainer) GetList() map[string]*Client { </s> remove // Search for a client by IP
func clientFind(ip string) (Client, bool) {
</s> add // Find searches for a client by IP
func (clients *clientsContainer) Find(ip string) (Client, bool) { </s> remove // Remove a client
func clientDel(name string) bool {
</s> add // Del removes a client
func (clients *clientsContainer) Del(name string) bool { </s> remove clientsAddFromHostsFile()
clientsAddFromSystemARP()
</s> add clients.addFromHostsFile()
clients.addFromSystemARP() </s> remove clientsList := clientsGetList()
</s> add clientsList := config.clients.GetList() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
// Find searches for a client by IP
func (clients *clientsContainer) Find(ip string) (Client, bool) { | <mask> _, ok = clients.ipHost[ip]
<mask> return ok
<mask> }
<mask>
<mask> // Search for a client by IP
<mask> func clientFind(ip string) (Client, bool) {
<mask> clients.lock.Lock()
<mask> defer clients.lock.Unlock()
<mask>
<mask> c, ok := clients.ipIndex[ip]
<mask> if ok {
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove func clientExists(ip string) bool {
</s> add // Exists checks if client with this IP already exists
func (clients *clientsContainer) Exists(ip string) bool { </s> remove // Remove a client
func clientDel(name string) bool {
</s> add // Del removes a client
func (clients *clientsContainer) Del(name string) bool { </s> remove c, ok := clientFind(clientAddr)
</s> add c, ok := config.clients.Find(clientAddr) </s> remove func clientAddHost(ip, host string, source clientSource) (bool, error) {
</s> add func (clients *clientsContainer) AddHost(ip, host string, source clientSource) (bool, error) { </s> remove ok, e := clientAddHost(fields[0], fields[1], ClientSourceHostsFile)
</s> add ok, e := clients.AddHost(fields[0], fields[1], ClientSourceHostsFile) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
func (c *Client) check() error { | <mask> return Client{}, false
<mask> }
<mask>
<mask> // Check if Client object's fields are correct
<mask> func clientCheck(c *Client) error {
<mask> if len(c.Name) == 0 {
<mask> return fmt.Errorf("Invalid Name")
<mask> }
<mask>
<mask> if (len(c.IP) == 0 && len(c.MAC) == 0) ||
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove if clientExists(ip) {
</s> add if config.clients.Exists(ip) { </s> remove func clientsAddFromHostsFile() {
</s> add func (clients *clientsContainer) addFromHostsFile() { </s> remove clientsList := clientsGetList()
</s> add clientsList := config.clients.GetList() </s> remove func clientsAddFromSystemARP() {
</s> add func (clients *clientsContainer) addFromSystemARP() { </s> remove t.Fatalf("clientAdd - ip in use")
</s> add t.Fatalf("Add - ip in use") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
func (clients *clientsContainer) Add(c Client) (bool, error) {
e := c.check() | <mask> }
<mask>
<mask> // Add a new client object
<mask> // Return true: success; false: client exists.
<mask> func clientAdd(c Client) (bool, error) {
<mask> e := clientCheck(&c)
<mask> if e != nil {
<mask> return false, e
<mask> }
<mask>
<mask> clients.lock.Lock()
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove func clientUpdate(name string, c Client) error {
err := clientCheck(&c)
</s> add func (clients *clientsContainer) Update(name string, c Client) error {
err := c.check() </s> remove // Remove a client
func clientDel(name string) bool {
</s> add // Del removes a client
func (clients *clientsContainer) Del(name string) bool { </s> remove // Search for a client by IP
func clientFind(ip string) (Client, bool) {
</s> add // Find searches for a client by IP
func (clients *clientsContainer) Find(ip string) (Client, bool) { </s> remove // Add new IP -> Host pair
</s> add // AddHost adds new IP -> Host pair </s> remove func clientAddHost(ip, host string, source clientSource) (bool, error) {
</s> add func (clients *clientsContainer) AddHost(ip, host string, source clientSource) (bool, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
// Del removes a client
func (clients *clientsContainer) Del(name string) bool { | <mask> log.Tracef("'%s': '%s' | '%s' -> [%d]", c.Name, c.IP, c.MAC, len(clients.list))
<mask> return true, nil
<mask> }
<mask>
<mask> // Remove a client
<mask> func clientDel(name string) bool {
<mask> clients.lock.Lock()
<mask> defer clients.lock.Unlock()
<mask>
<mask> c, ok := clients.list[name]
<mask> if !ok {
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove // Search for a client by IP
func clientFind(ip string) (Client, bool) {
</s> add // Find searches for a client by IP
func (clients *clientsContainer) Find(ip string) (Client, bool) { </s> remove func clientExists(ip string) bool {
</s> add // Exists checks if client with this IP already exists
func (clients *clientsContainer) Exists(ip string) bool { </s> remove c, ok := clientFind(clientAddr)
</s> add c, ok := config.clients.Find(clientAddr) </s> remove func clientUpdate(name string, c Client) error {
err := clientCheck(&c)
</s> add func (clients *clientsContainer) Update(name string, c Client) error {
err := c.check() </s> remove clients.lock.Lock()
for _, c := range clients.list {
</s> add config.clients.lock.Lock()
for _, c := range config.clients.list { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
func (clients *clientsContainer) Update(name string, c Client) error {
err := c.check() | <mask> return true
<mask> }
<mask>
<mask> // Update a client
<mask> func clientUpdate(name string, c Client) error {
<mask> err := clientCheck(&c)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> clients.lock.Lock()
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove func clientAdd(c Client) (bool, error) {
e := clientCheck(&c)
</s> add func (clients *clientsContainer) Add(c Client) (bool, error) {
e := c.check() </s> remove ok, err := clientAdd(*c)
</s> add ok, err := config.clients.Add(*c) </s> remove err = clientUpdate(dj.Name, *c)
</s> add err = config.clients.Update(dj.Name, *c) </s> remove _, err = clientAdd(cli)
</s> add _, err = config.clients.Add(cli) </s> remove var dj clientUpdateJSON
</s> add var dj updateJSON | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
// AddHost adds new IP -> Host pair | <mask>
<mask> return nil
<mask> }
<mask>
<mask> // Add new IP -> Host pair
<mask> // Use priority of the source (etc/hosts > ARP > rDNS)
<mask> // so we overwrite existing entries with an equal or higher priority
<mask> func clientAddHost(ip, host string, source clientSource) (bool, error) {
<mask> clients.lock.Lock()
<mask> defer clients.lock.Unlock()
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove func clientAddHost(ip, host string, source clientSource) (bool, error) {
</s> add func (clients *clientsContainer) AddHost(ip, host string, source clientSource) (bool, error) { </s> remove func clientAdd(c Client) (bool, error) {
e := clientCheck(&c)
</s> add func (clients *clientsContainer) Add(c Client) (bool, error) {
e := c.check() </s> remove func clientsAddFromSystemARP() {
</s> add func (clients *clientsContainer) addFromSystemARP() { </s> remove func clientExists(ip string) bool {
</s> add // Exists checks if client with this IP already exists
func (clients *clientsContainer) Exists(ip string) bool { </s> remove b, e = clientAddHost("1.1.1.1", "host2", ClientSourceARP)
</s> add b, e = clients.AddHost("1.1.1.1", "host2", ClientSourceARP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
func (clients *clientsContainer) AddHost(ip, host string, source clientSource) (bool, error) { | <mask>
<mask> // Add new IP -> Host pair
<mask> // Use priority of the source (etc/hosts > ARP > rDNS)
<mask> // so we overwrite existing entries with an equal or higher priority
<mask> func clientAddHost(ip, host string, source clientSource) (bool, error) {
<mask> clients.lock.Lock()
<mask> defer clients.lock.Unlock()
<mask>
<mask> // check index
<mask> c, ok := clients.ipHost[ip]
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove // Add new IP -> Host pair
</s> add // AddHost adds new IP -> Host pair </s> remove // Search for a client by IP
func clientFind(ip string) (Client, bool) {
</s> add // Find searches for a client by IP
func (clients *clientsContainer) Find(ip string) (Client, bool) { </s> remove func clientAdd(c Client) (bool, error) {
e := clientCheck(&c)
</s> add func (clients *clientsContainer) Add(c Client) (bool, error) {
e := c.check() </s> remove func clientExists(ip string) bool {
</s> add // Exists checks if client with this IP already exists
func (clients *clientsContainer) Exists(ip string) bool { </s> remove func clientsAddFromSystemARP() {
</s> add func (clients *clientsContainer) addFromSystemARP() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
func (clients *clientsContainer) addFromHostsFile() { | <mask> return true, nil
<mask> }
<mask>
<mask> // Parse system 'hosts' file and fill clients array
<mask> func clientsAddFromHostsFile() {
<mask> hostsFn := "/etc/hosts"
<mask> if runtime.GOOS == "windows" {
<mask> hostsFn = os.ExpandEnv("$SystemRoot\\system32\\drivers\\etc\\hosts")
<mask> }
<mask>
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove func clientsAddFromSystemARP() {
</s> add func (clients *clientsContainer) addFromSystemARP() { </s> remove var clients clientsContainer
// Initialize clients container
func clientsInit() {
</s> add // Init initializes clients container
// Note: this function must be called only once
func (clients *clientsContainer) Init() { </s> remove func clientCheck(c *Client) error {
</s> add func (c *Client) check() error { </s> remove // Remove a client
func clientDel(name string) bool {
</s> add // Del removes a client
func (clients *clientsContainer) Del(name string) bool { </s> remove func clientsGetList() map[string]*Client {
</s> add // GetList returns the pointer to clients list
func (clients *clientsContainer) GetList() map[string]*Client { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
ok, e := clients.AddHost(fields[0], fields[1], ClientSourceHostsFile) | <mask> if len(fields) < 2 {
<mask> continue
<mask> }
<mask>
<mask> ok, e := clientAddHost(fields[0], fields[1], ClientSourceHostsFile)
<mask> if e != nil {
<mask> log.Tracef("%s", e)
<mask> }
<mask> if ok {
<mask> n++
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove ok, e := clientAddHost(ip, host, ClientSourceARP)
</s> add ok, e := clients.AddHost(ip, host, ClientSourceARP) </s> remove ok, err := clientAdd(*c)
</s> add ok, err := config.clients.Add(*c) </s> remove clients.lock.Unlock()
</s> add config.clients.lock.Unlock() </s> remove b, e = clientAddHost("1.1.1.1", "host3", ClientSourceHostsFile)
</s> add b, e = clients.AddHost("1.1.1.1", "host3", ClientSourceHostsFile) </s> remove if !clientDel("client1") || clientExists("1.1.1.2") {
t.Fatalf("clientDel")
</s> add if !clients.Del("client1") || clients.Exists("1.1.1.2") {
t.Fatalf("Del") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
func (clients *clientsContainer) addFromSystemARP() { | <mask>
<mask> // Add IP -> Host pairs from the system's `arp -a` command output
<mask> // The command's output is:
<mask> // HOST (IP) at MAC on IFACE
<mask> func clientsAddFromSystemARP() {
<mask>
<mask> if runtime.GOOS == "windows" {
<mask> return
<mask> }
<mask>
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove // Add new IP -> Host pair
</s> add // AddHost adds new IP -> Host pair </s> remove func clientsAddFromHostsFile() {
</s> add func (clients *clientsContainer) addFromHostsFile() { </s> remove func clientAddHost(ip, host string, source clientSource) (bool, error) {
</s> add func (clients *clientsContainer) AddHost(ip, host string, source clientSource) (bool, error) { </s> remove if clientExists(ip) {
</s> add if config.clients.Exists(ip) { </s> remove func clientCheck(c *Client) error {
</s> add func (c *Client) check() error { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
ok, e := clients.AddHost(ip, host, ClientSourceARP) | <mask> if utils.IsValidHostname(host) != nil || net.ParseIP(ip) == nil {
<mask> continue
<mask> }
<mask>
<mask> ok, e := clientAddHost(ip, host, ClientSourceARP)
<mask> if e != nil {
<mask> log.Tracef("%s", e)
<mask> }
<mask> if ok {
<mask> n++
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove ok, e := clientAddHost(fields[0], fields[1], ClientSourceHostsFile)
</s> add ok, e := clients.AddHost(fields[0], fields[1], ClientSourceHostsFile) </s> remove ok, err := clientAdd(*c)
</s> add ok, err := config.clients.Add(*c) </s> remove if !clientDel("client1") || clientExists("1.1.1.2") {
t.Fatalf("clientDel")
</s> add if !clients.Del("client1") || clients.Exists("1.1.1.2") {
t.Fatalf("Del") </s> remove b, e = clientAddHost("1.1.1.1", "host", ClientSourceARP)
</s> add b, e = clients.AddHost("1.1.1.1", "host", ClientSourceARP) </s> remove clients.lock.Unlock()
</s> add config.clients.lock.Unlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
config.clients.lock.Lock()
for _, c := range config.clients.list { | <mask> log.Tracef("%s %v", r.Method, r.URL)
<mask>
<mask> data := clientListJSON{}
<mask>
<mask> clients.lock.Lock()
<mask> for _, c := range clients.list {
<mask> cj := clientJSON{
<mask> IP: c.IP,
<mask> MAC: c.MAC,
<mask> Name: c.Name,
<mask> UseGlobalSettings: !c.UseOwnSettings,
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove for ip, ch := range clients.ipHost {
</s> add for ip, ch := range config.clients.ipHost { </s> remove // Remove a client
func clientDel(name string) bool {
</s> add // Del removes a client
func (clients *clientsContainer) Del(name string) bool { </s> remove clientsList := clientsGetList()
</s> add clientsList := config.clients.GetList() </s> remove func clientExists(ip string) bool {
</s> add // Exists checks if client with this IP already exists
func (clients *clientsContainer) Exists(ip string) bool { </s> remove // Search for a client by IP
func clientFind(ip string) (Client, bool) {
</s> add // Find searches for a client by IP
func (clients *clientsContainer) Find(ip string) (Client, bool) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
for ip, ch := range config.clients.ipHost { | <mask> }
<mask>
<mask> data.Clients = append(data.Clients, cj)
<mask> }
<mask> for ip, ch := range clients.ipHost {
<mask> cj := clientHostJSON{
<mask> IP: ip,
<mask> Name: ch.Host,
<mask> }
<mask> cj.Source = "etc/hosts"
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove clients.lock.Lock()
for _, c := range clients.list {
</s> add config.clients.lock.Lock()
for _, c := range config.clients.list { </s> remove clients.lock.Unlock()
</s> add config.clients.lock.Unlock() </s> remove go periodicClientsUpdate()
</s> add go clients.periodicUpdate() </s> remove clientsList := clientsGetList()
</s> add clientsList := config.clients.GetList() </s> remove b, e = clientAdd(c)
</s> add b, e = clients.Add(c) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
config.clients.lock.Unlock() | <mask> cj.Source = "ARP"
<mask> }
<mask> data.AutoClients = append(data.AutoClients, cj)
<mask> }
<mask> clients.lock.Unlock()
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask> e := json.NewEncoder(w).Encode(data)
<mask> if e != nil {
<mask> httpError(w, http.StatusInternalServerError, "Failed to encode to json: %v", e)
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove var dj clientUpdateJSON
</s> add var dj updateJSON </s> remove for ip, ch := range clients.ipHost {
</s> add for ip, ch := range config.clients.ipHost { </s> remove ok, e := clientAddHost(ip, host, ClientSourceARP)
</s> add ok, e := clients.AddHost(ip, host, ClientSourceARP) </s> remove ok, e := clientAddHost(fields[0], fields[1], ClientSourceHostsFile)
</s> add ok, e := clients.AddHost(fields[0], fields[1], ClientSourceHostsFile) </s> remove err = clientUpdate(dj.Name, *c)
</s> add err = config.clients.Update(dj.Name, *c) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
ok, err := config.clients.Add(*c) | <mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "%s", err)
<mask> return
<mask> }
<mask> ok, err := clientAdd(*c)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "%s", err)
<mask> return
<mask> }
<mask> if !ok {
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove err = clientUpdate(dj.Name, *c)
</s> add err = config.clients.Update(dj.Name, *c) </s> remove var dj clientUpdateJSON
</s> add var dj updateJSON </s> remove if !clientDel(cj.Name) {
</s> add if !config.clients.Del(cj.Name) { </s> remove _, err = clientAdd(cli)
</s> add _, err = config.clients.Add(cli) </s> remove func clientUpdate(name string, c Client) error {
err := clientCheck(&c)
</s> add func (clients *clientsContainer) Update(name string, c Client) error {
err := c.check() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
if !config.clients.Del(cj.Name) { | <mask> httpError(w, http.StatusBadRequest, "JSON parse: %s", err)
<mask> return
<mask> }
<mask>
<mask> if !clientDel(cj.Name) {
<mask> httpError(w, http.StatusBadRequest, "Client not found")
<mask> return
<mask> }
<mask>
<mask> _ = writeAllConfigsAndReloadDNS()
</s> * clients: move container object to "config"
Now the functions use parameter, not a global object. </s> remove var dj clientUpdateJSON
</s> add var dj updateJSON </s> remove err = clientUpdate(dj.Name, *c)
</s> add err = config.clients.Update(dj.Name, *c) </s> remove ok, err := clientAdd(*c)
</s> add ok, err := config.clients.Add(*c) </s> remove if clientExists(ip) {
</s> add if config.clients.Exists(ip) { </s> remove _, err = clientAdd(cli)
</s> add _, err = config.clients.Add(cli) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d51f43e27a5b664be5da299ea6f8c73872ef1a9e | home/clients.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.