Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/model: Fix file size inconsistency due to enc. trailer (#8840) 

lib/model: Fix file size inconsisency due to enc. trailer

Fixes a regression due to PR #8563, while arguable the bug was actually
introduced in a much older PR #7155, but didn't have any bad effects so
far:
We account for the encryption trailer in the db updater routine,
calculating the file-info size there. However there's no guarantee that
the file-info at this point is still the exact same as when it was
written. It was before, but isn't anymore since introducing the new
EncryptedTrailerSize field.
Fix: Adjust the size in the info at the same place where the trailer is
written, i.e. we definitely have the actual size on disk.
This commit is contained in:
Simon Frei 2023-03-28 22:02:59 +02:00 committed by GitHub
parent 51e85d5162
commit 6a66aee489
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/model/folder_sendrecv.go
View File

@ -1251,11 +1251,12 @@ func (f *sendReceiveFolder) shortcutFile(file protocol.FileInfo, dbUpdateChan ch
}
defer fd.Close()
trailerSize, err := writeEncryptionTrailer(file, fd)
file.EncryptionTrailerSize = int(trailerSize)
if err != nil {
return err
}
return fd.Truncate(file.Size + trailerSize)
file.EncryptionTrailerSize = int(trailerSize)
file.Size += trailerSize
return fd.Truncate(file.Size)
}, f.mtimefs, file.Name, true)
if err != nil {
f.newPullError(file.Name, fmt.Errorf("writing encrypted file trailer: %w", err))
@ -1744,7 +1745,6 @@ func (f *sendReceiveFolder) dbUpdaterRoutine(dbUpdateChan <-chan dbUpdateJob) {
return nil
})
recvEnc := f.Type == config.FolderTypeReceiveEncrypted
loop:
for {
select {
@ -1756,9 +1756,6 @@ loop:
switch job.jobType {
case dbUpdateHandleFile, dbUpdateShortcutFile:
changedDirs[filepath.Dir(job.file.Name)] = struct{}{}
if recvEnc {
job.file.Size += encryptionTrailerSize(job.file)
}
case dbUpdateHandleDir:
changedDirs[job.file.Name] = struct{}{}
case dbUpdateHandleSymlink, dbUpdateInvalidate:

8
lib/model/sharedpullerstate.go
View File

@ -352,8 +352,12 @@ func (s *sharedPullerState) finalizeEncrypted() error {
return err
}
}
_, err := writeEncryptionTrailer(s.file, s.writer)
return err
trailerSize, err := writeEncryptionTrailer(s.file, s.writer)
if err != nil {
return err
}
s.file.Size += trailerSize
return nil
}
// Returns the size of the written trailer.