summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Frei <freisim93@gmail.com>2021-07-03 13:47:04 +0200
committerGitHub <noreply@github.com>2021-07-03 13:47:04 +0200
commit89e762fd6e4a7593d909cae5da189e1b88f38d31 (patch)
tree9024a3c6a15b6bd8e063ac7832eda0c7565596aa
parenta63d3ee62506e967c4e24f0a8b3790bf8d41b772 (diff)
lib/model: Prevent folder-type change from/to encrypted (fixes #7704) (#7796)
-rw-r--r--lib/model/model.go7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/model/model.go b/lib/model/model.go
index 376a69ac02..4696dd77d3 100644
--- a/lib/model/model.go
+++ b/lib/model/model.go
@@ -2767,6 +2767,13 @@ func (m *model) String() string {
}
func (m *model) VerifyConfiguration(from, to config.Configuration) error {
+ toFolders := to.FolderMap()
+ for _, from := range from.Folders {
+ to, ok := toFolders[from.ID]
+ if ok && from.Type != to.Type && (from.Type == config.FolderTypeReceiveEncrypted || to.Type == config.FolderTypeReceiveEncrypted) {
+ return errors.New("folder type must not be changed from/to receive-encrypted")
+ }
+ }
return nil
}