Skip to content

[v14] Add sort index trees to unified resource cache #33027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
avatus merged 1 commit into from
Oct 5, 2023
Merged

[v14] Add sort index trees to unified resource cache #33027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
117 changes: 24 additions & 93 deletions lib/auth/auth_with_roles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1627,112 +1627,43 @@ func (a *ServerWithRoles) ListUnifiedResources(ctx context.Context, req *proto.L
}()

startFetch := time.Now()
unifiedResources, err := a.authServer.UnifiedResourceCache.GetUnifiedResources(ctx)
if err != nil {
return nil, trace.Wrap(err)
}

elapsedFetch = time.Since(startFetch)

startFilter := time.Now()
for _, resource := range unifiedResources {
switch r := resource.(type) {
case types.Server:
{
if err := a.checkAccessToNode(r); err != nil {
if trace.IsAccessDenied(err) {
continue
}

return nil, trace.Wrap(err)
}

filteredResources = append(filteredResources, resource)
}
case types.DatabaseServer:
{
if err := a.checkAccessToDatabase(r.GetDatabase()); err != nil {
if trace.IsAccessDenied(err) {
continue
}

return nil, trace.Wrap(err)
}

filteredResources = append(filteredResources, resource)
}

case types.AppServer:
{
if err := a.checkAccessToApp(r.GetApp()); err != nil {
if trace.IsAccessDenied(err) {
continue
}

return nil, trace.Wrap(err)
}

filteredResources = append(filteredResources, resource)
}
case types.SAMLIdPServiceProvider:
{
if err := a.action(apidefaults.Namespace, types.KindSAMLIdPServiceProvider, types.VerbList); err == nil {
filteredResources = append(filteredResources, resource)
}
}
case types.KubeServer:
kube := r.GetCluster()
if err := a.checkAccessToKubeCluster(kube); err != nil {
if trace.IsAccessDenied(err) {
continue
}

return nil, trace.Wrap(err)
}

filteredResources = append(filteredResources, kube)
case types.WindowsDesktop:
{
if err := a.checkAccessToWindowsDesktop(r); err != nil {
if trace.IsAccessDenied(err) {
continue
}

return nil, trace.Wrap(err)
}

filteredResources = append(filteredResources, resource)
}
}
}
elapsedFilter = time.Since(startFilter)

if req.SortBy.Field != "" {
if err := filteredResources.SortByCustom(req.SortBy); err != nil {
return nil, trace.Wrap(err, "sorting unified resources")
}
}

// Apply request filters and get pagination info.
resp, err := local.FakePaginate(filteredResources, local.FakePaginateParams{
Limit: req.Limit,
filter := services.MatchResourceFilter{
Labels: req.Labels,
SearchKeywords: req.SearchKeywords,
PredicateExpression: req.PredicateExpression,
StartKey: req.StartKey,
Kinds: req.Kinds,
})
}

resourceChecker, err := a.newResourceAccessChecker(types.KindUnifiedResource)
if err != nil {
return nil, trace.Wrap(err)
}

paginatedResources, err := a.MakePaginatedResources(types.KindUnifiedResource, resp.Resources)
unifiedResources, nextKey, err := a.authServer.UnifiedResourceCache.IterateUnifiedResources(ctx, func(resource types.ResourceWithLabels) (bool, error) {
if err := resourceChecker.CanAccess(resource); err != nil {
if trace.IsAccessDenied(err) {
return false, nil
}
return false, trace.Wrap(err)
}
match, err := services.MatchResourceByFilters(resource, filter, nil)
return match, trace.Wrap(err)
}, req)
if err != nil {
return nil, trace.Wrap(err, "filtering unified resources")
}

elapsedFetch = time.Since(startFetch)
elapsedFilter = time.Since(startFilter)

paginatedResources, err := services.MakePaginatedResources(types.KindUnifiedResource, unifiedResources)
if err != nil {
return nil, trace.Wrap(err, "making paginated unified resources")
}

