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

lib/protocol: Preserve sequence decrypting fileinfos (fixes #7994) (#7995)

This commit is contained in:
Simon Frei 2021-10-06 10:26:54 +02:00 committed by GitHub
parent 4e513b8393
commit c94b797f00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/protocol/encryption.go
View File

@ -365,6 +365,10 @@ func DecryptFileInfo(fi FileInfo, folderKey *[keySize]byte) (FileInfo, error) {
if err := proto.Unmarshal(dec, &decFI); err != nil {
return FileInfo{}, err
}
// Preserve sequence, which is legitimately controlled by the untrusted device
decFI.Sequence = fi.Sequence
return decFI, nil
}

11
lib/protocol/encryption_test.go
View File

@ -139,6 +139,7 @@ func encFileInfo() FileInfo {
Size: 45,
Permissions: 0755,
ModifiedS: 8080,
Sequence: 1000,
Blocks: []BlockInfo{
{
Offset: 0,
@ -165,6 +166,9 @@ func TestEnDecryptFileInfo(t *testing.T) {
if enc.RawBlockSize < MinBlockSize {
t.Error("Too small raw block size:", enc.RawBlockSize)
}
if enc.Sequence != fi.Sequence {
t.Error("encrypted fileinfo didn't maintain sequence number")
}
again := encryptFileInfo(fi, &key)
if !bytes.Equal(enc.Blocks[0].Hash, again.Blocks[0].Hash) {
t.Error("block hashes should remain stable (0)")
@ -173,10 +177,17 @@ func TestEnDecryptFileInfo(t *testing.T) {
t.Error("block hashes should remain stable (1)")
}
// Simulate the remote setting the sequence number when writing to db
enc.Sequence = 10
dec, err := DecryptFileInfo(enc, &key)
if err != nil {
t.Error(err)
}
if dec.Sequence != enc.Sequence {
t.Error("decrypted fileinfo didn't maintain sequence number")
}
dec.Sequence = fi.Sequence
if !reflect.DeepEqual(fi, dec) {
t.Error("mismatch after decryption")
}