Skip to content

Commit

Permalink
fix(credential-store): set parent scope id for credential-store resource
Browse files Browse the repository at this point in the history
set the ParentScopeId before fetching authorized actions for credential-store resource
  • Loading branch information
elimt committed Jan 22, 2025
1 parent bd096ff commit 3659eb9
Show file tree
Hide file tree
Showing 2 changed files with 153 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -676,9 +676,10 @@ func newOutputOpts(
authzScopes map[string]*scopes.ScopeInfo,
) ([]handlers.Option, bool, error) {
res := perms.Resource{
Type: resource.CredentialStore,
Id: item.GetPublicId(),
ScopeId: item.GetProjectId(),
Type: resource.CredentialStore,
Id: item.GetPublicId(),
ScopeId: item.GetProjectId(),
ParentScopeId: authzScopes[item.GetProjectId()].GetParentScopeId(),
}
authorizedActions := authResults.FetchActionSetForId(ctx, item.GetPublicId(), IdActions, auth.WithResource(&res)).Strings()
if len(authorizedActions) == 0 {
Expand Down
149 changes: 149 additions & 0 deletions internal/daemon/controller/handlers/credentialstores/grants_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: BUSL-1.1

package credentialstores_test

import (
"context"
"testing"

"github.com/hashicorp/boundary/globals"
"github.com/hashicorp/boundary/internal/authtoken"
"github.com/hashicorp/boundary/internal/credential"
"github.com/hashicorp/boundary/internal/credential/static"
"github.com/hashicorp/boundary/internal/credential/vault"
"github.com/hashicorp/boundary/internal/daemon/controller/auth"
"github.com/hashicorp/boundary/internal/daemon/controller/handlers/credentialstores"
"github.com/hashicorp/boundary/internal/db"
pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services"
"github.com/hashicorp/boundary/internal/iam"
"github.com/hashicorp/boundary/internal/kms"
"github.com/hashicorp/boundary/internal/scheduler"
"github.com/stretchr/testify/require"
)

// TestGrants_ReadActions tests read actions to assert that grants are being applied properly
//
// Role - which scope the role is created in
// - global level
// - org level
// - proj level
// Grant - what IAM grant scope is set for the permission
// - global: descendant
// - org: children
// - project: this
// Scopes [resource]:
// - global
// - org1
// - proj1
func TestGrants_ReadActions(t *testing.T) {
ctx := context.Background()
conn, _ := db.TestSetup(t, "postgres")
wrap := db.TestWrapper(t)
rw := db.New(conn)
iamRepo := iam.TestRepo(t, conn, wrap)
kmsCache := kms.TestKms(t, conn, wrap)

sche := scheduler.TestScheduler(t, conn, wrap)
iamRepoFn := func() (*iam.Repository, error) {
return iamRepo, nil
}
vaultRepoFn := func() (*vault.Repository, error) {
return vault.NewRepository(ctx, rw, rw, kmsCache, sche)
}
staticRepoFn := func() (*static.Repository, error) {
return static.NewRepository(ctx, rw, rw, kmsCache)
}
credStoreRepoFn := func() (*credential.StoreRepository, error) {
return credential.NewStoreRepository(context.Background(), rw, rw)
}
s, err := credentialstores.NewService(ctx, iamRepoFn, vaultRepoFn, staticRepoFn, credStoreRepoFn, 1000)
require.NoError(t, err)

org, proj := iam.TestScopes(t, iamRepo)

var wantStores []string
for _, s := range vault.TestCredentialStores(t, conn, wrap, proj.GetPublicId(), 5) {
wantStores = append(wantStores, s.GetPublicId())
}

for _, s := range static.TestCredentialStores(t, conn, wrap, proj.GetPublicId(), 5) {
wantStores = append(wantStores, s.GetPublicId())
}

t.Run("List", func(t *testing.T) {
testcases := []struct {
name string
input *pbs.ListCredentialStoresRequest
rolesToCreate []authtoken.TestRoleGrantsForToken
wantErr error
wantIDs []string
}{
{
name: "global role grant this returns all created credential stores",
input: &pbs.ListCredentialStoresRequest{
ScopeId: globals.GlobalPrefix,
Recursive: true,
},
rolesToCreate: []authtoken.TestRoleGrantsForToken{
{
RoleScopeID: globals.GlobalPrefix,
GrantStrings: []string{"ids=*;type=credential-store;actions=list,read"},
GrantScopes: []string{globals.GrantScopeThis, globals.GrantScopeDescendants},
},
},
wantErr: nil,
wantIDs: wantStores,
},
{
name: "org role grant this returns all created credential stores",
input: &pbs.ListCredentialStoresRequest{
ScopeId: org.GetPublicId(),
Recursive: true,
},
rolesToCreate: []authtoken.TestRoleGrantsForToken{
{
RoleScopeID: org.PublicId,
GrantStrings: []string{"ids=*;type=credential-store;actions=list,read"},
GrantScopes: []string{globals.GrantScopeThis, globals.GrantScopeChildren},
},
},
wantErr: nil,
wantIDs: wantStores,
},
{
name: "project role grant this returns all created credential stores",
input: &pbs.ListCredentialStoresRequest{
ScopeId: proj.GetPublicId(),
},
rolesToCreate: []authtoken.TestRoleGrantsForToken{
{
RoleScopeID: proj.PublicId,
GrantStrings: []string{"ids=*;type=credential-store;actions=list,read"},
GrantScopes: []string{globals.GrantScopeThis},
},
},
wantErr: nil,
wantIDs: wantStores,
},
}

for _, tc := range testcases {
t.Run(tc.name, func(t *testing.T) {
tok := authtoken.TestAuthTokenWithRoles(t, conn, kmsCache, globals.GlobalPrefix, tc.rolesToCreate)
fullGrantAuthCtx := auth.TestAuthContextFromToken(t, conn, wrap, tok, iamRepo)
got, finalErr := s.ListCredentialStores(fullGrantAuthCtx, tc.input)
if tc.wantErr != nil {
require.ErrorIs(t, finalErr, tc.wantErr)
return
}
require.NoError(t, finalErr)
var gotIDs []string
for _, g := range got.Items {
gotIDs = append(gotIDs, g.GetId())
}
require.ElementsMatch(t, tc.wantIDs, gotIDs)
})
}
})
}

0 comments on commit 3659eb9

Please sign in to comment.