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.

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

Jump to bottom

authz: removes sdk term from grpc authz #5191

Merged
merged 2 commits into from Feb 10, 2022
Merged

authz: removes sdk term from grpc authz #5191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ac3608
remove sdk term from grpc authz
ashithasantosh Feb 10, 2022
72fff4e
Merge remote-tracking branch 'upstream/master' into remove_sdk_term
ashithasantosh Feb 10, 2022
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
44 changes: 22 additions & 22 deletions authz/sdk_end2end_test.go → authz/grpc_authz_end2end_test.go
View file
Open in desktop
Expand Up @@ -69,7 +69,7 @@ func Test(t *testing.T) {
grpctest.RunSubTests(t, s{})
}

var sdkTests = map[string]struct {
var authzTests = map[string]struct {
authzPolicy string
md metadata.MD
wantStatus *status.Status
Expand Down Expand Up @@ -307,10 +307,10 @@ var sdkTests = map[string]struct {
},
}

func (s) TestSDKStaticPolicyEnd2End(t *testing.T) {
for name, test := range sdkTests {
func (s) TestStaticPolicyEnd2End(t *testing.T) {
for name, test := range authzTests {
t.Run(name, func(t *testing.T) {
// Start a gRPC server with SDK unary and stream server interceptors.
// Start a gRPC server with gRPC authz unary and stream server interceptors.
i, _ := authz.NewStatic(test.authzPolicy)
s := grpc.NewServer(
grpc.ChainUnaryInterceptor(i.UnaryInterceptor),
Expand Down Expand Up @@ -363,7 +363,7 @@ func (s) TestSDKStaticPolicyEnd2End(t *testing.T) {
}
}

func (s) TestSDKAllowsRPCRequestWithPrincipalsFieldOnTLSAuthenticatedConnection(t *testing.T) {
func (s) TestAllowsRPCRequestWithPrincipalsFieldOnTLSAuthenticatedConnection(t *testing.T) {
authzPolicy := `{
"name": "authz",
"allow_rules":
Expand All @@ -376,7 +376,7 @@ func (s) TestSDKAllowsRPCRequestWithPrincipalsFieldOnTLSAuthenticatedConnection(
}
]
}`
// Start a gRPC server with SDK unary server interceptor.
// Start a gRPC server with gRPC authz unary server interceptor.
i, _ := authz.NewStatic(authzPolicy)
creds, err := credentials.NewServerTLSFromFile(testdata.Path("x509/server1_cert.pem"), testdata.Path("x509/server1_key.pem"))
if err != nil {
Expand Down Expand Up @@ -415,7 +415,7 @@ func (s) TestSDKAllowsRPCRequestWithPrincipalsFieldOnTLSAuthenticatedConnection(
}
}

func (s) TestSDKAllowsRPCRequestWithPrincipalsFieldOnMTLSAuthenticatedConnection(t *testing.T) {
func (s) TestAllowsRPCRequestWithPrincipalsFieldOnMTLSAuthenticatedConnection(t *testing.T) {
authzPolicy := `{
"name": "authz",
"allow_rules":
Expand All @@ -428,7 +428,7 @@ func (s) TestSDKAllowsRPCRequestWithPrincipalsFieldOnMTLSAuthenticatedConnection
}
]
}`
// Start a gRPC server with SDK unary server interceptor.
// Start a gRPC server with gRPC authz unary server interceptor.
i, _ := authz.NewStatic(authzPolicy)
cert, err := tls.LoadX509KeyPair(testdata.Path("x509/server1_cert.pem"), testdata.Path("x509/server1_key.pem"))
if err != nil {
Expand Down Expand Up @@ -493,14 +493,14 @@ func (s) TestSDKAllowsRPCRequestWithPrincipalsFieldOnMTLSAuthenticatedConnection
}
}

func (s) TestSDKFileWatcherEnd2End(t *testing.T) {
for name, test := range sdkTests {
func (s) TestFileWatcherEnd2End(t *testing.T) {
for name, test := range authzTests {
t.Run(name, func(t *testing.T) {
file := createTmpPolicyFile(t, name, []byte(test.authzPolicy))
i, _ := authz.NewFileWatcher(file, 1*time.Second)
defer i.Close()

// Start a gRPC server with SDK unary and stream server interceptors.
// Start a gRPC server with gRPC authz unary and stream server interceptors.
s := grpc.NewServer(
grpc.ChainUnaryInterceptor(i.UnaryInterceptor),
grpc.ChainStreamInterceptor(i.StreamInterceptor))
Expand Down Expand Up @@ -564,13 +564,13 @@ func retryUntil(ctx context.Context, tsc pb.TestServiceClient, want *status.Stat
return lastErr
}

func (s) TestSDKFileWatcher_ValidPolicyRefresh(t *testing.T) {
valid1 := sdkTests["DeniesRPCMatchInDenyAndAllow"]
func (s) TestFileWatcher_ValidPolicyRefresh(t *testing.T) {
valid1 := authzTests["DeniesRPCMatchInDenyAndAllow"]
file := createTmpPolicyFile(t, "valid_policy_refresh", []byte(valid1.authzPolicy))
i, _ := authz.NewFileWatcher(file, 100*time.Millisecond)
defer i.Close()

// Start a gRPC server with SDK unary server interceptor.
// Start a gRPC server with gRPC authz unary server interceptor.
s := grpc.NewServer(
grpc.ChainUnaryInterceptor(i.UnaryInterceptor))
defer s.Stop()
Expand Down Expand Up @@ -601,7 +601,7 @@ func (s) TestSDKFileWatcher_ValidPolicyRefresh(t *testing.T) {
}

// Rewrite the file with a different valid authorization policy.
valid2 := sdkTests["AllowsRPCEmptyDenyMatchInAllow"]
valid2 := authzTests["AllowsRPCEmptyDenyMatchInAllow"]
if err := ioutil.WriteFile(file, []byte(valid2.authzPolicy), os.ModePerm); err != nil {
t.Fatalf("ioutil.WriteFile(%q) failed: %v", file, err)
}
Expand All @@ -612,13 +612,13 @@ func (s) TestSDKFileWatcher_ValidPolicyRefresh(t *testing.T) {
}
}

func (s) TestSDKFileWatcher_InvalidPolicySkipReload(t *testing.T) {
valid := sdkTests["DeniesRPCMatchInDenyAndAllow"]
func (s) TestFileWatcher_InvalidPolicySkipReload(t *testing.T) {
valid := authzTests["DeniesRPCMatchInDenyAndAllow"]
file := createTmpPolicyFile(t, "invalid_policy_skip_reload", []byte(valid.authzPolicy))
i, _ := authz.NewFileWatcher(file, 20*time.Millisecond)
defer i.Close()

// Start a gRPC server with SDK unary server interceptors.
// Start a gRPC server with gRPC authz unary server interceptors.
s := grpc.NewServer(
grpc.ChainUnaryInterceptor(i.UnaryInterceptor))
defer s.Stop()
Expand Down Expand Up @@ -663,13 +663,13 @@ func (s) TestSDKFileWatcher_InvalidPolicySkipReload(t *testing.T) {
}
}

func (s) TestSDKFileWatcher_RecoversFromReloadFailure(t *testing.T) {
valid1 := sdkTests["DeniesRPCMatchInDenyAndAllow"]
func (s) TestFileWatcher_RecoversFromReloadFailure(t *testing.T) {
valid1 := authzTests["DeniesRPCMatchInDenyAndAllow"]
file := createTmpPolicyFile(t, "recovers_from_reload_failure", []byte(valid1.authzPolicy))
i, _ := authz.NewFileWatcher(file, 100*time.Millisecond)
defer i.Close()

// Start a gRPC server with SDK unary server interceptors.
// Start a gRPC server with gRPC authz unary server interceptors.
s := grpc.NewServer(
grpc.ChainUnaryInterceptor(i.UnaryInterceptor))
defer s.Stop()
Expand Down Expand Up @@ -714,7 +714,7 @@ func (s) TestSDKFileWatcher_RecoversFromReloadFailure(t *testing.T) {
}

// Rewrite the file with a different valid authorization policy.
valid2 := sdkTests["AllowsRPCEmptyDenyMatchInAllow"]
valid2 := authzTests["AllowsRPCEmptyDenyMatchInAllow"]
if err := ioutil.WriteFile(file, []byte(valid2.authzPolicy), os.ModePerm); err != nil {
t.Fatalf("ioutil.WriteFile(%q) failed: %v", file, err)
}
Expand Down
0 authz/sdk_server_interceptors.go → authz/grpc_authz_server_interceptors.go
View file
Open in desktop
File renamed without changes.
0 authz/sdk_server_interceptors_test.go → authz/grpc_authz_server_interceptors_test.go
View file
Open in desktop
File renamed without changes.