Skip to content

Commit 6637bbf

Browse files
6543JakobDev
6543
and
JakobDev
authored
Delete repos of org when purge delete user (#27273) (#27728)
Fixes https://codeberg.org/forgejo/forgejo/issues/1514 Backports #27273 --------- Co-authored-by: JakobDev <[email protected]>
1 parent 6ac2ade commit 6637bbf

File tree

14 files changed

+79
-51
lines changed

14 files changed

+79
-51
lines changed

‎models/repo/repo_list.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ func FindUserCodeAccessibleOwnerRepoIDs(ctx context.Context, ownerID int64, user
716716
}
717717

718718
// GetUserRepositories returns a list of repositories of given user.
719-
func GetUserRepositories(opts *SearchRepoOptions) (RepositoryList, int64, error) {
719+
func GetUserRepositories(ctx context.Context, opts *SearchRepoOptions) (RepositoryList, int64, error) {
720720
if len(opts.OrderBy) == 0 {
721721
opts.OrderBy = "updated_unix DESC"
722722
}
@@ -734,7 +734,7 @@ func GetUserRepositories(opts *SearchRepoOptions) (RepositoryList, int64, error)
734734
cond = cond.And(builder.In("lower_name", opts.LowerNames))
735735
}
736736

737-
sess := db.GetEngine(db.DefaultContext)
737+
sess := db.GetEngine(ctx)
738738

739739
count, err := sess.Where(cond).Count(new(Repository))
740740
if err != nil {

‎routers/api/v1/org/org.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ func Delete(ctx *context.APIContext) {
385385
// "404":
386386
// "$ref": "#/responses/notFound"
387387

388-
if err := org.DeleteOrganization(ctx.Org.Organization); err != nil {
388+
if err := org.DeleteOrganization(ctx, ctx.Org.Organization, false); err != nil {
389389
ctx.Error(http.StatusInternalServerError, "DeleteOrganization", err)
390390
return
391391
}

‎routers/api/v1/user/repo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
func listUserRepos(ctx *context.APIContext, u *user_model.User, private bool) {
2222
opts := utils.GetListOptions(ctx)
2323

24-
repos, count, err := repo_model.GetUserRepositories(&repo_model.SearchRepoOptions{
24+
repos, count, err := repo_model.GetUserRepositories(ctx, &repo_model.SearchRepoOptions{
2525
Actor: u,
2626
Private: private,
2727
ListOptions: opts,

‎routers/web/org/setting.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func SettingsPost(ctx *context.Context) {
7575

7676
// Check if organization name has been changed.
7777
if nameChanged {
78-
err := org_service.RenameOrganization(ctx, org, form.Name)
78+
err := user_service.RenameUser(ctx, org.AsUser(), form.Name)
7979
switch {
8080
case user_model.IsErrUserAlreadyExist(err):
8181
ctx.Data["OrgName"] = true
@@ -124,7 +124,7 @@ func SettingsPost(ctx *context.Context) {
124124

125125
// update forks visibility
126126
if visibilityChanged {
127-
repos, _, err := repo_model.GetUserRepositories(&repo_model.SearchRepoOptions{
127+
repos, _, err := repo_model.GetUserRepositories(ctx, &repo_model.SearchRepoOptions{
128128
Actor: org.AsUser(), Private: true, ListOptions: db.ListOptions{Page: 1, PageSize: org.NumRepos},
129129
})
130130
if err != nil {
@@ -180,7 +180,7 @@ func SettingsDelete(ctx *context.Context) {
180180
return
181181
}
182182

183-
if err := org_service.DeleteOrganization(ctx.Org.Organization); err != nil {
183+
if err := org_service.DeleteOrganization(ctx, ctx.Org.Organization, false); err != nil {
184184
if models.IsErrUserOwnRepos(err) {
185185
ctx.Flash.Error(ctx.Tr("form.org_still_own_repo"))
186186
ctx.Redirect(ctx.Org.OrgLink + "/settings/delete")

‎routers/web/user/home_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"net/http"
88
"testing"
99

10+
"code.gitea.io/gitea/models/db"
1011
repo_model "code.gitea.io/gitea/models/repo"
1112
"code.gitea.io/gitea/models/unittest"
1213
"code.gitea.io/gitea/modules/contexttest"
@@ -25,7 +26,7 @@ func TestArchivedIssues(t *testing.T) {
2526
ctx.Req.Form.Set("state", "open")
2627

2728
// Assume: User 30 has access to two Repos with Issues, one of the Repos being archived.
28-
repos, _, _ := repo_model.GetUserRepositories(&repo_model.SearchRepoOptions{Actor: ctx.Doer})
29+
repos, _, _ := repo_model.GetUserRepositories(db.DefaultContext, &repo_model.SearchRepoOptions{Actor: ctx.Doer})
2930
assert.Len(t, repos, 3)
3031
IsArchived := make(map[int64]bool)
3132
NumIssues := make(map[int64]int)

‎routers/web/user/package.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ func PackageSettings(ctx *context.Context) {
383383
ctx.Data["IsPackagesPage"] = true
384384
ctx.Data["PackageDescriptor"] = pd
385385

386-
repos, _, _ := repo_model.GetUserRepositories(&repo_model.SearchRepoOptions{
386+
repos, _, _ := repo_model.GetUserRepositories(ctx, &repo_model.SearchRepoOptions{
387387
Actor: pd.Owner,
388388
Private: true,
389389
})

‎routers/web/user/setting/profile.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ func Repos(ctx *context.Context) {
287287
return
288288
}
289289

290-
userRepos, _, err := repo_model.GetUserRepositories(&repo_model.SearchRepoOptions{
290+
userRepos, _, err := repo_model.GetUserRepositories(ctx, &repo_model.SearchRepoOptions{
291291
Actor: ctxUser,
292292
Private: true,
293293
ListOptions: db.ListOptions{
@@ -312,7 +312,7 @@ func Repos(ctx *context.Context) {
312312
ctx.Data["Dirs"] = repoNames
313313
ctx.Data["ReposMap"] = repos
314314
} else {
315-
repos, count64, err := repo_model.GetUserRepositories(&repo_model.SearchRepoOptions{Actor: ctxUser, Private: true, ListOptions: opts})
315+
repos, count64, err := repo_model.GetUserRepositories(ctx, &repo_model.SearchRepoOptions{Actor: ctxUser, Private: true, ListOptions: opts})
316316
if err != nil {
317317
ctx.ServerError("GetUserRepositories", err)
318318
return

‎services/org/org.go

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,24 @@ import (
1515
user_model "code.gitea.io/gitea/models/user"
1616
"code.gitea.io/gitea/modules/storage"
1717
"code.gitea.io/gitea/modules/util"
18-
user_service "code.gitea.io/gitea/services/user"
18+
repo_service "code.gitea.io/gitea/services/repository"
1919
)
2020

2121
// DeleteOrganization completely and permanently deletes everything of organization.
22-
func DeleteOrganization(org *org_model.Organization) error {
23-
ctx, commiter, err := db.TxContext(db.DefaultContext)
22+
func DeleteOrganization(ctx context.Context, org *org_model.Organization, purge bool) error {
23+
ctx, commiter, err := db.TxContext(ctx)
2424
if err != nil {
2525
return err
2626
}
2727
defer commiter.Close()
2828

29+
if purge {
30+
err := repo_service.DeleteOwnerRepositoriesDirectly(ctx, org.AsUser())
31+
if err != nil {
32+
return err
33+
}
34+
}
35+
2936
// Check ownership of repository.
3037
count, err := repo_model.CountRepositories(ctx, repo_model.CountRepositoryOptions{OwnerID: org.ID})
3138
if err != nil {
@@ -67,8 +74,3 @@ func DeleteOrganization(org *org_model.Organization) error {
6774

6875
return nil
6976
}
70-
71-
// RenameOrganization renames an organization.
72-
func RenameOrganization(ctx context.Context, org *org_model.Organization, newName string) error {
73-
return user_service.RenameUser(ctx, org.AsUser(), newName)
74-
}

‎services/org/org_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models"
11+
"code.gitea.io/gitea/models/db"
1112
"code.gitea.io/gitea/models/organization"
1213
"code.gitea.io/gitea/models/unittest"
1314
user_model "code.gitea.io/gitea/models/user"
@@ -24,17 +25,17 @@ func TestMain(m *testing.M) {
2425
func TestDeleteOrganization(t *testing.T) {
2526
assert.NoError(t, unittest.PrepareTestDatabase())
2627
org := unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 6})
27-
assert.NoError(t, DeleteOrganization(org))
28+
assert.NoError(t, DeleteOrganization(db.DefaultContext, org, false))
2829
unittest.AssertNotExistsBean(t, &organization.Organization{ID: 6})
2930
unittest.AssertNotExistsBean(t, &organization.OrgUser{OrgID: 6})
3031
unittest.AssertNotExistsBean(t, &organization.Team{OrgID: 6})
3132

3233
org = unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 3})
33-
err := DeleteOrganization(org)
34+
err := DeleteOrganization(db.DefaultContext, org, false)
3435
assert.Error(t, err)
3536
assert.True(t, models.IsErrUserOwnRepos(err))
3637

3738
user := unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 5})
38-
assert.Error(t, DeleteOrganization(user))
39+
assert.Error(t, DeleteOrganization(db.DefaultContext, user, false))
3940
unittest.CheckConsistencyFor(t, &user_model.User{}, &organization.Team{})
4041
}

‎services/repository/adopt.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ func checkUnadoptedRepositories(ctx context.Context, userName string, repoNamesT
259259
}
260260
return err
261261
}
262-
repos, _, err := repo_model.GetUserRepositories(&repo_model.SearchRepoOptions{
262+
repos, _, err := repo_model.GetUserRepositories(ctx, &repo_model.SearchRepoOptions{
263263
Actor: ctxUser,
264264
Private: true,
265265
ListOptions: db.ListOptions{

‎services/repository/delete.go

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,3 +425,30 @@ func RemoveRepositoryFromTeam(ctx context.Context, t *organization.Team, repoID
425425

426426
return committer.Commit()
427427
}
428+
429+
// DeleteOwnerRepositoriesDirectly calls DeleteRepositoryDirectly for all repos of the given owner
430+
func DeleteOwnerRepositoriesDirectly(ctx context.Context, owner *user_model.User) error {
431+
for {
432+
repos, _, err := repo_model.GetUserRepositories(ctx, &repo_model.SearchRepoOptions{
433+
ListOptions: db.ListOptions{
434+
PageSize: repo_model.RepositoryListDefaultPageSize,
435+
Page: 1,
436+
},
437+
Private: true,
438+
OwnerID: owner.ID,
439+
Actor: owner,
440+
})
441+
if err != nil {
442+
return fmt.Errorf("GetUserRepositories: %w", err)
443+
}
444+
if len(repos) == 0 {
445+
break
446+
}
447+
for _, repo := range repos {
448+
if err := DeleteRepositoryDirectly(ctx, owner, owner.ID, repo.ID); err != nil {
449+
return fmt.Errorf("unable to delete repository %s for %s[%d]. Error: %w", repo.Name, owner.Name, owner.ID, err)
450+
}
451+
}
452+
}
453+
return nil
454+
}

‎services/repository/delete_test.go

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2017 The Gitea Authors. All rights reserved.
22
// SPDX-License-Identifier: MIT
33

4-
package repository
4+
package repository_test
55

66
import (
77
"testing"
@@ -10,6 +10,8 @@ import (
1010
"code.gitea.io/gitea/models/organization"
1111
repo_model "code.gitea.io/gitea/models/repo"
1212
"code.gitea.io/gitea/models/unittest"
13+
user_model "code.gitea.io/gitea/models/user"
14+
repo_service "code.gitea.io/gitea/services/repository"
1315

1416
"github.com/stretchr/testify/assert"
1517
)
@@ -19,7 +21,7 @@ func TestTeam_HasRepository(t *testing.T) {
1921

2022
test := func(teamID, repoID int64, expected bool) {
2123
team := unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: teamID})
22-
assert.Equal(t, expected, HasRepository(db.DefaultContext, team, repoID))
24+
assert.Equal(t, expected, repo_service.HasRepository(db.DefaultContext, team, repoID))
2325
}
2426
test(1, 1, false)
2527
test(1, 3, true)
@@ -35,11 +37,19 @@ func TestTeam_RemoveRepository(t *testing.T) {
3537

3638
testSuccess := func(teamID, repoID int64) {
3739
team := unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: teamID})
38-
assert.NoError(t, RemoveRepositoryFromTeam(db.DefaultContext, team, repoID))
40+
assert.NoError(t, repo_service.RemoveRepositoryFromTeam(db.DefaultContext, team, repoID))
3941
unittest.AssertNotExistsBean(t, &organization.TeamRepo{TeamID: teamID, RepoID: repoID})
4042
unittest.CheckConsistencyFor(t, &organization.Team{ID: teamID}, &repo_model.Repository{ID: repoID})
4143
}
4244
testSuccess(2, 3)
4345
testSuccess(2, 5)
4446
testSuccess(1, unittest.NonexistentID)
4547
}
48+
49+
func TestDeleteOwnerRepositoriesDirectly(t *testing.T) {
50+
unittest.PrepareTestEnv(t)
51+
52+
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
53+
54+
assert.NoError(t, repo_service.DeleteOwnerRepositoriesDirectly(db.DefaultContext, user))
55+
}

‎services/repository/lfs_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2023 The Gitea Authors. All rights reserved.
22
// SPDX-License-Identifier: MIT
33

4-
package repository
4+
package repository_test
55

66
import (
77
"bytes"
@@ -16,12 +16,13 @@ import (
1616
"code.gitea.io/gitea/modules/lfs"
1717
"code.gitea.io/gitea/modules/setting"
1818
"code.gitea.io/gitea/modules/storage"
19+
repo_service "code.gitea.io/gitea/services/repository"
1920

2021
"github.com/stretchr/testify/assert"
2122
)
2223

2324
func TestGarbageCollectLFSMetaObjects(t *testing.T) {
24-
assert.NoError(t, unittest.PrepareTestDatabase())
25+
unittest.PrepareTestEnv(t)
2526

2627
setting.LFS.StartServer = true
2728
err := storage.Init()
@@ -35,7 +36,7 @@ func TestGarbageCollectLFSMetaObjects(t *testing.T) {
3536
lfsOid := storeObjectInRepo(t, repo.ID, &lfsContent)
3637

3738
// gc
38-
err = GarbageCollectLFSMetaObjects(context.Background(), GarbageCollectLFSMetaObjectsOptions{
39+
err = repo_service.GarbageCollectLFSMetaObjects(context.Background(), repo_service.GarbageCollectLFSMetaObjectsOptions{
3940
AutoFix: true,
4041
OlderThan: time.Now().Add(7 * 24 * time.Hour).Add(5 * 24 * time.Hour),
4142
UpdatedLessRecentlyThan: time.Now().Add(7 * 24 * time.Hour).Add(3 * 24 * time.Hour),

‎services/user/user.go

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"code.gitea.io/gitea/modules/storage"
2525
"code.gitea.io/gitea/modules/util"
2626
"code.gitea.io/gitea/services/agit"
27+
org_service "code.gitea.io/gitea/services/org"
2728
"code.gitea.io/gitea/services/packages"
2829
container_service "code.gitea.io/gitea/services/packages/container"
2930
repo_service "code.gitea.io/gitea/services/repository"
@@ -158,27 +159,9 @@ func DeleteUser(ctx context.Context, u *user_model.User, purge bool) error {
158159
//
159160
// An alternative option here would be write a DeleteAllRepositoriesForUserID function which would delete all of the repos
160161
// but such a function would likely get out of date
161-
for {
162-
repos, _, err := repo_model.GetUserRepositories(&repo_model.SearchRepoOptions{
163-
ListOptions: db.ListOptions{
164-
PageSize: repo_model.RepositoryListDefaultPageSize,
165-
Page: 1,
166-
},
167-
Private: true,
168-
OwnerID: u.ID,
169-
Actor: u,
170-
})
171-
if err != nil {
172-
return fmt.Errorf("GetUserRepositories: %w", err)
173-
}
174-
if len(repos) == 0 {
175-
break
176-
}
177-
for _, repo := range repos {
178-
if err := repo_service.DeleteRepositoryDirectly(ctx, u, u.ID, repo.ID); err != nil {
179-
return fmt.Errorf("unable to delete repository %s for %s[%d]. Error: %w", repo.Name, u.Name, u.ID, err)
180-
}
181-
}
162+
err := repo_service.DeleteOwnerRepositoriesDirectly(ctx, u)
163+
if err != nil {
164+
return err
182165
}
183166

184167
// Remove from Organizations and delete last owner organizations
@@ -206,7 +189,10 @@ func DeleteUser(ctx context.Context, u *user_model.User, purge bool) error {
206189
for _, org := range orgs {
207190
if err := models.RemoveOrgUser(org.ID, u.ID); err != nil {
208191
if organization.IsErrLastOrgOwner(err) {
209-
err = organization.DeleteOrganization(ctx, org)
192+
err = org_service.DeleteOrganization(ctx, org, true)
193+
if err != nil {
194+
return fmt.Errorf("unable to delete organization %d: %w", org.ID, err)
195+
}
210196
}
211197
if err != nil {
212198
return fmt.Errorf("unable to remove user %s[%d] from org %s[%d]. Error: %w", u.Name, u.ID, org.Name, org.ID, err)

0 commit comments

Comments
 (0)