return &proto.ListUnifiedResourcesResponse{
NextKey: resp.NextKey,
NextKey: nextKey,
Resources: paginatedResources,
}, nil
}
Expand Down Expand Up @@ -2055,7 +1986,7 @@ func (r resourceChecker) CanAccess(resource types.Resource) error {
// newResourceAccessChecker creates a resourceAccessChecker for the provided resource type
func (a *ServerWithRoles) newResourceAccessChecker(resource string) (resourceAccessChecker, error) {
switch resource {
case types.KindAppServer, types.KindDatabaseServer, types.KindDatabaseService, types.KindWindowsDesktop, types.KindWindowsDesktopService, types.KindNode, types.KindKubeServer, types.KindUserGroup:
case types.KindAppServer, types.KindDatabaseServer, types.KindDatabaseService, types.KindWindowsDesktop, types.KindWindowsDesktopService, types.KindNode, types.KindKubeServer, types.KindUserGroup, types.KindUnifiedResource:
return &resourceChecker{AccessChecker: a.context.Checker}, nil
default:
return nil, trace.BadParameter("could not check access to resource type %s", resource)
Expand Down
17 changes: 11 additions & 6 deletions lib/auth/auth_with_roles_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4188,8 +4188,9 @@ func TestListUnifiedResources_KindsFilter(t *testing.T) {
clt, err := srv.NewClient(TestUser(user.GetName()))
require.NoError(t, err)
resp, err := clt.ListUnifiedResources(ctx, &proto.ListUnifiedResourcesRequest{
Kinds: []string{types.KindDatabase},
Limit: 5,
Kinds: []string{types.KindDatabase},
Limit: 5,
SortBy: types.SortBy{IsDesc: true, Field: types.ResourceMetadataName},
})
require.NoError(t, err)
require.Eventually(t, func() bool {
Expand Down Expand Up @@ -4236,6 +4237,7 @@ func TestListUnifiedResources_WithSearch(t *testing.T) {
resp, err := clt.ListUnifiedResources(ctx, &proto.ListUnifiedResourcesRequest{
SearchKeywords: []string{"tifa"},
Limit: 10,
SortBy: types.SortBy{IsDesc: true, Field: types.ResourceMetadataName},
})
require.NoError(t, err)
require.Len(t, resp.Resources, 2)
Expand Down Expand Up @@ -4323,7 +4325,8 @@ func TestListUnifiedResources_MixedAccess(t *testing.T) {

require.NoError(t, err)
resp, err := clt.ListUnifiedResources(ctx, &proto.ListUnifiedResourcesRequest{
Limit: 10,
Limit: 10,
SortBy: types.SortBy{IsDesc: true, Field: types.ResourceMetadataName},
})
require.NoError(t, err)
require.Len(t, resp.Resources, 6)
Expand Down Expand Up @@ -4376,6 +4379,7 @@ func TestListUnifiedResources_WithPredicate(t *testing.T) {
resp, err := clt.ListUnifiedResources(ctx, &proto.ListUnifiedResourcesRequest{
PredicateExpression: `labels.name == "tifa"`,
Limit: 10,
SortBy: types.SortBy{IsDesc: true, Field: types.ResourceMetadataName},
})
require.NoError(t, err)
require.Len(t, resp.Resources, 1)
Expand All @@ -4388,9 +4392,9 @@ func TestListUnifiedResources_WithPredicate(t *testing.T) {
// pkg: github.com/gravitational/teleport/lib/auth
// BenchmarkListUnifiedResources
// BenchmarkListUnifiedResources/simple_labels
// BenchmarkListUnifiedResources/simple_labels-10 1 22900895292 ns/op 15071189320 B/op 272733781 allocs/op
// BenchmarkListUnifiedResources/simple_labels-10 1 653696459 ns/op 480570296 B/op 8241706 allocs/op
// PASS
// ok github.com/gravitational/teleport/lib/auth 25.135s
// ok github.com/gravitational/teleport/lib/auth 2.878s
func BenchmarkListUnifiedResources(b *testing.B) {
const nodeCount = 50_000
const roleCount = 32
Expand Down Expand Up @@ -4497,7 +4501,8 @@ func benchmarkListUnifiedResources(
for n := 0; n < b.N; n++ {
var resources []*proto.PaginatedResource
req := &proto.ListUnifiedResourcesRequest{
Limit: 1_000,
SortBy: types.SortBy{IsDesc: false, Field: types.ResourceMetadataName},
Limit: 1_000,
}
for {
rsp, err := clt.ListUnifiedResources(ctx, req)
Expand Down
Loading