octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-09 23:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/protocol: Fix OOR panic on recv-only folders (#7143)

Browse Source
This commit is contained in:
Simon Frei 2020-11-23 18:37:27 +01:00 committed by GitHub
parent 8e5c844370
commit 5d2c83a7e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/protocol/encryption.go
View File

@ -542,6 +542,11 @@ func isEncryptedParentFromComponents(pathComponents []string) bool {
return false return false
} else if l == 2 && len(pathComponents[1]) != 2 { } else if l == 2 && len(pathComponents[1]) != 2 {
return false return false
} else if l == 0 {
return false
} }
return pathComponents[0][1:1+len(encryptedDirExtension)] == encryptedDirExtension if len(pathComponents[0]) == 0 {
return false
}
return pathComponents[0][1:] == encryptedDirExtension
} }

23
lib/protocol/encryption_test.go
View File

@ -95,3 +95,26 @@ func TestEnDecryptFileInfo(t *testing.T) {
t.Error("mismatch after decryption") t.Error("mismatch after decryption")
} }
} }
func TestIsEncryptedParent(t *testing.T) {
cases := []struct {
path string
is bool
}{
{"", false},
{".", false},
{"/", false},
{"12" + encryptedDirExtension, false},
{"1" + encryptedDirExtension, true},
{"1" + encryptedDirExtension + "/b", false},
{"1" + encryptedDirExtension + "/bc", true},
{"1" + encryptedDirExtension + "/bcd", false},
{"1" + encryptedDirExtension + "/bc/foo", false},
{"1.12/22", false},
}
for _, tc := range cases {
if res := IsEncryptedParent(tc.path); res != tc.is {
t.Errorf("%v: got %v, expected %v", tc.path, res, tc.is)
}
}
}