Skip to content

Commit 0f9f73d

Browse files
jpraetGusted
jpraet
authored and
Gusted
committed
Respect DefaultUserIsRestricted system default when creating new user (go-gitea#19310)
* Apply DefaultUserIsRestricted in CreateUser * Enforce system defaults in CreateUser Allow for overwrites with CreateUserOverwriteOptions * Fix compilation errors * Add "restricted" option to create user command * Add "restricted" option to create user admin api * Respect default setting.Service.RegisterEmailConfirm and setting.Service.RegisterManualConfirm where needed * Revert "Respect default setting.Service.RegisterEmailConfirm and setting.Service.RegisterManualConfirm where needed" This reverts commit ee95d3e.
1 parent a0c79fb commit 0f9f73d

File tree

17 files changed

+170
-85
lines changed

17 files changed

+170
-85
lines changed

‎cmd/admin.go

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
repo_module "code.gitea.io/gitea/modules/repository"
2626
"code.gitea.io/gitea/modules/setting"
2727
"code.gitea.io/gitea/modules/storage"
28+
"code.gitea.io/gitea/modules/util"
2829
auth_service "code.gitea.io/gitea/services/auth"
2930
"code.gitea.io/gitea/services/auth/source/oauth2"
3031
"code.gitea.io/gitea/services/auth/source/smtp"
@@ -114,6 +115,10 @@ var (
114115
Name: "access-token",
115116
Usage: "Generate access token for the user",
116117
},
118+
cli.BoolFlag{
119+
Name: "restricted",
120+
Usage: "Make a restricted user account",
121+
},
117122
},
118123
}
119124

@@ -559,17 +564,26 @@ func runCreateUser(c *cli.Context) error {
559564
changePassword = c.Bool("must-change-password")
560565
}
561566

567+
restricted := util.OptionalBoolNone
568+
569+
if c.IsSet("restricted") {
570+
restricted = util.OptionalBoolOf(c.Bool("restricted"))
571+
}
572+
562573
u := &user_model.User{
563574
Name: username,
564575
Email: c.String("email"),
565576
Passwd: password,
566-
IsActive: true,
567577
IsAdmin: c.Bool("admin"),
568578
MustChangePassword: changePassword,
569-
Theme: setting.UI.DefaultTheme,
570579
}
571580

