all: Add untrusted folders behind feature flag (ref #62) (#7055)

2020-11-09 15:33:32 +01:00
parent 4db5ea5893
commit 31559e908b
59 changed files with 6952 additions and 1111 deletions
@@ -0,0 +1,111 @@
+// Copyright (C) 2018 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 model
+
+import (
+	"fmt"
+	"sort"
+
+	"github.com/syncthing/syncthing/lib/config"
+	"github.com/syncthing/syncthing/lib/db"
+	"github.com/syncthing/syncthing/lib/events"
+	"github.com/syncthing/syncthing/lib/fs"
+	"github.com/syncthing/syncthing/lib/ignore"
+	"github.com/syncthing/syncthing/lib/protocol"
+	"github.com/syncthing/syncthing/lib/versioner"
+)
+
+func init() {
+	folderFactories[config.FolderTypeReceiveEncrypted] = newReceiveEncryptedFolder
+}
+
+type receiveEncryptedFolder struct {
+	*sendReceiveFolder
+}
+
+func newReceiveEncryptedFolder(model *model, fset *db.FileSet, ignores *ignore.Matcher, cfg config.FolderConfiguration, ver versioner.Versioner, fs fs.Filesystem, evLogger events.Logger, ioLimiter *byteSemaphore) service {
+	return &receiveEncryptedFolder{newSendReceiveFolder(model, fset, ignores, cfg, ver, fs, evLogger, ioLimiter).(*sendReceiveFolder)}
+}
+
+func (f *receiveEncryptedFolder) Revert() {
+	f.doInSync(func() error { f.revert(); return nil })
+}
+
+func (f *receiveEncryptedFolder) revert() {
+	l.Infof("Reverting unexpected items in folder %v (receive-encrypted)", f.Description())
+
+	f.setState(FolderScanning)
+	defer f.setState(FolderIdle)
+
+	batch := newFileInfoBatch(func(fs []protocol.FileInfo) error {
+		f.updateLocalsFromScanning(fs)
+		return nil
+	})
+
+	snap := f.fset.Snapshot()
+	defer snap.Release()
+	var iterErr error
+	var dirs []string
+	snap.WithHaveTruncated(protocol.LocalDeviceID, func(intf protocol.FileIntf) bool {
+		if iterErr = batch.flushIfFull(); iterErr != nil {
+			return false
+		}
+
+		fit := intf.(db.FileInfoTruncated)
+		if !fit.IsReceiveOnlyChanged() || intf.IsDeleted() {
+			return true
+		}
+
+		if fit.IsDirectory() {
+			dirs = append(dirs, fit.Name)
+			return true
+		}
+
+		if err := f.inWritableDir(f.fs.Remove, fit.Name); err != nil && !fs.IsNotExist(err) {
+			f.newScanError(fit.Name, fmt.Errorf("deleting unexpected item: %w", err))
+		}
+
+		fi := fit.ConvertToDeletedFileInfo(f.shortID)
+		// Set version to zero, such that we pull the global version in case
+		// this is a valid filename that was erroneously changed locally.
+		// Should already be zero from scanning, but lets be safe.
+		fi.Version = protocol.Vector{}
+		// Purposely not removing FlagLocalReceiveOnly as the deleted
+		// item should still not be sent in index updates. However being
+		// deleted, it will not show up as an unexpected file in the UI
+		// anymore.
+		batch.append(fi)
+
+		return true
+	})
+
+	f.revertHandleDirs(dirs, snap)
+
+	if iterErr == nil {
+		iterErr = batch.flush()
+	}
+	if iterErr != nil {
+		l.Infoln("Failed to delete unexpected items:", iterErr)
+	}
+}
+
+func (f *receiveEncryptedFolder) revertHandleDirs(dirs []string, snap *db.Snapshot) {
+	if len(dirs) == 0 {
+		return
+	}
+
+	scanChan := make(chan string)
+	go f.pullScannerRoutine(scanChan)
+	defer close(scanChan)
+
+	sort.Sort(sort.Reverse(sort.StringSlice(dirs)))
+	for _, dir := range dirs {
+		if err := f.deleteDirOnDisk(dir, snap, scanChan); err != nil {
+			f.newScanError(dir, fmt.Errorf("deleting unexpected dir: %w", err))
+		}
+	}
+}