jgaunt/duplicacy
1
0
Fork 0
mirror of https://github.com/gilbertchen/duplicacy synced 2025-12-06 00:03:38 +00:00
Code Issues Releases Wiki Activity

Verify chunk id for snapshot chunks

Browse Source
This commit is contained in:
Gilbert Chen
2017-07-07 12:08:38 -04:00
parent 2908b807b9
commit 09f695b3e1
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
integration_tests/resume_test.sh
View File

@@ -8,7 +8,7 @@ fixture
pushd ${TEST_REPO} pushd ${TEST_REPO}
${DUPLICACY} init integration-tests $TEST_STORAGE -c 4 ${DUPLICACY} init integration-tests $TEST_STORAGE -c 4
# Create 10 20 files # Create 10 small files
add_file file1 20 add_file file1 20
add_file file2 20 add_file file2 20
add_file file3 20 add_file file3 20
@@ -25,6 +25,8 @@ env DUPLICACY_FAIL_CHUNK=10 ${DUPLICACY} backup
# Try it again to test the multiple-resume case # Try it again to test the multiple-resume case
env DUPLICACY_FAIL_CHUNK=5 ${DUPLICACY} backup env DUPLICACY_FAIL_CHUNK=5 ${DUPLICACY} backup
add_file file1 20
add_file file2 20
# Fail the backup before uploading the snapshot # Fail the backup before uploading the snapshot
env DUPLICACY_FAIL_SNAPSHOT=true ${DUPLICACY} backup env DUPLICACY_FAIL_SNAPSHOT=true ${DUPLICACY} backup

12
src/duplicacy_chunk.go
View File

@@ -154,6 +154,18 @@ func (chunk *Chunk) GetID() string {
return chunk.id return chunk.id
} }
func (chunk *Chunk) VerifyID() {
hasher := chunk.config.NewKeyedHasher(chunk.config.HashKey)
hasher.Write(chunk.buffer.Bytes())
hash := hasher.Sum(nil)
hasher = chunk.config.NewKeyedHasher(chunk.config.IDKey)
hasher.Write([]byte(hash))
chunkID := hex.EncodeToString(hasher.Sum(nil))
if chunkID != chunk.GetID() {
LOG_ERROR("CHUNK_ID", "The chunk id should be %s instead of %s, length: %d", chunkID, chunk.GetID(), len(chunk.buffer.Bytes()))
}
}
// Encrypt encrypts the plain data stored in the chunk buffer. If derivationKey is not nil, the actual // Encrypt encrypts the plain data stored in the chunk buffer. If derivationKey is not nil, the actual
// encryption key will be HMAC-SHA256(encryptionKey, derivationKey). // encryption key will be HMAC-SHA256(encryptionKey, derivationKey).
func (chunk *Chunk) Encrypt(encryptionKey []byte, derivationKey string) (err error) { func (chunk *Chunk) Encrypt(encryptionKey []byte, derivationKey string) (err error) {

5
src/duplicacy_chunkuploader.go
View File

@@ -92,6 +92,11 @@ func (uploader *ChunkUploader) Upload(threadIndex int, task ChunkUploadTask) boo
chunkSize := chunk.GetLength() chunkSize := chunk.GetLength()
chunkID := chunk.GetID() chunkID := chunk.GetID()
// For a snapshot chunk, verify that its chunk id is correct
if uploader.snapshotCache != nil {
chunk.VerifyID()
}
if uploader.snapshotCache != nil && uploader.storage.IsCacheNeeded() { if uploader.snapshotCache != nil && uploader.storage.IsCacheNeeded() {
// Save a copy to the local snapshot. // Save a copy to the local snapshot.
chunkPath, exist, _, err := uploader.snapshotCache.FindChunk(threadIndex, chunkID, false) chunkPath, exist, _, err := uploader.snapshotCache.FindChunk(threadIndex, chunkID, false)