572-
if err := user_model.CreateUser(u); err != nil {
581+
overwriteDefault := &user_model.CreateUserOverwriteOptions{
582+
IsActive: util.OptionalBoolTrue,
583+
IsRestricted: restricted,
584+
}
585+
586+
if err := user_model.CreateUser(u, overwriteDefault); err != nil {
573587
return fmt.Errorf("CreateUser: %v", err)
574588
}
575589

‎models/user/user.go

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,14 @@ func IsUsableUsername(name string) error {
621621

622622
// CreateUserOverwriteOptions are an optional options who overwrite system defaults on user creation
623623
type CreateUserOverwriteOptions struct {
624-
Visibility structs.VisibleType
624+
KeepEmailPrivate util.OptionalBool
625+
Visibility *structs.VisibleType
626+
AllowCreateOrganization util.OptionalBool
627+
EmailNotificationsPreference *string
628+
MaxRepoCreation *int
629+
Theme *string
630+
IsRestricted util.OptionalBool
631+
IsActive util.OptionalBool
625632
}
626633

627634
// CreateUser creates record of a new user.
@@ -637,10 +644,36 @@ func CreateUser(u *User, overwriteDefault ...*CreateUserOverwriteOptions) (err e
637644
u.EmailNotificationsPreference = setting.Admin.DefaultEmailNotification
638645
u.MaxRepoCreation = -1
639646
u.Theme = setting.UI.DefaultTheme
647+
u.IsRestricted = setting.Service.DefaultUserIsRestricted
648+
u.IsActive = !(setting.Service.RegisterEmailConfirm || setting.Service.RegisterManualConfirm)
640649

641650
// overwrite defaults if set
642651
if len(overwriteDefault) != 0 && overwriteDefault[0] != nil {
643-
u.Visibility = overwriteDefault[0].Visibility
652+
overwrite := overwriteDefault[0]
653+
if !overwrite.KeepEmailPrivate.IsNone() {
654+
u.KeepEmailPrivate = overwrite.KeepEmailPrivate.IsTrue()
655+
}
656+
if overwrite.Visibility != nil {
657+
u.Visibility = *overwrite.Visibility
658+
}
659+
if !overwrite.AllowCreateOrganization.IsNone() {
660+
u.AllowCreateOrganization = overwrite.AllowCreateOrganization.IsTrue()
661+
}
662+
if overwrite.EmailNotificationsPreference != nil {
663+
u.EmailNotificationsPreference = *overwrite.EmailNotificationsPreference
664+
}
665+
if overwrite.MaxRepoCreation != nil {
666+
u.MaxRepoCreation = *overwrite.MaxRepoCreation
667+
}
668+
if overwrite.Theme != nil {
669+
u.Theme = *overwrite.Theme
670+
}
671+
if !overwrite.IsRestricted.IsNone() {
672+
u.IsRestricted = overwrite.IsRestricted.IsTrue()
673+
}
674+
if !overwrite.IsActive.IsNone() {
675+
u.IsActive = overwrite.IsActive.IsTrue()
676+
}
644677
}
645678

646679
// validate data

‎modules/structs/admin_user.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ type CreateUserOption struct {
1919
Password string `json:"password" binding:"Required;MaxSize(255)"`
2020
MustChangePassword *bool `json:"must_change_password"`
2121
SendNotify bool `json:"send_notify"`
22+
Restricted *bool `json:"restricted"`
2223
Visibility string `json:"visibility" binding:"In(,public,limited,private)"`
2324
}
2425

‎routers/api/v1/admin/user.go

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"code.gitea.io/gitea/modules/password"
2323
"code.gitea.io/gitea/modules/setting"
2424
api "code.gitea.io/gitea/modules/structs"
25+
"code.gitea.io/gitea/modules/util"
2526
"code.gitea.io/gitea/modules/web"
2627
"code.gitea.io/gitea/routers/api/v1/user"
2728
"code.gitea.io/gitea/routers/api/v1/utils"
@@ -82,7 +83,6 @@ func CreateUser(ctx *context.APIContext) {
8283
Email: form.Email,
8384
Passwd: form.Password,
8485
MustChangePassword: true,
85-
IsActive: true,
8686
LoginType: auth.Plain,
8787
}
8888
if form.MustChangePassword != nil {
@@ -108,11 +108,17 @@ func CreateUser(ctx *context.APIContext) {
108108
return
109109
}
110110

111-
var overwriteDefault *user_model.CreateUserOverwriteOptions
111+
overwriteDefault := &user_model.CreateUserOverwriteOptions{
112+
IsActive: util.OptionalBoolTrue,
113+
}
114+
115+
if form.Restricted != nil {
116+
overwriteDefault.IsRestricted = util.OptionalBoolOf(*form.Restricted)
117+
}
118+
112119
if form.Visibility != "" {
113-
overwriteDefault = &user_model.CreateUserOverwriteOptions{
114-
Visibility: api.VisibilityModes[form.Visibility],
115-
}
120+
visibility := api.VisibilityModes[form.Visibility]
121+
overwriteDefault.Visibility = &visibility
116122
}
117123

118124
if err := user_model.CreateUser(u, overwriteDefault); err != nil {

‎routers/install/install.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -499,13 +499,17 @@ func SubmitInstall(ctx *context.Context) {
499499
// Create admin account
500500
if len(form.AdminName) > 0 {
501501
u := &user_model.User{
502-
Name: form.AdminName,
503-
Email: form.AdminEmail,
504-
Passwd: form.AdminPasswd,
505-
IsAdmin: true,
506-
IsActive: true,
502+
Name: form.AdminName,
503+
Email: form.AdminEmail,
504+
Passwd: form.AdminPasswd,
505+
IsAdmin: true,
507506
}
508-
if err = user_model.CreateUser(u); err != nil {
507+
overwriteDefault := &user_model.CreateUserOverwriteOptions{
508+
IsRestricted: util.OptionalBoolFalse,
509+
IsActive: util.OptionalBoolTrue,
510+
}
511+
512+
if err = user_model.CreateUser(u, overwriteDefault); err != nil {
509513
if !user_model.IsErrUserAlreadyExist(err) {
510514
setting.InstallLock = false
511515
ctx.Data["Err_AdminName"] = true

‎routers/web/admin/users.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,14 @@ func NewUserPost(ctx *context.Context) {
125125
Name: form.UserName,
126126
Email: form.Email,
127127
Passwd: form.Password,
128-
IsActive: true,
129128
LoginType: auth.Plain,
130129
}
131130

131+
overwriteDefault := &user_model.CreateUserOverwriteOptions{
132+
IsActive: util.OptionalBoolTrue,
133+
Visibility: &form.Visibility,
134+
}
135+
132136
if len(form.LoginType) > 0 {
133137
fields := strings.Split(form.LoginType, "-")
134138
if len(fields) == 2 {
@@ -163,7 +167,7 @@ func NewUserPost(ctx *context.Context) {
163167
u.MustChangePassword = form.MustChangePassword
164168
}
165169

166-
if err := user_model.CreateUser(u, &user_model.CreateUserOverwriteOptions{Visibility: form.Visibility}); err != nil {
170+
if err := user_model.CreateUser(u, overwriteDefault); err != nil {
167171
switch {
168172
case user_model.IsErrUserAlreadyExist(err):
169173
ctx.Data["Err_UserName"] = true

‎routers/web/auth/auth.go

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -507,14 +507,12 @@ func SignUpPost(ctx *context.Context) {
507507
}
508508

509509
u := &user_model.User{
510-
Name: form.UserName,
511-
Email: form.Email,
512-
Passwd: form.Password,
513-
IsActive: !(setting.Service.RegisterEmailConfirm || setting.Service.RegisterManualConfirm),
514-
IsRestricted: setting.Service.DefaultUserIsRestricted,
510+
Name: form.UserName,
511+
Email: form.Email,
512+
Passwd: form.Password,
515513
}
516514

517-
if !createAndHandleCreatedUser(ctx, tplSignUp, form, u, nil, false) {
515+
if !createAndHandleCreatedUser(ctx, tplSignUp, form, u, nil, nil, false) {
518516
// error already handled
519517
return
520518
}
@@ -525,17 +523,17 @@ func SignUpPost(ctx *context.Context) {
525523

526524
// createAndHandleCreatedUser calls createUserInContext and
527525
// then handleUserCreated.
528-
func createAndHandleCreatedUser(ctx *context.Context, tpl base.TplName, form interface{}, u *user_model.User, gothUser *goth.User, allowLink bool) bool {
529-
if !createUserInContext(ctx, tpl, form, u, gothUser, allowLink) {
526+
func createAndHandleCreatedUser(ctx *context.Context, tpl base.TplName, form interface{}, u *user_model.User, overwrites *user_model.CreateUserOverwriteOptions, gothUser *goth.User, allowLink bool) bool {
527+
if !createUserInContext(ctx, tpl, form, u, overwrites, gothUser, allowLink) {
530528
return false
531529
}
532530
return handleUserCreated(ctx, u, gothUser)
533531
}
534532

535533
// createUserInContext creates a user and handles errors within a given context.
536534
// Optionally a template can be specified.
537-
func createUserInContext(ctx *context.Context, tpl base.TplName, form interface{}, u *user_model.User, gothUser *goth.User, allowLink bool) (ok bool) {
538-
if err := user_model.CreateUser(u); err != nil {
535+
func createUserInContext(ctx *context.Context, tpl base.TplName, form interface{}, u *user_model.User, overwrites *user_model.CreateUserOverwriteOptions, gothUser *goth.User, allowLink bool) (ok bool) {
536+
if err := user_model.CreateUser(u, overwrites); err != nil {
539537
if allowLink && (user_model.IsErrUserAlreadyExist(err) || user_model.IsErrEmailAlreadyUsed(err)) {
540538
if setting.OAuth2Client.AccountLinking == setting.OAuth2AccountLinkingAuto {
541539
var user *user_model.User

‎routers/web/auth/linkaccount.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,13 +283,12 @@ func LinkAccountPostRegister(ctx *context.Context) {
283283
Name: form.UserName,
284284
Email: form.Email,
285285
Passwd: form.Password,
286-
IsActive: !(setting.Service.RegisterEmailConfirm || setting.Service.RegisterManualConfirm),
287286
LoginType: auth.OAuth2,
288287
LoginSource: authSource.ID,
289288
LoginName: gothUser.UserID,
290289
}
291290

292-
if !createAndHandleCreatedUser(ctx, tplLinkAccount, form, u, &gothUser, false) {
291+
if !createAndHandleCreatedUser(ctx, tplLinkAccount, form, u, nil, &gothUser, false) {
293292
// error already handled
294293
return
295294
}

‎routers/web/auth/oauth.go

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"code.gitea.io/gitea/modules/session"
2525
"code.gitea.io/gitea/modules/setting"
2626
"code.gitea.io/gitea/modules/timeutil"
27+
"code.gitea.io/gitea/modules/util"
2728
"code.gitea.io/gitea/modules/web"
2829
"code.gitea.io/gitea/modules/web/middleware"
2930
auth_service "code.gitea.io/gitea/services/auth"
@@ -867,19 +868,21 @@ func SignInOAuthCallback(ctx *context.Context) {
867868
return
868869
}
869870
u = &user_model.User{
870-
Name: getUserName(&gothUser),
871-
FullName: gothUser.Name,
872-
Email: gothUser.Email,
873-
IsActive: !setting.OAuth2Client.RegisterEmailConfirm,
874-
LoginType: auth.OAuth2,
875-
LoginSource: authSource.ID,
876-
LoginName: gothUser.UserID,
877-
IsRestricted: setting.Service.DefaultUserIsRestricted,
871+
Name: getUserName(&gothUser),
872+
FullName: gothUser.Name,
873+
Email: gothUser.Email,
874+
LoginType: auth.OAuth2,
875+
LoginSource: authSource.ID,
876+
LoginName: gothUser.UserID,
877+
}
878+
879+
overwriteDefault := &user_model.CreateUserOverwriteOptions{
880+
IsActive: util.OptionalBoolOf(!setting.OAuth2Client.RegisterEmailConfirm),
878881
}
879882

880883
setUserGroupClaims(authSource, u, &gothUser)
881884

882-
if !createAndHandleCreatedUser(ctx, base.TplName(""), nil, u, &gothUser, setting.OAuth2Client.AccountLinking != setting.OAuth2AccountLinkingDisabled) {
885+
if !createAndHandleCreatedUser(ctx, base.TplName(""), nil, u, overwriteDefault, &gothUser, setting.OAuth2Client.AccountLinking != setting.OAuth2AccountLinkingDisabled) {
883886
// error already handled
884887
return
885888
}

‎routers/web/auth/openid.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -423,12 +423,11 @@ func RegisterOpenIDPost(ctx *context.Context) {
423423
}
424424

425425
u := &user_model.User{
426-
Name: form.UserName,
427-
Email: form.Email,
428-
Passwd: password,
429-
IsActive: !(setting.Service.RegisterEmailConfirm || setting.Service.RegisterManualConfirm),
426+
Name: form.UserName,
427+
Email: form.Email,
428+
Passwd: password,
430429
}
431-
if !createUserInContext(ctx, tplSignUpOID, form, u, nil, false) {
430+
if !createUserInContext(ctx, tplSignUpOID, form, u, nil, nil, false) {
432431
// error already handled
433432
return
434433
}

‎services/auth/reverseproxy.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
user_model "code.gitea.io/gitea/models/user"
1313
"code.gitea.io/gitea/modules/log"
1414
"code.gitea.io/gitea/modules/setting"
15+
"code.gitea.io/gitea/modules/util"
1516
"code.gitea.io/gitea/modules/web/middleware"
1617
"code.gitea.io/gitea/services/mailer"
1718

@@ -105,11 +106,15 @@ func (r *ReverseProxy) newUser(req *http.Request) *user_model.User {
105106
}
106107

107108
user := &user_model.User{
108-
Name: username,
109-
Email: email,
110-
IsActive: true,
109+
Name: username,
110+
Email: email,
111111
}
112-
if err := user_model.CreateUser(user); err != nil {
112+
113+
overwriteDefault := user_model.CreateUserOverwriteOptions{
114+
IsActive: util.OptionalBoolTrue,
115+
}
116+
117+
if err := user_model.CreateUser(user, &overwriteDefault); err != nil {
113118
// FIXME: should I create a system notice?
114119
log.Error("CreateUser: %v", err)
115120
return nil

‎services/auth/source/ldap/source_authenticate.go

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"code.gitea.io/gitea/models/db"
1414
"code.gitea.io/gitea/models/organization"
1515
user_model "code.gitea.io/gitea/models/user"
16+
"code.gitea.io/gitea/modules/util"
1617
"code.gitea.io/gitea/services/mailer"
1718
user_service "code.gitea.io/gitea/services/user"
1819
)
@@ -85,19 +86,21 @@ func (source *Source) Authenticate(user *user_model.User, userName, password str
8586
}
8687

8788
user = &user_model.User{
88-
LowerName: strings.ToLower(sr.Username),
89-
Name: sr.Username,
90-
FullName: composeFullName(sr.Name, sr.Surname, sr.Username),
91-
Email: sr.Mail,
92-
LoginType: source.authSource.Type,
93-
LoginSource: source.authSource.ID,
94-
LoginName: userName,
95-
IsActive: true,
96-
IsAdmin: sr.IsAdmin,
97-
IsRestricted: sr.IsRestricted,
89+
LowerName: strings.ToLower(sr.Username),
90+
Name: sr.Username,
91+
FullName: composeFullName(sr.Name, sr.Surname, sr.Username),
92+
Email: sr.Mail,
93+
LoginType: source.authSource.Type,
94+
LoginSource: source.authSource.ID,
95+
LoginName: userName,
96+
IsAdmin: sr.IsAdmin,
97+
}
98+
overwriteDefault := &user_model.CreateUserOverwriteOptions{
99+
IsRestricted: util.OptionalBoolOf(sr.IsRestricted),
100+
IsActive: util.OptionalBoolTrue,
98101
}
99102

100-
err := user_model.CreateUser(user)
103+
err := user_model.CreateUser(user, overwriteDefault)
101104
if err != nil {
102105
return user, err
103106
}

0 commit comments

Comments
 (0)