mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-18 03:18:29 -07:00
2796e65468
Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master
Updates #2499.
Squashed commit of the following:
commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3
Merge: f49e9186 2b635bf6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 14 19:23:07 2021 +0300
Merge branch 'master' into 2499-merge-rewrites-vol.1
commit f49e9186ffc8b7074d03c6721ee56cdb09243684
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 14 18:50:49 2021 +0300
aghos: fix fs events filtering
commit 567dd646556606212af5dab60e3ecbb8fff22c25
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 14 16:50:37 2021 +0300
all: imp code, docs, fix windows
commit 140c8bf519345eb54d0e7500a996fcf465353d71
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 13 19:41:53 2021 +0300
aghnet: use const
commit bebf3f76bd394a498ccad812c57d4507c69529ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 13 19:32:37 2021 +0300
all: imp tests, docs
commit 9bfdbb6eb454833135d616e208e82699f98e2562
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 13 18:42:20 2021 +0300
all: imp path more, imp docs
commit ee9ea4c132a6b17787d150bf2bee703abaa57be3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 13 16:09:46 2021 +0300
all: fix windows, imp paths
commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 11 19:53:35 2021 +0300
all: imp code, docs
commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 11 18:22:50 2021 +0300
aghnet: fix windows tests
commit d29de359ed68118d71efb226a8433fac15ff5c66
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 8 21:02:14 2021 +0300
all: repl & imp
commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 8 01:41:19 2021 +0300
all: add tests, mv logic, added tmpfs
commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 7 14:26:30 2021 +0300
all: imp filewalker, refactor hosts container
187 lines
4.2 KiB
Go
187 lines
4.2 KiB
Go
package aghos
|
|
|
|
import (
|
|
"bufio"
|
|
"io"
|
|
"io/fs"
|
|
"path"
|
|
"testing"
|
|
"testing/fstest"
|
|
|
|
"github.com/AdguardTeam/golibs/errors"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestFileWalker_Walk(t *testing.T) {
|
|
const attribute = `000`
|
|
|
|
makeFileWalker := func(_ string) (fw FileWalker) {
|
|
return func(r io.Reader) (patterns []string, cont bool, err error) {
|
|
s := bufio.NewScanner(r)
|
|
for s.Scan() {
|
|
line := s.Text()
|
|
if line == attribute {
|
|
return nil, false, nil
|
|
}
|
|
|
|
if len(line) != 0 {
|
|
patterns = append(patterns, path.Join(".", line))
|
|
}
|
|
}
|
|
|
|
return patterns, true, s.Err()
|
|
}
|
|
}
|
|
|
|
const nl = "\n"
|
|
|
|
testCases := []struct {
|
|
testFS fstest.MapFS
|
|
want assert.BoolAssertionFunc
|
|
initPattern string
|
|
name string
|
|
}{{
|
|
name: "simple",
|
|
testFS: fstest.MapFS{
|
|
"simple_0001.txt": &fstest.MapFile{Data: []byte(attribute + nl)},
|
|
},
|
|
initPattern: "simple_0001.txt",
|
|
want: assert.True,
|
|
}, {
|
|
name: "chain",
|
|
testFS: fstest.MapFS{
|
|
"chain_0001.txt": &fstest.MapFile{Data: []byte(`chain_0002.txt` + nl)},
|
|
"chain_0002.txt": &fstest.MapFile{Data: []byte(`chain_0003.txt` + nl)},
|
|
"chain_0003.txt": &fstest.MapFile{Data: []byte(attribute + nl)},
|
|
},
|
|
initPattern: "chain_0001.txt",
|
|
want: assert.True,
|
|
}, {
|
|
name: "several",
|
|
testFS: fstest.MapFS{
|
|
"several_0001.txt": &fstest.MapFile{Data: []byte(`several_*` + nl)},
|
|
"several_0002.txt": &fstest.MapFile{Data: []byte(`several_0001.txt` + nl)},
|
|
"several_0003.txt": &fstest.MapFile{Data: []byte(attribute + nl)},
|
|
},
|
|
initPattern: "several_0001.txt",
|
|
want: assert.True,
|
|
}, {
|
|
name: "no",
|
|
testFS: fstest.MapFS{
|
|
"no_0001.txt": &fstest.MapFile{Data: []byte(nl)},
|
|
"no_0002.txt": &fstest.MapFile{Data: []byte(nl)},
|
|
"no_0003.txt": &fstest.MapFile{Data: []byte(nl)},
|
|
},
|
|
initPattern: "no_*",
|
|
want: assert.False,
|
|
}, {
|
|
name: "subdirectory",
|
|
testFS: fstest.MapFS{
|
|
path.Join("dir", "subdir_0002.txt"): &fstest.MapFile{
|
|
Data: []byte(attribute + nl),
|
|
},
|
|
"subdir_0001.txt": &fstest.MapFile{Data: []byte(`dir/*`)},
|
|
},
|
|
initPattern: "subdir_0001.txt",
|
|
want: assert.True,
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
fw := makeFileWalker("")
|
|
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
ok, err := fw.Walk(tc.testFS, tc.initPattern)
|
|
require.NoError(t, err)
|
|
|
|
tc.want(t, ok)
|
|
})
|
|
}
|
|
|
|
t.Run("pattern_malformed", func(t *testing.T) {
|
|
f := fstest.MapFS{}
|
|
ok, err := makeFileWalker("").Walk(f, "[]")
|
|
require.Error(t, err)
|
|
|
|
assert.False(t, ok)
|
|
assert.ErrorIs(t, err, path.ErrBadPattern)
|
|
})
|
|
|
|
t.Run("bad_filename", func(t *testing.T) {
|
|
const filename = "bad_filename.txt"
|
|
|
|
f := fstest.MapFS{
|
|
filename: &fstest.MapFile{Data: []byte("[]")},
|
|
}
|
|
ok, err := FileWalker(func(r io.Reader) (patterns []string, cont bool, err error) {
|
|
s := bufio.NewScanner(r)
|
|
for s.Scan() {
|
|
patterns = append(patterns, s.Text())
|
|
}
|
|
|
|
return patterns, true, s.Err()
|
|
}).Walk(f, filename)
|
|
require.Error(t, err)
|
|
|
|
assert.False(t, ok)
|
|
assert.ErrorIs(t, err, path.ErrBadPattern)
|
|
})
|
|
|
|
t.Run("itself_error", func(t *testing.T) {
|
|
const rerr errors.Error = "returned error"
|
|
|
|
f := fstest.MapFS{
|
|
"mockfile.txt": &fstest.MapFile{Data: []byte(`mockdata`)},
|
|
}
|
|
|
|
ok, err := FileWalker(func(r io.Reader) (patterns []string, ok bool, err error) {
|
|
return nil, true, rerr
|
|
}).Walk(f, "*")
|
|
require.ErrorIs(t, err, rerr)
|
|
|
|
assert.False(t, ok)
|
|
})
|
|
}
|
|
|
|
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)
|
|
})
|
|
}
|