Skip to content

Commit

Permalink
fix(scope): set parent scope id for worker resource (#5439)
Browse files Browse the repository at this point in the history
set the `ParentScopeId` before fetching authorized actions for worker
  • Loading branch information
elimt authored and bosorawis committed Jan 23, 2025
1 parent dd0c054 commit fafb367
Show file tree
Hide file tree
Showing 2 changed files with 116 additions and 3 deletions.
112 changes: 112 additions & 0 deletions internal/daemon/controller/handlers/scopes/grants_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: BUSL-1.1

package scopes_test

import (
"context"
"testing"

"github.com/hashicorp/boundary/globals"
"github.com/hashicorp/boundary/internal/authtoken"
"github.com/hashicorp/boundary/internal/daemon/controller/auth"
"github.com/hashicorp/boundary/internal/daemon/controller/handlers/scopes"
"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/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
// Grant - what IAM grant scope is set for the permission
// - global: descendant
// - org: children
// Scopes [resource]:
// - global [globalScope]
// - org1
// - proj1
func TestGrants_ReadActions(t *testing.T) {
ctx := context.Background()
conn, _ := db.TestSetup(t, "postgres")
wrap := db.TestWrapper(t)
iamRepo := iam.TestRepo(t, conn, wrap)
kmsCache := kms.TestKms(t, conn, wrap)
repoFn := func() (*iam.Repository, error) {
return iamRepo, nil
}
s, err := scopes.NewServiceFn(ctx, repoFn, kmsCache, 1000)
require.NoError(t, err)

org1, proj1 := iam.TestScopes(t, iamRepo)

t.Run("List", func(t *testing.T) {
testcases := []struct {
name string
input *pbs.ListScopesRequest
rolesToCreate []authtoken.TestRoleGrantsForToken
wantErr error
wantIDs []string
}{
{
name: "global role grant this returns all created scopes",
input: &pbs.ListScopesRequest{
ScopeId: globals.GlobalPrefix,
Recursive: true,
},
rolesToCreate: []authtoken.TestRoleGrantsForToken{
{
RoleScopeID: globals.GlobalPrefix,
GrantStrings: []string{"ids=*;type=scope;actions=list,read"},
GrantScopes: []string{globals.GrantScopeThis, globals.GrantScopeChildren},
},
},
wantErr: nil,
wantIDs: []string{
org1.PublicId,
proj1.PublicId,
},
},
{
name: "org role grant this returns all created scopes",
input: &pbs.ListScopesRequest{
ScopeId: globals.GlobalPrefix,
Recursive: true,
},
rolesToCreate: []authtoken.TestRoleGrantsForToken{
{
RoleScopeID: org1.PublicId,
GrantStrings: []string{"ids=*;type=scope;actions=list,read"},
GrantScopes: []string{globals.GrantScopeThis, globals.GrantScopeChildren},
},
},
wantErr: nil,
wantIDs: []string{
proj1.PublicId,
},
},
}

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.ListScopes(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)
})
}
})
}
7 changes: 4 additions & 3 deletions internal/daemon/controller/handlers/scopes/scope_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -1138,9 +1138,10 @@ func validateDestroyKeyVersionRequest(req *pbs.DestroyKeyVersionRequest) error {

func newOutputOpts(ctx context.Context, item *iam.Scope, authResults auth.VerifyResults, scopeInfoMap map[string]*pb.ScopeInfo) ([]handlers.Option, bool, error) {
res := perms.Resource{
Type: resource.Scope,
Id: item.GetPublicId(),
ScopeId: item.GetParentId(),
Type: resource.Scope,
Id: item.GetPublicId(),
ScopeId: item.GetParentId(),
ParentScopeId: scopeInfoMap[item.GetParentId()].GetParentScopeId(),
}

authorizedActions := authResults.FetchActionSetForId(ctx, item.GetPublicId(), idActionsById(item.GetPublicId()), auth.WithResource(&res)).Strings()
Expand Down

0 comments on commit fafb367

Please sign in to comment.