Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions core/security/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ func GetUserPermissions(shortUser *UserSessionInfo) *UserAssignedPermission {
if ok {
if !x.NeedRefresh() {
shortUser.UserAssignedPermission = x
shortUser.Permissions = x.GetPermissionKeys()
if global.Env().IsDebug {
log.Trace("hit permission cache")
x.Dump()
Expand Down
6 changes: 6 additions & 0 deletions core/security/filters/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ func (f *AuthFilter) ApplyFilter(
if resolverErr := security.RunRequestContextResolvers(r.Context(), r, claims); resolverErr != nil {
log.Warn("request context resolver error: ", resolverErr)
}

//proactive update permission on auth check
if claims.UserAssignedPermission == nil || claims.UserAssignedPermission.NeedRefresh() {
claims.UserAssignedPermission = security.GetUserPermissions(claims)
}

r = r.WithContext(security.AddUserToContext(r.Context(), claims))
}

Expand Down
4 changes: 4 additions & 0 deletions core/security/permission_registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,10 @@ func MustRegisterPermissionByKey(key PermissionKey) PermissionID {
return permissionRegistry.MustGetPermissionIDByKey(key)
}

func MustGetPermissionKey(id PermissionID) PermissionKey {
return permissionRegistry.MustGetPermissionKeyByID(id)
}

func MustRegisterPermissionByKeys(key []PermissionKey) []PermissionID {
v := []PermissionID{}
for _, k := range key {
Expand Down
15 changes: 15 additions & 0 deletions core/security/user_permission.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,21 @@ func (p *UserAssignedPermission) Dump() {
}
}

func (p *UserAssignedPermission) GetPermissionKeys() []PermissionKey {
keys := []PermissionKey{}
if p.AllowedPermissions != nil {
iter := p.AllowedPermissions.Iterator()
for iter.HasNext() {
id := PermissionID(iter.Next())
k := MustGetPermissionKey(id)
if k != "" {
keys = append(keys, k)
}
}
}
return keys
}

func (p *UserAssignedPermission) NeedRefresh() bool {
return NeedRefreshPermission(p.PermissionVersion)
}
Expand Down
Loading