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

AccessControl: Move GetCacheKey to SignedInUser (#53591)

Browse Source 
* Add HasUniqueId and IsApiKeyUser to SignedInUser

* Improve GetCacheKey by explicit checks and error branch

* Align SignedInUser to merged changes

* change comparison method

Co-authored-by: jguer <joao.guerreiro@grafana.com>
This commit is contained in:
Mihály Gyöngyösi 2022-08-12 09:47:47 +02:00 committed by GitHub
parent 7e16d5b4b4
commit 57a46767cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/services/user/model.go
View File

@ -26,6 +26,7 @@ var (
ErrUserAlreadyExists = errors.New("user already exists")
ErrLastGrafanaAdmin = errors.New("cannot remove last grafana admin")
ErrProtectedUser = errors.New("cannot adopt protected user")
ErrNoUniqueID = errors.New("identifying id not found")
)
type User struct {
@ -245,6 +246,7 @@ func (u *SignedInUser) ToUserDisplayDTO() *UserDisplayDTO {
Name: u.Name,
}
}
func (u *SignedInUser) HasRole(role org.RoleType) bool {
if u.IsGrafanaAdmin {
return true
@ -254,7 +256,25 @@ func (u *SignedInUser) HasRole(role org.RoleType) bool {
}
func (u *SignedInUser) IsRealUser() bool {
return u.UserID != 0
return u.UserID > 0
}
func (u *SignedInUser) IsApiKeyUser() bool {
return u.ApiKeyID > 0
}
func (u *SignedInUser) HasUniqueId() bool {
return u.IsRealUser() || u.IsApiKeyUser()
}
func (u *SignedInUser) GetCacheKey() (string, error) {
if u.IsRealUser() {
return fmt.Sprintf("%d-user-%d", u.OrgID, u.UserID), nil
}
if u.IsApiKeyUser() {
return fmt.Sprintf("%d-apikey-%d", u.OrgID, u.ApiKeyID), nil
}
return "", ErrNoUniqueID
}
func (e *ErrCaseInsensitiveLoginConflict) Unwrap() error {