mirror of
https://github.com/zitadel/zitadel.git
synced 2025-07-15 22:38:36 +00:00

# Which Problems Are Solved Permission checks in project v2beta API did not cover projects and granted projects correctly. # How the Problems Are Solved Add permission checks v1 correctly to the list queries, add correct permission checks v2 for projects. # Additional Changes Correct Pre-Checks for project grants that the right resource owner is used. # Additional Context Permission checks v2 for project grants is still outstanding under #9972.
127 lines
4.1 KiB
Go
127 lines
4.1 KiB
Go
package project
|
|
|
|
import (
|
|
"context"
|
|
|
|
"google.golang.org/protobuf/types/known/timestamppb"
|
|
|
|
"github.com/zitadel/zitadel/internal/command"
|
|
"github.com/zitadel/zitadel/internal/eventstore/v1/models"
|
|
"github.com/zitadel/zitadel/internal/query"
|
|
project_pb "github.com/zitadel/zitadel/pkg/grpc/project/v2beta"
|
|
)
|
|
|
|
func (s *Server) CreateProjectGrant(ctx context.Context, req *project_pb.CreateProjectGrantRequest) (*project_pb.CreateProjectGrantResponse, error) {
|
|
add := projectGrantCreateToCommand(req)
|
|
project, err := s.command.AddProjectGrant(ctx, add)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var creationDate *timestamppb.Timestamp
|
|
if !project.EventDate.IsZero() {
|
|
creationDate = timestamppb.New(project.EventDate)
|
|
}
|
|
return &project_pb.CreateProjectGrantResponse{
|
|
CreationDate: creationDate,
|
|
}, nil
|
|
}
|
|
|
|
func projectGrantCreateToCommand(req *project_pb.CreateProjectGrantRequest) *command.AddProjectGrant {
|
|
return &command.AddProjectGrant{
|
|
ObjectRoot: models.ObjectRoot{
|
|
AggregateID: req.ProjectId,
|
|
},
|
|
GrantID: req.GrantedOrganizationId,
|
|
GrantedOrgID: req.GrantedOrganizationId,
|
|
RoleKeys: req.RoleKeys,
|
|
}
|
|
}
|
|
|
|
func (s *Server) UpdateProjectGrant(ctx context.Context, req *project_pb.UpdateProjectGrantRequest) (*project_pb.UpdateProjectGrantResponse, error) {
|
|
project, err := s.command.ChangeProjectGrant(ctx, projectGrantUpdateToCommand(req))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var changeDate *timestamppb.Timestamp
|
|
if !project.EventDate.IsZero() {
|
|
changeDate = timestamppb.New(project.EventDate)
|
|
}
|
|
return &project_pb.UpdateProjectGrantResponse{
|
|
ChangeDate: changeDate,
|
|
}, nil
|
|
}
|
|
|
|
func projectGrantUpdateToCommand(req *project_pb.UpdateProjectGrantRequest) *command.ChangeProjectGrant {
|
|
return &command.ChangeProjectGrant{
|
|
ObjectRoot: models.ObjectRoot{
|
|
AggregateID: req.ProjectId,
|
|
},
|
|
GrantedOrgID: req.GrantedOrganizationId,
|
|
RoleKeys: req.RoleKeys,
|
|
}
|
|
}
|
|
|
|
func (s *Server) DeactivateProjectGrant(ctx context.Context, req *project_pb.DeactivateProjectGrantRequest) (*project_pb.DeactivateProjectGrantResponse, error) {
|
|
details, err := s.command.DeactivateProjectGrant(ctx, req.ProjectId, "", req.GrantedOrganizationId, "")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var changeDate *timestamppb.Timestamp
|
|
if !details.EventDate.IsZero() {
|
|
changeDate = timestamppb.New(details.EventDate)
|
|
}
|
|
return &project_pb.DeactivateProjectGrantResponse{
|
|
ChangeDate: changeDate,
|
|
}, nil
|
|
}
|
|
|
|
func (s *Server) ActivateProjectGrant(ctx context.Context, req *project_pb.ActivateProjectGrantRequest) (*project_pb.ActivateProjectGrantResponse, error) {
|
|
details, err := s.command.ReactivateProjectGrant(ctx, req.ProjectId, "", req.GrantedOrganizationId, "")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var changeDate *timestamppb.Timestamp
|
|
if !details.EventDate.IsZero() {
|
|
changeDate = timestamppb.New(details.EventDate)
|
|
}
|
|
return &project_pb.ActivateProjectGrantResponse{
|
|
ChangeDate: changeDate,
|
|
}, nil
|
|
}
|
|
|
|
func (s *Server) DeleteProjectGrant(ctx context.Context, req *project_pb.DeleteProjectGrantRequest) (*project_pb.DeleteProjectGrantResponse, error) {
|
|
userGrantIDs, err := s.userGrantsFromProjectGrant(ctx, req.ProjectId, req.GrantedOrganizationId)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
details, err := s.command.DeleteProjectGrant(ctx, req.ProjectId, "", req.GrantedOrganizationId, "", userGrantIDs...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var deletionDate *timestamppb.Timestamp
|
|
if !details.EventDate.IsZero() {
|
|
deletionDate = timestamppb.New(details.EventDate)
|
|
}
|
|
return &project_pb.DeleteProjectGrantResponse{
|
|
DeletionDate: deletionDate,
|
|
}, nil
|
|
}
|
|
|
|
func (s *Server) userGrantsFromProjectGrant(ctx context.Context, projectID, grantedOrganizationID string) ([]string, error) {
|
|
projectQuery, err := query.NewUserGrantProjectIDSearchQuery(projectID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
grantQuery, err := query.NewUserGrantGrantIDSearchQuery(grantedOrganizationID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
userGrants, err := s.query.UserGrants(ctx, &query.UserGrantsQueries{
|
|
Queries: []query.SearchQuery{projectQuery, grantQuery},
|
|
}, false)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return userGrantsToIDs(userGrants.UserGrants), nil
|
|
}
|