IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

OAuth: Enforce auto_assign_org_id setting when role mapping enabled using Generic OAuth (#22268)

Browse Source 
* OAuth: Make use of auto_assign_org_id setting
This commit is contained in:
Arve Knudsen 2020-02-19 17:38:53 +01:00 committed by GitHub
parent 4c282c538a
commit 8d1bef3769
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/login_oauth.go
View File

@ -186,7 +186,13 @@ func (hs *HTTPServer) OAuthLogin(ctx *m.ReqContext) {
if userInfo.Role != "" {
rt := m.RoleType(userInfo.Role)
if rt.IsValid() {
extUser.OrgRoles[1] = rt
var orgID int64
if setting.AutoAssignOrg && setting.AutoAssignOrgId > 0 {
orgID = int64(setting.AutoAssignOrgId)
} else {
orgID = int64(1)
}
extUser.OrgRoles[orgID] = rt
}
}

25
pkg/services/login/login.go
View File

@ -27,6 +27,7 @@ func (ls *LoginService) Init() error {
return nil
}
// UpsertUser updates an existing user, or if it doesn't exist, inserts a new one.
func (ls *LoginService) UpsertUser(cmd *models.UpsertUserCommand) error {
extUser := cmd.ExternalUser
@ -38,12 +39,10 @@ func (ls *LoginService) UpsertUser(cmd *models.UpsertUserCommand) error {
Login: extUser.Login,
}
err := bus.Dispatch(userQuery)
if err != models.ErrUserNotFound && err != nil {
return err
}
if err != nil {
if err := bus.Dispatch(userQuery); err != nil {
if err != models.ErrUserNotFound {
return err
}
if !cmd.SignupAllowed {
log.Warn("Not allowing %s login, user not found in internal user database and allow signup = false", extUser.AuthModule)
return ErrInvalidCredentials
@ -74,7 +73,6 @@ func (ls *LoginService) UpsertUser(cmd *models.UpsertUserCommand) error {
return err
}
}
} else {
cmd.Result = userQuery.Result
@ -99,9 +97,7 @@ func (ls *LoginService) UpsertUser(cmd *models.UpsertUserCommand) error {
}
}
err = syncOrgRoles(cmd.Result, extUser)
if err != nil {
if err := syncOrgRoles(cmd.Result, extUser); err != nil {
return err
}
@ -112,16 +108,15 @@ func (ls *LoginService) UpsertUser(cmd *models.UpsertUserCommand) error {
}
}
err = ls.Bus.Dispatch(&models.SyncTeamsCommand{
err := ls.Bus.Dispatch(&models.SyncTeamsCommand{
User: cmd.Result,
ExternalUser: extUser,
})
if err == bus.ErrHandlerNotFound {
return nil
if err != nil && err != bus.ErrHandlerNotFound {
return err
}
return err
return nil
}
func createUser(extUser *models.ExternalUserInfo) (*models.User, error) {