Unify password changing and invalidate auth tokens

cmd/admin_user_change_password.go

@@ -11,6 +11,7 @@ import (
 	user_model "code.gitea.io/gitea/models/user"
 	pwd "code.gitea.io/gitea/modules/auth/password"
 	"code.gitea.io/gitea/modules/setting"
+	user_service "code.gitea.io/gitea/services/user"
 
 	"github.com/urfave/cli/v2"
 )
@@ -65,11 +66,8 @@ func runChangePassword(c *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	if err = user.SetPassword(c.String("password")); err != nil {
-		return err
-	}
 
-	if err = user_model.UpdateUserCols(ctx, user, "passwd", "passwd_hash_algo", "salt"); err != nil {
+	if err := user_service.ChangePassword(ctx, user, c.String("password"), user.MustChangePassword); err != nil {
 		return err
 	}
 

models/auth/auth_token.go

@@ -54,6 +54,11 @@ func DeleteAuthTokenByID(ctx context.Context, id string) error {
 	return err
 }
 
+func DeleteAuthTokensByUserID(ctx context.Context, uid int64) error {
+	_, err := db.GetEngine(ctx).Where(builder.Eq{"user_id": uid}).Delete(&AuthToken{})
+	return err
+}
+
 func DeleteExpiredAuthTokens(ctx context.Context) error {
 	_, err := db.GetEngine(ctx).Where(builder.Lt{"expires_unix": timeutil.TimeStampNow()}).Delete(&AuthToken{})
 	return err

routers/api/v1/admin/user.go

@@ -185,6 +185,10 @@ func EditUser(ctx *context.APIContext) {
 		return
 	}
 
+	if form.MustChangePassword != nil {
+		ctx.ContextUser.MustChangePassword = *form.MustChangePassword
+	}
+
 	if len(form.Password) != 0 {
 		if len(form.Password) < setting.MinPasswordLength {
 			ctx.Error(http.StatusBadRequest, "PasswordTooShort", fmt.Errorf("password must be at least %d characters", setting.MinPasswordLength))
@@ -203,20 +207,13 @@ func EditUser(ctx *context.APIContext) {
 			ctx.Error(http.StatusBadRequest, "PasswordPwned", errors.New("PasswordPwned"))
 			return
 		}
-		if ctx.ContextUser.Salt, err = user_model.GetUserSalt(); err != nil {
-			ctx.Error(http.StatusInternalServerError, "UpdateUser", err)
-			return
-		}
-		if err = ctx.ContextUser.SetPassword(form.Password); err != nil {
+
+		if err := user_service.ChangePassword(ctx, ctx.ContextUser, form.Password, ctx.ContextUser.MustChangePassword); err != nil {
 			ctx.InternalServerError(err)
 			return
 		}
 	}
 
-	if form.MustChangePassword != nil {
-		ctx.ContextUser.MustChangePassword = *form.MustChangePassword
-	}
-
 	ctx.ContextUser.LoginName = form.LoginName
 
 	if form.FullName != nil {

routers/web/admin/users.go

@@ -381,12 +381,8 @@ func EditUserPost(ctx *context.Context) {
 			return
 		}
 
-		if u.Salt, err = user_model.GetUserSalt(); err != nil {
-			ctx.ServerError("UpdateUser", err)
-			return
-		}
-		if err = u.SetPassword(form.Password); err != nil {
-			ctx.ServerError("SetPassword", err)
+		if err := user_service.ChangePassword(ctx, u, form.Password, u.MustChangePassword); err != nil {
+			ctx.ServerError("ChangePassword", err)
 			return
 		}
 	}

routers/web/auth/password.go

@@ -21,6 +21,7 @@ import (
 	"code.gitea.io/gitea/routers/utils"
 	"code.gitea.io/gitea/services/forms"
 	"code.gitea.io/gitea/services/mailer"
+	user_service "code.gitea.io/gitea/services/user"
 )
 
 var (
@@ -228,13 +229,8 @@ func ResetPasswdPost(ctx *context.Context) {
 		ctx.ServerError("UpdateUser", err)
 		return
 	}
-	if err = u.SetPassword(passwd); err != nil {
-		ctx.ServerError("UpdateUser", err)
-		return
-	}
-	u.MustChangePassword = false
-	if err := user_model.UpdateUserCols(ctx, u, "must_change_password", "passwd", "passwd_hash_algo", "rands", "salt"); err != nil {
-		ctx.ServerError("UpdateUser", err)
+	if err := user_service.ChangePassword(ctx, u, passwd, false); err != nil {
+		ctx.ServerError("ChangePassword", err)
 		return
 	}
 
@@ -321,15 +317,8 @@ func MustChangePasswordPost(ctx *context.Context) {
 		return
 	}
 
-	if err = u.SetPassword(form.Password); err != nil {
-		ctx.ServerError("UpdateUser", err)
-		return
-	}
-
-	u.MustChangePassword = false
-
-	if err := user_model.UpdateUserCols(ctx, u, "must_change_password", "passwd", "passwd_hash_algo", "salt"); err != nil {
-		ctx.ServerError("UpdateUser", err)
+	if err := user_service.ChangePassword(ctx, u, form.Password, false); err != nil {
+		ctx.ServerError("ChangePassword", err)
 		return
 	}
 

routers/web/user/setting/account.go

@@ -69,16 +69,13 @@ func AccountPost(ctx *context.Context) {
 		}
 		ctx.Flash.Error(errMsg)
 	} else {
-		var err error
-		if err = ctx.Doer.SetPassword(form.Password); err != nil {
-			ctx.ServerError("UpdateUser", err)
-			return
-		}
-		if err := user_model.UpdateUserCols(ctx, ctx.Doer, "salt", "passwd_hash_algo", "passwd"); err != nil {
-			ctx.ServerError("UpdateUser", err)
+		if err := user.ChangePassword(ctx, ctx.Doer, form.Password, false); err != nil {
+			ctx.ServerError("ChangePassword", err)
 			return
 		}
+
 		log.Trace("User password updated: %s", ctx.Doer.Name)
+
 		ctx.Flash.Success(ctx.Tr("settings.change_password_success"))
 	}
 

services/user/delete.go

@@ -183,6 +183,10 @@ func deleteUser(ctx context.Context, u *user_model.User, purge bool) (err error)
 	}
 	// ***** END: ExternalLoginUser *****
 
+	if err := auth_model.DeleteAuthTokensByUserID(ctx, u.ID); err != nil {
+		return fmt.Errorf("DeleteAuthTokensByUserID: %w", err)
+	}
+
 	if _, err = db.DeleteByID(ctx, u.ID, new(user_model.User)); err != nil {
 		return fmt.Errorf("delete: %w", err)
 	}

services/user/user.go

@@ -12,6 +12,7 @@ import (
 
 	"code.gitea.io/gitea/models"
 	asymkey_model "code.gitea.io/gitea/models/asymkey"
+	auth_model "code.gitea.io/gitea/models/auth"
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/models/organization"
 	packages_model "code.gitea.io/gitea/models/packages"
@@ -120,6 +121,21 @@ func RenameUser(ctx context.Context, u *user_model.User, newUserName string) err
 	return nil
 }
 
+// ChangePassword sets the users password and invalidates all existing auth tokens
+func ChangePassword(ctx context.Context, u *user_model.User, password string, mustChangePassword bool) error {
+	if err := u.SetPassword(password); err != nil {
+		return err
+	}
+
+	u.MustChangePassword = mustChangePassword
+
+	if err := user_model.UpdateUserCols(ctx, u, "must_change_password", "passwd", "passwd_hash_algo", "rands", "salt"); err != nil {
+		return err
+	}
+
+	return auth_model.DeleteAuthTokensByUserID(ctx, u.ID)
+}
+
 // 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.