grant permissions

backend/src/ee/services/permission/default-roles.ts

@@ -4,6 +4,7 @@ import {
   ProjectPermissionActions,
   ProjectPermissionAppConnectionActions,
   ProjectPermissionApprovalRequestActions,
+  ProjectPermissionApprovalRequestGrantActions,
   ProjectPermissionAuditLogsActions,
   ProjectPermissionCertificateActions,
   ProjectPermissionCertificateAuthorityActions,
@@ -345,6 +346,11 @@ const buildAdminPermissionRules = () => {
     ProjectPermissionSub.ApprovalRequests
   );
 
+  can(
+    [ProjectPermissionApprovalRequestGrantActions.Read, ProjectPermissionApprovalRequestGrantActions.Revoke],
+    ProjectPermissionSub.ApprovalRequestGrants
+  );
+
   return rules;
 };
 

backend/src/ee/services/permission/project-permission.ts

@@ -229,6 +229,11 @@ export enum ProjectPermissionApprovalRequestActions {
   Create = "create"
 }
 
+export enum ProjectPermissionApprovalRequestGrantActions {
+  Read = "read",
+  Revoke = "revoke"
+}
+
 export const isCustomProjectRole = (slug: string) =>
   !Object.values(ProjectMembershipRole).includes(slug as ProjectMembershipRole);
 
@@ -280,7 +285,8 @@ export enum ProjectPermissionSub {
   PamAccounts = "pam-accounts",
   PamSessions = "pam-sessions",
   CertificateProfiles = "certificate-profiles",
-  ApprovalRequests = "approval-requests"
+  ApprovalRequests = "approval-requests",
+  ApprovalRequestGrants = "approval-request-grants"
 }
 
 export type SecretSubjectFields = {
@@ -507,7 +513,8 @@ export type ProjectPermissionSet =
         | (ForcedSubject<ProjectPermissionSub.CertificateProfiles> & CertificateProfileSubjectFields)
       )
     ]
-  | [ProjectPermissionApprovalRequestActions, ProjectPermissionSub.ApprovalRequests];
+  | [ProjectPermissionApprovalRequestActions, ProjectPermissionSub.ApprovalRequests]
+  | [ProjectPermissionApprovalRequestGrantActions, ProjectPermissionSub.ApprovalRequestGrants];
 
 const SECRET_PATH_MISSING_SLASH_ERR_MSG = "Invalid Secret Path; it must start with a '/'";
 const SECRET_PATH_PERMISSION_OPERATOR_SCHEMA = z.union([
@@ -1118,6 +1125,12 @@ const GeneralPermissionSchema = [
     action: CASL_ACTION_SCHEMA_NATIVE_ENUM(ProjectPermissionApprovalRequestActions).describe(
       "Describe what action an entity can take."
     )
+  }),
+  z.object({
+    subject: z.literal(ProjectPermissionSub.ApprovalRequestGrants).describe("The entity this permission pertains to."),
+    action: CASL_ACTION_SCHEMA_NATIVE_ENUM(ProjectPermissionApprovalRequestGrantActions).describe(
+      "Describe what action an entity can take."
+    )
   })
 ];
 

backend/src/services/approval-policy/approval-policy-service.ts

@@ -38,6 +38,7 @@ import { ForbiddenError } from "@casl/ability";
 import {
   ProjectPermissionActions,
   ProjectPermissionApprovalRequestActions,
+  ProjectPermissionApprovalRequestGrantActions,
   ProjectPermissionSub
 } from "@app/ee/services/permission/project-permission";
 
@@ -87,7 +88,7 @@ export const approvalPolicyServiceFactory = ({
 
     if (userIdsToNotify.size === 0) return;
 
-    // TODO: Potentially link to requests in the future?
+    // TODO: Potentially link to requests in the future to support click redirects
     await notificationService.createUserNotifications(
       Array.from(userIdsToNotify).map((userId) => ({
         userId,
@@ -793,20 +794,44 @@ export const approvalPolicyServiceFactory = ({
   };
 
   const listGrants = async (policyType: ApprovalPolicyType, projectId: string, actor: OrgServiceActor) => {
-    // TODO(andrey): Perm check
+    const { permission } = await permissionService.getProjectPermission({
+      actor: actor.type,
+      actorAuthMethod: actor.authMethod,
+      actorId: actor.id,
+      actorOrgId: actor.orgId,
+      projectId,
+      actionProjectType: ActionProjectType.Any
+    });
+
+    ForbiddenError.from(permission).throwUnlessCan(
+      ProjectPermissionApprovalRequestGrantActions.Read,
+      ProjectPermissionSub.ApprovalRequestGrants
+    );
 
     const grants = await approvalRequestGrantsDAL.find({ projectId, type: policyType });
     return { grants };
   };
 
   const getGrantById = async (grantId: string, actor: OrgServiceActor) => {
-    // TODO(andrey): Perm check
-
     const grant = await approvalRequestGrantsDAL.findById(grantId);
     if (!grant) {
       throw new NotFoundError({ message: "Grant not found" });
     }
 
+    const { permission } = await permissionService.getProjectPermission({
+      actor: actor.type,
+      actorAuthMethod: actor.authMethod,
+      actorId: actor.id,
+      actorOrgId: actor.orgId,
+      projectId: grant.projectId,
+      actionProjectType: ActionProjectType.Any
+    });
+
+    ForbiddenError.from(permission).throwUnlessCan(
+      ProjectPermissionApprovalRequestGrantActions.Read,
+      ProjectPermissionSub.ApprovalRequestGrants
+    );
+
     return { grant };
   };
 
@@ -815,13 +840,25 @@ export const approvalPolicyServiceFactory = ({
     { revocationReason }: { revocationReason?: string },
     actor: OrgServiceActor
   ) => {
-    // TODO(andrey): Perm check
-
     const grant = await approvalRequestGrantsDAL.findById(grantId);
     if (!grant) {
       throw new NotFoundError({ message: "Grant not found" });
     }
 
+    const { permission } = await permissionService.getProjectPermission({
+      actor: actor.type,
+      actorAuthMethod: actor.authMethod,
+      actorId: actor.id,
+      actorOrgId: actor.orgId,
+      projectId: grant.projectId,
+      actionProjectType: ActionProjectType.Any
+    });
+
+    ForbiddenError.from(permission).throwUnlessCan(
+      ProjectPermissionApprovalRequestGrantActions.Revoke,
+      ProjectPermissionSub.ApprovalRequestGrants
+    );
+
     if (grant.status !== ApprovalRequestGrantStatus.Active) {
       throw new BadRequestError({ message: "Grant is not active" });
     }