refactor: Update RequirePermission middleware to connect to spicedb CheckPermission API

3 files changed, 32 insertions, 22 deletions

diff --git a/app/middleware/permission.go b/app/middleware/permission.go
index 03e7cf9..36a7ea0 100644
--- a/app/middleware/permission.go
+++ b/app/middleware/permission.go
@@ -1,7 +1,7 @@
 package middleware
 
 import (
-	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/authzd.git/pkg/rpc"
+	v1 "github.com/authzed/authzed-go/proto/authzed/api/v1"
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/domain"
 )
 
@@ -11,11 +11,13 @@ func (p Permission) ToGID() string {
 	return "gid://sparkle/Permission/" + p.String()
 }
 
-func (p Permission) RequestFor(user domain.Identifiable, resource domain.Identifiable) *rpc.AllowRequest {
-	return &rpc.AllowRequest{
-		Subject:    user.ToGID(),
-		Permission: p.ToGID(),
-		Resource:   resource.ToGID(),
+func (p Permission) RequestFor(user domain.Identifiable, resource domain.Identifiable) *v1.CheckPermissionRequest {
+	return &v1.CheckPermissionRequest{
+		Subject: &v1.SubjectReference{
+			Object: user.ToObjectReference(),
+		},
+		Permission: p.String(),
+		Resource:   resource.ToObjectReference(),
 	}
 }
 
diff --git a/app/middleware/require_permission.go b/app/middleware/require_permission.go
index 563278e..a10a9b6 100644
--- a/app/middleware/require_permission.go
+++ b/app/middleware/require_permission.go
@@ -3,27 +3,26 @@ package middleware
 import (
 	"net/http"
 
-	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/authzd.git/pkg/rpc"
+	v1 "github.com/authzed/authzed-go/proto/authzed/api/v1"
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/cfg"
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/domain"
+	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/authz"
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/pls"
 )
 
-func RequirePermission(permission Permission, ability rpc.Ability) func(http.Handler) http.Handler {
+func RequirePermission(permission Permission, client authz.CheckPermission) func(http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			user := cfg.CurrentUser.From(r.Context())
 
-			reply, err := ability.Allowed(r.Context(),
-				permission.RequestFor(user, &domain.Sparkle{ID: "*"}),
-			)
+			reply, err := client.CheckPermission(r.Context(), permission.RequestFor(user, &domain.Sparkle{ID: "*"}))
 			if err != nil {
 				pls.LogError(r.Context(), err)
 				w.WriteHeader(http.StatusForbidden)
 				return
 			}
 
-			if reply.Result {
+			if reply.Permissionship == v1.CheckPermissionResponse_PERMISSIONSHIP_HAS_PERMISSION {
 				next.ServeHTTP(w, r)
 			} else {
 				w.WriteHeader(http.StatusForbidden)
diff --git a/app/middleware/require_permission_test.go b/app/middleware/require_permission_test.go
index 34a04a7..df21b5a 100644
--- a/app/middleware/require_permission_test.go
+++ b/app/middleware/require_permission_test.go
@@ -5,16 +5,17 @@ import (
 	"net/http"
 	"testing"
 
+	v1 "github.com/authzed/authzed-go/proto/authzed/api/v1"
 	"github.com/stretchr/testify/require"
 	"github.com/xlgmokha/x/pkg/test"
-	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/authzd.git/pkg/rpc"
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/cfg"
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/domain"
+	"google.golang.org/grpc"
 )
 
-type MockAbility func(context.Context, *rpc.AllowRequest) (*rpc.AllowReply, error)
+type MockAbility func(context.Context, *v1.CheckPermissionRequest) (*v1.CheckPermissionResponse, error)
 
-func (m MockAbility) Allowed(ctx context.Context, r *rpc.AllowRequest) (*rpc.AllowReply, error) {
+func (m MockAbility) CheckPermission(ctx context.Context, r *v1.CheckPermissionRequest, opts ...grpc.CallOption) (*v1.CheckPermissionResponse, error) {
 	return m(ctx, r)
 }
 
@@ -26,12 +27,18 @@ func TestRequirePermission(t *testing.T) {
 	t.Run("when the permission is granted", func(t *testing.T) {
 		r, w := test.RequestResponse("GET", "/sparkles", test.WithContext(ctx))
 
-		middleware := RequirePermission(permission, MockAbility(func(ctx context.Context, r *rpc.AllowRequest) (*rpc.AllowReply, error) {
-			require.Equal(t, "gid://sparkle/User/"+user.ID.String(), r.Subject)
-			require.Equal(t, permission.ToGID(), r.Permission)
-			require.Equal(t, "gid://sparkle/Sparkle/*", r.Resource)
+		middleware := RequirePermission(permission, MockAbility(func(ctx context.Context, r *v1.CheckPermissionRequest) (*v1.CheckPermissionResponse, error) {
+			require.Equal(t, "user", r.Subject.Object.ObjectType)
+			require.Equal(t, user.Username, r.Subject.Object.ObjectId)
 
-			return &rpc.AllowReply{Result: true}, nil
+			require.Equal(t, permission.String(), r.Permission)
+
+			require.Equal(t, "sparkle", r.Resource.ObjectType)
+			require.Equal(t, "*", r.Resource.ObjectId)
+
+			return &v1.CheckPermissionResponse{
+				Permissionship: v1.CheckPermissionResponse_PERMISSIONSHIP_HAS_PERMISSION,
+			}, nil
 		}))
 		server := middleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			w.WriteHeader(http.StatusTeapot)
@@ -44,8 +51,10 @@ func TestRequirePermission(t *testing.T) {
 	t.Run("when the permission is denied", func(t *testing.T) {
 		r, w := test.RequestResponse("GET", "/sparkles", test.WithContext(ctx))
 
-		middleware := RequirePermission(permission, MockAbility(func(ctx context.Context, r *rpc.AllowRequest) (*rpc.AllowReply, error) {
-			return &rpc.AllowReply{Result: false}, nil
+		middleware := RequirePermission(permission, MockAbility(func(ctx context.Context, r *v1.CheckPermissionRequest) (*v1.CheckPermissionResponse, error) {
+			return &v1.CheckPermissionResponse{
+				Permissionship: v1.CheckPermissionResponse_PERMISSIONSHIP_NO_PERMISSION,
+			}, nil
 		}))
 		server := middleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			require.Fail(t, "unexpected call to handler")