Skip to content
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.

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

xds: Added support for metadataMatcher.invert #5345

Merged
merged 1 commit into from May 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions internal/xds/rbac/matchers.go
Expand Up @@ -122,8 +122,11 @@ func matchersFromPermissions(permissions []*v3rbacpb.Permission) ([]matcher, err
}
matchers = append(matchers, &notMatcher{matcherToNot: mList[0]})
case *v3rbacpb.Permission_Metadata:
// Not supported in gRPC RBAC currently - a permission typed as
// Metadata in the initial config will be a no-op.
// Never matches - so no-op if not inverted, always match if
// inverted.
if permission.GetMetadata().GetInvert() { // Test metadata being no-op and also metadata with invert always matching
matchers = append(matchers, &alwaysMatcher{})
}
case *v3rbacpb.Permission_RequestedServerName:
// Not supported in gRPC RBAC currently - a permission typed as
// requested server name in the initial config will be a no-op.
Expand Down
72 changes: 71 additions & 1 deletion internal/xds/rbac/rbac_engine_test.go
Expand Up @@ -936,8 +936,78 @@ func (s) TestChainEngine(t *testing.T) {
},
},
},
// This test tests that an RBAC policy configured with a metadata
// matcher as a permission doesn't match with any incoming RPC.
{
name: "metadata-never-matches",
rbacConfigs: []*v3rbacpb.RBAC{
{
Policies: map[string]*v3rbacpb.Policy{
"metadata-never-matches": {
Permissions: []*v3rbacpb.Permission{
{Rule: &v3rbacpb.Permission_Metadata{
Metadata: &v3matcherpb.MetadataMatcher{},
}},
},
Principals: []*v3rbacpb.Principal{
{Identifier: &v3rbacpb.Principal_Any{Any: true}},
},
},
},
},
},
rbacQueries: []struct {
rpcData *rpcData
wantStatusCode codes.Code
}{
{
rpcData: &rpcData{
fullMethod: "some method",
peerInfo: &peer.Peer{
Addr: &addr{ipAddress: "0.0.0.0"},
},
},
wantStatusCode: codes.PermissionDenied,
},
},
},
// This test tests that an RBAC policy configured with a metadata
// matcher with invert set to true as a permission always matches with
// any incoming RPC.
{
name: "metadata-invert-always-matches",
rbacConfigs: []*v3rbacpb.RBAC{
{
Policies: map[string]*v3rbacpb.Policy{
"metadata-invert-always-matches": {
Permissions: []*v3rbacpb.Permission{
{Rule: &v3rbacpb.Permission_Metadata{
Metadata: &v3matcherpb.MetadataMatcher{Invert: true},
}},
},
Principals: []*v3rbacpb.Principal{
{Identifier: &v3rbacpb.Principal_Any{Any: true}},
},
},
},
},
},
rbacQueries: []struct {
rpcData *rpcData
wantStatusCode codes.Code
}{
{
rpcData: &rpcData{
fullMethod: "some method",
peerInfo: &peer.Peer{
Addr: &addr{ipAddress: "0.0.0.0"},
},
},
wantStatusCode: codes.OK,
},
},
},
}

for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
// Instantiate the chainedRBACEngine with different configurations that are
Expand Down