summaryrefslogtreecommitdiff
path: root/app/middleware/require_permission.go
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2025-07-23 11:50:42 -0600
committermo khan <mo@mokhan.ca>2025-07-23 11:50:42 -0600
commit944ef4ca499fe27a57d4cd3c21bccb99508526ca (patch)
tree3c929141ee07fc2a4f2c2b825630cb2ad3121b44 /app/middleware/require_permission.go
parent8a1b03afb949a5a3be6a78e9b2c88d2e48643f46 (diff)
refactor: Update RequirePermission middleware to connect to spicedb CheckPermission API
Diffstat (limited to 'app/middleware/require_permission.go')
-rw-r--r--app/middleware/require_permission.go11
1 files changed, 5 insertions, 6 deletions
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)