[MODERATION] Purge issues on user deletion
- Forgejo has the option to delete users, in which all data except issues and comments are removed, this makes sense in some cases where users need to be removed cleanly but without removing their existing bug reports or comments to an discussion. In the case of spammers, admins have the option to enable purging, where comments are removed. - Add issues to the list of things to be removed if purge is checked. - No unit testing, as this gigantic function doesn't have one to begin with. - Add integration test. - Resolves https://codeberg.org/forgejo/forgejo/issues/1268 (cherry picked from commit3ed381c758
) (cherry picked from commit44d00650ce
) (cherry picked from commit7f4da82779
) (cherry picked from commitd629314def
) Conflicts: models/fixtures/issue.yml https://codeberg.org/forgejo/forgejo/pulls/1508 (cherry picked from commit794dcc218f
) (cherry picked from commitc433f2ecb6
) (cherry picked from commitbb23683f4b
) (cherry picked from commit634c5604d4
) (cherry picked from commit219073f5c5
) (cherry picked from commit32893dbab1
) (cherry picked from commit0ef40cfb5a
) (cherry picked from commit e535409cab3c276fd8db6b402f85934ef5127491) (cherry picked from commit29059f611b
) (cherry picked from commitcd480c5b8b
) (cherry picked from commit340e657392
) (cherry picked from commit3a7a5564d0
) (cherry picked from commit1dbcaca726
) (cherry picked from commitc491c439e2
) (cherry picked from commitc8fe2140cc
) (cherry picked from commitc72564e3ee
)
This commit is contained in:
parent
9fe826605f
commit
2084f3fa11
8 changed files with 59 additions and 12 deletions
|
@ -338,3 +338,20 @@
|
||||||
created_unix: 978307210
|
created_unix: 978307210
|
||||||
updated_unix: 978307210
|
updated_unix: 978307210
|
||||||
is_locked: false
|
is_locked: false
|
||||||
|
|
||||||
|
-
|
||||||
|
id: 21
|
||||||
|
repo_id: 10
|
||||||
|
index: 2
|
||||||
|
poster_id: 8
|
||||||
|
original_author_id: 0
|
||||||
|
name: issue for pr
|
||||||
|
content: content
|
||||||
|
milestone_id: 0
|
||||||
|
priority: 0
|
||||||
|
is_closed: false
|
||||||
|
is_pull: false
|
||||||
|
num_comments: 0
|
||||||
|
created_unix: 946684830
|
||||||
|
updated_unix: 978307200
|
||||||
|
is_locked: false
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
max_index: 2
|
max_index: 2
|
||||||
-
|
-
|
||||||
group_id: 10
|
group_id: 10
|
||||||
max_index: 1
|
max_index: 2
|
||||||
-
|
-
|
||||||
group_id: 32
|
group_id: 32
|
||||||
max_index: 2
|
max_index: 2
|
||||||
|
|
|
@ -283,7 +283,7 @@
|
||||||
num_watches: 0
|
num_watches: 0
|
||||||
num_stars: 0
|
num_stars: 0
|
||||||
num_forks: 1
|
num_forks: 1
|
||||||
num_issues: 0
|
num_issues: 1
|
||||||
num_closed_issues: 0
|
num_closed_issues: 0
|
||||||
num_pulls: 1
|
num_pulls: 1
|
||||||
num_closed_pulls: 0
|
num_closed_pulls: 0
|
||||||
|
|
|
@ -2843,7 +2843,7 @@ users.cannot_delete_self = "You cannot delete yourself"
|
||||||
users.still_own_repo = This user still owns one or more repositories. Delete or transfer these repositories first.
|
users.still_own_repo = This user still owns one or more repositories. Delete or transfer these repositories first.
|
||||||
users.still_has_org = This user is a member of an organization. Remove the user from any organizations first.
|
users.still_has_org = This user is a member of an organization. Remove the user from any organizations first.
|
||||||
users.purge = Purge User
|
users.purge = Purge User
|
||||||
users.purge_help = Forcibly delete user and any repositories, organizations, and packages owned by the user. All comments will be deleted too.
|
users.purge_help = Forcibly delete user and any repositories, organizations, and packages owned by the user. All comments and issues posted by this user will also be deleted.
|
||||||
users.still_own_packages = This user still owns one or more packages, delete these packages first.
|
users.still_own_packages = This user still owns one or more packages, delete these packages first.
|
||||||
users.deletion_success = The user account has been deleted.
|
users.deletion_success = The user account has been deleted.
|
||||||
users.reset_2fa = Reset 2FA
|
users.reset_2fa = Reset 2FA
|
||||||
|
|
|
@ -23,6 +23,7 @@ import (
|
||||||
repo_model "code.gitea.io/gitea/models/repo"
|
repo_model "code.gitea.io/gitea/models/repo"
|
||||||
user_model "code.gitea.io/gitea/models/user"
|
user_model "code.gitea.io/gitea/models/user"
|
||||||
"code.gitea.io/gitea/modules/setting"
|
"code.gitea.io/gitea/modules/setting"
|
||||||
|
issue_service "code.gitea.io/gitea/services/issue"
|
||||||
|
|
||||||
"xorm.io/builder"
|
"xorm.io/builder"
|
||||||
)
|
)
|
||||||
|
@ -127,6 +128,31 @@ func deleteUser(ctx context.Context, u *user_model.User, purge bool) (err error)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ***** START: Issues *****
|
||||||
|
if purge {
|
||||||
|
const batchSize = 50
|
||||||
|
|
||||||
|
for {
|
||||||
|
issues := make([]*issues_model.Issue, 0, batchSize)
|
||||||
|
if err = e.Where("poster_id=?", u.ID).Limit(batchSize, 0).Find(&issues); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if len(issues) == 0 {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, issue := range issues {
|
||||||
|
// NOTE: Don't open git repositories just to remove the reference data,
|
||||||
|
// `git gc` is able to remove that reference which is run as a cron job
|
||||||
|
// by default. Also use the deleted user as doer to delete the issue.
|
||||||
|
if err = issue_service.DeleteIssue(ctx, u, nil, issue); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// ***** END: Issues *****
|
||||||
|
|
||||||
// ***** START: Branch Protections *****
|
// ***** START: Branch Protections *****
|
||||||
{
|
{
|
||||||
const batchSize = 50
|
const batchSize = 50
|
||||||
|
|
|
@ -75,9 +75,10 @@ func TestAdminDeleteUser(t *testing.T) {
|
||||||
csrf := GetCSRF(t, session, "/admin/users/8/edit")
|
csrf := GetCSRF(t, session, "/admin/users/8/edit")
|
||||||
req := NewRequestWithValues(t, "POST", "/admin/users/8/delete", map[string]string{
|
req := NewRequestWithValues(t, "POST", "/admin/users/8/delete", map[string]string{
|
||||||
"_csrf": csrf,
|
"_csrf": csrf,
|
||||||
|
"purge": "true",
|
||||||
})
|
})
|
||||||
session.MakeRequest(t, req, http.StatusSeeOther)
|
session.MakeRequest(t, req, http.StatusSeeOther)
|
||||||
|
|
||||||
assertUserDeleted(t, 8)
|
assertUserDeleted(t, 8, true)
|
||||||
unittest.CheckConsistencyFor(t, &user_model.User{})
|
unittest.CheckConsistencyFor(t, &user_model.User{})
|
||||||
}
|
}
|
||||||
|
|
|
@ -368,7 +368,7 @@ func TestAPISearchIssues(t *testing.T) {
|
||||||
defer tests.PrepareTestEnv(t)()
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
// as this API was used in the frontend, it uses UI page size
|
// as this API was used in the frontend, it uses UI page size
|
||||||
expectedIssueCount := 18 // from the fixtures
|
expectedIssueCount := 19 // from the fixtures
|
||||||
if expectedIssueCount > setting.UI.IssuePagingNum {
|
if expectedIssueCount > setting.UI.IssuePagingNum {
|
||||||
expectedIssueCount = setting.UI.IssuePagingNum
|
expectedIssueCount = setting.UI.IssuePagingNum
|
||||||
}
|
}
|
||||||
|
@ -392,7 +392,7 @@ func TestAPISearchIssues(t *testing.T) {
|
||||||
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
|
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
|
||||||
resp = MakeRequest(t, req, http.StatusOK)
|
resp = MakeRequest(t, req, http.StatusOK)
|
||||||
DecodeJSON(t, resp, &apiIssues)
|
DecodeJSON(t, resp, &apiIssues)
|
||||||
assert.Len(t, apiIssues, 11)
|
assert.Len(t, apiIssues, 12)
|
||||||
query.Del("since")
|
query.Del("since")
|
||||||
query.Del("before")
|
query.Del("before")
|
||||||
|
|
||||||
|
@ -408,15 +408,15 @@ func TestAPISearchIssues(t *testing.T) {
|
||||||
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
|
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
|
||||||
resp = MakeRequest(t, req, http.StatusOK)
|
resp = MakeRequest(t, req, http.StatusOK)
|
||||||
DecodeJSON(t, resp, &apiIssues)
|
DecodeJSON(t, resp, &apiIssues)
|
||||||
assert.EqualValues(t, "20", resp.Header().Get("X-Total-Count"))
|
assert.EqualValues(t, "21", resp.Header().Get("X-Total-Count"))
|
||||||
assert.Len(t, apiIssues, 20)
|
assert.Len(t, apiIssues, 21)
|
||||||
|
|
||||||
query.Add("limit", "10")
|
query.Add("limit", "10")
|
||||||
link.RawQuery = query.Encode()
|
link.RawQuery = query.Encode()
|
||||||
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
|
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
|
||||||
resp = MakeRequest(t, req, http.StatusOK)
|
resp = MakeRequest(t, req, http.StatusOK)
|
||||||
DecodeJSON(t, resp, &apiIssues)
|
DecodeJSON(t, resp, &apiIssues)
|
||||||
assert.EqualValues(t, "20", resp.Header().Get("X-Total-Count"))
|
assert.EqualValues(t, "21", resp.Header().Get("X-Total-Count"))
|
||||||
assert.Len(t, apiIssues, 10)
|
assert.Len(t, apiIssues, 10)
|
||||||
|
|
||||||
query = url.Values{"assigned": {"true"}, "state": {"all"}}
|
query = url.Values{"assigned": {"true"}, "state": {"all"}}
|
||||||
|
@ -466,7 +466,7 @@ func TestAPISearchIssuesWithLabels(t *testing.T) {
|
||||||
defer tests.PrepareTestEnv(t)()
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
// as this API was used in the frontend, it uses UI page size
|
// as this API was used in the frontend, it uses UI page size
|
||||||
expectedIssueCount := 18 // from the fixtures
|
expectedIssueCount := 19 // from the fixtures
|
||||||
if expectedIssueCount > setting.UI.IssuePagingNum {
|
if expectedIssueCount > setting.UI.IssuePagingNum {
|
||||||
expectedIssueCount = setting.UI.IssuePagingNum
|
expectedIssueCount = setting.UI.IssuePagingNum
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@ import (
|
||||||
"code.gitea.io/gitea/tests"
|
"code.gitea.io/gitea/tests"
|
||||||
)
|
)
|
||||||
|
|
||||||
func assertUserDeleted(t *testing.T, userID int64) {
|
func assertUserDeleted(t *testing.T, userID int64, purged bool) {
|
||||||
unittest.AssertNotExistsBean(t, &user_model.User{ID: userID})
|
unittest.AssertNotExistsBean(t, &user_model.User{ID: userID})
|
||||||
unittest.AssertNotExistsBean(t, &user_model.Follow{UserID: userID})
|
unittest.AssertNotExistsBean(t, &user_model.Follow{UserID: userID})
|
||||||
unittest.AssertNotExistsBean(t, &user_model.Follow{FollowID: userID})
|
unittest.AssertNotExistsBean(t, &user_model.Follow{FollowID: userID})
|
||||||
|
@ -27,6 +27,9 @@ func assertUserDeleted(t *testing.T, userID int64) {
|
||||||
unittest.AssertNotExistsBean(t, &issues_model.IssueUser{UID: userID})
|
unittest.AssertNotExistsBean(t, &issues_model.IssueUser{UID: userID})
|
||||||
unittest.AssertNotExistsBean(t, &organization.TeamUser{UID: userID})
|
unittest.AssertNotExistsBean(t, &organization.TeamUser{UID: userID})
|
||||||
unittest.AssertNotExistsBean(t, &repo_model.Star{UID: userID})
|
unittest.AssertNotExistsBean(t, &repo_model.Star{UID: userID})
|
||||||
|
if purged {
|
||||||
|
unittest.AssertNotExistsBean(t, &issues_model.Issue{PosterID: userID})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestUserDeleteAccount(t *testing.T) {
|
func TestUserDeleteAccount(t *testing.T) {
|
||||||
|
@ -40,7 +43,7 @@ func TestUserDeleteAccount(t *testing.T) {
|
||||||
})
|
})
|
||||||
session.MakeRequest(t, req, http.StatusSeeOther)
|
session.MakeRequest(t, req, http.StatusSeeOther)
|
||||||
|
|
||||||
assertUserDeleted(t, 8)
|
assertUserDeleted(t, 8, false)
|
||||||
unittest.CheckConsistencyFor(t, &user_model.User{})
|
unittest.CheckConsistencyFor(t, &user_model.User{})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue