diff options
author | Lunny Xiao <xiaolunwen@gmail.com> | 2023-09-08 12:51:15 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-08 04:51:15 +0000 |
commit | 4f32abaf941ba30ade1f96930a05d14f1c6a6782 (patch) | |
tree | 9351b7d654b20db032867041b0292924ec93bb3f /models | |
parent | 3c0c27965836328abd2668dcd77710ee2460535e (diff) | |
download | gitea-4f32abaf941ba30ade1f96930a05d14f1c6a6782.tar.gz gitea-4f32abaf941ba30ade1f96930a05d14f1c6a6782.zip |
move repository deletion to service layer (#26948)
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'models')
-rw-r--r-- | models/activities/main_test.go | 1 | ||||
-rw-r--r-- | models/auth/main_test.go | 1 | ||||
-rw-r--r-- | models/git/main_test.go | 2 | ||||
-rw-r--r-- | models/issues/main_test.go | 2 | ||||
-rw-r--r-- | models/main_test.go | 1 | ||||
-rw-r--r-- | models/org_team.go | 79 | ||||
-rw-r--r-- | models/org_team_test.go | 30 | ||||
-rw-r--r-- | models/organization/main_test.go | 2 | ||||
-rw-r--r-- | models/packages/package_test.go | 2 | ||||
-rw-r--r-- | models/perm/access/main_test.go | 2 | ||||
-rw-r--r-- | models/repo.go | 326 | ||||
-rw-r--r-- | models/repo/main_test.go | 4 | ||||
-rw-r--r-- | models/system/main_test.go | 4 | ||||
-rw-r--r-- | models/user/main_test.go | 2 |
14 files changed, 21 insertions, 437 deletions
diff --git a/models/activities/main_test.go b/models/activities/main_test.go index a8740f53c4..6be54db658 100644 --- a/models/activities/main_test.go +++ b/models/activities/main_test.go @@ -10,6 +10,7 @@ import ( "code.gitea.io/gitea/models/unittest" _ "code.gitea.io/gitea/models" + _ "code.gitea.io/gitea/models/actions" ) func TestMain(m *testing.M) { diff --git a/models/auth/main_test.go b/models/auth/main_test.go index 3205d8816f..f8cbf3bd54 100644 --- a/models/auth/main_test.go +++ b/models/auth/main_test.go @@ -10,6 +10,7 @@ import ( "code.gitea.io/gitea/models/unittest" _ "code.gitea.io/gitea/models" + _ "code.gitea.io/gitea/models/actions" _ "code.gitea.io/gitea/models/activities" _ "code.gitea.io/gitea/models/auth" _ "code.gitea.io/gitea/models/perm/access" diff --git a/models/git/main_test.go b/models/git/main_test.go index 5ef9cde607..a8658d70c4 100644 --- a/models/git/main_test.go +++ b/models/git/main_test.go @@ -10,6 +10,8 @@ import ( "code.gitea.io/gitea/models/unittest" _ "code.gitea.io/gitea/models" + _ "code.gitea.io/gitea/models/actions" + _ "code.gitea.io/gitea/models/activities" ) func TestMain(m *testing.M) { diff --git a/models/issues/main_test.go b/models/issues/main_test.go index 9fbe294f70..190df027f4 100644 --- a/models/issues/main_test.go +++ b/models/issues/main_test.go @@ -11,6 +11,8 @@ import ( "code.gitea.io/gitea/models/unittest" _ "code.gitea.io/gitea/models" + _ "code.gitea.io/gitea/models/actions" + _ "code.gitea.io/gitea/models/activities" _ "code.gitea.io/gitea/models/repo" _ "code.gitea.io/gitea/models/user" diff --git a/models/main_test.go b/models/main_test.go index d490507649..c09b661d2c 100644 --- a/models/main_test.go +++ b/models/main_test.go @@ -12,6 +12,7 @@ import ( "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + _ "code.gitea.io/gitea/models/actions" _ "code.gitea.io/gitea/models/system" "github.com/stretchr/testify/assert" diff --git a/models/org_team.go b/models/org_team.go index be0c859a4b..f887c9ee98 100644 --- a/models/org_team.go +++ b/models/org_team.go @@ -151,85 +151,6 @@ func removeAllRepositories(ctx context.Context, t *organization.Team) (err error return nil } -// HasRepository returns true if given repository belong to team. -func HasRepository(t *organization.Team, repoID int64) bool { - return organization.HasTeamRepo(db.DefaultContext, t.OrgID, t.ID, repoID) -} - -// removeRepository removes a repository from a team and recalculates access -// Note: Repository shall not be removed from team if it includes all repositories (unless the repository is deleted) -func removeRepository(ctx context.Context, t *organization.Team, repo *repo_model.Repository, recalculate bool) (err error) { - e := db.GetEngine(ctx) - if err = organization.RemoveTeamRepo(ctx, t.ID, repo.ID); err != nil { - return err - } - - t.NumRepos-- - if _, err = e.ID(t.ID).Cols("num_repos").Update(t); err != nil { - return err - } - - // Don't need to recalculate when delete a repository from organization. - if recalculate { - if err = access_model.RecalculateTeamAccesses(ctx, repo, t.ID); err != nil { - return err - } - } - - teamUsers, err := organization.GetTeamUsersByTeamID(ctx, t.ID) - if err != nil { - return fmt.Errorf("getTeamUsersByTeamID: %w", err) - } - for _, teamUser := range teamUsers { - has, err := access_model.HasAccess(ctx, teamUser.UID, repo) - if err != nil { - return err - } else if has { - continue - } - - if err = repo_model.WatchRepo(ctx, teamUser.UID, repo.ID, false); err != nil { - return err - } - - // Remove all IssueWatches a user has subscribed to in the repositories - if err := issues_model.RemoveIssueWatchersByRepoID(ctx, teamUser.UID, repo.ID); err != nil { - return err - } - } - - return nil -} - -// RemoveRepository removes repository from team of organization. -// If the team shall include all repositories the request is ignored. -func RemoveRepository(t *organization.Team, repoID int64) error { - if !HasRepository(t, repoID) { - return nil - } - - if t.IncludesAllRepositories { - return nil - } - - repo, err := repo_model.GetRepositoryByID(db.DefaultContext, repoID) - if err != nil { - return err - } - - ctx, committer, err := db.TxContext(db.DefaultContext) - if err != nil { - return err - } - defer committer.Close() - - if err = removeRepository(ctx, t, repo, true); err != nil { - return err - } - - return committer.Commit() -} - // NewTeam creates a record of new team. // It's caller's responsibility to assign organization ID. func NewTeam(t *organization.Team) (err error) { diff --git a/models/org_team_test.go b/models/org_team_test.go index 446084c815..4978f8ef99 100644 --- a/models/org_team_test.go +++ b/models/org_team_test.go @@ -51,36 +51,6 @@ func TestTeam_RemoveMember(t *testing.T) { assert.True(t, organization.IsErrLastOrgOwner(err)) } -func TestTeam_HasRepository(t *testing.T) { - assert.NoError(t, unittest.PrepareTestDatabase()) - - test := func(teamID, repoID int64, expected bool) { - team := unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: teamID}) - assert.Equal(t, expected, HasRepository(team, repoID)) - } - test(1, 1, false) - test(1, 3, true) - test(1, 5, true) - test(1, unittest.NonexistentID, false) - - test(2, 3, true) - test(2, 5, false) -} - -func TestTeam_RemoveRepository(t *testing.T) { - assert.NoError(t, unittest.PrepareTestDatabase()) - - testSuccess := func(teamID, repoID int64) { - team := unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: teamID}) - assert.NoError(t, RemoveRepository(team, repoID)) - unittest.AssertNotExistsBean(t, &organization.TeamRepo{TeamID: teamID, RepoID: repoID}) - unittest.CheckConsistencyFor(t, &organization.Team{ID: teamID}, &repo_model.Repository{ID: repoID}) - } - testSuccess(2, 3) - testSuccess(2, 5) - testSuccess(1, unittest.NonexistentID) -} - func TestIsUsableTeamName(t *testing.T) { assert.NoError(t, organization.IsUsableTeamName("usable")) assert.True(t, db.IsErrNameReserved(organization.IsUsableTeamName("new"))) diff --git a/models/organization/main_test.go b/models/organization/main_test.go index 7ccf8c8efd..bc5bde2565 100644 --- a/models/organization/main_test.go +++ b/models/organization/main_test.go @@ -10,6 +10,8 @@ import ( "code.gitea.io/gitea/models/unittest" _ "code.gitea.io/gitea/models" + _ "code.gitea.io/gitea/models/actions" + _ "code.gitea.io/gitea/models/activities" _ "code.gitea.io/gitea/models/organization" _ "code.gitea.io/gitea/models/repo" _ "code.gitea.io/gitea/models/user" diff --git a/models/packages/package_test.go b/models/packages/package_test.go index 735688a731..525a9f08d6 100644 --- a/models/packages/package_test.go +++ b/models/packages/package_test.go @@ -13,6 +13,8 @@ import ( user_model "code.gitea.io/gitea/models/user" _ "code.gitea.io/gitea/models" + _ "code.gitea.io/gitea/models/actions" + _ "code.gitea.io/gitea/models/activities" "github.com/stretchr/testify/assert" ) diff --git a/models/perm/access/main_test.go b/models/perm/access/main_test.go index 837a9db437..8102cae496 100644 --- a/models/perm/access/main_test.go +++ b/models/perm/access/main_test.go @@ -10,6 +10,8 @@ import ( "code.gitea.io/gitea/models/unittest" _ "code.gitea.io/gitea/models" + _ "code.gitea.io/gitea/models/actions" + _ "code.gitea.io/gitea/models/activities" _ "code.gitea.io/gitea/models/repo" _ "code.gitea.io/gitea/models/user" ) diff --git a/models/repo.go b/models/repo.go index 74a88d4c48..de0f7ee345 100644 --- a/models/repo.go +++ b/models/repo.go @@ -11,28 +11,15 @@ import ( _ "image/jpeg" // Needed for jpeg support - actions_model "code.gitea.io/gitea/models/actions" - activities_model "code.gitea.io/gitea/models/activities" - admin_model "code.gitea.io/gitea/models/admin" asymkey_model "code.gitea.io/gitea/models/asymkey" "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" access_model "code.gitea.io/gitea/models/perm/access" - project_model "code.gitea.io/gitea/models/project" repo_model "code.gitea.io/gitea/models/repo" - secret_model "code.gitea.io/gitea/models/secret" system_model "code.gitea.io/gitea/models/system" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/lfs" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" - - "xorm.io/builder" ) // Init initialize model @@ -43,319 +30,6 @@ func Init(ctx context.Context) error { return system_model.Init(ctx) } -// DeleteRepository deletes a repository for a user or organization. -// make sure if you call this func to close open sessions (sqlite will otherwise get a deadlock) -func DeleteRepository(doer *user_model.User, uid, repoID int64) error { - ctx, committer, err := db.TxContext(db.DefaultContext) - if err != nil { - return err - } - defer committer.Close() - sess := db.GetEngine(ctx) - - // Query the action tasks of this repo, they will be needed after they have been deleted to remove the logs - tasks, err := actions_model.FindTasks(ctx, actions_model.FindTaskOptions{RepoID: repoID}) - if err != nil { - return fmt.Errorf("find actions tasks of repo %v: %w", repoID, err) - } - - // Query the artifacts of this repo, they will be needed after they have been deleted to remove artifacts files in ObjectStorage - artifacts, err := actions_model.ListArtifactsByRepoID(ctx, repoID) - if err != nil { - return fmt.Errorf("list actions artifacts of repo %v: %w", repoID, err) - } - - // In case is a organization. - org, err := user_model.GetUserByID(ctx, uid) - if err != nil { - return err - } - - repo := &repo_model.Repository{OwnerID: uid} - has, err := sess.ID(repoID).Get(repo) - if err != nil { - return err - } else if !has { - return repo_model.ErrRepoNotExist{ - ID: repoID, - UID: uid, - OwnerName: "", - Name: "", - } - } - - // Delete Deploy Keys - deployKeys, err := asymkey_model.ListDeployKeys(ctx, &asymkey_model.ListDeployKeysOptions{RepoID: repoID}) - if err != nil { - return fmt.Errorf("listDeployKeys: %w", err) - } - needRewriteKeysFile := len(deployKeys) > 0 - for _, dKey := range deployKeys { - if err := DeleteDeployKey(ctx, doer, dKey.ID); err != nil { - return fmt.Errorf("deleteDeployKeys: %w", err) - } - } - - if cnt, err := sess.ID(repoID).Delete(&repo_model.Repository{}); err != nil { - return err - } else if cnt != 1 { - return repo_model.ErrRepoNotExist{ - ID: repoID, - UID: uid, - OwnerName: "", - Name: "", - } - } - - if org.IsOrganization() { - teams, err := organization.FindOrgTeams(ctx, org.ID) - if err != nil { - return err - } - for _, t := range teams { - if !organization.HasTeamRepo(ctx, t.OrgID, t.ID, repoID) { - continue - } else if err = removeRepository(ctx, t, repo, false); err != nil { - return err - } - } - } - - attachments := make([]*repo_model.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].RelativePath()) - } - - if _, err := db.Exec(ctx, "UPDATE `user` SET num_stars=num_stars-1 WHERE id IN (SELECT `uid` FROM `star` WHERE repo_id = ?)", repo.ID); err != nil { - return err - } - - if _, err := db.GetEngine(ctx).In("hook_id", builder.Select("id").From("webhook").Where(builder.Eq{"webhook.repo_id": repo.ID})). - Delete(&webhook.HookTask{}); err != nil { - return err - } - - if err := db.DeleteBeans(ctx, - &access_model.Access{RepoID: repo.ID}, - &activities_model.Action{RepoID: repo.ID}, - &repo_model.Collaboration{RepoID: repoID}, - &issues_model.Comment{RefRepoID: repoID}, - &git_model.CommitStatus{RepoID: repoID}, - &git_model.Branch{RepoID: repoID}, - &git_model.LFSLock{RepoID: repoID}, - &repo_model.LanguageStat{RepoID: repoID}, - &issues_model.Milestone{RepoID: repoID}, - &repo_model.Mirror{RepoID: repoID}, - &activities_model.Notification{RepoID: repoID}, - &git_model.ProtectedBranch{RepoID: repoID}, - &git_model.ProtectedTag{RepoID: repoID}, - &repo_model.PushMirror{RepoID: repoID}, - &repo_model.Release{RepoID: repoID}, - &repo_model.RepoIndexerStatus{RepoID: repoID}, - &repo_model.Redirect{RedirectRepoID: repoID}, - &repo_model.RepoUnit{RepoID: repoID}, - &repo_model.Star{RepoID: repoID}, - &admin_model.Task{RepoID: repoID}, - &repo_model.Watch{RepoID: repoID}, - &webhook.Webhook{RepoID: repoID}, - &secret_model.Secret{RepoID: repoID}, - &actions_model.ActionTaskStep{RepoID: repoID}, - &actions_model.ActionTask{RepoID: repoID}, - &actions_model.ActionRunJob{RepoID: repoID}, - &actions_model.ActionRun{RepoID: repoID}, - &actions_model.ActionRunner{RepoID: repoID}, - &actions_model.ActionScheduleSpec{RepoID: repoID}, - &actions_model.ActionSchedule{RepoID: repoID}, - &actions_model.ActionArtifact{RepoID: repoID}, - ); err != nil { - return fmt.Errorf("deleteBeans: %w", err) - } - - // Delete Labels and related objects - if err := issues_model.DeleteLabelsByRepoID(ctx, repoID); err != nil { - return err - } - - // Delete Pulls and related objects - if err := issues_model.DeletePullsByBaseRepoID(ctx, repoID); err != nil { - return err - } - - // Delete Issues and related objects - var attachmentPaths []string - if attachmentPaths, err = issues_model.DeleteIssuesByRepoID(ctx, repoID); err != nil { - return err - } - - // Delete issue index - if err := db.DeleteResourceIndex(ctx, "issue_index", repoID); err != nil { - return err - } - - if repo.IsFork { - if _, err := db.Exec(ctx, "UPDATE `repository` SET num_forks=num_forks-1 WHERE id=?", repo.ForkID); err != nil { - return fmt.Errorf("decrease fork count: %w", err) - } - } - - if _, err := db.Exec(ctx, "UPDATE `user` SET num_repos=num_repos-1 WHERE id=?", uid); err != nil { - return err - } - - if len(repo.Topics) > 0 { - if err := repo_model.RemoveTopicsFromRepo(ctx, repo.ID); err != nil { - return err - } - } - - if err := project_model.DeleteProjectByRepoID(ctx, repoID); err != nil { - return fmt.Errorf("unable to delete projects for repo[%d]: %w", repoID, err) - } - - // Remove LFS objects - var lfsObjects []*git_model.LFSMetaObject - if err = sess.Where("repository_id=?", repoID).Find(&lfsObjects); err != nil { - return err - } - - lfsPaths := make([]string, 0, len(lfsObjects)) - for _, v := range lfsObjects { - count, err := db.CountByBean(ctx, &git_model.LFSMetaObject{Pointer: lfs.Pointer{Oid: v.Oid}}) - if err != nil { - return err - } - if count > 1 { - continue - } - - lfsPaths = append(lfsPaths, v.RelativePath()) - } - - if _, err := db.DeleteByBean(ctx, &git_model.LFSMetaObject{RepositoryID: repoID}); err != nil { - return err - } - - // Remove archives - var archives []*repo_model.RepoArchiver - if err = sess.Where("repo_id=?", repoID).Find(&archives); err != nil { - return err - } - - archivePaths := make([]string, 0, len(archives)) - for _, v := range archives { - archivePaths = append(archivePaths, v.RelativePath()) - } - - if _, err := db.DeleteByBean(ctx, &repo_model.RepoArchiver{RepoID: repoID}); err != nil { - return err - } - - if repo.NumForks > 0 { - if _, err = sess.Exec("UPDATE `repository` SET fork_id=0,is_fork=? WHERE fork_id=?", false, repo.ID); err != nil { - log.Error("reset 'fork_id' and 'is_fork': %v", err) - } - } - - // Get all attachments with both issue_id and release_id are zero - var newAttachments []*repo_model.Attachment - if err := sess.Where(builder.Eq{ - "repo_id": repo.ID, - "issue_id": 0, - "release_id": 0, - }).Find(&newAttachments); err != nil { - return err - } - - newAttachmentPaths := make([]string, 0, len(newAttachments)) - for _, attach := range newAttachments { - newAttachmentPaths = append(newAttachmentPaths, attach.RelativePath()) - } - - if _, err := sess.Where("repo_id=?", repo.ID).Delete(new(repo_model.Attachment)); err != nil { - return err - } - - if err = committer.Commit(); err != nil { - return err - } - - committer.Close() - - if needRewriteKeysFile { - if err := asymkey_model.RewriteAllPublicKeys(); err != nil { - log.Error("RewriteAllPublicKeys failed: %v", err) - } - } - - // We should always delete the files after the database transaction succeed. If - // we delete the file but the database rollback, the repository will be broken. - - // Remove repository files. - repoPath := repo.RepoPath() - system_model.RemoveAllWithNotice(db.DefaultContext, "Delete repository files", repoPath) - - // Remove wiki files - if repo.HasWiki() { - system_model.RemoveAllWithNotice(db.DefaultContext, "Delete repository wiki", repo.WikiPath()) - } - - // Remove archives - for _, archive := range archivePaths { - system_model.RemoveStorageWithNotice(db.DefaultContext, storage.RepoArchives, "Delete repo archive file", archive) - } - - // Remove lfs objects - for _, lfsObj := range lfsPaths { - system_model.RemoveStorageWithNotice(db.DefaultContext, storage.LFS, "Delete orphaned LFS file", lfsObj) - } - - // Remove issue attachment files. - for _, attachment := range attachmentPaths { - system_model.RemoveStorageWithNotice(db.DefaultContext, storage.Attachments, "Delete issue attachment", attachment) - } - - // Remove release attachment files. - for _, releaseAttachment := range releaseAttachments { - system_model.RemoveStorageWithNotice(db.DefaultContext, storage.Attachments, "Delete release attachment", releaseAttachment) - } - - // Remove attachment with no issue_id and release_id. - for _, newAttachment := range newAttachmentPaths { - system_model.RemoveStorageWithNotice(db.DefaultContext, storage.Attachments, "Delete issue attachment", newAttachment) - } - - if len(repo.Avatar) > 0 { - if err := storage.RepoAvatars.Delete(repo.CustomAvatarRelativePath()); err != nil { - return fmt.Errorf("Failed to remove %s: %w", repo.Avatar, err) - } - } - - // Finally, delete action logs after the actions have already been deleted to avoid new log files - for _, task := range tasks { - err := actions_module.RemoveLogs(ctx, task.LogInStorage, task.LogFilename) - if err != nil { - log.Error("remove log file %q: %v", task.LogFilename, err) - // go on - } - } - - // delete actions artifacts in ObjectStorage after the repo have already been deleted - for _, art := range artifacts { - if err := storage.ActionsArtifacts.Delete(art.StoragePath); err != nil { - log.Error("remove artifact file %q: %v", art.StoragePath, err) - // go on - } - } - - return nil -} - type repoChecker struct { querySQL func(ctx context.Context) ([]map[string][]byte, error) correctSQL func(ctx context.Context, id int64) error diff --git a/models/repo/main_test.go b/models/repo/main_test.go index bb9be54b9c..ff97c7ac9e 100644 --- a/models/repo/main_test.go +++ b/models/repo/main_test.go @@ -9,7 +9,9 @@ import ( "code.gitea.io/gitea/models/unittest" - _ "code.gitea.io/gitea/models" // register table model + _ "code.gitea.io/gitea/models" // register table model + _ "code.gitea.io/gitea/models/actions" + _ "code.gitea.io/gitea/models/activities" _ "code.gitea.io/gitea/models/perm/access" // register table model _ "code.gitea.io/gitea/models/repo" // register table model _ "code.gitea.io/gitea/models/user" // register table model diff --git a/models/system/main_test.go b/models/system/main_test.go index 94e2906447..e074abc155 100644 --- a/models/system/main_test.go +++ b/models/system/main_test.go @@ -9,7 +9,9 @@ import ( "code.gitea.io/gitea/models/unittest" - _ "code.gitea.io/gitea/models" // register models + _ "code.gitea.io/gitea/models" // register models + _ "code.gitea.io/gitea/models/actions" + _ "code.gitea.io/gitea/models/activities" _ "code.gitea.io/gitea/models/system" // register models of system ) diff --git a/models/user/main_test.go b/models/user/main_test.go index 0d76aacd5f..8833cc7386 100644 --- a/models/user/main_test.go +++ b/models/user/main_test.go @@ -10,6 +10,8 @@ import ( "code.gitea.io/gitea/models/unittest" _ "code.gitea.io/gitea/models" + _ "code.gitea.io/gitea/models/actions" + _ "code.gitea.io/gitea/models/activities" _ "code.gitea.io/gitea/models/user" ) |