public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SQLStore: extend user.SearchUsers method (#17514)

Browse Source 
* SQLStore: extend `user.SearchUsers` method

Allow `user.SearchUsers` to search users based on their auth type
This commit is contained in:
Oleg Gaidarenko
2019-06-14 09:50:38 +01:00
committed by GitHub
parent 51c6b50582
commit c853ef7318
3 changed files with 149 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/user.go
+68 -57
View File
@@ -9,7 +9,7 @@ import (
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/events"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
)
@@ -35,12 +35,12 @@ func (ss *SqlStore) addUserQueryAndCommandHandlers() {
bus.AddHandlerCtx("sql", CreateUser)
}
func getOrgIdForNewUser(cmd *m.CreateUserCommand, sess *DBSession) (int64, error) {
func getOrgIdForNewUser(cmd *models.CreateUserCommand, sess *DBSession) (int64, error) {
if cmd.SkipOrgSetup {
return -1, nil
}
var org m.Org
var org models.Org
if setting.AutoAssignOrg {
has, err := sess.Where("id=?", setting.AutoAssignOrgId).Get(&org)
@@ -88,7 +88,7 @@ func getOrgIdForNewUser(cmd *m.CreateUserCommand, sess *DBSession) (int64, error
return org.Id, nil
}
func CreateUser(ctx context.Context, cmd *m.CreateUserCommand) error {
func CreateUser(ctx context.Context, cmd *models.CreateUserCommand) error {
return inTransactionCtx(ctx, func(sess *DBSession) error {
orgId, err := getOrgIdForNewUser(cmd, sess)
if err != nil {
@@ -100,7 +100,7 @@ func CreateUser(ctx context.Context, cmd *m.CreateUserCommand) error {
}
// create user
user := m.User{
user := models.User{
Email: cmd.Email,
Name: cmd.Name,
Login: cmd.Login,
@@ -138,19 +138,19 @@ func CreateUser(ctx context.Context, cmd *m.CreateUserCommand) error {
// create org user link
if !cmd.SkipOrgSetup {
orgUser := m.OrgUser{
orgUser := models.OrgUser{
OrgId: orgId,
UserId: user.Id,
Role: m.ROLE_ADMIN,
Role: models.ROLE_ADMIN,
Created: time.Now(),
Updated: time.Now(),
}
if setting.AutoAssignOrg && !user.IsAdmin {
if len(cmd.DefaultOrgRole) > 0 {
orgUser.Role = m.RoleType(cmd.DefaultOrgRole)
orgUser.Role = models.RoleType(cmd.DefaultOrgRole)
} else {
orgUser.Role = m.RoleType(setting.AutoAssignOrgRole)
orgUser.Role = models.RoleType(setting.AutoAssignOrgRole)
}
}
@@ -163,14 +163,14 @@ func CreateUser(ctx context.Context, cmd *m.CreateUserCommand) error {
})
}
func GetUserById(query *m.GetUserByIdQuery) error {
user := new(m.User)
func GetUserById(query *models.GetUserByIdQuery) error {
user := new(models.User)
has, err := x.Id(query.Id).Get(user)
if err != nil {
return err
} else if !has {
return m.ErrUserNotFound
return models.ErrUserNotFound
}
query.Result = user
@@ -178,14 +178,14 @@ func GetUserById(query *m.GetUserByIdQuery) error {
return nil
}
func GetUserByLogin(query *m.GetUserByLoginQuery) error {
func GetUserByLogin(query *models.GetUserByLoginQuery) error {
if query.LoginOrEmail == "" {
return m.ErrUserNotFound
return models.ErrUserNotFound
}
// Try and find the user by login first.
// It's not sufficient to assume that a LoginOrEmail with an "@" is an email.
user := &m.User{Login: query.LoginOrEmail}
user := &models.User{Login: query.LoginOrEmail}
has, err := x.Get(user)
if err != nil {
@@ -195,14 +195,14 @@ func GetUserByLogin(query *m.GetUserByLoginQuery) error {
if !has && strings.Contains(query.LoginOrEmail, "@") {
// If the user wasn't found, and it contains an "@" fallback to finding the
// user by email.
user = &m.User{Email: query.LoginOrEmail}
user = &models.User{Email: query.LoginOrEmail}
has, err = x.Get(user)
}
if err != nil {
return err
} else if !has {
return m.ErrUserNotFound
return models.ErrUserNotFound
}
query.Result = user
@@ -210,18 +210,18 @@ func GetUserByLogin(query *m.GetUserByLoginQuery) error {
return nil
}
func GetUserByEmail(query *m.GetUserByEmailQuery) error {
func GetUserByEmail(query *models.GetUserByEmailQuery) error {
if query.Email == "" {
return m.ErrUserNotFound
return models.ErrUserNotFound
}
user := &m.User{Email: query.Email}
user := &models.User{Email: query.Email}
has, err := x.Get(user)
if err != nil {
return err
} else if !has {
return m.ErrUserNotFound
return models.ErrUserNotFound
}
query.Result = user
@@ -229,10 +229,10 @@ func GetUserByEmail(query *m.GetUserByEmailQuery) error {
return nil
}
func UpdateUser(cmd *m.UpdateUserCommand) error {
func UpdateUser(cmd *models.UpdateUserCommand) error {
return inTransaction(func(sess *DBSession) error {
user := m.User{
user := models.User{
Name: cmd.Name,
Email: cmd.Email,
Login: cmd.Login,
@@ -256,10 +256,10 @@ func UpdateUser(cmd *m.UpdateUserCommand) error {
})
}
func ChangeUserPassword(cmd *m.ChangeUserPasswordCommand) error {
func ChangeUserPassword(cmd *models.ChangeUserPasswordCommand) error {
return inTransaction(func(sess *DBSession) error {
user := m.User{
user := models.User{
Password: cmd.NewPassword,
Updated: time.Now(),
}
@@ -269,9 +269,9 @@ func ChangeUserPassword(cmd *m.ChangeUserPasswordCommand) error {
})
}
func UpdateUserLastSeenAt(cmd *m.UpdateUserLastSeenAtCommand) error {
func UpdateUserLastSeenAt(cmd *models.UpdateUserLastSeenAtCommand) error {
return inTransaction(func(sess *DBSession) error {
user := m.User{
user := models.User{
Id: cmd.UserId,
LastSeenAt: time.Now(),
}
@@ -281,8 +281,8 @@ func UpdateUserLastSeenAt(cmd *m.UpdateUserLastSeenAtCommand) error {
})
}
func SetUsingOrg(cmd *m.SetUsingOrgCommand) error {
getOrgsForUserCmd := &m.GetUserOrgListQuery{UserId: cmd.UserId}
func SetUsingOrg(cmd *models.SetUsingOrgCommand) error {
getOrgsForUserCmd := &models.GetUserOrgListQuery{UserId: cmd.UserId}
GetUserOrgList(getOrgsForUserCmd)
valid := false
@@ -302,7 +302,7 @@ func SetUsingOrg(cmd *m.SetUsingOrgCommand) error {
}
func setUsingOrgInTransaction(sess *DBSession, userID int64, orgID int64) error {
user := m.User{
user := models.User{
Id: userID,
OrgId: orgID,
}
@@ -311,17 +311,17 @@ func setUsingOrgInTransaction(sess *DBSession, userID int64, orgID int64) error
return err
}
func GetUserProfile(query *m.GetUserProfileQuery) error {
var user m.User
func GetUserProfile(query *models.GetUserProfileQuery) error {
var user models.User
has, err := x.Id(query.UserId).Get(&user)
if err != nil {
return err
} else if !has {
return m.ErrUserNotFound
return models.ErrUserNotFound
}
query.Result = m.UserProfileDTO{
query.Result = models.UserProfileDTO{
Id: user.Id,
Name: user.Name,
Email: user.Email,
@@ -335,8 +335,8 @@ func GetUserProfile(query *m.GetUserProfileQuery) error {
return err
}
func GetUserOrgList(query *m.GetUserOrgListQuery) error {
query.Result = make([]*m.UserOrgDTO, 0)
func GetUserOrgList(query *models.GetUserOrgListQuery) error {
query.Result = make([]*models.UserOrgDTO, 0)
sess := x.Table("org_user")
sess.Join("INNER", "org", "org_user.org_id=org.id")
sess.Where("org_user.user_id=?", query.UserId)
@@ -350,10 +350,10 @@ func newSignedInUserCacheKey(orgID, userID int64) string {
return fmt.Sprintf("signed-in-user-%d-%d", userID, orgID)
}
func (ss *SqlStore) GetSignedInUserWithCache(query *m.GetSignedInUserQuery) error {
func (ss *SqlStore) GetSignedInUserWithCache(query *models.GetSignedInUserQuery) error {
cacheKey := newSignedInUserCacheKey(query.OrgId, query.UserId)
if cached, found := ss.CacheService.Get(cacheKey); found {
query.Result = cached.(*m.SignedInUser)
query.Result = cached.(*models.SignedInUser)
return nil
}
@@ -367,7 +367,7 @@ func (ss *SqlStore) GetSignedInUserWithCache(query *m.GetSignedInUserQuery) erro
return nil
}
func GetSignedInUser(query *m.GetSignedInUserQuery) error {
func GetSignedInUser(query *models.GetSignedInUserQuery) error {
orgId := "u.org_id"
if query.OrgId > 0 {
orgId = strconv.FormatInt(query.OrgId, 10)
@@ -398,12 +398,12 @@ func GetSignedInUser(query *m.GetSignedInUserQuery) error {
sess.SQL(rawSql+"WHERE u.email=?", query.Email)
}
var user m.SignedInUser
var user models.SignedInUser
has, err := sess.Get(&user)
if err != nil {
return err
} else if !has {
return m.ErrUserNotFound
return models.ErrUserNotFound
}
if user.OrgRole == "" {
@@ -411,7 +411,7 @@ func GetSignedInUser(query *m.GetSignedInUserQuery) error {
user.OrgName = "Org missing"
}
getTeamsByUserQuery := &m.GetTeamsByUserQuery{OrgId: user.OrgId, UserId: user.UserId}
getTeamsByUserQuery := &models.GetTeamsByUserQuery{OrgId: user.OrgId, UserId: user.UserId}
err = GetTeamsByUser(getTeamsByUserQuery)
if err != nil {
return err
@@ -426,9 +426,9 @@ func GetSignedInUser(query *m.GetSignedInUserQuery) error {
return err
}
func SearchUsers(query *m.SearchUsersQuery) error {
query.Result = m.SearchUserQueryResult{
Users: make([]*m.UserSearchHitDTO, 0),
func SearchUsers(query *models.SearchUsersQuery) error {
query.Result = models.SearchUserQueryResult{
Users: make([]*models.UserSearchHitDTO, 0),
}
queryWithWildcards := "%" + query.Query + "%"
@@ -447,6 +447,17 @@ func SearchUsers(query *m.SearchUsersQuery) error {
whereParams = append(whereParams, queryWithWildcards, queryWithWildcards, queryWithWildcards)
}
if query.AuthModule != "" {
whereConditions = append(
whereConditions,
`id IN (SELECT user_id
FROM user_auth
WHERE auth_module=?)`,
)
whereParams = append(whereParams, query.AuthModule)
}
if len(whereConditions) > 0 {
sess.Where(strings.Join(whereConditions, " AND "), whereParams...)
}
@@ -459,7 +470,7 @@ func SearchUsers(query *m.SearchUsersQuery) error {
}
// get total
user := m.User{}
user := models.User{}
countSess := x.Table("user")
if len(whereConditions) > 0 {
@@ -476,8 +487,8 @@ func SearchUsers(query *m.SearchUsersQuery) error {
return err
}
func DisableUser(cmd *m.DisableUserCommand) error {
user := m.User{}
func DisableUser(cmd *models.DisableUserCommand) error {
user := models.User{}
sess := x.Table("user")
sess.ID(cmd.UserId).Get(&user)
@@ -488,7 +499,7 @@ func DisableUser(cmd *m.DisableUserCommand) error {
return err
}
func BatchDisableUsers(cmd *m.BatchDisableUsersCommand) error {
func BatchDisableUsers(cmd *models.BatchDisableUsersCommand) error {
return inTransaction(func(sess *DBSession) error {
userIds := cmd.UserIds
@@ -513,13 +524,13 @@ func BatchDisableUsers(cmd *m.BatchDisableUsersCommand) error {
})
}
func DeleteUser(cmd *m.DeleteUserCommand) error {
func DeleteUser(cmd *models.DeleteUserCommand) error {
return inTransaction(func(sess *DBSession) error {
return deleteUserInTransaction(sess, cmd)
})
}
func deleteUserInTransaction(sess *DBSession, cmd *m.DeleteUserCommand) error {
func deleteUserInTransaction(sess *DBSession, cmd *models.DeleteUserCommand) error {
deletes := []string{
"DELETE FROM star WHERE user_id = ?",
"DELETE FROM " + dialect.Quote("user") + " WHERE id = ?",
@@ -542,9 +553,9 @@ func deleteUserInTransaction(sess *DBSession, cmd *m.DeleteUserCommand) error {
return nil
}
func UpdateUserPermissions(cmd *m.UpdateUserPermissionsCommand) error {
func UpdateUserPermissions(cmd *models.UpdateUserPermissionsCommand) error {
return inTransaction(func(sess *DBSession) error {
user := m.User{}
user := models.User{}
sess.ID(cmd.UserId).Get(&user)
user.IsAdmin = cmd.IsGrafanaAdmin
@@ -564,10 +575,10 @@ func UpdateUserPermissions(cmd *m.UpdateUserPermissionsCommand) error {
})
}
func SetUserHelpFlag(cmd *m.SetUserHelpFlagCommand) error {
func SetUserHelpFlag(cmd *models.SetUserHelpFlagCommand) error {
return inTransaction(func(sess *DBSession) error {
user := m.User{
user := models.User{
Id: cmd.UserId,
HelpFlags1: cmd.HelpFlags1,
Updated: time.Now(),
@@ -580,13 +591,13 @@ func SetUserHelpFlag(cmd *m.SetUserHelpFlagCommand) error {
func validateOneAdminLeft(sess *DBSession) error {
// validate that there is an admin user left
count, err := sess.Where("is_admin=?", true).Count(&m.User{})
count, err := sess.Where("is_admin=?", true).Count(&models.User{})
if err != nil {
return err
}
if count == 0 {
return m.ErrLastGrafanaAdmin
return models.ErrLastGrafanaAdmin
}
return nil