Skip to content

fix: Files with pending deletion can still be downloaded until deletion is complete #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Forceu merged 1 commit into from
Jan 12, 2026
Merged

fix: Files with pending deletion can still be downloaded until deletion is complete #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions internal/storage/FileServing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,9 @@ func GetFile(id string) (models.File, bool) {
if !ok {
return emptyResult, false
}
if file.IsPendingForDeletion() {
return emptyResult, false
}
if IsExpiredFile(file, time.Now().Unix()) {
return emptyResult, false
}
Expand Down
19 changes: 19 additions & 0 deletions internal/storage/FileServing_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,25 @@ func TestGetFile(t *testing.T) {
_, result = GetFile(file.Id)
test.IsEqualBool(t, result, false)

// Test pending deletion - file should not be retrievable when pending deletion
pendingFile := models.File{
Id: "testpendingdelete",
Name: "testpendingdelete",
SHA1: "e017693e4a04a59d0b0f400fe98177fe7ee13cf7",
UnlimitedDownloads: true,
UnlimitedTime: true,
PendingDeletion: time.Now().Add(time.Hour).Unix(),
}
database.SaveMetaData(pendingFile)
_, result = GetFile(pendingFile.Id)
test.IsEqualBool(t, result, false)
// Clean up - cancel pending deletion to allow normal retrieval
pendingFile.PendingDeletion = 0
database.SaveMetaData(pendingFile)
_, result = GetFile(pendingFile.Id)
test.IsEqualBool(t, result, true)
// Clean up test data
database.DeleteMetaData(pendingFile.Id)
}

func TestGetEncInfoFromExistingFile(t *testing.T) {
Expand Down