refactor: replace download-based hash verification with lightweight size check

The previous approach downloaded the entire backup file after upload to
compute a remote SHA-256, which doubles bandwidth cost for every backup.

New approach:
- Local SHA-256 is still computed before upload (stored in record for audit)
- After upload, use provider.List() to check remote file size (single API call)
- If remote size is 0 or mismatches local size → mark failed + auto-delete
- If List() fails, log a warning but don't block (file may have uploaded fine)

This catches 0KB corrupted uploads with zero download overhead.
This commit is contained in:
Awuqing
2026-03-31 12:36:29 +08:00
parent 2537149b39
commit 1d5923f747
2 changed files with 26 additions and 30 deletions

View File

@@ -38,15 +38,6 @@ func SHA256File(path string) (string, error) {
return hex.EncodeToString(hash.Sum(nil)), nil return hex.EncodeToString(hash.Sum(nil)), nil
} }
// SHA256Reader 计算 reader 的 SHA-256 哈希值,返回十六进制字符串
func SHA256Reader(reader io.Reader) (string, error) {
hash := sha256.New()
if _, err := io.Copy(hash, reader); err != nil {
return "", fmt.Errorf("compute checksum: %w", err)
}
return hex.EncodeToString(hash.Sum(nil)), nil
}
func sanitizeFileName(value string) string { func sanitizeFileName(value string) string {
builder := strings.Builder{} builder := strings.Builder{}
for _, char := range strings.TrimSpace(value) { for _, char := range strings.TrimSpace(value) {

View File

@@ -376,29 +376,34 @@ func (s *BackupExecutionService) executeTask(ctx context.Context, task *model.Ba
logger.Warnf("存储目标 %s 上传失败:%v", targetName, uploadErr) logger.Warnf("存储目标 %s 上传失败:%v", targetName, uploadErr)
return return
} }
// 上传后完整性校验:下载并验证 SHA-256 // 上传后轻量级完整性校验:通过 List 检查远端文件大小
verifyReader, verifyErr := provider.Download(ctx, storagePath) remoteObjects, listErr := provider.List(ctx, storagePath)
if verifyErr != nil { if listErr != nil {
uploadResults[index] = StorageUploadResultItem{StorageTargetID: targetID, StorageTargetName: targetName, Status: "failed", Error: fmt.Sprintf("上传后校验失败(无法下载验证): %v", verifyErr)} // List 失败不阻断,仅警告(文件可能已上传成功)
logger.Warnf("存储目标 %s 上传后下载验证失败:%v", targetName, verifyErr) logger.Warnf("存储目标 %s 上传后大小校验跳过List 失败%v", targetName, listErr)
return } else {
} remoteSize := int64(0)
remoteChecksum, hashErr := backup.SHA256Reader(verifyReader) for _, obj := range remoteObjects {
verifyReader.Close() if obj.Key == storagePath {
if hashErr != nil { remoteSize = obj.Size
uploadResults[index] = StorageUploadResultItem{StorageTargetID: targetID, StorageTargetName: targetName, Status: "failed", Error: fmt.Sprintf("上传后校验失败(哈希计算错误): %v", hashErr)} break
logger.Warnf("存储目标 %s 上传后哈希计算失败:%v", targetName, hashErr) }
return }
} if remoteSize == 0 {
if remoteChecksum != localChecksum { uploadResults[index] = StorageUploadResultItem{StorageTargetID: targetID, StorageTargetName: targetName, Status: "failed", Error: "完整性校验失败: 远端文件大小为 0上传损坏"}
uploadResults[index] = StorageUploadResultItem{StorageTargetID: targetID, StorageTargetName: targetName, Status: "failed", Error: fmt.Sprintf("完整性校验失败: 本地=%s, 远端=%s", localChecksum, remoteChecksum)} logger.Errorf("存储目标 %s 完整性校验失败:远端文件大小为 0", targetName)
logger.Errorf("存储目标 %s 完整性校验失败:本地 SHA-256=%s, 远端 SHA-256=%s", targetName, localChecksum, remoteChecksum) _ = provider.Delete(ctx, storagePath)
// 删除损坏的远端文件 return
_ = provider.Delete(ctx, storagePath) }
return if remoteSize != fileSize {
uploadResults[index] = StorageUploadResultItem{StorageTargetID: targetID, StorageTargetName: targetName, Status: "failed", Error: fmt.Sprintf("完整性校验失败: 本地=%d bytes, 远端=%d bytes", fileSize, remoteSize)}
logger.Errorf("存储目标 %s 完整性校验失败:本地 %d bytes, 远端 %d bytes", targetName, fileSize, remoteSize)
_ = provider.Delete(ctx, storagePath)
return
}
} }
uploadResults[index] = StorageUploadResultItem{StorageTargetID: targetID, StorageTargetName: targetName, Status: "success", StoragePath: storagePath, FileSize: fileSize} uploadResults[index] = StorageUploadResultItem{StorageTargetID: targetID, StorageTargetName: targetName, Status: "success", StoragePath: storagePath, FileSize: fileSize}
logger.Infof("存储目标 %s 上传成功,完整性校验通过 (SHA-256=%s)", targetName, localChecksum) logger.Infof("存储目标 %s 上传成功,大小校验通过 (%d bytes, SHA-256=%s)", targetName, fileSize, localChecksum)
// 每个成功目标独立执行保留策略 // 每个成功目标独立执行保留策略
if s.retention != nil { if s.retention != nil {
cleanupResult, cleanupErr := s.retention.Cleanup(ctx, task, provider) cleanupResult, cleanupErr := s.retention.Cleanup(ctx, task, provider)