Skip to content

Respect DefaultUserIsRestricted system default when creating new user #19310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Apr 29, 2022
Merged

Respect DefaultUserIsRestricted system default when creating new user #19310

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9020faa
Apply DefaultUserIsRestricted in CreateUser
jpraet Apr 1, 2022
1f8710e
Enforce system defaults in CreateUser
jpraet Apr 2, 2022
4172f3f
Fix compilation errors
jpraet Apr 2, 2022
f747cdd
Add "restricted" option to create user command
jpraet Apr 2, 2022
a795e55
Add "restricted" option to create user admin api
jpraet Apr 2, 2022
5ceff35
Merge branch 'main' into create-user-system-defaults
jpraet Apr 4, 2022
a8dc6ec
Merge branch 'main' into create-user-system-defaults
jpraet Apr 10, 2022
ee95d3e
Respect default setting.Service.RegisterEmailConfirm and setting.Serv…
jpraet Apr 10, 2022
c481b65
Merge branch 'main' into create-user-system-defaults
jpraet Apr 22, 2022
dd8f66d
Merge branch 'main' into create-user-system-defaults
jpraet Apr 25, 2022
dc26370
Merge branch 'master' into create-user-system-defaults
jpraet Apr 26, 2022
5574ad1
Revert "Respect default setting.Service.RegisterEmailConfirm and sett…
jpraet Apr 26, 2022
a2e3b13
Merge branch 'main' into create-user-system-defaults
jpraet Apr 27, 2022
1a086b8
Merge branch 'main' into create-user-system-defaults
jpraet Apr 28, 2022
fb9ba55
Merge branch 'main' into create-user-system-defaults
jpraet Apr 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Respect default setting.Service.RegisterEmailConfirm and setting.Serv… 
…ice.RegisterManualConfirm where needed
  • Loading branch information
@jpraet
jpraet committed Apr 10, 2022
commit ee95d3e8dc9e9fff4fa66a5111e4d3930280e033
2 changes: 1 addition & 1 deletion routers/web/auth/oauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,7 @@ func SignInOAuthCallback(ctx *context.Context) {
}

overwriteDefault := &user_model.CreateUserOverwriteOptions{
IsActive: util.OptionalBoolOf(!setting.OAuth2Client.RegisterEmailConfirm),
IsActive: util.OptionalBoolOf(!(setting.OAuth2Client.RegisterEmailConfirm || setting.Service.RegisterManualConfirm)),
}

setUserGroupClaims(authSource, u, &gothUser)
Expand Down
7 changes: 1 addition & 6 deletions services/auth/reverseproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/modules/web/middleware"
"code.gitea.io/gitea/services/mailer"

Expand Down Expand Up @@ -110,11 +109,7 @@ func (r *ReverseProxy) newUser(req *http.Request) *user_model.User {
Email: email,
}

overwriteDefault := user_model.CreateUserOverwriteOptions{
IsActive: util.OptionalBoolTrue,
}

if err := user_model.CreateUser(user, &overwriteDefault); err != nil {
if err := user_model.CreateUser(user); err != nil {
// FIXME: should I create a system notice?
log.Error("CreateUser: %v", err)
return nil
Expand Down
1 change: 0 additions & 1 deletion services/auth/source/ldap/source_authenticate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ func (source *Source) Authenticate(user *user_model.User, userName, password str
}
overwriteDefault := &user_model.CreateUserOverwriteOptions{
IsRestricted: util.OptionalBoolOf(sr.IsRestricted),
IsActive: util.OptionalBoolTrue,
}

err := user_model.CreateUser(user, overwriteDefault)
Expand Down
6 changes: 1 addition & 5 deletions services/auth/source/pam/source_authenticate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/auth/pam"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/services/mailer"

"github.com/google/uuid"
Expand Down Expand Up @@ -60,11 +59,8 @@ func (source *Source) Authenticate(user *user_model.User, userName, password str
LoginSource: source.authSource.ID,
LoginName: userName, // This is what the user typed in
}
overwriteDefault := &user_model.CreateUserOverwriteOptions{
IsActive: util.OptionalBoolTrue,
}

if err := user_model.CreateUser(user, overwriteDefault); err != nil {
if err := user_model.CreateUser(user); err != nil {
return user, err
}

Expand Down
5 changes: 1 addition & 4 deletions services/auth/source/smtp/source_authenticate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,8 @@ func (source *Source) Authenticate(user *user_model.User, userName, password str
LoginSource: source.authSource.ID,
LoginName: userName,
}
overwriteDefault := &user_model.CreateUserOverwriteOptions{
IsActive: util.OptionalBoolTrue,
}

if err := user_model.CreateUser(user, overwriteDefault); err != nil {
if err := user_model.CreateUser(user); err != nil {
return user, err
}

Expand Down