Files
grafana/pkg/services/apiserver/auth/authorizer/storewrapper/wrapper.go
Misi e0dbb966fc IAM: Add users filtering and improved RBAC mapper for users API (#119100)
* IAM: Add hidden users filtering and improved RBAC mapper for users API

- Add StoreWrapper for user resource that filters hidden users on Get/List
- Wire up StoreWrapper in the users API group registration
- Expand RBAC verb mapping for users to use explicit action translations
- Add integration tests for hidden users filtering behavior

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* IAM: Fix duplicate user validation and storewrapper context propagation

The storewrapper replaced the request context with a service identity
(OrgID=0) before invoking createValidation/updateValidation callbacks.
Since these callbacks wrap k8s admission webhooks (including the
duplicate email/login checks), the validation ran with OrgID=0 causing
SearchOrgUsers to return no results, silently passing duplicates through
to the DB which then returned a 500 instead of 409.

Fix 1 (storewrapper): Add validationWithUserContext and
updateValidationWithUserContext helpers that rebind validation callbacks
to the original user context before passing them to the inner store.

Fix 2 (legacy store): Add toUserConflictError as defense-in-depth that
converts SQLite UNIQUE constraint failures on user.email/user.login into
proper 409 Conflict API errors in CreateUser and UpdateUser.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* Regen

* Use configprovider.ConfigProvider instead of setting.Cfg

* Enforce hidden-users restrictions on write operations

BeforeCreate, BeforeUpdate, and BeforeDelete in the user StoreWrapper
now return HTTP 403 when the target user's login is in the hidden-users
list, returning a generic "operation not permitted" message to callers
and logging the hidden-user detail server-side via a structured logger.

Integration tests are updated to create the user before marking it
hidden (so BeforeCreate does not block setup), then verify all four
guarded paths (get→404, list filtered, update→403, delete→403) and
add a dedicated sub-test that confirms create is blocked once a login
is in the hidden list.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* IAM: Add WithPreserveIdentity option to storewrapper

Introduces a WithPreserveIdentity() functional option on storewrapper.New()
so the users storage path passes the original caller identity through to the
inner store instead of replacing it with a service identity. This ensures
admission validation (e.g. duplicate email/login checks) runs with the correct
OrgID. Adds unit tests for the new option.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* Address feedback

* Fix some minor issues

* Update pkg/registry/apis/iam/register.go

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>

* Address feedback

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
2026-03-12 13:42:22 +01:00

282 lines
9.5 KiB
Go

package storewrapper
import (
"context"
"fmt"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/apis/meta/internalversion"
metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"
k8srest "k8s.io/apiserver/pkg/registry/rest"
"github.com/grafana/grafana/pkg/apimachinery/identity"
"github.com/grafana/grafana/pkg/apiserver/rest"
)
var (
ErrUnauthenticated = errors.NewUnauthorized("unauthenticated")
ErrUnauthorized = errors.NewUnauthorized("unauthorized")
ErrUnexpectedType = errors.NewBadRequest("unexpected object type")
)
// ResourceStorageAuthorizer defines authorization hooks for resource storage operations.
type ResourceStorageAuthorizer interface {
BeforeCreate(ctx context.Context, obj runtime.Object) error
BeforeUpdate(ctx context.Context, oldObj, obj runtime.Object) error
BeforeDelete(ctx context.Context, obj runtime.Object) error
AfterGet(ctx context.Context, obj runtime.Object) error
FilterList(ctx context.Context, list runtime.Object) (runtime.Object, error)
}
// Wrapper is a k8sStorage (e.g. registry.Store) wrapper that enforces authorization based on ResourceStorageAuthorizer.
// It overrides the identity in the context to use service identity for the underlying store operations so the
// store's authorization always succeeds and the wrapper enforces authorization. The wrapper injects the original
// user's UID as metadata identity so unistore can set createdBy/updatedBy correctly (see identity.WithOriginalIdentityUID).
// The wrapper also supports an option to preserve the original caller's identity in the context for inner store calls instead of replacing it with a service identity.
// Use this when the inner store does not perform its own RBAC checks and the caller's identity is needed downstream (e.g. for admission webhooks).
type Wrapper struct {
inner K8sStorage
authorizer ResourceStorageAuthorizer
preserveIdentity bool
}
// Option configures a Wrapper.
type Option func(*Wrapper)
// WithPreserveIdentity instructs the Wrapper to leave the caller's identity in the context when
// calling the inner store, instead of replacing it with a service identity. Use this when the inner
// store does not perform its own RBAC checks and the caller's identity is needed downstream
// (e.g. for admission webhooks).
func WithPreserveIdentity() Option {
return func(w *Wrapper) {
w.preserveIdentity = true
}
}
type K8sStorage interface {
k8srest.Storage
k8srest.Scoper
k8srest.SingularNameProvider
k8srest.Lister
k8srest.Getter
k8srest.CreaterUpdater
k8srest.GracefulDeleter
}
var _ rest.Storage = (*Wrapper)(nil)
var _ k8srest.Watcher = (*Wrapper)(nil)
// New returns a Wrapper that enforces authorization and uses service identity for inner store calls,
// injecting the original user's UID for createdBy/updatedBy annotations.
func New(store K8sStorage, authz ResourceStorageAuthorizer, opts ...Option) *Wrapper {
w := &Wrapper{inner: store, authorizer: authz}
for _, opt := range opts {
opt(w)
}
return w
}
// storeCtx returns the context for inner store calls: service identity so the store's authorization
// succeeds, with the original user's UID injected as metadata identity for createdBy/updatedBy (see identity.WithOriginalIdentityUID).
// When preserveIdentity is true the original caller context is returned unchanged;
func (w *Wrapper) storeCtx(ctx context.Context) context.Context {
if w.preserveIdentity {
return ctx
}
srvCtx, _ := identity.WithServiceIdentity(ctx, 0)
if user, err := identity.GetRequester(ctx); err == nil && user.GetUID() != "" {
srvCtx = identity.WithOriginalIdentityUID(srvCtx, user.GetUID())
}
return srvCtx
}
func (w *Wrapper) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metaV1.Table, error) {
return w.inner.ConvertToTable(ctx, object, tableOptions)
}
func (w *Wrapper) Create(ctx context.Context, obj runtime.Object, createValidation k8srest.ValidateObjectFunc, options *metaV1.CreateOptions) (runtime.Object, error) {
// Enforce authorization based on the user permissions before creating the object
err := w.authorizer.BeforeCreate(ctx, obj)
if err != nil {
return nil, err
}
return w.inner.Create(w.storeCtx(ctx), obj, createValidation, options)
}
func (w *Wrapper) Delete(ctx context.Context, name string, deleteValidation k8srest.ValidateObjectFunc, options *metaV1.DeleteOptions) (runtime.Object, bool, error) {
// Fetch the object first to authorize
storeCtx := w.storeCtx(ctx)
getOpts := &metaV1.GetOptions{TypeMeta: options.TypeMeta}
if options.Preconditions != nil {
getOpts.ResourceVersion = *options.Preconditions.ResourceVersion
}
obj, err := w.inner.Get(storeCtx, name, getOpts)
if err != nil {
return nil, false, err
}
// Enforce authorization based on the user permissions
if err := w.authorizer.BeforeDelete(ctx, obj); err != nil {
return nil, false, err
}
return w.inner.Delete(storeCtx, name, deleteValidation, options)
}
func (w *Wrapper) DeleteCollection(ctx context.Context, deleteValidation k8srest.ValidateObjectFunc, options *metaV1.DeleteOptions, listOptions *internalversion.ListOptions) (runtime.Object, error) {
// DeleteCollection is complex to authorize properly
// For now, deny it entirely for safety
return nil, fmt.Errorf("bulk delete operations are not supported through this API")
}
func (w *Wrapper) Destroy() {
w.inner.Destroy()
}
func (w *Wrapper) Get(ctx context.Context, name string, options *metaV1.GetOptions) (runtime.Object, error) {
item, err := w.inner.Get(w.storeCtx(ctx), name, options)
if err != nil {
return nil, err
}
// Enforce authorization based on the user permissions after retrieving the object
err = w.authorizer.AfterGet(ctx, item)
if err != nil {
return nil, err
}
return item, nil
}
func (w *Wrapper) GetSingularName() string {
return w.inner.GetSingularName()
}
func (w *Wrapper) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) {
list, err := w.inner.List(w.storeCtx(ctx), options)
if err != nil {
return nil, err
}
// Enforce authorization based on the user permissions after retrieving the list
return w.authorizer.FilterList(ctx, list)
}
func (w *Wrapper) NamespaceScoped() bool {
return w.inner.NamespaceScoped()
}
func (w *Wrapper) New() runtime.Object {
return w.inner.New()
}
func (w *Wrapper) NewList() runtime.Object {
return w.inner.NewList()
}
func (w *Wrapper) Update(
ctx context.Context,
name string,
objInfo k8srest.UpdatedObjectInfo,
createValidation k8srest.ValidateObjectFunc,
updateValidation k8srest.ValidateObjectUpdateFunc,
forceAllowCreate bool,
options *metaV1.UpdateOptions,
) (runtime.Object, bool, error) {
// Create a wrapper around UpdatedObjectInfo to inject authorization
wrappedObjInfo := &authorizedUpdateInfo{
inner: objInfo,
authorizer: w.authorizer,
userCtx: ctx, // Keep original context for authorization
}
return w.inner.Update(w.storeCtx(ctx), name, wrappedObjInfo, createValidation, updateValidation, forceAllowCreate, options)
}
type authorizedUpdateInfo struct {
inner k8srest.UpdatedObjectInfo
authorizer ResourceStorageAuthorizer
userCtx context.Context
}
func (a *authorizedUpdateInfo) Preconditions() *metaV1.Preconditions {
return a.inner.Preconditions()
}
func (a *authorizedUpdateInfo) UpdatedObject(ctx context.Context, oldObj runtime.Object) (runtime.Object, error) {
// Get the updated object
updatedObj, err := a.inner.UpdatedObject(ctx, oldObj)
if err != nil {
return nil, err
}
// Enforce authorization using the original user context
if err := a.authorizer.BeforeUpdate(a.userCtx, oldObj, updatedObj); err != nil {
return nil, err
}
return updatedObj, nil
}
func (w *Wrapper) Watch(ctx context.Context, options *internalversion.ListOptions) (watch.Interface, error) {
if watcher, ok := w.inner.(k8srest.Watcher); ok {
return watcher.Watch(w.storeCtx(ctx), options)
}
return nil, fmt.Errorf("watch is not supported on the underlying storage")
}
// NoopAuthorizer is a no-op implementation of ResourceStorageAuthorizer.
// Use this when authorization is handled at the API level and no additional
// storage-level authorization is needed.
// This will be used if a service wants to tackle Cluster-scoped resources.
type NoopAuthorizer struct{}
func (b *NoopAuthorizer) BeforeCreate(ctx context.Context, obj runtime.Object) error {
return nil
}
func (b *NoopAuthorizer) BeforeUpdate(ctx context.Context, oldObj, obj runtime.Object) error {
return nil
}
func (b *NoopAuthorizer) BeforeDelete(ctx context.Context, obj runtime.Object) error {
return nil
}
func (b *NoopAuthorizer) AfterGet(ctx context.Context, obj runtime.Object) error {
return nil
}
func (b *NoopAuthorizer) FilterList(ctx context.Context, list runtime.Object) (runtime.Object, error) {
return list, nil
}
// DenyAuthorizer denies all storage operations.
// Use this as a safe default when no explicit authorizer is provided
// for cluster-scoped resources. This ensures fail-closed behavior.
type DenyAuthorizer struct{}
func (d *DenyAuthorizer) BeforeCreate(ctx context.Context, obj runtime.Object) error {
return ErrUnauthorized
}
func (d *DenyAuthorizer) BeforeUpdate(ctx context.Context, oldObj, obj runtime.Object) error {
return ErrUnauthorized
}
func (d *DenyAuthorizer) BeforeDelete(ctx context.Context, obj runtime.Object) error {
return ErrUnauthorized
}
func (d *DenyAuthorizer) AfterGet(ctx context.Context, obj runtime.Object) error {
return ErrUnauthorized
}
func (d *DenyAuthorizer) FilterList(ctx context.Context, list runtime.Object) (runtime.Object, error) {
return nil, ErrUnauthorized
}