Skip to content
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

Fix bug that release attachment files not deleted when deleting repository #9322

Merged
merged 5 commits into from
Dec 12, 2019
Merged

Fix bug that release attachment files not deleted when deleting repository #9322

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4b178e1
Fix bug that release attachment files not deleted when deleting repos…
lunny Dec 11, 2019
b4a936b
improve code
lunny Dec 11, 2019
ec6ffeb
add quote
lunny Dec 12, 2019
3399073
improve code
lunny Dec 12, 2019
0681860
Merge branch 'master' into lunny/fix_delete_repo
techknowlogick Dec 12, 2019
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
35 changes: 28 additions & 7 deletions models/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1992,6 +1992,17 @@ func DeleteRepository(doer *User, uid, repoID int64) error {
}
}

attachments := make([]*Attachment, 0, 20)
if err = sess.Join("INNER", "`release`", "`release`.id = `attachment`.release_id").
Where("`release`.repo_id = ?", repoID).
Find(&attachments); err != nil {
return err
}
releaseAttachments := make([]string, 0, len(attachments))
for i := 0; i < len(attachments); i++ {
releaseAttachments = append(releaseAttachments, attachments[i].LocalPath())
}

if err = deleteBeans(sess,
&Access{RepoID: repo.ID},
&Action{RepoID: repo.ID},
Expand Down Expand Up @@ -2042,13 +2053,13 @@ func DeleteRepository(doer *User, uid, repoID int64) error {
return err
}

attachmentPaths := make([]string, 0, 20)
attachments := make([]*Attachment, 0, len(attachmentPaths))
attachments = attachments[:0]
if err = sess.Join("INNER", "issue", "issue.id = attachment.issue_id").
Where("issue.repo_id = ?", repoID).
Find(&attachments); err != nil {
return err
}
attachmentPaths := make([]string, 0, len(attachments))
for j := range attachments {
attachmentPaths = append(attachmentPaths, attachments[j].LocalPath())
}
Expand Down Expand Up @@ -2085,11 +2096,6 @@ func DeleteRepository(doer *User, uid, repoID int64) error {
return err
}

// Remove attachment files.
for i := range attachmentPaths {
removeAllWithNotice(sess, "Delete attachment", attachmentPaths[i])
}

// Remove LFS objects
var lfsObjects []*LFSMetaObject
if err = sess.Where("repository_id=?", repoID).Find(&lfsObjects); err != nil {
Expand Down Expand Up @@ -2129,6 +2135,21 @@ func DeleteRepository(doer *User, uid, repoID int64) error {
return fmt.Errorf("Commit: %v", err)
}

sess.Close()

// We should always delete the files after the database transaction succeed. If
// we delete the file but the database rollback, the repository will be borken.

// Remove issue attachment files.
for i := range attachmentPaths {
removeAllWithNotice(x, "Delete issue attachment", attachmentPaths[i])
}

// Remove release attachment files.
for i := range releaseAttachments {
removeAllWithNotice(x, "Delete release attachment", releaseAttachments[i])
}

if len(repo.Avatar) > 0 {
avatarPath := repo.CustomAvatarPath()
if com.IsExist(avatarPath) {
Expand Down