mirror of
https://github.com/octoleo/syncthing.git
synced 2024-11-19 03:25:16 +00:00
3f2742a275
The restore function of Trash Can ran a rename at the end regardless of whether there was anything to rename. In this case, when the file-to-be-restored did not exist in the destination folder, this resulted in an error. I added a simple check, keeping track of whether the file existed prior to restoring it in the destination folder and depending on this value it will now return nil after the restoration to prevent the renaming function to kick off. Added a test for this specific edge-case as well.
266 lines
6.5 KiB
Go
266 lines
6.5 KiB
Go
// Copyright (C) 2015 The Syncthing Authors.
|
|
//
|
|
// This Source Code Form is subject to the terms of the Mozilla Public
|
|
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
// You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
|
|
package versioner
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/syncthing/syncthing/lib/config"
|
|
"github.com/syncthing/syncthing/lib/fs"
|
|
)
|
|
|
|
func TestTrashcanArchiveRestoreSwitcharoo(t *testing.T) {
|
|
// This tests that trashcan versioner restoration correctly archives existing file, because trashcan versioner
|
|
// files are untagged, archiving existing file to replace with a restored version technically should collide in
|
|
// in names.
|
|
tmpDir1 := t.TempDir()
|
|
|
|
tmpDir2 := t.TempDir()
|
|
|
|
cfg := config.FolderConfiguration{
|
|
FilesystemType: fs.FilesystemTypeBasic,
|
|
Path: tmpDir1,
|
|
Versioning: config.VersioningConfiguration{
|
|
FSType: fs.FilesystemTypeBasic,
|
|
FSPath: tmpDir2,
|
|
},
|
|
}
|
|
folderFs := cfg.Filesystem(nil)
|
|
|
|
versionsFs := fs.NewFilesystem(fs.FilesystemTypeBasic, tmpDir2)
|
|
|
|
writeFile(t, folderFs, "file", "A")
|
|
|
|
versioner := newTrashcan(cfg)
|
|
|
|
if err := versioner.Archive("file"); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
if _, err := folderFs.Stat("file"); !fs.IsNotExist(err) {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// Check versions
|
|
versions, err := versioner.GetVersions()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
fileVersions := versions["file"]
|
|
if len(fileVersions) != 1 {
|
|
t.Fatalf("unexpected number of versions: %d != 1", len(fileVersions))
|
|
}
|
|
|
|
fileVersion := fileVersions[0]
|
|
|
|
if !fileVersion.ModTime.Equal(fileVersion.VersionTime) {
|
|
t.Error("time mismatch")
|
|
}
|
|
|
|
if content := readFile(t, versionsFs, "file"); content != "A" {
|
|
t.Errorf("expected A got %s", content)
|
|
}
|
|
|
|
writeFile(t, folderFs, "file", "B")
|
|
|
|
versionInfo, err := versionsFs.Stat("file")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
if !versionInfo.ModTime().Truncate(time.Second).Equal(fileVersion.ModTime) {
|
|
t.Error("time mismatch")
|
|
}
|
|
|
|
if err := versioner.Restore("file", fileVersion.VersionTime); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
if content := readFile(t, folderFs, "file"); content != "A" {
|
|
t.Errorf("expected A got %s", content)
|
|
}
|
|
|
|
if content := readFile(t, versionsFs, "file"); content != "B" {
|
|
t.Errorf("expected B got %s", content)
|
|
}
|
|
}
|
|
|
|
func TestTrashcanRestoreDeletedFile(t *testing.T) {
|
|
// This tests that the Trash Can restore function works correctly when the file
|
|
// to be restored was deleted/nonexistent in the folder where the file/folder is
|
|
// going to be restored in. (Issue: #7965)
|
|
|
|
tmpDir1 := t.TempDir()
|
|
|
|
tmpDir2 := t.TempDir()
|
|
|
|
cfg := config.FolderConfiguration{
|
|
FilesystemType: fs.FilesystemTypeBasic,
|
|
Path: tmpDir1,
|
|
Versioning: config.VersioningConfiguration{
|
|
FSType: fs.FilesystemTypeBasic,
|
|
FSPath: tmpDir2,
|
|
},
|
|
}
|
|
|
|
folderFs := cfg.Filesystem(nil)
|
|
|
|
versionsFs := fs.NewFilesystem(fs.FilesystemTypeBasic, tmpDir2)
|
|
|
|
versioner := newTrashcan(cfg)
|
|
|
|
writeFile(t, folderFs, "file", "Some content")
|
|
|
|
if err := versioner.Archive("file"); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// Shouldn't be in the default folder anymore, thus "deleted"
|
|
if _, err := folderFs.Stat("file"); !fs.IsNotExist(err) {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// It should, however, be in the archive
|
|
if _, err := versionsFs.Lstat("file"); fs.IsNotExist(err) {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
versions, err := versioner.GetVersions()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
fileVersions := versions["file"]
|
|
if len(fileVersions) != 1 {
|
|
t.Fatalf("unexpected number of versions: %d != 1", len(fileVersions))
|
|
}
|
|
|
|
fileVersion := fileVersions[0]
|
|
|
|
if !fileVersion.ModTime.Equal(fileVersion.VersionTime) {
|
|
t.Error("time mismatch")
|
|
}
|
|
|
|
// Restore the file from the archive.
|
|
if err := versioner.Restore("file", fileVersion.VersionTime); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// The file should be correctly restored
|
|
if content := readFile(t, folderFs, "file"); content != "Some content" {
|
|
t.Errorf("expected A got %s", content)
|
|
}
|
|
|
|
// It should no longer be in the archive
|
|
if _, err := versionsFs.Lstat("file"); !fs.IsNotExist(err) {
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
func readFile(t *testing.T, filesystem fs.Filesystem, name string) string {
|
|
t.Helper()
|
|
fd, err := filesystem.Open(name)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer fd.Close()
|
|
buf, err := io.ReadAll(fd)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
return string(buf)
|
|
}
|
|
|
|
func writeFile(t *testing.T, filesystem fs.Filesystem, name, content string) {
|
|
fd, err := filesystem.OpenFile(name, fs.OptReadWrite|fs.OptCreate, 0777)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer fd.Close()
|
|
if err := fd.Truncate(int64(len(content))); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
if n, err := fd.Write([]byte(content)); err != nil || n != len(content) {
|
|
t.Fatal(n, len(content), err)
|
|
}
|
|
}
|
|
|
|
func TestTrashcanCleanOut(t *testing.T) {
|
|
testDir := t.TempDir()
|
|
|
|
cfg := config.FolderConfiguration{
|
|
FilesystemType: fs.FilesystemTypeBasic,
|
|
Path: testDir,
|
|
Versioning: config.VersioningConfiguration{
|
|
Params: map[string]string{
|
|
"cleanoutDays": "7",
|
|
},
|
|
},
|
|
}
|
|
|
|
fs := cfg.Filesystem(nil)
|
|
|
|
v := newTrashcan(cfg)
|
|
|
|
var testcases = map[string]bool{
|
|
".stversions/file1": false,
|
|
".stversions/file2": true,
|
|
".stversions/keep1/file1": false,
|
|
".stversions/keep1/file2": false,
|
|
".stversions/keep2/file1": false,
|
|
".stversions/keep2/file2": true,
|
|
".stversions/keep3/keepsubdir/file1": false,
|
|
".stversions/remove/file1": true,
|
|
".stversions/remove/file2": true,
|
|
".stversions/remove/removesubdir/file1": true,
|
|
}
|
|
|
|
t.Run(fmt.Sprintf("trashcan versioner trashcan clean up"), func(t *testing.T) {
|
|
oldTime := time.Now().Add(-8 * 24 * time.Hour)
|
|
for file, shouldRemove := range testcases {
|
|
fs.MkdirAll(filepath.Dir(file), 0777)
|
|
|
|
writeFile(t, fs, file, "some content")
|
|
|
|
if shouldRemove {
|
|
if err := fs.Chtimes(file, oldTime, oldTime); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
}
|
|
|
|
if err := v.Clean(context.Background()); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
for file, shouldRemove := range testcases {
|
|
_, err := fs.Lstat(file)
|
|
if shouldRemove && !os.IsNotExist(err) {
|
|
t.Error(file, "should have been removed")
|
|
} else if !shouldRemove && err != nil {
|
|
t.Error(file, "should not have been removed")
|
|
}
|
|
}
|
|
|
|
if _, err := fs.Lstat(".stversions/keep3"); os.IsNotExist(err) {
|
|
t.Error("directory with non empty subdirs should not be removed")
|
|
}
|
|
|
|
if _, err := fs.Lstat(".stversions/remove"); !os.IsNotExist(err) {
|
|
t.Error("empty directory should have been removed")
|
|
}
|
|
})
|
|
}
|