upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-02-18 18:38:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Backport add SCIM endpoint ServiceProviderConfig into ce/main (#12303)

Browse source
This commit is contained in:
Vault Automation 2026-02-17 10:41:09 -05:00 committed by GitHub
parent daa03407c0
commit 2ee80aef37
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
vault/identity_store.go
View file

@ -113,6 +113,14 @@ func NewIdentityStore(ctx context.Context, core *Core, config *logical.BackendCo
return nil, fmt.Errorf("failed to create group packer: %w", err)
}
unauthenticatedPaths := []string{
"oidc/.well-known/*",
"oidc/+/.well-known/*",
"oidc/provider/+/.well-known/*",
"oidc/provider/+/token",
}
unauthenticatedPaths = append(unauthenticatedPaths, identityStoreLoginMFAEntUnauthedPaths()...)
unauthenticatedPaths = append(unauthenticatedPaths, identityStoreSCIMUnauthedPaths()...)
iStore.Backend = &framework.Backend{
BackendType: logical.TypeLogical,
Paths: iStore.paths(),
@ -120,12 +128,7 @@ func NewIdentityStore(ctx context.Context, core *Core, config *logical.BackendCo
InitializeFunc: iStore.initialize,
ActivationFunc: iStore.activate,
PathsSpecial: &logical.Paths{
Unauthenticated: append([]string{
"oidc/.well-known/*",
"oidc/+/.well-known/*",
"oidc/provider/+/.well-known/*",
"oidc/provider/+/token",
}),
Unauthenticated: unauthenticatedPaths,
LocalStorage: []string{
localAliasesBucketsPrefix,
},
@ -167,6 +170,8 @@ func (i *IdentityStore) paths() []*framework.Path {
mfaDuoPaths(i),
mfaPingIDPaths(i),
mfaLoginEnforcementPaths(i),
mfaLoginEnterprisePaths(i),
scimPaths(i),
)
}

4
vault/identity_store_oss.go
View file

@ -24,6 +24,10 @@ func identityStoreLoginMFAEntUnauthedPaths() []string {
return []string{}
}
func identityStoreSCIMUnauthedPaths() []string {
return []string{}
}
func mfaLoginEnterprisePaths(i *IdentityStore) []*framework.Path {
return []*framework.Path{}
}

6
vault/identity_store_scim_oss.go
View file

@ -7,6 +7,8 @@ package vault
import (
"context"
"github.com/hashicorp/vault/sdk/framework"
)
func (i *IdentityStore) loadSCIMClients(ctx context.Context) error {
@ -15,3 +17,7 @@ func (i *IdentityStore) loadSCIMClients(ctx context.Context) error {
func (i *IdentityStore) invalidateSCIMClient(ctx context.Context, key string) {
}
func scimPaths(_ *IdentityStore) []*framework.Path {
return []*framework.Path{}
}