fix: Fixes workspace access

opengovern · Aug 1, 2024 · 90eb0d5 · 90eb0d5
1 parent ab05a19
commit 90eb0d5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/pkg/workspace/cost_estimator_apis.go b/pkg/workspace/cost_estimator_apis.go
@@ -18,7 +18,7 @@ func (s *Server) GetAwsCost(ctx echo.Context) error {
 		return echo.NewHTTPError(http.StatusBadRequest, err.Error())
 	}
 
-	if err := s.CheckRoleInWorkspace(ctx, nil, nil); err != nil {
+	if err := s.CheckRoleInWorkspace(ctx, nil, nil, ""); err != nil {
 		return err
 	}
 
@@ -40,7 +40,7 @@ func (s *Server) GetAzureCost(ctx echo.Context) error {
 		return echo.NewHTTPError(http.StatusBadRequest, err.Error())
 	}
 
-	if err := s.CheckRoleInWorkspace(ctx, nil, nil); err != nil {
+	if err := s.CheckRoleInWorkspace(ctx, nil, nil, ""); err != nil {
 		return err
 	}
 

diff --git a/pkg/workspace/helper.go b/pkg/workspace/helper.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 )
 
-func (s *Server) CheckRoleInWorkspace(ctx echo.Context, workspaceID, ownerID *string) error {
+func (s *Server) CheckRoleInWorkspace(ctx echo.Context, workspaceID, ownerID *string, workspaceName string) error {
 	resp, err := s.authClient.GetUserRoleBindings(httpclient.FromEchoContext(ctx))
 	if err != nil {
 		return fmt.Errorf("GetUserRoleBindings: %v", err)
@@ -20,6 +20,9 @@ func (s *Server) CheckRoleInWorkspace(ctx echo.Context, workspaceID, ownerID *st
 	}
 
 	hasRoleInWorkspace := false
+	if workspaceName == "main" {
+		hasRoleInWorkspace = true
+	}
 	for _, roleBinding := range resp.RoleBindings {
 		if roleBinding.WorkspaceID == *workspaceID {
 			hasRoleInWorkspace = true

diff --git a/pkg/workspace/server.go b/pkg/workspace/server.go
@@ -475,7 +475,7 @@ func (s *Server) GetBootstrapStatus(c echo.Context) error {
 		return err
 	}
 
-	if err := s.CheckRoleInWorkspace(c, &ws.ID, ws.OwnerId); err != nil {
+	if err := s.CheckRoleInWorkspace(c, &ws.ID, ws.OwnerId, workspaceName); err != nil {
 		return err
 	}
 
@@ -795,7 +795,7 @@ func (s *Server) GetWorkspace(c echo.Context) error {
 		return echo.NewHTTPError(http.StatusInternalServerError, ErrInternalServer)
 	}
 
-	if err := s.CheckRoleInWorkspace(c, &workspace.ID, workspace.OwnerId); err != nil {
+	if err := s.CheckRoleInWorkspace(c, &workspace.ID, workspace.OwnerId, workspace.Name); err != nil {
 		return err
 	}
 
@@ -832,7 +832,7 @@ func (s *Server) GetWorkspaceByName(c echo.Context) error {
 		return echo.NewHTTPError(http.StatusInternalServerError, ErrInternalServer)
 	}
 
-	if err := s.CheckRoleInWorkspace(c, &workspace.ID, workspace.OwnerId); err != nil {
+	if err := s.CheckRoleInWorkspace(c, &workspace.ID, workspace.OwnerId, name); err != nil {
 		return err
 	}
 
@@ -1061,7 +1061,7 @@ func (s *Server) GetWorkspaceLimits(c echo.Context) error {
 		return err
 	}
 
-	if err := s.CheckRoleInWorkspace(c, &dbWorkspace.ID, dbWorkspace.OwnerId); err != nil {
+	if err := s.CheckRoleInWorkspace(c, &dbWorkspace.ID, dbWorkspace.OwnerId, workspaceName); err != nil {
 		return err
 	}