Add option to purge users

cmd/admin.go

@@ -157,6 +157,10 @@ var (
  Name: "email,e",
  Usage: "Email of the user to delete",
  },
+ cli.BoolFlag{
+ Name: "purge",
+ Usage: "Purge user, all their repositories, organizations and comments",
+ },
  },
  Action: runDeleteUser,
  }
@@ -675,7 +679,7 @@ func runDeleteUser(c *cli.Context) error {
  return fmt.Errorf("The user %s does not match the provided id %d", user.Name, c.Int64("id"))
  }
 
- return user_service.DeleteUser(user)
+ return user_service.DeleteUser(ctx, user, c.Bool("purge"))
 }
 
 func runGenerateAccessToken(c *cli.Context) error {

integrations/admin_user_test.go

@@ -76,7 +76,7 @@ func TestAdminDeleteUser(t *testing.T) {
  req := NewRequestWithValues(t, "POST", "/admin/users/8/delete", map[string]string{
  "_csrf": csrf,
  })
- session.MakeRequest(t, req, http.StatusOK)
+ session.MakeRequest(t, req, http.StatusSeeOther)
 
  assertUserDeleted(t, 8)
  unittest.CheckConsistencyFor(t, &user_model.User{})

integrations/integration_test.go

@@ -188,8 +188,13 @@ func initIntegrationTest() {
 
  switch {
  case setting.Database.UseMySQL:
- db, err := sql.Open("mysql", fmt.Sprintf("%s:%s@tcp(%s)/",
- setting.Database.User, setting.Database.Passwd, setting.Database.Host))
+ connType := "tcp"
+ if len(setting.Database.Host) > 0 && setting.Database.Host[0] == '/' { // looks like a unix socket
+ connType = "unix"
+ }
+
+ db, err := sql.Open("mysql", fmt.Sprintf("%s:%s@%s(%s)/",
+ setting.Database.User, setting.Database.Passwd, connType, setting.Database.Host))
  defer db.Close()
  if err != nil {
  log.Fatal("sql.Open: %v", err)

models/packages/package_version.go

@@ -107,7 +107,7 @@ func getVersionByNameAndVersion(ctx context.Context, ownerID int64, packageType
  ExactMatch: true,
  Value: version,
  },
- IsInternal: isInternal,
+ IsInternal: util.OptionalBoolOf(isInternal),
  Paginator: db.NewAbsoluteListOptions(0, 1),
  })
  if err != nil {
@@ -171,15 +171,18 @@ type PackageSearchOptions struct {
  Name SearchValue // only results with the specific name are found
  Version SearchValue // only results with the specific version are found
  Properties map[string]string // only results are found which contain all listed version properties with the specific value
- IsInternal bool
+ IsInternal util.OptionalBool
  HasFileWithName string // only results are found which are associated with a file with the specific name
  HasFiles util.OptionalBool // only results are found which have associated files
  Sort string
  db.Paginator
 }
 
 func (opts *PackageSearchOptions) toConds() builder.Cond {
- var cond builder.Cond = builder.Eq{"package_version.is_internal": opts.IsInternal}
+ cond := builder.NewCond()
+ if !opts.IsInternal.IsNone() {
+ cond = builder.Eq{"package_version.is_internal": opts.IsInternal.IsTrue()}
+ }
 
  if opts.OwnerID != 0 {
  cond = cond.And(builder.Eq{"package.owner_id": opts.OwnerID})

models/project/project.go

@@ -330,3 +330,40 @@ func DeleteProjectByIDCtx(ctx context.Context, id int64) error {
 
  return updateRepositoryProjectCount(ctx, p.RepoID)
 }
+
+func DeleteProjectByRepoIDCtx(ctx context.Context, repoID int64) error {
+ switch {
+ case setting.Database.UseSQLite3:
+ if _, err := db.GetEngine(ctx).Exec("DELETE FROM project_issue WHERE project_issue.id IN (SELECT project_issue.id FROM project_issue INNER JOIN project WHERE project.id = project_issue.project_id AND project.repo_id = ?)", repoID); err != nil {
+ return err
+ }
+ if _, err := db.GetEngine(ctx).Exec("DELETE FROM project_board WHERE project_board.id IN (SELECT project_board.id FROM project_board INNER JOIN project WHERE project.id = project_board.project_id AND project.repo_id = ?)", repoID); err != nil {
+ return err
+ }
+ if _, err := db.GetEngine(ctx).Table("project").Where("repo_id = ? ", repoID).Delete(&Project{}); err != nil {
+ return err
+ }
+ case setting.Database.UsePostgreSQL:
+ if _, err := db.GetEngine(ctx).Exec("DELETE FROM project_issue USING project WHERE project.id = project_issue.project_id AND project.repo_id = ? ", repoID); err != nil {
+ return err
+ }
+ if _, err := db.GetEngine(ctx).Exec("DELETE FROM project_board USING project WHERE project.id = project_board.project_id AND project.repo_id = ? ", repoID); err != nil {
+ return err
+ }
+ if _, err := db.GetEngine(ctx).Table("project").Where("repo_id = ? ", repoID).Delete(&Project{}); err != nil {
+ return err
+ }
+ default:
+ if _, err := db.GetEngine(ctx).Exec("DELETE project_issue FROM project_issue INNER JOIN project ON project.id = project_issue.project_id WHERE project.repo_id = ? ", repoID); err != nil {
+ return err
+ }
+ if _, err := db.GetEngine(ctx).Exec("DELETE project_board FROM project_board INNER JOIN project ON project.id = project_board.project_id WHERE project.repo_id = ? ", repoID); err != nil {
+ return err
+ }
+ if _, err := db.GetEngine(ctx).Table("project").Where("repo_id = ? ", repoID).Delete(&Project{}); err != nil {
+ return err
+ }
+ }
+
+ return updateRepositoryProjectCount(ctx, repoID)
+}

models/repo.go

@@ -342,16 +342,8 @@ func DeleteRepository(doer *user_model.User, uid, repoID int64) error {
  }
  }
 
- projects, _, err := project_model.GetProjects(ctx, project_model.SearchOptions{
- RepoID: repoID,
- })
- if err != nil {
- return fmt.Errorf("get projects: %v", err)
- }
- for i := range projects {
- if err := project_model.DeleteProjectByIDCtx(ctx, projects[i].ID); err != nil {
- return fmt.Errorf("delete project [%d]: %v", projects[i].ID, err)
- }
+ if err := project_model.DeleteProjectByRepoIDCtx(ctx, repoID); err != nil {
+ return fmt.Errorf("unable to delete projects for repo[%d]: %v", repoID, err)
  }
 
  // Remove LFS objects

models/user.go

@@ -27,7 +27,7 @@ import (
 )
 
 // DeleteUser deletes models associated to an user.
-func DeleteUser(ctx context.Context, u *user_model.User) (err error) {
+func DeleteUser(ctx context.Context, u *user_model.User, purge bool) (err error) {
  e := db.GetEngine(ctx)
 
  // ***** START: Watch *****
@@ -95,8 +95,8 @@ func DeleteUser(ctx context.Context, u *user_model.User) (err error) {
  return err
  }
 
- if setting.Service.UserDeleteWithCommentsMaxTime != 0 &&
- u.CreatedUnix.AsTime().Add(setting.Service.UserDeleteWithCommentsMaxTime).After(time.Now()) {
+ if purge || (setting.Service.UserDeleteWithCommentsMaxTime != 0 &&
+ u.CreatedUnix.AsTime().Add(setting.Service.UserDeleteWithCommentsMaxTime).After(time.Now())) {
 
  // Delete Comments
  const batchSize = 50

options/locale/locale_en-US.ini

@@ -2540,6 +2540,8 @@ users.delete_account = Delete User Account
 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_has_org = This user is a member of an organization. Remove the user from any organizations first.
+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.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.reset_2fa = Reset 2FA

routers/api/v1/admin/user.go

@@ -316,7 +316,7 @@ func DeleteUser(ctx *context.APIContext) {
  return
  }
 
- if err := user_service.DeleteUser(ctx.ContextUser); err != nil {
+ if err := user_service.DeleteUser(ctx, ctx.ContextUser, ctx.FormBool("purge")); err != nil {
  if models.IsErrUserOwnRepos(err) ||
  models.IsErrUserHasOrgs(err) ||
  models.IsErrUserOwnPackages(err) {

routers/web/admin/users.go

@@ -419,29 +419,21 @@ func DeleteUser(ctx *context.Context) {
  // admin should not delete themself
  if u.ID == ctx.Doer.ID {
  ctx.Flash.Error(ctx.Tr("admin.users.cannot_delete_self"))
- ctx.JSON(http.StatusOK, map[string]interface{}{
- "redirect": setting.AppSubURL + "/admin/users/" + url.PathEscape(ctx.Params(":userid")),
- })
+ ctx.Redirect(setting.AppSubURL + "/admin/users/" + url.PathEscape(ctx.Params(":userid")))
  return
  }
 
- if err = user_service.DeleteUser(u); err != nil {
+ if err = user_service.DeleteUser(ctx, u, ctx.FormBool("purge")); err != nil {
  switch {
  case models.IsErrUserOwnRepos(err):
  ctx.Flash.Error(ctx.Tr("admin.users.still_own_repo"))
- ctx.JSON(http.StatusOK, map[string]interface{}{
- "redirect": setting.AppSubURL + "/admin/users/" + url.PathEscape(ctx.Params(":userid")),
- })
+ ctx.Redirect(setting.AppSubURL + "/admin/users/" + url.PathEscape(ctx.Params(":userid")))
  case models.IsErrUserHasOrgs(err):
  ctx.Flash.Error(ctx.Tr("admin.users.still_has_org"))
- ctx.JSON(http.StatusOK, map[string]interface{}{
- "redirect": setting.AppSubURL + "/admin/users/" + url.PathEscape(ctx.Params(":userid")),
- })
+ ctx.Redirect(setting.AppSubURL + "/admin/users/" + url.PathEscape(ctx.Params(":userid")))
  case models.IsErrUserOwnPackages(err):
  ctx.Flash.Error(ctx.Tr("admin.users.still_own_packages"))
- ctx.JSON(http.StatusOK, map[string]interface{}{
- "redirect": setting.AppSubURL + "/admin/users/" + ctx.Params(":userid"),
- })
+ ctx.Redirect(setting.AppSubURL + "/admin/users/" + ctx.Params(":userid"))
  default:
  ctx.ServerError("DeleteUser", err)
  }
@@ -450,9 +442,7 @@ func DeleteUser(ctx *context.Context) {
  log.Trace("Account deleted by admin (%s): %s", ctx.Doer.Name, u.Name)
 
  ctx.Flash.Success(ctx.Tr("admin.users.deletion_success"))
- ctx.JSON(http.StatusOK, map[string]interface{}{
- "redirect": setting.AppSubURL + "/admin/users",
- })
+ ctx.Redirect(setting.AppSubURL + "/admin/users")
 }
 
 // AvatarPost response for change user's avatar request

routers/web/user/setting/account.go

@@ -248,7 +248,7 @@ func DeleteAccount(ctx *context.Context) {
  return
  }
 
- if err := user.DeleteUser(ctx.Doer); err != nil {
+ if err := user.DeleteUser(ctx, ctx.Doer, false); err != nil {
  switch {
  case models.IsErrUserOwnRepos(err):
  ctx.Flash.Error(ctx.Tr("form.still_own_repo"))

services/packages/container/cleanup.go

@@ -59,7 +59,7 @@ func cleanupExpiredUploadedBlobs(ctx context.Context, olderThan time.Duration) e
  ExactMatch: true,
  Value: container_model.UploadVersion,
  },
- IsInternal: true,
+ IsInternal: util.OptionalBoolTrue,
  HasFiles: util.OptionalBoolFalse,
  })
  if err != nil {

services/packages/packages.go

@@ -13,6 +13,7 @@ import (
 
  "code.gitea.io/gitea/models/db"
  packages_model "code.gitea.io/gitea/models/packages"
+ repo_model "code.gitea.io/gitea/models/repo"
  user_model "code.gitea.io/gitea/models/user"
  "code.gitea.io/gitea/modules/json"
  "code.gitea.io/gitea/modules/log"
@@ -451,3 +452,30 @@ func GetPackageFileStream(ctx context.Context, pf *packages_model.PackageFile) (
  }
  return s, pf, err
 }
+
+// RemoveAllPackages for User
+func RemoveAllPackages(ctx context.Context, userID int64) (int, error) {
+ count := 0
+ for {
+ pkgVersions, _, err := packages_model.SearchVersions(ctx, &packages_model.PackageSearchOptions{
+ Paginator: &db.ListOptions{
+ PageSize: repo_model.RepositoryListDefaultPageSize,
+ Page: 1,
+ },
+ OwnerID: userID,
+ })
+ if err != nil {
+ return count, fmt.Errorf("GetOwnedPackages[%d]: %w", userID, err)
+ }
+ if len(pkgVersions) == 0 {
+ break
+ }
+ for _, pv := range pkgVersions {
+ if err := DeletePackageVersionAndReferences(ctx, pv); err != nil {
+ return count, fmt.Errorf("unable to delete package %d:%s[%d]. Error: %w", pv.PackageID, pv.Version, pv.ID, err)
+ }
+ count++
+ }
+ }
+ return count, nil
+}