octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-03 15:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Encrypted fileinfo trailer needs to be in wire format (#7505)

Browse Source
This commit is contained in:
Simon Frei 2021-03-21 10:34:08 +01:00 committed by GitHub
parent a87c5515bd
commit bc08a951f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/syncthing/decrypt/decrypt.go
View File

@ -18,6 +18,7 @@ import (
"github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/config"
"github.com/syncthing/syncthing/lib/fs" "github.com/syncthing/syncthing/lib/fs"
"github.com/syncthing/syncthing/lib/osutil"
"github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/protocol"
"github.com/syncthing/syncthing/lib/scanner" "github.com/syncthing/syncthing/lib/scanner"
) )
@ -79,7 +80,7 @@ func (c *CLI) walk() error {
dstFs = fs.NewFilesystem(fs.FilesystemTypeBasic, c.To) dstFs = fs.NewFilesystem(fs.FilesystemTypeBasic, c.To)
} }
return srcFs.Walk("/", func(path string, info fs.FileInfo, err error) error { return srcFs.Walk(".", func(path string, info fs.FileInfo, err error) error {
if err != nil { if err != nil {
return err return err
} }
@ -142,6 +143,10 @@ func (c *CLI) process(srcFs fs.Filesystem, dstFs fs.Filesystem, path string) err
return fmt.Errorf("%s: loading metadata trailer: %w", path, err) return fmt.Errorf("%s: loading metadata trailer: %w", path, err)
} }
// Workaround for a bug in <= v1.15.0-rc.5 where we stored names
// in native format, while protocol expects wire format (slashes).
encFi.Name = osutil.NormalizedFilename(encFi.Name)
plainFi, err := protocol.DecryptFileInfo(*encFi, c.folderKey) plainFi, err := protocol.DecryptFileInfo(*encFi, c.folderKey)
if err != nil { if err != nil {
return fmt.Errorf("%s: decrypting metadata: %w", path, err) return fmt.Errorf("%s: decrypting metadata: %w", path, err)

12
lib/model/sharedpullerstate.go
View File

@ -13,6 +13,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/syncthing/syncthing/lib/fs" "github.com/syncthing/syncthing/lib/fs"
"github.com/syncthing/syncthing/lib/osutil"
"github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/protocol"
"github.com/syncthing/syncthing/lib/sync" "github.com/syncthing/syncthing/lib/sync"
) )
@ -346,8 +347,13 @@ func (s *sharedPullerState) finalClose() (bool, error) {
// folder from encrypted data we can extract this FileInfo from the end of // folder from encrypted data we can extract this FileInfo from the end of
// the file and regain the original metadata. // the file and regain the original metadata.
func (s *sharedPullerState) finalizeEncrypted() error { func (s *sharedPullerState) finalizeEncrypted() error {
bs := make([]byte, encryptionTrailerSize(s.file)) // Here the file is in native format, while encryption happens in
n, err := s.file.MarshalTo(bs) // wire format (always slashes).
wireFile := s.file
wireFile.Name = osutil.NormalizedFilename(wireFile.Name)
bs := make([]byte, encryptionTrailerSize(wireFile))
n, err := wireFile.MarshalTo(bs)
if err != nil { if err != nil {
return err return err
} }
@ -359,7 +365,7 @@ func (s *sharedPullerState) finalizeEncrypted() error {
return err return err
} }
} }
if _, err := s.writer.WriteAt(bs, s.file.Size); err != nil { if _, err := s.writer.WriteAt(bs, wireFile.Size); err != nil {
return err return err
} }