octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-02 11:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/scanner: Don't scan if input path is below symlink (fixes #6090) (#6101)

Browse Source
This commit is contained in:
Simon Frei 2019-10-22 11:12:21 +02:00 committed by Jakob Borg
parent 8b5bd45a29
commit 72194d137c
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/scanner/walk.go
View File

@ -21,6 +21,7 @@ import (
"github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/events"
"github.com/syncthing/syncthing/lib/fs" "github.com/syncthing/syncthing/lib/fs"
"github.com/syncthing/syncthing/lib/ignore" "github.com/syncthing/syncthing/lib/ignore"
"github.com/syncthing/syncthing/lib/osutil"
"github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/protocol"
"golang.org/x/text/unicode/norm" "golang.org/x/text/unicode/norm"
) )
@ -113,6 +114,10 @@ func (w *walker) walk(ctx context.Context) chan ScanResult {
w.Filesystem.Walk(".", hashFiles) w.Filesystem.Walk(".", hashFiles)
} else { } else {
for _, sub := range w.Subs { for _, sub := range w.Subs {
if err := osutil.TraversesSymlink(w.Filesystem, filepath.Dir(sub)); err != nil {
l.Debugf("Skip walking %v as it is below a symlink", sub)
continue
}
w.Filesystem.Walk(sub, hashFiles) w.Filesystem.Walk(sub, hashFiles)
} }
} }

24
lib/scanner/walk_test.go
View File

@ -322,7 +322,7 @@ func TestWalkRootSymlink(t *testing.T) {
} }
defer os.RemoveAll(tmp) defer os.RemoveAll(tmp)
link := tmp + "/link" link := filepath.Join(tmp, "link")
dest, _ := filepath.Abs("testdata/dir1") dest, _ := filepath.Abs("testdata/dir1")
if err := osutil.DebugSymlinkForTestsOnly(dest, link); err != nil { if err := osutil.DebugSymlinkForTestsOnly(dest, link); err != nil {
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
@ -333,13 +333,33 @@ func TestWalkRootSymlink(t *testing.T) {
} }
} }
// Scan it // Scan root with symlink at FS root
files := walkDir(fs.NewFilesystem(fs.FilesystemTypeBasic, link), ".", nil, nil, 0) files := walkDir(fs.NewFilesystem(fs.FilesystemTypeBasic, link), ".", nil, nil, 0)
// Verify that we got two files // Verify that we got two files
if len(files) != 2 { if len(files) != 2 {
t.Errorf("expected two files, not %d", len(files)) t.Errorf("expected two files, not %d", len(files))
} }
// Scan symlink below FS root
files = walkDir(fs.NewFilesystem(fs.FilesystemTypeBasic, tmp), "link", nil, nil, 0)
// Verify that we got the one symlink, except on windows
if runtime.GOOS == "windows" {
if len(files) != 0 {
t.Errorf("expected no files, not %d", len(files))
}
} else if len(files) != 1 {
t.Errorf("expected one file, not %d", len(files))
}
// Scan path below symlink
files = walkDir(fs.NewFilesystem(fs.FilesystemTypeBasic, tmp), filepath.Join("link", "cfile"), nil, nil, 0)
// Verify that we get nothing
if len(files) != 0 {
t.Errorf("expected no files, not %d", len(files))
}
} }
func TestBlocksizeHysteresis(t *testing.T) { func TestBlocksizeHysteresis(t *testing.T) {