fix: disabled org on create should be enabled only by SUs (#357)

Signed-off-by: Kush Sharma <[email protected]>
raystack · Sep 22, 2023 · 0c01431 · 0c01431
1 parent 315f401
commit 0c01431
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/cmd/serve.go b/cmd/serve.go
@@ -316,6 +316,7 @@ func buildAPIDependencies(
 	dependencies := api.Deps{
 		DisableOrgsListing:  cfg.App.DisableOrgsListing,
 		DisableUsersListing: cfg.App.DisableUsersListing,
+		DisableOrgOnCreate:  cfg.App.DisableOrgsOnCreate,
 		OrgService:          organizationService,
 		ProjectService:      projectService,
 		GroupService:        groupService,

diff --git a/internal/api/api.go b/internal/api/api.go
@@ -27,6 +27,7 @@ import (
 type Deps struct {
 	DisableOrgsListing  bool
 	DisableUsersListing bool
+	DisableOrgOnCreate  bool
 	OrgService          *organization.Service
 	ProjectService      *project.Service
 	GroupService        *group.Service

diff --git a/internal/api/v1beta1/v1beta1.go b/internal/api/v1beta1/v1beta1.go
@@ -12,6 +12,7 @@ type Handler struct {
 
 	DisableOrgsListing  bool
 	DisableUsersListing bool
+	DisableOrgOnCreate  bool
 	orgService          OrganizationService
 	projectService      ProjectService
 	groupService        GroupService
@@ -39,6 +40,7 @@ func Register(s *grpc.Server, deps api.Deps) error {
 	handler := &Handler{
 		DisableOrgsListing:  deps.DisableOrgsListing,
 		DisableUsersListing: deps.DisableUsersListing,
+		DisableOrgOnCreate:  deps.DisableOrgOnCreate,
 		orgService:          deps.OrgService,
 		projectService:      deps.ProjectService,
 		groupService:        deps.GroupService,

diff --git a/pkg/server/interceptors/authorization.go b/pkg/server/interceptors/authorization.go
@@ -286,7 +286,9 @@ var authorizationValidationMap = map[string]func(ctx context.Context, handler *v
 		return handler.IsAuthorized(ctx, schema.OrganizationNamespace, pbreq.GetId(), schema.UpdatePermission)
 	},
 	"/raystack.frontier.v1beta1.FrontierService/EnableOrganization": func(ctx context.Context, handler *v1beta1.Handler, req any) error {
-		//TODO(kushsharma): if we disable org creation being enabled, only super admins can enable it
+		if handler.DisableOrgOnCreate {
+			return handler.IsSuperUser(ctx)
+		}
 		pbreq := req.(*frontierv1beta1.EnableOrganizationRequest)
 		return handler.IsAuthorized(ctx, schema.OrganizationNamespace, pbreq.GetId(), schema.DeletePermission)
 	},