Skip to content

Commit 275abd6

Browse files
GiteaBotlunny
andauthored
Only validate changed columns when update user (#24867) (#24903)
Backport #24867 by @lunny Fix #23211 Replace #23496 --------- Co-authored-by: Lunny Xiao <[email protected]>
1 parent d19d5bc commit 275abd6

File tree

2 files changed

+35
-9
lines changed

2 files changed

+35
-9
lines changed

models/user/user.go

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ func CreateUser(u *User, overwriteDefault ...*CreateUserOverwriteOptions) (err e
613613
}
614614

615615
// validate data
616-
if err := validateUser(u); err != nil {
616+
if err := ValidateUser(u); err != nil {
617617
return err
618618
}
619619

@@ -803,19 +803,26 @@ func checkDupEmail(ctx context.Context, u *User) error {
803803
return nil
804804
}
805805

806-
// validateUser check if user is valid to insert / update into database
807-
func validateUser(u *User) error {
808-
if !setting.Service.AllowedUserVisibilityModesSlice.IsAllowedVisibility(u.Visibility) && !u.IsOrganization() {
809-
return fmt.Errorf("visibility Mode not allowed: %s", u.Visibility.String())
806+
// ValidateUser check if user is valid to insert / update into database
807+
func ValidateUser(u *User, cols ...string) error {
808+
if len(cols) == 0 || util.SliceContainsString(cols, "visibility", true) {
809+
if !setting.Service.AllowedUserVisibilityModesSlice.IsAllowedVisibility(u.Visibility) && !u.IsOrganization() {
810+
return fmt.Errorf("visibility Mode not allowed: %s", u.Visibility.String())
811+
}
810812
}
811813

812-
u.Email = strings.ToLower(u.Email)
813-
return ValidateEmail(u.Email)
814+
if len(cols) == 0 || util.SliceContainsString(cols, "email", true) {
815+
u.Email = strings.ToLower(u.Email)
816+
if err := ValidateEmail(u.Email); err != nil {
817+
return err
818+
}
819+
}
820+
return nil
814821
}
815822

816823
// UpdateUser updates user's information.
817824
func UpdateUser(ctx context.Context, u *User, changePrimaryEmail bool, cols ...string) error {
818-
err := validateUser(u)
825+
err := ValidateUser(u, cols...)
819826
if err != nil {
820827
return err
821828
}
@@ -881,7 +888,7 @@ func UpdateUser(ctx context.Context, u *User, changePrimaryEmail bool, cols ...s
881888

882889
// UpdateUserCols update user according special columns
883890
func UpdateUserCols(ctx context.Context, u *User, cols ...string) error {
884-
if err := validateUser(u); err != nil {
891+
if err := ValidateUser(u, cols...); err != nil {
885892
return err
886893
}
887894

models/user/user_test.go

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package user_test
55

66
import (
77
"context"
8+
"fmt"
89
"math/rand"
910
"strings"
1011
"testing"
@@ -524,3 +525,21 @@ func TestIsUserVisibleToViewer(t *testing.T) {
524525
test(user31, user33, true)
525526
test(user31, nil, false)
526527
}
528+
529+
func Test_ValidateUser(t *testing.T) {
530+
oldSetting := setting.Service.AllowedUserVisibilityModesSlice
531+
defer func() {
532+
setting.Service.AllowedUserVisibilityModesSlice = oldSetting
533+
}()
534+
setting.Service.AllowedUserVisibilityModesSlice = []bool{true, false, true}
535+
kases := map[*user_model.User]bool{
536+
{ID: 1, Visibility: structs.VisibleTypePublic}: true,
537+
{ID: 2, Visibility: structs.VisibleTypeLimited}: false,
538+
{ID: 2, Visibility: structs.VisibleTypeLimited, Email: "invalid"}: false,
539+
{ID: 2, Visibility: structs.VisibleTypePrivate, Email: "[email protected]"}: true,
540+
}
541+
for kase, expected := range kases {
542+
err := user_model.ValidateUser(kase)
543+
assert.EqualValues(t, expected, err == nil, fmt.Sprintf("case: %+v", kase))
544+
}
545+
}

0 commit comments

Comments
 (0)