Add option to purge users

cmd/admin.go

@@ -149,6 +149,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,
  }
@@ -571,7 +575,12 @@ 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)
+ purge := false
+ if c.IsSet("purge") {
+ purge = c.Bool("purge")
+ }
+
+ return user_service.DeleteUser(ctx, user, purge)
 }
 
 func runRepoSyncReleases(_ *cli.Context) error {

models/user.go

@@ -144,7 +144,7 @@ func deleteBeans(e db.Engine, beans ...interface{}) (err error) {
 }
 
 // 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 *****
@@ -207,8 +207,8 @@ func DeleteUser(ctx context.Context, u *user_model.User) (err error) {
  return fmt.Errorf("deleteBeans: %v", 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

@@ -2420,6 +2420,8 @@ users.update_profile = Update User Account
 users.delete_account = Delete User Account
 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 or organizations owned by the user. All comments will be deleted too.
 users.deletion_success = The user account has been deleted.
 users.reset_2fa = Reset 2FA
 users.list_status_filter.menu_text = Filter

routers/api/v1/admin/user.go

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

routers/web/admin/users.go

@@ -386,18 +386,19 @@ func DeleteUser(ctx *context.Context) {
  return
  }
 
- if err = user_service.DeleteUser(u); err != nil {
+ purge := false
+ if ctx.FormString("purge") != "" {
+ purge = true
+ }
+
+ if err = user_service.DeleteUser(ctx, u, 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")))
  default:
  ctx.ServerError("DeleteUser", err)
  }
@@ -406,9 +407,7 @@ func DeleteUser(ctx *context.Context) {
  log.Trace("Account deleted by admin (%s): %s", ctx.User.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

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

services/user/user.go

@@ -27,11 +27,52 @@ import (
 // DeleteUser completely and permanently deletes everything of a user,
 // but issues/comments/pulls will be kept and shown as someone has been deleted,
 // unless the user is younger than USER_DELETE_WITH_COMMENTS_MAX_DAYS.
-func DeleteUser(u *user_model.User) error {
+func DeleteUser(ctx context.Context, u *user_model.User, purge bool) error {
  if u.IsOrganization() {
  return fmt.Errorf("%s is an organization not a user", u.Name)
  }
 
+ if purge {
+ // Delete all repos belonging to this user
+ for page := 1; ; page++ {
+ repos, _, err := models.SearchRepositoryByName(&models.SearchRepoOptions{
+ ListOptions: db.ListOptions{
+ PageSize: models.RepositoryListDefaultPageSize,
+ Page: page,
+ },
+ Private: true,
+ OwnerID: u.ID,
+ })
+ if err != nil {
+ return fmt.Errorf("SearchRepositoryByName: %v", err)
+ }
+ if len(repos) == 0 {
+ break
+ }
+ for _, repo := range repos {
+ if err := models.DeleteRepository(u, u.ID, repo.ID); err != nil {
+ return fmt.Errorf("unable to delete repositories for %s[%d]. Error: %v", u.Name, u.ID, err)
+ }
+ }
+ }
+
+ // Delete Orgs
+ orgs, err := models.GetUserOrgsList(u)
+ if err != nil {
+ return fmt.Errorf("unable to org list for %s[%d]. Error: %v", u.Name, u.ID, err)
+ }
+ for _, org := range orgs {
+ if err := models.RemoveOrgUser(org.ID, u.ID); err != nil {
+ if models.IsErrLastOrgOwner(err) {
+ err = models.DeleteOrganization(ctx, org)
+ }
+ if err != nil {
+ return fmt.Errorf("unable to remove user %s[%d] from org %s[%d]. Error: %v", u.Name, u.ID, org.Name, org.ID, err)
+ }
+ }
+ }
+ }
+
  ctx, committer, err := db.TxContext()
  if err != nil {
  return err
@@ -57,7 +98,7 @@ func DeleteUser(u *user_model.User) error {
  return models.ErrUserHasOrgs{UID: u.ID}
  }
 
- if err := models.DeleteUser(ctx, u); err != nil {
+ if err := models.DeleteUser(ctx, u, purge); err != nil {
  return fmt.Errorf("DeleteUser: %v", err)
  }
 
@@ -108,7 +149,7 @@ func DeleteInactiveUsers(ctx context.Context, olderThan time.Duration) error {
  return db.ErrCancelledf("Before delete inactive user %s", u.Name)
  default:
  }
- if err := DeleteUser(u); err != nil {
+ if err := DeleteUser(ctx, u, false); err != nil {
  // Ignore users that were set inactive by admin.
  if models.IsErrUserOwnRepos(err) || models.IsErrUserHasOrgs(err) {
  continue

services/user/user_test.go

@@ -30,7 +30,7 @@ func TestDeleteUser(t *testing.T) {
  ownedRepos := make([]*repo_model.Repository, 0, 10)
  assert.NoError(t, db.GetEngine(db.DefaultContext).Find(&ownedRepos, &repo_model.Repository{OwnerID: userID}))
  if len(ownedRepos) > 0 {
- err := DeleteUser(user)
+ err := DeleteUser(db.DefaultContext, user, false)
  assert.Error(t, err)
  assert.True(t, models.IsErrUserOwnRepos(err))
  return
@@ -44,7 +44,7 @@ func TestDeleteUser(t *testing.T) {
  return
  }
  }
- assert.NoError(t, DeleteUser(user))
+ assert.NoError(t, DeleteUser(db.DefaultContext, user, false))
  unittest.AssertNotExistsBean(t, &user_model.User{ID: userID})
  unittest.CheckConsistencyFor(t, &user_model.User{}, &repo_model.Repository{})
  }
@@ -54,7 +54,7 @@ func TestDeleteUser(t *testing.T) {
  test(11)
 
  org := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3}).(*user_model.User)
- assert.Error(t, DeleteUser(org))
+ assert.Error(t, DeleteUser(db.DefaultContext, org, false))
 }
 
 func TestCreateUser(t *testing.T) {
@@ -69,7 +69,7 @@ func TestCreateUser(t *testing.T) {
 
  assert.NoError(t, user_model.CreateUser(user))
 
- assert.NoError(t, DeleteUser(user))
+ assert.NoError(t, DeleteUser(db.DefaultContext, user, false))
 }
 
 func TestCreateUser_Issue5882(t *testing.T) {
@@ -98,6 +98,6 @@ func TestCreateUser_Issue5882(t *testing.T) {
 
  assert.Equal(t, !u.AllowCreateOrganization, v.disableOrgCreation)
 
- assert.NoError(t, DeleteUser(v.user))
+ assert.NoError(t, DeleteUser(db.DefaultContext, v.user, false))
  }
 }

templates/admin/user/edit.tmpl

@@ -151,7 +151,7 @@
 
  <div class="field">
  <button class="ui green button">{{.i18n.Tr "admin.users.update_profile"}}</button>
- <div class="ui red button delete-button" data-url="{{$.Link}}/delete" data-id="{{.User.ID}}">{{.i18n.Tr "admin.users.delete_account"}}</div>
+ <div class="ui red button show-modal" data-modal="#delete-user-modal" data-url="{{$.Link}}/delete" data-id="{{.User.ID}}">{{.i18n.Tr "admin.users.delete_account"}}</div>
  </div>
  </form>
  </div>
@@ -196,14 +196,34 @@
  </div>
 </div>
 
-<div class="ui small basic delete modal">
+<div class="ui small basic delete modal" id="delete-user-modal">
  <div class="ui icon header">
  {{svg "octicon-trash"}}
  {{.i18n.Tr "settings.delete_account_title"}}
  </div>
  <div class="content">
  <p>{{.i18n.Tr "settings.delete_account_desc"}}</p>
  </div>
- {{template "base/delete_modal_actions" .}}
+ <form class="ui form" method="POST" action="{{.Link}}/delete">
+ {{$.CsrfTokenHtml}}
+ <input type="hidden" name="id">
+ <div class="field">
+ <div class="ui checkbox">
+ <label for="purge">{{.i18n.Tr "admin.users.purge"}}</label>
+ <input name="purge" type="checkbox">
+ </div>
+ <p class="help">{{.i18n.Tr "admin.users.purge_help"}}</p>
+ </div>
+ <div class="text right actions">
+ <div class="ui red basic inverted cancel button">
+ {{svg "octicon-x"}}
+ {{.i18n.Tr "modal.no"}}
+ </div>
+ <button class="ui green basic inverted ok button">
+ {{svg "octicon-check"}}
+ {{.i18n.Tr "modal.yes"}}
+ </button>
+ </div>
+ </form>
 </div>
 {{template "base/footer" .}}