Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

refact approval requests into another service

adilson695dc2fe0614
diff --git a/backend/src/@types/fastify.d.ts b/backend/src/@types/fastify.d.ts
index 333a010c67..dd300536b8 100644
--- a/backend/src/@types/fastify.d.ts
+++ b/backend/src/@types/fastify.d.ts
@@ -168,7 +168,8 @@ import { TReminderServiceFactory } from "@app/services/reminder/reminder-types";
import { TResourceMetadataServiceFactory } from "@app/services/resource-metadata/resource-metadata-service";
import { TRoleServiceFactory } from "@app/services/role/role-service";
import { TSecretServiceFactory } from "@app/services/secret/secret-service";
-import { TSecretAccessApprovalBridgeServiceFactory } from "@app/services/secret-access-approval-bridge/secret-access-approval-bridge-service";
+import { TSecretAccessApprovalPolicyBridgeServiceFactory } from "@app/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service";
+import { TSecretAccessApprovalRequestBridgeServiceFactory } from "@app/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-service";
import { TSecretBlindIndexServiceFactory } from "@app/services/secret-blind-index/secret-blind-index-service";
import { TSecretFolderServiceFactory } from "@app/services/secret-folder/secret-folder-service";
import { TSecretImportServiceFactory } from "@app/services/secret-import/secret-import-service";
@@ -346,7 +347,8 @@ declare module "fastify" {
identitySpiffeAuth: TIdentitySpiffeAuthServiceFactory;
identityLdapAuth: TIdentityLdapAuthServiceFactory;
accessApprovalPolicy: TAccessApprovalPolicyServiceFactory;
- secretAccessApprovalBridge: TSecretAccessApprovalBridgeServiceFactory;
+ secretAccessApprovalPolicyBridge: TSecretAccessApprovalPolicyBridgeServiceFactory;
+ secretAccessApprovalRequestBridge: TSecretAccessApprovalRequestBridgeServiceFactory;
accessApprovalRequest: TAccessApprovalRequestServiceFactory;
secretApprovalPolicy: TSecretApprovalPolicyServiceFactory;
secretApprovalRequest: TSecretApprovalRequestServiceFactory;
diff --git a/backend/src/ee/routes/v1/access-approval-policy-router.ts b/backend/src/ee/routes/v1/access-approval-policy-router.ts
index 1e85522055..d10596c7ed 100644
--- a/backend/src/ee/routes/v1/access-approval-policy-router.ts
+++ b/backend/src/ee/routes/v1/access-approval-policy-router.ts
@@ -148,7 +148,7 @@ export const registerAccessApprovalPolicyRouter = async (server: FastifyZodProvi
},
onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),
handler: async (req) => {
- const approval = await server.services.secretAccessApprovalBridge.createAccessApprovalPolicy({
+ const approval = await server.services.secretAccessApprovalPolicyBridge.createAccessApprovalPolicy({
actor: req.permission.type,
actorId: req.permission.id,
actorAuthMethod: req.permission.authMethod,
diff --git a/backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts b/backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts
index 6cc0abd072..31c0747b8a 100644
--- a/backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts
+++ b/backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts
@@ -13,8 +13,8 @@ import {
import { ApprovalPolicyType } from "@app/services/approval-policy/approval-policy-enums";
import { TProjectDALFactory } from "@app/services/project/project-dal";
import { TProjectEnvDALFactory } from "@app/services/project-env/project-env-dal";
-import { secretAccessApprovalPolicyExists } from "@app/services/secret-access-approval-bridge/secret-access-approval-bridge-fns";
-import { TSecretAccessApprovalBridgeServiceFactory } from "@app/services/secret-access-approval-bridge/secret-access-approval-bridge-service";
+import { secretAccessApprovalPolicyExists } from "@app/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns";
+import { TSecretAccessApprovalPolicyBridgeServiceFactory } from "@app/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service";
import { TUserDALFactory } from "@app/services/user/user-dal";
import { TAccessApprovalRequestDALFactory } from "../access-approval-request/access-approval-request-dal";
@@ -56,8 +56,8 @@ type TAccessApprovalPolicyServiceFactoryDep = {
TApprovalPolicySecretEnvironmentDALFactory,
"findPolicyByEnvIdsAndSecretPath"
>;
- secretAccessApprovalBridge: Pick<
- TSecretAccessApprovalBridgeServiceFactory,
+ secretAccessApprovalPolicyBridge: Pick<
+ TSecretAccessApprovalPolicyBridgeServiceFactory,
| "updateAccessApprovalPolicy"
| "deleteAccessApprovalPolicy"
| "getAccessApprovalPolicyById"
@@ -81,7 +81,7 @@ export const accessApprovalPolicyServiceFactory = ({
accessApprovalRequestReviewerDAL,
approvalPolicyDAL,
approvalPolicySecretEnvironmentDAL,
- secretAccessApprovalBridge
+ secretAccessApprovalPolicyBridge
}: TAccessApprovalPolicyServiceFactoryDep): TAccessApprovalPolicyServiceFactory => {
const $usesGlobalApprovalBridge = async (policyId: string) => {
const globalPolicy = await approvalPolicyDAL.findOne({ id: policyId, type: ApprovalPolicyType.SecretAccess });
@@ -89,10 +89,10 @@ export const accessApprovalPolicyServiceFactory = ({
};
const $listGlobalApprovalPolicies = (projectId: string) =>
- secretAccessApprovalBridge.listAccessApprovalPolicies({ projectId });
+ secretAccessApprovalPolicyBridge.listAccessApprovalPolicies({ projectId });
const $countGlobalApprovalPolicies = (projectId: string, envId: string) =>
- secretAccessApprovalBridge.countAccessApprovalPolicies({ projectId, envId });
+ secretAccessApprovalPolicyBridge.countAccessApprovalPolicies({ projectId, envId });
const $policyExists = async ({
envId,
@@ -107,7 +107,7 @@ export const accessApprovalPolicyServiceFactory = ({
}) => {
const resolvedEnvIds = envId ? [envId] : envIds;
if (!resolvedEnvIds?.length) {
- throw new BadRequestError({ message: "Must provide either envId or envIds" });
+ throw new BadRequestError({ message: "Must provide either envId or envIds" });
}
for (const id of resolvedEnvIds) {
@@ -390,7 +390,7 @@ export const accessApprovalPolicyServiceFactory = ({
requestExpirationTime
}: TUpdateAccessApprovalPolicy) => {
if (await $usesGlobalApprovalBridge(policyId)) {
- return secretAccessApprovalBridge.updateAccessApprovalPolicy({
+ return secretAccessApprovalPolicyBridge.updateAccessApprovalPolicy({
policyId,
approvers,
bypassers,
@@ -666,7 +666,7 @@ export const accessApprovalPolicyServiceFactory = ({
actorOrgId
}: TDeleteAccessApprovalPolicy) => {
if (await $usesGlobalApprovalBridge(policyId)) {
- return secretAccessApprovalBridge.deleteAccessApprovalPolicy({
+ return secretAccessApprovalPolicyBridge.deleteAccessApprovalPolicy({
policyId,
actor,
actorId,
@@ -767,7 +767,7 @@ export const accessApprovalPolicyServiceFactory = ({
policyId
}) => {
if (await $usesGlobalApprovalBridge(policyId)) {
- return secretAccessApprovalBridge.getAccessApprovalPolicyById({
+ return secretAccessApprovalPolicyBridge.getAccessApprovalPolicyById({
policyId,
actor,
actorId,
diff --git a/backend/src/ee/services/access-approval-request/access-approval-request-service.ts b/backend/src/ee/services/access-approval-request/access-approval-request-service.ts
index 308e16a667..749e65ca65 100644
--- a/backend/src/ee/services/access-approval-request/access-approval-request-service.ts
+++ b/backend/src/ee/services/access-approval-request/access-approval-request-service.ts
@@ -27,7 +27,7 @@ import { TMicrosoftTeamsServiceFactory } from "@app/services/microsoft-teams/mic
import { TProjectMicrosoftTeamsConfigDALFactory } from "@app/services/microsoft-teams/project-microsoft-teams-config-dal";
import { TProjectDALFactory } from "@app/services/project/project-dal";
import { TProjectEnvDALFactory } from "@app/services/project-env/project-env-dal";
-import { TSecretAccessApprovalBridgeServiceFactory } from "@app/services/secret-access-approval-bridge/secret-access-approval-bridge-service";
+import { TSecretAccessApprovalRequestBridgeServiceFactory } from "@app/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-service";
import { TProjectSlackConfigDALFactory } from "@app/services/slack/project-slack-config-dal";
import { SmtpTemplates, TSmtpService } from "@app/services/smtp/smtp-service";
import { TUserDALFactory } from "@app/services/user/user-dal";
@@ -77,8 +77,8 @@ type TSecretApprovalRequestServiceFactoryDep = {
>;
accessApprovalPolicyDAL: Pick<TAccessApprovalPolicyDALFactory, "findOne" | "find" | "findLastValidPolicy">;
secretAccessApprovalResource: Pick<TSecretAccessApprovalResource, "matchPolicy">;
- secretAccessApprovalBridge: Pick<
- TSecretAccessApprovalBridgeServiceFactory,
+ secretAccessApprovalRequestBridge: Pick<
+ TSecretAccessApprovalRequestBridgeServiceFactory,
| "createAccessApprovalRequest"
| "listAccessApprovalRequests"
| "countAccessApprovalRequests"
@@ -121,7 +121,7 @@ export const accessApprovalRequestServiceFactory = ({
accessApprovalPolicyDAL,
accessApprovalPolicyApproverDAL,
secretAccessApprovalResource,
- secretAccessApprovalBridge,
+ secretAccessApprovalRequestBridge,
additionalPrivilegeDAL,
smtpService,
userDAL,
@@ -306,7 +306,7 @@ export const accessApprovalRequestServiceFactory = ({
});
if (approvalBridge.usesGlobalBridge) {
- return secretAccessApprovalBridge.createAccessApprovalRequest({
+ return secretAccessApprovalRequestBridge.createAccessApprovalRequest({
policy: approvalBridge.globalPolicy,
projectId: project.id,
envId: environment.id,
@@ -528,7 +528,7 @@ export const accessApprovalRequestServiceFactory = ({
editNote,
requestId
}) => {
- if (await secretAccessApprovalBridge.isGlobalAccessApprovalRequest(requestId)) {
+ if (await secretAccessApprovalRequestBridge.isGlobalAccessApprovalRequest(requestId)) {
throw new BadRequestError({ message: "Access requests on the global approval system cannot be edited" });
}
@@ -737,7 +737,7 @@ export const accessApprovalRequestServiceFactory = ({
const policies = await accessApprovalPolicyDAL.find({ projectId });
const [legacyRequests, globalRequests] = await Promise.all([
accessApprovalRequestDAL.findRequestsWithPrivilegeByPolicyIds(policies.map((p) => p.id)),
- secretAccessApprovalBridge.listAccessApprovalRequests({ projectId })
+ secretAccessApprovalRequestBridge.listAccessApprovalRequests({ projectId })
]);
return [...legacyRequests, ...globalRequests];
};
@@ -804,8 +804,8 @@ export const accessApprovalRequestServiceFactory = ({
actorOrgId,
bypassReason
}) => {
- if (await secretAccessApprovalBridge.isGlobalAccessApprovalRequest(requestId)) {
- return secretAccessApprovalBridge.reviewAccessApprovalRequest({
+ if (await secretAccessApprovalRequestBridge.isGlobalAccessApprovalRequest(requestId)) {
+ return secretAccessApprovalRequestBridge.reviewAccessApprovalRequest({
requestId,
actor,
status,
@@ -1172,8 +1172,8 @@ export const accessApprovalRequestServiceFactory = ({
actorOrgId,
actorAuthMethod
}) => {
- if (await secretAccessApprovalBridge.isGlobalAccessApprovalRequest(requestId)) {
- return secretAccessApprovalBridge.revokeAccessApprovalRequest({
+ if (await secretAccessApprovalRequestBridge.isGlobalAccessApprovalRequest(requestId)) {
+ return secretAccessApprovalRequestBridge.revokeAccessApprovalRequest({
requestId,
actor,
actorId,
@@ -1276,7 +1276,11 @@ export const accessApprovalRequestServiceFactory = ({
}) => {
const [legacyCount, globalCount] = await Promise.all([
accessApprovalRequestDAL.getCount({ projectId, policyId, requestedByUserId }),
- secretAccessApprovalBridge.countAccessApprovalRequests({ projectId, policyId, requesterId: requestedByUserId })
+ secretAccessApprovalRequestBridge.countAccessApprovalRequests({
+ projectId,
+ policyId,
+ requesterId: requestedByUserId
+ })
]);
return {
diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.ts
index 16128d5982..330beff99f 100644
--- a/backend/src/server/routes/index.ts
+++ b/backend/src/server/routes/index.ts
@@ -512,8 +512,10 @@ import { secretQueueFactory } from "@app/services/secret/secret-queue";
import { secretServiceFactory } from "@app/services/secret/secret-service";
import { secretVersionDALFactory } from "@app/services/secret/secret-version-dal";
import { secretVersionTagDALFactory } from "@app/services/secret/secret-version-tag-dal";
-import { secretAccessApprovalBridgeDALFactory } from "@app/services/secret-access-approval-bridge/secret-access-approval-bridge-dal";
-import { secretAccessApprovalBridgeServiceFactory } from "@app/services/secret-access-approval-bridge/secret-access-approval-bridge-service";
+import { secretAccessApprovalPolicyBridgeDALFactory } from "@app/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-dal";
+import { secretAccessApprovalPolicyBridgeServiceFactory } from "@app/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service";
+import { secretAccessApprovalRequestBridgeDALFactory } from "@app/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-dal";
+import { secretAccessApprovalRequestBridgeServiceFactory } from "@app/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-service";
import { secretBlindIndexDALFactory } from "@app/services/secret-blind-index/secret-blind-index-dal";
import { secretBlindIndexServiceFactory } from "@app/services/secret-blind-index/secret-blind-index-service";
import { secretFolderDALFactory } from "@app/services/secret-folder/secret-folder-dal";
@@ -1809,7 +1811,8 @@ export const registerRoutes = async (
const approvalPolicyStepApproversDAL = approvalPolicyStepApproversDALFactory(db);
const approvalPolicyBypassersDAL = approvalPolicyBypassersDALFactory(db);
const approvalPolicySecretEnvironmentDAL = approvalPolicySecretEnvironmentDALFactory(db);
- const secretAccessApprovalBridgeDAL = secretAccessApprovalBridgeDALFactory(db);
+ const secretAccessApprovalPolicyBridgeDAL = secretAccessApprovalPolicyBridgeDALFactory(db);
+ const secretAccessApprovalRequestBridgeDAL = secretAccessApprovalRequestBridgeDALFactory(db);
const approvalRequestApprovalsDAL = approvalRequestApprovalsDALFactory(db);
const orgGatewayConfigV2DAL = orgGatewayConfigV2DalFactory(db);
@@ -2474,7 +2477,7 @@ export const registerRoutes = async (
additionalPrivilegeDAL
});
- const secretAccessApprovalBridgeService = secretAccessApprovalBridgeServiceFactory({
+ const secretAccessApprovalPolicyBridgeService = secretAccessApprovalPolicyBridgeServiceFactory({
projectDAL,
permissionService,
projectEnvDAL,
@@ -2486,7 +2489,16 @@ export const registerRoutes = async (
approvalPolicyStepApproversDAL,
approvalPolicyBypassersDAL,
approvalPolicySecretEnvironmentDAL,
- secretAccessApprovalBridgeDAL,
+ secretAccessApprovalPolicyBridgeDAL,
+ approvalRequestDAL,
+ approvalRequestGrantsDAL,
+ additionalPrivilegeDAL
+ });
+
+ const secretAccessApprovalRequestBridgeService = secretAccessApprovalRequestBridgeServiceFactory({
+ projectDAL,
+ permissionService,
+ userDAL,
userGroupMembershipDAL,
approvalRequestDAL,
approvalRequestStepsDAL,
@@ -2494,6 +2506,8 @@ export const registerRoutes = async (
approvalRequestApprovalsDAL,
approvalRequestGrantsDAL,
additionalPrivilegeDAL,
+ secretAccessApprovalPolicyBridgeDAL,
+ secretAccessApprovalRequestBridgeDAL,
smtpService,
notificationService,
kmsService,
@@ -2519,7 +2533,7 @@ export const registerRoutes = async (
additionalPrivilegeDAL,
approvalPolicyDAL,
approvalPolicySecretEnvironmentDAL,
- secretAccessApprovalBridge: secretAccessApprovalBridgeService
+ secretAccessApprovalPolicyBridge: secretAccessApprovalPolicyBridgeService
});
const accessApprovalRequestService = accessApprovalRequestServiceFactory({
@@ -2528,7 +2542,7 @@ export const registerRoutes = async (
accessApprovalRequestReviewerDAL,
accessApprovalPolicyDAL,
secretAccessApprovalResource,
- secretAccessApprovalBridge: secretAccessApprovalBridgeService,
+ secretAccessApprovalRequestBridge: secretAccessApprovalRequestBridgeService,
accessApprovalRequestDAL,
projectEnvDAL,
userDAL,
@@ -4413,7 +4427,8 @@ export const registerRoutes = async (
identitySpiffeAuth: identitySpiffeAuthService,
identityLdapAuth: identityLdapAuthService,
accessApprovalPolicy: accessApprovalPolicyService,
- secretAccessApprovalBridge: secretAccessApprovalBridgeService,
+ secretAccessApprovalPolicyBridge: secretAccessApprovalPolicyBridgeService,
+ secretAccessApprovalRequestBridge: secretAccessApprovalRequestBridgeService,
accessApprovalRequest: accessApprovalRequestService,
secretApprovalPolicy: secretApprovalPolicyService,
secretApprovalRequest: secretApprovalRequestService,
diff --git a/backend/src/services/approval-policy/approval-policy-service.ts b/backend/src/services/approval-policy/approval-policy-service.ts
index 69e0e5ca68..5ec4a724f6 100644
--- a/backend/src/services/approval-policy/approval-policy-service.ts
+++ b/backend/src/services/approval-policy/approval-policy-service.ts
@@ -1832,7 +1832,7 @@ export const approvalPolicyServiceFactory = ({
const request = grant.requestId ? await approvalRequestDAL.findById(grant.requestId) : null;
const assertDomainCanRevoke = resources[grantPolicyType]?.assertCanRevokeGrant;
- // Secret access grants are managed on secret-access-approval-bridge service
+ // Secret access grants are managed by the secret-access-approval-request-bridge service
if (grantPolicyType === ApprovalPolicyType.SecretAccess) {
throw new BadRequestError({
message: "This grant is for a secret access request. Revoke it from the access request instead."
diff --git a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-dal.ts b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-dal.ts
similarity index 56%
rename from backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-dal.ts
rename to backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-dal.ts
index ae4b23857c..95ed8368df 100644
--- a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-dal.ts
+++ b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-dal.ts
@@ -2,11 +2,11 @@ import { Knex } from "knex";
import { z } from "zod";
import { TDbClient } from "@app/db";
-import { AccessScope, TableName, TUsers } from "@app/db/schemas";
+import { TableName, TUsers } from "@app/db/schemas";
import { ApproverType, BypasserType } from "@app/ee/services/access-approval-policy/access-approval-policy-types";
import { DatabaseError } from "@app/lib/errors";
import { selectAllTableCols, sqlNestRelationships } from "@app/lib/knex";
-import { ApprovalPolicyType, ApprovalRequestStatus } from "@app/services/approval-policy/approval-policy-enums";
+import { ApprovalPolicyType } from "@app/services/approval-policy/approval-policy-enums";
import { SecretAccessPolicyConstraintsSchema } from "@app/services/approval-policy/secret-access/secret-access-policy-schemas";
const StoredConstraintsSchema = z.object({ version: z.literal(1), constraints: SecretAccessPolicyConstraintsSchema });
@@ -17,9 +17,9 @@ const parseConstraints = (constraints: unknown) => {
return { allowedSelfApprovals: true, requestExpirationTime: null, maxTimePeriod: null };
};
-export type TSecretAccessApprovalBridgeDALFactory = ReturnType<typeof secretAccessApprovalBridgeDALFactory>;
+export type TSecretAccessApprovalPolicyBridgeDALFactory = ReturnType<typeof secretAccessApprovalPolicyBridgeDALFactory>;
-export const secretAccessApprovalBridgeDALFactory = (db: TDbClient) => {
+export const secretAccessApprovalPolicyBridgeDALFactory = (db: TDbClient) => {
const findSecretAccessPolicies = async (
{ policyId, projectId, envId }: { policyId?: string; projectId?: string; envId?: string },
tx?: Knex
@@ -167,152 +167,5 @@ export const secretAccessApprovalBridgeDALFactory = (db: TDbClient) => {
}
};
- const findSecretAccessRequestById = async (requestId: string, tx?: Knex) => {
- try {
- const request = await (tx || db.replicaNode())(TableName.ApprovalRequests)
- .where({ id: requestId, type: ApprovalPolicyType.SecretAccess })
- .first();
- if (!request) return null;
-
- const grant = await (tx || db.replicaNode())(TableName.ApprovalRequestGrants)
- .where({ requestId: request.id, type: ApprovalPolicyType.SecretAccess })
- .orderBy("createdAt", "desc")
- .first();
-
- const privilege = grant
- ? await (tx || db.replicaNode())(TableName.AdditionalPrivilege).where({ grantId: grant.id }).first()
- : undefined;
-
- return { ...request, grant: grant ?? null, privilegeId: privilege?.id ?? null };
- } catch (error) {
- throw new DatabaseError({ error, name: "Find secret access approval request by id" });
- }
- };
-
- const findPendingRequests = async ({ policyId, requesterId }: { policyId: string; requesterId: string }) => {
- try {
- return await db
- .replicaNode()(TableName.ApprovalRequests)
- .where({ policyId, requesterId, type: ApprovalPolicyType.SecretAccess, status: ApprovalRequestStatus.Pending })
- .where((qb) => {
- void qb.whereNull("expiresAt").orWhere("expiresAt", ">", new Date());
- });
- } catch (error) {
- throw new DatabaseError({ error, name: "Find pending secret access approval requests" });
- }
- };
-
- const findSecretAccessRequests = async ({
- projectId,
- policyId,
- requesterId
- }: {
- projectId: string;
- policyId?: string;
- requesterId?: string;
- }) => {
- try {
- return await db
- .replicaNode()(TableName.ApprovalRequests)
- .where({ projectId, type: ApprovalPolicyType.SecretAccess })
- .where((qb) => {
- if (policyId) void qb.where("policyId", policyId);
- if (requesterId) void qb.where("requesterId", requesterId);
- })
- .orderBy("createdAt", "desc");
- } catch (error) {
- throw new DatabaseError({ error, name: "Find secret access approval requests" });
- }
- };
-
- const findGrantsByRequestIds = async (requestIds: string[]) => {
- if (!requestIds.length) return [];
- try {
- return await db
- .replicaNode()(TableName.ApprovalRequestGrants)
- .whereIn("requestId", requestIds)
- .where({ type: ApprovalPolicyType.SecretAccess })
- .orderBy("createdAt", "desc");
- } catch (error) {
- throw new DatabaseError({ error, name: "Find secret access grants by request ids" });
- }
- };
-
- const findPrivilegesByGrantIds = async (grantIds: string[]) => {
- if (!grantIds.length) return [];
- try {
- return await db.replicaNode()(TableName.AdditionalPrivilege).whereIn("grantId", grantIds);
- } catch (error) {
- throw new DatabaseError({ error, name: "Find additional privileges by grant ids" });
- }
- };
-
- const findApprovalsByRequestIds = async (requestIds: string[]) => {
- if (!requestIds.length) return [];
- try {
- return await db
- .replicaNode()(TableName.ApprovalRequestApprovals)
- .join(
- TableName.ApprovalRequestSteps,
- `${TableName.ApprovalRequestApprovals}.stepId`,
- `${TableName.ApprovalRequestSteps}.id`
- )
- .whereIn(`${TableName.ApprovalRequestSteps}.requestId`, requestIds)
- .select(selectAllTableCols(TableName.ApprovalRequestApprovals))
- .select(db.ref("requestId").withSchema(TableName.ApprovalRequestSteps))
- .orderBy(`${TableName.ApprovalRequestApprovals}.createdAt`, "asc");
- } catch (error) {
- throw new DatabaseError({ error, name: "Find approvals by request ids" });
- }
- };
-
- const findGroupMembers = async (groupIds: string[]) => {
- if (!groupIds.length) return [];
- try {
- return await db
- .replicaNode()(TableName.UserGroupMembership)
- .whereIn("groupId", groupIds)
- .select("groupId", "userId");
- } catch (error) {
- throw new DatabaseError({ error, name: "Find group members" });
- }
- };
-
- const findUsersByIds = async (userIds: string[]) => {
- if (!userIds.length) return [];
- try {
- return await db
- .replicaNode()(TableName.Users)
- .whereIn("id", userIds)
- .select("id", "email", "username", "firstName", "lastName");
- } catch (error) {
- throw new DatabaseError({ error, name: "Find users by ids" });
- }
- };
-
- const findOrgMembershipActivity = async (orgId: string, userIds: string[]) => {
- if (!userIds.length) return [];
- try {
- return await db
- .replicaNode()(TableName.Membership)
- .where({ scope: AccessScope.Organization, scopeOrgId: orgId })
- .whereIn("actorUserId", userIds)
- .select("actorUserId", "isActive");
- } catch (error) {
- throw new DatabaseError({ error, name: "Find org membership activity" });
- }
- };
-
- return {
- findSecretAccessPolicies,
- findSecretAccessRequestById,
- findSecretAccessRequests,
- findPendingRequests,
- findGrantsByRequestIds,
- findPrivilegesByGrantIds,
- findApprovalsByRequestIds,
- findGroupMembers,
- findUsersByIds,
- findOrgMembershipActivity
- };
+ return { findSecretAccessPolicies };
};
diff --git a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-fns.test.ts b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns.test.ts
similarity index 99%
rename from backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-fns.test.ts
rename to backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns.test.ts
index b2e92cc895..92151536c9 100644
--- a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-fns.test.ts
+++ b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns.test.ts
@@ -3,7 +3,7 @@ import { describe, expect, test } from "vitest";
import { BadRequestError } from "@app/lib/errors";
import { ApproverType } from "@app/services/approval-policy/approval-policy-enums";
-import { buildSecretAccessPolicySteps } from "./secret-access-approval-bridge-fns";
+import { buildSecretAccessPolicySteps } from "./secret-access-approval-policy-bridge-fns";
type TApprovalsRequired = { numberOfApprovals: number; stepNumber: number }[];
diff --git a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns.ts b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns.ts
new file mode 100644
index 0000000000..0e861248f9
--- /dev/null
+++ b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns.ts
@@ -0,0 +1,60 @@
+import { TAccessApprovalPolicyDALFactory } from "@app/ee/services/access-approval-policy/access-approval-policy-dal";
+import { BadRequestError } from "@app/lib/errors";
+import { groupBy } from "@app/lib/fn";
+import { TApprovalPolicySecretEnvironmentDALFactory } from "@app/services/approval-policy/approval-policy-dal";
+import { ApproverType } from "@app/services/approval-policy/approval-policy-enums";
+
+type TSecretAccessApprovalPolicyExistsDep = {
+ accessApprovalPolicyDAL: Pick<TAccessApprovalPolicyDALFactory, "findPolicyByEnvIdAndSecretPath">;
+ approvalPolicySecretEnvironmentDAL: Pick<
+ TApprovalPolicySecretEnvironmentDALFactory,
+ "findPolicyByEnvIdsAndSecretPath"
+ >;
+};
+
+export const secretAccessApprovalPolicyExists = async (
+ { envId, secretPath, excludePolicyId }: { envId: string; secretPath: string; excludePolicyId?: string },
+ { accessApprovalPolicyDAL, approvalPolicySecretEnvironmentDAL }: TSecretAccessApprovalPolicyExistsDep
+) => {
+ const legacyPolicy = await accessApprovalPolicyDAL.findPolicyByEnvIdAndSecretPath({ envIds: [envId], secretPath });
+ if (legacyPolicy && legacyPolicy.id !== excludePolicyId) return true;
+
+ const policy = await approvalPolicySecretEnvironmentDAL.findPolicyByEnvIdsAndSecretPath({
+ envIds: [envId],
+ secretPath,
+ excludePolicyId
+ });
+ return Boolean(policy);
+};
+
+// Legacy stores null on approver rows for a step with no approvalsRequired entry and reviews it as 1,
+// so the top-level `approvals` must not leak into a step's requirement.
+export const buildSecretAccessPolicySteps = <T extends { type: ApproverType; id: string; sequence: number }>(
+ approvers: T[],
+ approvalsRequired?: { numberOfApprovals: number; stepNumber: number }[]
+) => {
+ const approvalsRequiredByStepNumber = groupBy(approvalsRequired || [], (i) => i.stepNumber);
+ const approversBySequence = groupBy(approvers, (el) => el.sequence);
+ return Object.keys(approversBySequence)
+ .map(Number)
+ .sort((a, b) => a - b)
+ .map((sequence, index) => {
+ const seen = new Set<string>();
+ const stepApprovers = approversBySequence[sequence].filter((approver) => {
+ const key = `${approver.type}:${approver.id}`;
+ if (seen.has(key)) return false;
+ seen.add(key);
+ return true;
+ });
+ const requiredApprovals = approvalsRequiredByStepNumber[sequence]?.[0]?.numberOfApprovals || 1;
+
+ const hasGroupApprover = stepApprovers.some((approver) => approver.type === ApproverType.Group);
+ if (!hasGroupApprover && requiredApprovals > stepApprovers.length) {
+ throw new BadRequestError({
+ message: `Step ${index + 1} requires ${requiredApprovals} approvals but only has ${stepApprovers.length} approver${stepApprovers.length === 1 ? "" : "s"}. Add approvers to the step or lower its required approvals.`
+ });
+ }
+
+ return { requiredApprovals, approvers: stepApprovers };
+ });
+};
diff --git a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.ts b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.ts
new file mode 100644
index 0000000000..9c4bc9ed6c
--- /dev/null
+++ b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.ts
@@ -0,0 +1,577 @@
+import { ForbiddenError } from "@casl/ability";
+import { Knex } from "knex";
+
+import { ActionProjectType } from "@app/db/schemas";
+import { approvalPolicyMembershipVerifierFactory } from "@app/ee/services/access-approval-policy/access-approval-policy-fns";
+import {
+ ApproverType,
+ BypasserType,
+ TCreateAccessApprovalPolicy
+} from "@app/ee/services/access-approval-policy/access-approval-policy-types";
+import { ProjectPermissionActions, ProjectPermissionSub } from "@app/ee/services/permission/project-permission";
+import { BadRequestError, NotFoundError } from "@app/lib/errors";
+import { groupBy } from "@app/lib/fn";
+import {
+ ApprovalPolicyType,
+ ApprovalRequestGrantStatus,
+ ApprovalRequestStatus
+} from "@app/services/approval-policy/approval-policy-enums";
+import { ActorType } from "@app/services/auth/auth-type";
+
+import {
+ buildSecretAccessPolicySteps,
+ secretAccessApprovalPolicyExists
+} from "./secret-access-approval-policy-bridge-fns";
+import {
+ TCountSecretAccessApprovalPoliciesDTO,
+ TCreateSecretAccessApprovalPolicyDTO,
+ TDeleteSecretAccessApprovalPolicyDTO,
+ TGetSecretAccessApprovalPolicyByIdDTO,
+ TListSecretAccessApprovalPoliciesDTO,
+ TSecretAccessApprovalPolicyBridgeServiceFactoryDep,
+ TUpdateSecretAccessApprovalPolicyDTO
+} from "./secret-access-approval-policy-bridge-types";
+
+export type TSecretAccessApprovalPolicyBridgeServiceFactory = ReturnType<
+ typeof secretAccessApprovalPolicyBridgeServiceFactory
+>;
+
+type TApproverInput = TCreateAccessApprovalPolicy["approvers"];
+type TBypasserInput = NonNullable<TCreateAccessApprovalPolicy["bypassers"]>;
+type TSequencedSubject = { id: string; sequence?: number };
+type TPolicyStep = {
+ requiredApprovals: number;
+ approvers: { type: ApproverType; id: string }[];
+};
+
+export const secretAccessApprovalPolicyBridgeServiceFactory = ({
+ projectDAL,
+ permissionService,
+ projectEnvDAL,
+ userDAL,
+ groupDAL,
+ accessApprovalPolicyDAL,
+ approvalPolicyDAL,
+ approvalPolicyStepsDAL,
+ approvalPolicyStepApproversDAL,
+ approvalPolicyBypassersDAL,
+ approvalPolicySecretEnvironmentDAL,
+ secretAccessApprovalPolicyBridgeDAL,
+ approvalRequestDAL,
+ approvalRequestGrantsDAL,
+ additionalPrivilegeDAL
+}: TSecretAccessApprovalPolicyBridgeServiceFactoryDep) => {
+ const { verifyProjectSubjectsMembership } = approvalPolicyMembershipVerifierFactory({ projectDAL });
+
+ const $splitApprovers = (approvers: TApproverInput) => ({
+ groupApprovers: approvers.filter((approver) => approver.type === ApproverType.Group) as TSequencedSubject[],
+ userApprovers: approvers.filter(
+ (approver) => approver.type === ApproverType.User && approver.id
+ ) as TSequencedSubject[],
+ userApproverNames: approvers.filter((approver) => approver.type === ApproverType.User && approver.username) as {
+ username: string;
+ sequence?: number;
+ }[]
+ });
+
+ const $resolveApprovers = async (
+ approvers: TApproverInput,
+ { projectId, orgId }: { projectId: string; orgId: string }
+ ) => {
+ const { groupApprovers, userApprovers, userApproverNames } = $splitApprovers(approvers);
+
+ let approverUserIds = userApprovers;
+ if (userApproverNames.length) {
+ const approverUsersInDB = await userDAL.find({
+ $in: {
+ username: userApproverNames.map((el) => el.username)
+ }
+ });
+ const approverUsersInDBGroupByUsername = groupBy(approverUsersInDB, (i) => i.username);
+ const invalidUsernames = userApproverNames.filter((el) => !approverUsersInDBGroupByUsername?.[el.username]?.[0]);
+
+ if (invalidUsernames.length) {
+ throw new BadRequestError({
+ message: `Invalid approver user: ${invalidUsernames.map((i) => i.username).join(", ")}`
+ });
+ }
+
+ approverUserIds = approverUserIds.concat(
+ userApproverNames.map((el) => ({
+ id: approverUsersInDBGroupByUsername[el.username]?.[0].id,
+ sequence: el.sequence
+ }))
+ );
+ }
+
+ if (approverUserIds.length > 0 || groupApprovers.length > 0) {
+ await verifyProjectSubjectsMembership({
+ userIds: approverUserIds.map((au) => au.id),
+ groupIds: groupApprovers.map((ga) => ga.id).filter(Boolean),
+ orgId,
+ projectId
+ });
+ }
+
+ return { approverUserIds, groupApprovers };
+ };
+
+ const $resolveBypassers = async (
+ bypassers: TBypasserInput | undefined,
+ { projectId, orgId }: { projectId: string; orgId: string }
+ ) => {
+ let groupBypassers: string[] = [];
+ let bypasserUserIds: string[] = [];
+
+ if (bypassers && bypassers.length) {
+ groupBypassers = [
+ ...new Set(
+ bypassers
+ .filter((bypasser) => bypasser.type === BypasserType.Group)
+ .map((bypasser) => bypasser.id) as string[]
+ )
+ ];
+
+ const userBypassers = bypassers
+ .filter((bypasser) => bypasser.type === BypasserType.User)
+ .map((bypasser) => bypasser.id)
+ .filter(Boolean) as string[];
+
+ const userBypasserNames = bypassers
+ .map((bypasser) => (bypasser.type === BypasserType.User ? bypasser.username : undefined))
+ .filter(Boolean) as string[];
+
+ bypasserUserIds = userBypassers;
+ if (userBypasserNames.length) {
+ const bypasserUsers = await userDAL.find({
+ $in: {
+ username: userBypasserNames
+ }
+ });
+
+ const bypasserNamesFromDb = bypasserUsers.map((user) => user.username);
+ const invalidUsernames = userBypasserNames.filter((username) => !bypasserNamesFromDb.includes(username));
+
+ if (invalidUsernames.length) {
+ throw new BadRequestError({
+ message: `Invalid bypasser user: ${invalidUsernames.join(", ")}`
+ });
+ }
+
+ bypasserUserIds = bypasserUserIds.concat(bypasserUsers.map((user) => user.id));
+ }
+ bypasserUserIds = [...new Set(bypasserUserIds)];
+
+ if (groupBypassers.length > 0) {
+ const orgGroups = await groupDAL.find({
+ $in: { id: groupBypassers },
+ orgId
+ });
+
+ if (orgGroups.length !== groupBypassers.length) {
+ const foundGroupIdsInOrg = new Set(orgGroups.map((group) => group.id));
+ const missingGroupIds = groupBypassers.filter((id) => !foundGroupIdsInOrg.has(id));
+ throw new BadRequestError({
+ message: `One or more specified bypasser groups are not part of the organization or do not exist. Invalid or non-member group IDs: ${missingGroupIds.join(", ")}`
+ });
+ }
+ }
+
+ if (bypasserUserIds.length) {
+ await verifyProjectSubjectsMembership({
+ userIds: bypasserUserIds,
+ groupIds: [],
+ orgId,
+ projectId
+ });
+ }
+ }
+
+ return { bypasserUserIds, groupBypassers };
+ };
+
+ const $buildSteps = ({
+ approverUserIds,
+ groupApprovers,
+ approvalsRequired
+ }: {
+ approverUserIds: TSequencedSubject[];
+ groupApprovers: TSequencedSubject[];
+ approvalsRequired?: { numberOfApprovals: number; stepNumber: number }[];
+ }): TPolicyStep[] =>
+ buildSecretAccessPolicySteps(
+ [
+ ...approverUserIds.map((el) => ({ type: ApproverType.User, id: el.id, sequence: el.sequence ?? 1 })),
+ ...groupApprovers.map((el) => ({ type: ApproverType.Group, id: el.id, sequence: el.sequence ?? 1 }))
+ ],
+ approvalsRequired
+ );
+
+ const $insertStepsAndBypassers = async (
+ {
+ policyId,
+ steps,
+ bypasserUserIds,
+ groupBypassers
+ }: { policyId: string; steps: TPolicyStep[]; bypasserUserIds: string[]; groupBypassers: string[] },
+ tx: Knex
+ ) => {
+ const stepDocs = await approvalPolicyStepsDAL.insertMany(
+ steps.map((step, i) => ({
+ policyId,
+ stepNumber: i + 1,
+ requiredApprovals: step.requiredApprovals
+ })),
+ tx
+ );
+
+ await approvalPolicyStepApproversDAL.insertMany(
+ steps.flatMap((step, i) =>
+ step.approvers.map((approver) => ({
+ policyStepId: stepDocs[i].id,
+ userId: approver.type === ApproverType.User ? approver.id : null,
+ groupId: approver.type === ApproverType.Group ? approver.id : null
+ }))
+ ),
+ tx
+ );
+
+ if (bypasserUserIds.length || groupBypassers.length) {
+ await approvalPolicyBypassersDAL.insertMany(
+ [
+ ...bypasserUserIds.map((userId) => ({ policyId, userId, groupId: null })),
+ ...groupBypassers.map((groupId) => ({ policyId, userId: null, groupId }))
+ ],
+ tx
+ );
+ }
+ };
+
+ const $getProjectPermission = async ({
+ actor,
+ actorId,
+ actorAuthMethod,
+ actorOrgId,
+ projectId
+ }: Pick<TUpdateSecretAccessApprovalPolicyDTO, "actor" | "actorId" | "actorAuthMethod" | "actorOrgId"> & {
+ projectId: string;
+ }) => {
+ const { permission } = await permissionService.getProjectPermission({
+ actor,
+ actorId,
+ projectId,
+ actorAuthMethod,
+ actorOrgId,
+ actionProjectType: ActionProjectType.SecretManager
+ });
+ return permission;
+ };
+
+ const $findPolicyById = async (policyId: string, message: string) => {
+ const [policy] = await secretAccessApprovalPolicyBridgeDAL.findSecretAccessPolicies({ policyId });
+ if (!policy) throw new NotFoundError({ message });
+ return policy;
+ };
+
+ const createAccessApprovalPolicy = async ({
+ name,
+ actor,
+ actorId,
+ actorOrgId,
+ secretPath,
+ actorAuthMethod,
+ approvals,
+ approvers,
+ bypassers,
+ projectSlug,
+ environment,
+ environments,
+ enforcementLevel,
+ allowedSelfApprovals,
+ approvalsRequired,
+ maxTimePeriod,
+ requestExpirationTime
+ }: TCreateSecretAccessApprovalPolicyDTO) => {
+ const project = await projectDAL.findProjectBySlug(projectSlug, actorOrgId);
+ if (!project) throw new NotFoundError({ message: `Project with slug '${projectSlug}' not found` });
+
+ const permission = await $getProjectPermission({
+ actor,
+ actorId,
+ actorAuthMethod,
+ actorOrgId,
+ projectId: project.id
+ });
+ ForbiddenError.from(permission).throwUnlessCan(
+ ProjectPermissionActions.Create,
+ ProjectPermissionSub.SecretApproval
+ );
+
+ const mergedEnvs = (environment ? [environment] : environments) || [];
+ if (mergedEnvs.length === 0) {
+ throw new BadRequestError({ message: "Must provide either environment or environments" });
+ }
+ const envs = await projectEnvDAL.find({ $in: { slug: mergedEnvs }, projectId: project.id });
+ if (!envs.length || envs.length !== mergedEnvs.length) {
+ const notFoundEnvs = mergedEnvs.filter((env) => !envs.find((el) => el.slug === env));
+ throw new NotFoundError({ message: `One or more environments not found: ${notFoundEnvs.join(", ")}` });
+ }
+
+ for (const env of envs) {
+ if (
+ // eslint-disable-next-line no-await-in-loop
+ await secretAccessApprovalPolicyExists(
+ { envId: env.id, secretPath },
+ { accessApprovalPolicyDAL, approvalPolicySecretEnvironmentDAL }
+ )
+ ) {
+ throw new BadRequestError({
+ message: `A policy for secret path '${secretPath}' already exists in environment '${env.slug}'`
+ });
+ }
+ }
+
+ const scope = { projectId: project.id, orgId: project.orgId };
+ const { approverUserIds, groupApprovers } = await $resolveApprovers(approvers, scope);
+ const { bypasserUserIds, groupBypassers } = await $resolveBypassers(bypassers, scope);
+ const steps = $buildSteps({ approverUserIds, groupApprovers, approvalsRequired });
+
+ const policy = await approvalPolicyDAL.transaction(async (tx) => {
+ const doc = await approvalPolicyDAL.create(
+ {
+ projectId: project.id,
+ organizationId: project.orgId,
+ type: ApprovalPolicyType.SecretAccess,
+ name,
+ enforcementLevel,
+ bypassForMachineIdentities: false,
+ scopeType: null,
+ scopeId: null,
+ conditions: { version: 1, conditions: {} },
+ constraints: {
+ version: 1,
+ constraints: {
+ allowedSelfApprovals,
+ requestExpirationTime: requestExpirationTime ?? null,
+ maxTimePeriod: maxTimePeriod ?? null
+ }
+ }
+ },
+ tx
+ );
+
+ await approvalPolicySecretEnvironmentDAL.insertMany(
+ envs.map((env) => ({ policyId: doc.id, envId: env.id, secretPath })),
+ tx
+ );
+
+ await $insertStepsAndBypassers({ policyId: doc.id, steps, bypasserUserIds, groupBypassers }, tx);
+
+ return doc;
+ });
+
+ return {
+ id: policy.id,
+ name: policy.name,
+ secretPath,
+ approvals,
+ envId: envs[0].id,
+ createdAt: policy.createdAt,
+ updatedAt: policy.updatedAt,
+ enforcementLevel: policy.enforcementLevel,
+ deletedAt: null,
+ allowedSelfApprovals,
+ bypassForMachineIdentities: false,
+ maxTimePeriod: maxTimePeriod ?? null,
+ requestExpirationTime: requestExpirationTime ?? null,
+ environment: envs[0],
+ environments: envs,
+ projectId: project.id
+ };
+ };
+
+ const updateAccessApprovalPolicy = async ({
+ policyId,
+ approvers,
+ bypassers,
+ secretPath,
+ name,
+ actorId,
+ actor,
+ actorOrgId,
+ actorAuthMethod,
+ enforcementLevel,
+ allowedSelfApprovals,
+ approvalsRequired,
+ environments,
+ maxTimePeriod,
+ requestExpirationTime
+ }: TUpdateSecretAccessApprovalPolicyDTO) => {
+ const policy = await $findPolicyById(policyId, `Access approval policy with ID '${policyId}' not found`);
+
+ const permission = await $getProjectPermission({
+ actor,
+ actorId,
+ actorAuthMethod,
+ actorOrgId,
+ projectId: policy.projectId
+ });
+ ForbiddenError.from(permission).throwUnlessCan(ProjectPermissionActions.Edit, ProjectPermissionSub.SecretApproval);
+
+ let envs: { id: string; slug: string }[] = policy.environments;
+ if (environments) {
+ envs = await projectEnvDAL.find({ $in: { slug: environments }, projectId: policy.projectId });
+ if (envs.length !== environments.length) {
+ const notFoundEnvs = environments.filter((env) => !envs.find((el) => el.slug === env));
+ throw new NotFoundError({ message: `One or more environments not found: ${notFoundEnvs.join(", ")}` });
+ }
+ }
+
+ const nextSecretPath = secretPath || policy.secretPath;
+ for (const env of envs) {
+ if (
+ // eslint-disable-next-line no-await-in-loop
+ await secretAccessApprovalPolicyExists(
+ { envId: env.id, secretPath: nextSecretPath, excludePolicyId: policy.id },
+ { accessApprovalPolicyDAL, approvalPolicySecretEnvironmentDAL }
+ )
+ ) {
+ throw new BadRequestError({
+ message: `A policy for secret path '${nextSecretPath}' already exists in environment '${env.slug}'`
+ });
+ }
+ }
+
+ const scope = { projectId: policy.projectId, orgId: actorOrgId };
+ const { approverUserIds, groupApprovers } = await $resolveApprovers(approvers, scope);
+ const { bypasserUserIds, groupBypassers } = await $resolveBypassers(bypassers, scope);
+ const steps = $buildSteps({ approverUserIds, groupApprovers, approvalsRequired });
+
+ return approvalPolicyDAL.transaction(async (tx) => {
+ await approvalPolicyDAL.updateById(
+ policy.id,
+ {
+ name,
+ enforcementLevel,
+ constraints: {
+ version: 1,
+ constraints: {
+ allowedSelfApprovals,
+ requestExpirationTime:
+ requestExpirationTime === undefined ? policy.requestExpirationTime : requestExpirationTime,
+ maxTimePeriod: maxTimePeriod === undefined ? policy.maxTimePeriod : maxTimePeriod
+ }
+ }
+ },
+ tx
+ );
+
+ await approvalPolicyStepsDAL.delete({ policyId: policy.id }, tx);
+ await approvalPolicyBypassersDAL.delete({ policyId: policy.id }, tx);
+ await $insertStepsAndBypassers({ policyId: policy.id, steps, bypasserUserIds, groupBypassers }, tx);
+
+ if (environments || secretPath) {
+ await approvalPolicySecretEnvironmentDAL.delete({ policyId: policy.id }, tx);
+ await approvalPolicySecretEnvironmentDAL.insertMany(
+ envs.map((env) => ({ policyId: policy.id, envId: env.id, secretPath: nextSecretPath })),
+ tx
+ );
+ }
+
+ const [updatedPolicy] = await secretAccessApprovalPolicyBridgeDAL.findSecretAccessPolicies(
+ { policyId: policy.id },
+ tx
+ );
+ return updatedPolicy;
+ });
+ };
+
+ const deleteAccessApprovalPolicy = async ({
+ policyId,
+ actor,
+ actorId,
+ actorAuthMethod,
+ actorOrgId
+ }: TDeleteSecretAccessApprovalPolicyDTO) => {
+ const policy = await $findPolicyById(policyId, `Secret approval policy with ID '${policyId}' not found`);
+
+ const permission = await $getProjectPermission({
+ actor,
+ actorId,
+ actorAuthMethod,
+ actorOrgId,
+ projectId: policy.projectId
+ });
+ ForbiddenError.from(permission).throwUnlessCan(
+ ProjectPermissionActions.Delete,
+ ProjectPermissionSub.SecretApproval
+ );
+
+ await approvalPolicyDAL.transaction(async (tx) => {
+ await approvalRequestDAL.update(
+ { policyId: policy.id, status: ApprovalRequestStatus.Pending },
+ { status: ApprovalRequestStatus.Cancelled },
+ tx
+ );
+
+ const requests = await approvalRequestDAL.find({ policyId: policy.id }, { tx });
+ if (requests.length) {
+ const revokedGrants = await approvalRequestGrantsDAL.update(
+ { $in: { requestId: requests.map((request) => request.id) }, status: ApprovalRequestGrantStatus.Active },
+ {
+ status: ApprovalRequestGrantStatus.Revoked,
+ revokedAt: new Date(),
+ revokedByUserId: actor === ActorType.USER ? actorId : null
+ },
+ tx
+ );
+
+ if (revokedGrants.length) {
+ await additionalPrivilegeDAL.delete({ $in: { grantId: revokedGrants.map((grant) => grant.id) } }, tx);
+ }
+ }
+
+ await approvalPolicyDAL.deleteById(policy.id, tx);
+ });
+
+ return policy;
+ };
+
+ const getAccessApprovalPolicyById = async ({
+ policyId,
+ actor,
+ actorId,
+ actorAuthMethod,
+ actorOrgId
+ }: TGetSecretAccessApprovalPolicyByIdDTO) => {
+ const policy = await $findPolicyById(policyId, `Cannot find access approval policy with ID ${policyId}`);
+
+ const permission = await $getProjectPermission({
+ actor,
+ actorId,
+ actorAuthMethod,
+ actorOrgId,
+ projectId: policy.projectId
+ });
+ ForbiddenError.from(permission).throwUnlessCan(ProjectPermissionActions.Read, ProjectPermissionSub.SecretApproval);
+
+ return policy;
+ };
+
+ const listAccessApprovalPolicies = ({ projectId }: TListSecretAccessApprovalPoliciesDTO) =>
+ secretAccessApprovalPolicyBridgeDAL.findSecretAccessPolicies({ projectId });
+
+ const countAccessApprovalPolicies = async ({ projectId, envId }: TCountSecretAccessApprovalPoliciesDTO) => {
+ const policies = await secretAccessApprovalPolicyBridgeDAL.findSecretAccessPolicies({ projectId, envId });
+ return policies.length;
+ };
+
+ return {
+ createAccessApprovalPolicy,
+ updateAccessApprovalPolicy,
+ deleteAccessApprovalPolicy,
+ getAccessApprovalPolicyById,
+ listAccessApprovalPolicies,
+ countAccessApprovalPolicies
+ };
+};
diff --git a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-types.ts b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-types.ts
new file mode 100644
index 0000000000..5ac055be9f
--- /dev/null
+++ b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-types.ts
@@ -0,0 +1,55 @@
+import { TAccessApprovalPolicyDALFactory } from "@app/ee/services/access-approval-policy/access-approval-policy-dal";
+import {
+ TCreateAccessApprovalPolicy,
+ TDeleteAccessApprovalPolicy,
+ TGetAccessApprovalPolicyByIdDTO,
+ TUpdateAccessApprovalPolicy
+} from "@app/ee/services/access-approval-policy/access-approval-policy-types";
+import { TGroupDALFactory } from "@app/ee/services/group/group-dal";
+import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service-types";
+import { TAdditionalPrivilegeDALFactory } from "@app/services/additional-privilege/additional-privilege-dal";
+import {
+ TApprovalPolicyBypassersDALFactory,
+ TApprovalPolicyDALFactory,
+ TApprovalPolicySecretEnvironmentDALFactory,
+ TApprovalPolicyStepApproversDALFactory,
+ TApprovalPolicyStepsDALFactory
+} from "@app/services/approval-policy/approval-policy-dal";
+import {
+ TApprovalRequestDALFactory,
+ TApprovalRequestGrantsDALFactory
+} from "@app/services/approval-policy/approval-request-dal";
+import { TProjectDALFactory } from "@app/services/project/project-dal";
+import { TProjectEnvDALFactory } from "@app/services/project-env/project-env-dal";
+import { TUserDALFactory } from "@app/services/user/user-dal";
+
+import { TSecretAccessApprovalPolicyBridgeDALFactory } from "./secret-access-approval-policy-bridge-dal";
+
+export type TSecretAccessApprovalPolicyBridgeServiceFactoryDep = {
+ projectDAL: Pick<TProjectDALFactory, "findProjectBySlug" | "findEffectiveProjectSubjectsMembership">;
+ permissionService: Pick<TPermissionServiceFactory, "getProjectPermission">;
+ projectEnvDAL: Pick<TProjectEnvDALFactory, "find">;
+ userDAL: Pick<TUserDALFactory, "find">;
+ groupDAL: Pick<TGroupDALFactory, "find">;
+ accessApprovalPolicyDAL: Pick<TAccessApprovalPolicyDALFactory, "findPolicyByEnvIdAndSecretPath">;
+ approvalPolicyDAL: Pick<TApprovalPolicyDALFactory, "create" | "transaction" | "updateById" | "deleteById">;
+ approvalPolicyStepsDAL: Pick<TApprovalPolicyStepsDALFactory, "insertMany" | "delete">;
+ approvalPolicyStepApproversDAL: Pick<TApprovalPolicyStepApproversDALFactory, "insertMany">;
+ approvalPolicyBypassersDAL: Pick<TApprovalPolicyBypassersDALFactory, "insertMany" | "delete">;
+ approvalPolicySecretEnvironmentDAL: Pick<
+ TApprovalPolicySecretEnvironmentDALFactory,
+ "insertMany" | "delete" | "findPolicyByEnvIdsAndSecretPath"
+ >;
+ approvalRequestDAL: Pick<TApprovalRequestDALFactory, "find" | "update">;
+ approvalRequestGrantsDAL: Pick<TApprovalRequestGrantsDALFactory, "update">;
+ additionalPrivilegeDAL: Pick<TAdditionalPrivilegeDALFactory, "delete">;
+ secretAccessApprovalPolicyBridgeDAL: Pick<TSecretAccessApprovalPolicyBridgeDALFactory, "findSecretAccessPolicies">;
+};
+
+export type TCreateSecretAccessApprovalPolicyDTO = TCreateAccessApprovalPolicy;
+export type TUpdateSecretAccessApprovalPolicyDTO = TUpdateAccessApprovalPolicy;
+export type TDeleteSecretAccessApprovalPolicyDTO = TDeleteAccessApprovalPolicy;
+export type TGetSecretAccessApprovalPolicyByIdDTO = TGetAccessApprovalPolicyByIdDTO;
+
+export type TListSecretAccessApprovalPoliciesDTO = { projectId: string };
+export type TCountSecretAccessApprovalPoliciesDTO = { projectId: string; envId: string };
diff --git a/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-dal.ts b/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-dal.ts
new file mode 100644
index 0000000000..44feac998f
--- /dev/null
+++ b/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-dal.ts
@@ -0,0 +1,161 @@
+import { Knex } from "knex";
+
+import { TDbClient } from "@app/db";
+import { AccessScope, TableName } from "@app/db/schemas";
+import { DatabaseError } from "@app/lib/errors";
+import { selectAllTableCols } from "@app/lib/knex";
+import { ApprovalPolicyType, ApprovalRequestStatus } from "@app/services/approval-policy/approval-policy-enums";
+
+export type TSecretAccessApprovalRequestBridgeDALFactory = ReturnType<
+ typeof secretAccessApprovalRequestBridgeDALFactory
+>;
+
+export const secretAccessApprovalRequestBridgeDALFactory = (db: TDbClient) => {
+ const findSecretAccessRequestById = async (requestId: string, tx?: Knex) => {
+ try {
+ const request = await (tx || db.replicaNode())(TableName.ApprovalRequests)
+ .where({ id: requestId, type: ApprovalPolicyType.SecretAccess })
+ .first();
+ if (!request) return null;
+
+ const grant = await (tx || db.replicaNode())(TableName.ApprovalRequestGrants)
+ .where({ requestId: request.id, type: ApprovalPolicyType.SecretAccess })
+ .orderBy("createdAt", "desc")
+ .first();
+
+ const privilege = grant
+ ? await (tx || db.replicaNode())(TableName.AdditionalPrivilege).where({ grantId: grant.id }).first()
+ : undefined;
+
+ return { ...request, grant: grant ?? null, privilegeId: privilege?.id ?? null };
+ } catch (error) {
+ throw new DatabaseError({ error, name: "Find secret access approval request by id" });
+ }
+ };
+
+ const findPendingRequests = async ({ policyId, requesterId }: { policyId: string; requesterId: string }) => {
+ try {
+ return await db
+ .replicaNode()(TableName.ApprovalRequests)
+ .where({ policyId, requesterId, type: ApprovalPolicyType.SecretAccess, status: ApprovalRequestStatus.Pending })
+ .where((qb) => {
+ void qb.whereNull("expiresAt").orWhere("expiresAt", ">", new Date());
+ });
+ } catch (error) {
+ throw new DatabaseError({ error, name: "Find pending secret access approval requests" });
+ }
+ };
+
+ const findSecretAccessRequests = async ({
+ projectId,
+ policyId,
+ requesterId
+ }: {
+ projectId: string;
+ policyId?: string;
+ requesterId?: string;
+ }) => {
+ try {
+ return await db
+ .replicaNode()(TableName.ApprovalRequests)
+ .where({ projectId, type: ApprovalPolicyType.SecretAccess })
+ .where((qb) => {
+ if (policyId) void qb.where("policyId", policyId);
+ if (requesterId) void qb.where("requesterId", requesterId);
+ })
+ .orderBy("createdAt", "desc");
+ } catch (error) {
+ throw new DatabaseError({ error, name: "Find secret access approval requests" });
+ }
+ };
+
+ const findGrantsByRequestIds = async (requestIds: string[]) => {
+ if (!requestIds.length) return [];
+ try {
+ return await db
+ .replicaNode()(TableName.ApprovalRequestGrants)
+ .whereIn("requestId", requestIds)
+ .where({ type: ApprovalPolicyType.SecretAccess })
+ .orderBy("createdAt", "desc");
+ } catch (error) {
+ throw new DatabaseError({ error, name: "Find secret access grants by request ids" });
+ }
+ };
+
+ const findPrivilegesByGrantIds = async (grantIds: string[]) => {
+ if (!grantIds.length) return [];
+ try {
+ return await db.replicaNode()(TableName.AdditionalPrivilege).whereIn("grantId", grantIds);
+ } catch (error) {
+ throw new DatabaseError({ error, name: "Find additional privileges by grant ids" });
+ }
+ };
+
+ const findApprovalsByRequestIds = async (requestIds: string[]) => {
+ if (!requestIds.length) return [];
+ try {
+ return await db
+ .replicaNode()(TableName.ApprovalRequestApprovals)
+ .join(
+ TableName.ApprovalRequestSteps,
+ `${TableName.ApprovalRequestApprovals}.stepId`,
+ `${TableName.ApprovalRequestSteps}.id`
+ )
+ .whereIn(`${TableName.ApprovalRequestSteps}.requestId`, requestIds)
+ .select(selectAllTableCols(TableName.ApprovalRequestApprovals))
+ .select(db.ref("requestId").withSchema(TableName.ApprovalRequestSteps))
+ .orderBy(`${TableName.ApprovalRequestApprovals}.createdAt`, "asc");
+ } catch (error) {
+ throw new DatabaseError({ error, name: "Find approvals by request ids" });
+ }
+ };
+
+ const findGroupMembers = async (groupIds: string[]) => {
+ if (!groupIds.length) return [];
+ try {
+ return await db
+ .replicaNode()(TableName.UserGroupMembership)
+ .whereIn("groupId", groupIds)
+ .select("groupId", "userId");
+ } catch (error) {
+ throw new DatabaseError({ error, name: "Find group members" });
+ }
+ };
+
+ const findUsersByIds = async (userIds: string[]) => {
+ if (!userIds.length) return [];
+ try {
+ return await db
+ .replicaNode()(TableName.Users)
+ .whereIn("id", userIds)
+ .select("id", "email", "username", "firstName", "lastName");
+ } catch (error) {
+ throw new DatabaseError({ error, name: "Find users by ids" });
+ }
+ };
+
+ const findOrgMembershipActivity = async (orgId: string, userIds: string[]) => {
+ if (!userIds.length) return [];
+ try {
+ return await db
+ .replicaNode()(TableName.Membership)
+ .where({ scope: AccessScope.Organization, scopeOrgId: orgId })
+ .whereIn("actorUserId", userIds)
+ .select("actorUserId", "isActive");
+ } catch (error) {
+ throw new DatabaseError({ error, name: "Find org membership activity" });
+ }
+ };
+
+ return {
+ findSecretAccessRequestById,
+ findSecretAccessRequests,
+ findPendingRequests,
+ findGrantsByRequestIds,
+ findPrivilegesByGrantIds,
+ findApprovalsByRequestIds,
+ findGroupMembers,
+ findUsersByIds,
+ findOrgMembershipActivity
+ };
+};
diff --git a/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-fns.test.ts b/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-fns.test.ts
new file mode 100644
index 0000000000..d9e484da9c
--- /dev/null
+++ b/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-fns.test.ts
@@ -0,0 +1,405 @@
+import { describe, expect, test } from "vitest";
+
+import { BypasserType } from "@app/ee/services/access-approval-policy/access-approval-policy-types";
+import { ApprovalStatus } from "@app/ee/services/access-approval-request/access-approval-request-types";
+import { BadRequestError, NotFoundError } from "@app/lib/errors";
+import {
+ ApprovalRequestApprovalDecision,
+ ApprovalRequestGrantStatus,
+ ApprovalRequestStatus,
+ ApproverType
+} from "@app/services/approval-policy/approval-policy-enums";
+
+import {
+ collectSecretAccessRequestUserIds,
+ composeSecretAccessRequestRows,
+ isPolicySubjectMatch,
+ toLegacyAccessApprovalRequest,
+ TSecretAccessRequestListInput
+} from "./secret-access-approval-request-bridge-fns";
+
+type TRequest = TSecretAccessRequestListInput["requests"][number];
+type TPolicy = TSecretAccessRequestListInput["policies"][number];
+type TGrant = TSecretAccessRequestListInput["grants"][number];
+type TPrivilege = TSecretAccessRequestListInput["privileges"][number];
+type TApproval = TSecretAccessRequestListInput["approvals"][number];
+
+const ENV_ID = "7b8f3a52-91c4-4d0e-9a6b-2f1c5e8d4a73";
+const PERMISSIONS = [["read", "secrets", { environment: "dev", secretPath: { $glob: "/app" } }]];
+const createdAt = new Date("2026-01-01T00:00:00.000Z");
+const updatedAt = new Date("2026-01-02T00:00:00.000Z");
+
+const storedRequestData = (overrides: Partial<{ isTemporary: boolean; temporaryRange: string | null }> = {}) => ({
+ version: 1,
+ requestData: {
+ envId: ENV_ID,
+ envSlug: "dev",
+ secretPath: "/app",
+ permissions: PERMISSIONS,
+ isTemporary: false,
+ temporaryRange: null,
+ ...overrides
+ }
+});
+
+const request = (overrides: Partial<TRequest> = {}): TRequest =>
+ ({
+ id: "req-1",
+ policyId: "policy-1",
+ requesterId: "requester",
+ organizationId: "org-1",
+ projectId: "project-1",
+ requestData: storedRequestData(),
+ justification: "need it",
+ status: ApprovalRequestStatus.Pending,
+ expiresAt: null,
+ createdAt,
+ updatedAt,
+ ...overrides
+ }) as TRequest;
+
+const grant = (overrides: Partial<TGrant> = {}): TGrant =>
+ ({
+ id: "grant-1",
+ requestId: "req-1",
+ status: ApprovalRequestGrantStatus.Active,
+ createdAt,
+ revokedAt: null,
+ revokedByUserId: null,
+ isBreakGlass: false,
+ bypassReason: null,
+ ...overrides
+ }) as TGrant;
+
+const privilege = (overrides: Partial<TPrivilege> = {}): TPrivilege =>
+ ({
+ id: "privilege-1",
+ grantId: "grant-1",
+ projectId: "project-1",
+ actorUserId: "requester",
+ isTemporary: false,
+ temporaryMode: null,
+ temporaryRange: null,
+ temporaryAccessStartTime: null,
+ temporaryAccessEndTime: null,
+ permissions: PERMISSIONS,
+ ...overrides
+ }) as TPrivilege;
+
+const approval = (overrides: Partial<TApproval> = {}): TApproval =>
+ ({
+ id: "approval-1",
+ requestId: "req-1",
+ stepId: "step-1",
+ approverUserId: "approver-a",
+ decision: ApprovalRequestApprovalDecision.Approved,
+ createdAt,
+ ...overrides
+ }) as TApproval;
+
+const policy = (overrides: Partial<TPolicy> = {}): TPolicy =>
+ ({
+ id: "policy-1",
+ name: "Policy",
+ projectId: "project-1",
+ enforcementLevel: "hard",
+ bypassForMachineIdentities: false,
+ createdAt,
+ updatedAt,
+ deletedAt: null,
+ secretPath: "/app",
+ envId: ENV_ID,
+ maxTimePeriod: null,
+ allowedSelfApprovals: true,
+ requestExpirationTime: null,
+ approvals: 1,
+ approvers: [{ id: "approver-a", type: ApproverType.User, name: "approver-a", sequence: 1, approvalsRequired: 1 }],
+ bypassers: [],
+ environment: { id: ENV_ID, name: "Development", slug: "dev" },
+ environments: [{ id: ENV_ID, name: "Development", slug: "dev" }],
+ ...overrides
+ }) as TPolicy;
+
+const user = (id: string) => ({ id, email: `${id}@example.com`, username: id, firstName: id, lastName: null });
+
+const listInput = (overrides: Partial<TSecretAccessRequestListInput> = {}): TSecretAccessRequestListInput => ({
+ requests: [request()],
+ policies: [policy()],
+ grants: [],
+ privileges: [],
+ approvals: [],
+ groupMembers: [],
+ users: [user("requester"), user("approver-a")],
+ orgMemberships: [
+ { actorUserId: "requester", isActive: true },
+ { actorUserId: "approver-a", isActive: true }
+ ],
+ ...overrides
+});
+
+describe("toLegacyAccessApprovalRequest", () => {
+ test("maps a pending request with no grant", () => {
+ const legacy = toLegacyAccessApprovalRequest({ ...request(), grant: null, privilegeId: null });
+
+ expect(legacy).toEqual({
+ id: "req-1",
+ policyId: "policy-1",
+ requestedByUserId: "requester",
+ isTemporary: false,
+ temporaryRange: null,
+ permissions: PERMISSIONS,
+ note: "need it",
+ privilegeId: null,
+ status: ApprovalStatus.PENDING,
+ expiresAt: null,
+ approvedAt: null,
+ approvedByUserId: null,
+ revokedAt: null,
+ revokedByUserId: null,
+ createdAt,
+ updatedAt,
+ editedByUserId: null,
+ editNote: null,
+ bypassReason: null,
+ privilegeDeletedAt: null
+ });
+ });
+
+ test("an active grant exposes the privilege and the approval time", () => {
+ const legacy = toLegacyAccessApprovalRequest(
+ {
+ ...request({
+ status: ApprovalRequestStatus.Approved,
+ requestData: storedRequestData({ isTemporary: true, temporaryRange: "1h" })
+ }),
+ grant: grant(),
+ privilegeId: "privilege-1"
+ },
+ "approver-a"
+ );
+
+ expect(legacy.status).toBe(ApprovalStatus.APPROVED);
+ expect(legacy.privilegeId).toBe("privilege-1");
+ expect(legacy.approvedAt).toEqual(createdAt);
+ expect(legacy.approvedByUserId).toBe("approver-a");
+ expect(legacy.isTemporary).toBe(true);
+ expect(legacy.temporaryRange).toBe("1h");
+ });
+
+ test("a revoked grant reports the revoked status and hides the privilege", () => {
+ const revokedAt = new Date("2026-01-03T00:00:00.000Z");
+ const legacy = toLegacyAccessApprovalRequest({
+ ...request({ status: ApprovalRequestStatus.Approved }),
+ grant: grant({ status: ApprovalRequestGrantStatus.Revoked, revokedAt, revokedByUserId: "admin" }),
+ privilegeId: "privilege-1"
+ });
+
+ expect(legacy.status).toBe(ApprovalStatus.REVOKED);
+ expect(legacy.privilegeId).toBeNull();
+ expect(legacy.revokedAt).toEqual(revokedAt);
+ expect(legacy.revokedByUserId).toBe("admin");
+ });
+
+ test("a cancelled request reads as rejected", () => {
+ const legacy = toLegacyAccessApprovalRequest({
+ ...request({ status: ApprovalRequestStatus.Cancelled }),
+ grant: null,
+ privilegeId: null
+ });
+
+ expect(legacy.status).toBe(ApprovalStatus.REJECTED);
+ });
+
+ test("only a break-glass grant carries its bypass reason", () => {
+ const breakGlass = toLegacyAccessApprovalRequest({
+ ...request({ status: ApprovalRequestStatus.Approved }),
+ grant: grant({ isBreakGlass: true, bypassReason: "incident response" }),
+ privilegeId: "privilege-1"
+ });
+ const regular = toLegacyAccessApprovalRequest({
+ ...request({ status: ApprovalRequestStatus.Approved }),
+ grant: grant({ isBreakGlass: false, bypassReason: "stale" }),
+ privilegeId: "privilege-1"
+ });
+
+ expect(breakGlass.bypassReason).toBe("incident response");
+ expect(regular.bypassReason).toBeNull();
+ });
+
+ test("rejects a request whose policy or requester is gone", () => {
+ expect(() =>
+ toLegacyAccessApprovalRequest({ ...request({ policyId: null }), grant: null, privilegeId: null })
+ ).toThrow(BadRequestError);
+ expect(() =>
+ toLegacyAccessApprovalRequest({ ...request({ requesterId: null }), grant: null, privilegeId: null })
+ ).toThrow(NotFoundError);
+ });
+
+ test("rejects malformed request data", () => {
+ expect(() =>
+ toLegacyAccessApprovalRequest({ ...request({ requestData: { version: 2 } }), grant: null, privilegeId: null })
+ ).toThrow(BadRequestError);
+ });
+});
+
+describe("isPolicySubjectMatch", () => {
+ const subjects = [
+ { type: ApproverType.User, id: "user-a" },
+ { type: ApproverType.Group, id: "group-g" },
+ { type: ApproverType.User, id: null }
+ ];
+
+ test("matches the actor directly or through a group", () => {
+ expect(isPolicySubjectMatch(subjects, "user-a", new Set())).toBe(true);
+ expect(isPolicySubjectMatch(subjects, "user-b", new Set(["group-g"]))).toBe(true);
+ });
+
+ test("does not match an outsider or a subject with no id", () => {
+ expect(isPolicySubjectMatch(subjects, "user-b", new Set(["group-other"]))).toBe(false);
+ expect(isPolicySubjectMatch([{ type: ApproverType.User, id: null }], "user-a", new Set())).toBe(false);
+ });
+});
+
+describe("collectSecretAccessRequestUserIds", () => {
+ test("collects every user a request row can name, once", () => {
+ const userIds = collectSecretAccessRequestUserIds({
+ requests: [
+ request(),
+ request({ id: "req-2", requesterId: "requester" }),
+ request({ id: "req-3", requesterId: null })
+ ],
+ policies: [
+ policy({
+ approvers: [
+ { id: "approver-a", type: ApproverType.User, name: "approver-a", sequence: 1, approvalsRequired: 1 },
+ { id: "group-g", type: ApproverType.Group, sequence: 1, approvalsRequired: 1 }
+ ]
+ })
+ ],
+ grants: [grant({ revokedByUserId: "admin" }), grant({ id: "grant-2", revokedByUserId: null })],
+ approvals: [approval(), approval({ id: "approval-2", approverUserId: "approver-b" })],
+ groupMembers: [{ groupId: "group-g", userId: "member-1" }]
+ });
+
+ expect(userIds.sort()).toEqual(["admin", "approver-a", "approver-b", "member-1", "requester"]);
+ });
+});
+
+describe("composeSecretAccessRequestRows", () => {
+ test("expands group approvers and bypassers into their members", () => {
+ const [row] = composeSecretAccessRequestRows(
+ listInput({
+ policies: [
+ policy({
+ approvers: [
+ { id: "approver-a", type: ApproverType.User, name: "approver-a", sequence: 1, approvalsRequired: 1 },
+ { id: "group-g", type: ApproverType.Group, sequence: 2, approvalsRequired: 2 }
+ ],
+ bypassers: [{ id: "group-g", type: BypasserType.Group }]
+ })
+ ],
+ groupMembers: [
+ { groupId: "group-g", userId: "member-1" },
+ { groupId: "group-g", userId: "member-2" }
+ ],
+ users: [user("requester"), user("approver-a"), user("member-1")],
+ orgMemberships: [
+ { actorUserId: "approver-a", isActive: true },
+ { actorUserId: "member-1", isActive: false }
+ ]
+ })
+ );
+
+ expect(row.policy?.approvers).toEqual([
+ {
+ userId: "approver-a",
+ sequence: 1,
+ approvalsRequired: 1,
+ email: "[email protected]",
+ username: "approver-a",
+ isOrgMembershipActive: true
+ },
+ {
+ userId: "member-1",
+ sequence: 2,
+ approvalsRequired: 2,
+ email: "[email protected]",
+ username: "member-1",
+ isOrgMembershipActive: false
+ },
+ { userId: "member-2", sequence: 2, approvalsRequired: 2, email: null, username: "", isOrgMembershipActive: false }
+ ]);
+ expect(row.policy?.bypassers).toEqual(["member-1", "member-2"]);
+ expect(row.environment).toEqual({ id: ENV_ID, name: "Development", slug: "dev" });
+ });
+
+ test("attaches the newest grant, its privilege, the last approver and the reviewers", () => {
+ const olderGrant = grant({ id: "grant-old", status: ApprovalRequestGrantStatus.Revoked, revokedByUserId: "admin" });
+ const [row] = composeSecretAccessRequestRows(
+ listInput({
+ requests: [request({ status: ApprovalRequestStatus.Approved })],
+ grants: [grant(), olderGrant],
+ privileges: [privilege(), privilege({ id: "privilege-old", grantId: "grant-old" })],
+ approvals: [
+ approval({ id: "approval-1", approverUserId: "approver-a" }),
+ approval({
+ id: "approval-2",
+ approverUserId: "approver-b",
+ decision: ApprovalRequestApprovalDecision.Rejected
+ }),
+ approval({ id: "approval-3", approverUserId: "approver-c" })
+ ],
+ users: [user("requester"), user("approver-a"), user("approver-c")],
+ orgMemberships: [
+ { actorUserId: "requester", isActive: true },
+ { actorUserId: "approver-a", isActive: true }
+ ]
+ })
+ );
+
+ expect(row.grant?.id).toBe("grant-1");
+ expect(row.privilegeId).toBe("privilege-1");
+ expect(row.privilege).toEqual({
+ membershipId: "project-1",
+ userId: "requester",
+ projectId: "project-1",
+ isTemporary: false,
+ temporaryMode: null,
+ temporaryRange: null,
+ temporaryAccessStartTime: null,
+ temporaryAccessEndTime: null,
+ permissions: PERMISSIONS
+ });
+ expect(row.requestedByUser).toEqual({
+ userId: "requester",
+ email: "[email protected]",
+ firstName: "requester",
+ lastName: null,
+ username: "requester"
+ });
+ expect(row.approvedByUser?.userId).toBe("approver-c");
+ expect(row.revokedByUser).toBeNull();
+ expect(row.reviewers).toEqual([
+ { userId: "approver-a", status: ApprovalRequestApprovalDecision.Approved, isOrgMembershipActive: true },
+ { userId: "approver-b", status: ApprovalRequestApprovalDecision.Rejected, isOrgMembershipActive: false },
+ { userId: "approver-c", status: ApprovalRequestApprovalDecision.Approved, isOrgMembershipActive: false }
+ ]);
+ });
+
+ test("a request whose policy is gone keeps its own fields and drops the policy", () => {
+ const [row] = composeSecretAccessRequestRows(listInput({ requests: [request({ policyId: null })] }));
+
+ expect(row.policy).toBeNull();
+ expect(row.environment).toBeNull();
+ expect(row.grant).toBeNull();
+ expect(row.privilegeId).toBeNull();
+ expect(row.approvedByUser).toBeNull();
+ expect(row.requestedByUser?.userId).toBe("requester");
+ });
+
+ test("a requester who no longer exists is reported as null", () => {
+ const [row] = composeSecretAccessRequestRows(listInput({ requests: [request({ requesterId: null })] }));
+
+ expect(row.requestedByUser).toBeNull();
+ });
+});
diff --git a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-fns.ts b/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-fns.ts
similarity index 83%
rename from backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-fns.ts
rename to backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-fns.ts
index 025042cf0b..2b739331a0 100644
--- a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-fns.ts
+++ b/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-fns.ts
@@ -1,16 +1,13 @@
import msFn from "ms";
import { TAdditionalPrivileges, TApprovalRequestGrants, TApprovalRequests, TUsers } from "@app/db/schemas";
-import { TAccessApprovalPolicyDALFactory } from "@app/ee/services/access-approval-policy/access-approval-policy-dal";
import { ApprovalStatus } from "@app/ee/services/access-approval-request/access-approval-request-types";
import { getConfig } from "@app/lib/config/env";
import { BadRequestError, NotFoundError } from "@app/lib/errors";
-import { groupBy } from "@app/lib/fn";
import { logger } from "@app/lib/logger";
import { ms } from "@app/lib/ms";
import { triggerWorkflowIntegrationNotification } from "@app/lib/workflow-integrations/trigger-notification";
import { TriggerFeature } from "@app/lib/workflow-integrations/types";
-import { TApprovalPolicySecretEnvironmentDALFactory } from "@app/services/approval-policy/approval-policy-dal";
import {
ApprovalRequestGrantStatus,
ApprovalRequestStatus,
@@ -21,65 +18,11 @@ import { resolveStepApproverUserIds } from "@app/services/approval-policy/approv
import { getSecretAccessRequestData } from "@app/services/approval-policy/secret-access/secret-access-policy-fns";
import { TSecretAccessRequestData } from "@app/services/approval-policy/secret-access/secret-access-policy-types";
import { NotificationType } from "@app/services/notification/notification-types";
+import { TSecretAccessApprovalPolicyBridgeDALFactory } from "@app/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-dal";
import { SmtpTemplates } from "@app/services/smtp/smtp-service";
-import { TSecretAccessApprovalBridgeDALFactory } from "./secret-access-approval-bridge-dal";
-import { TSecretAccessApprovalBridgeServiceFactoryDep } from "./secret-access-approval-bridge-types";
-
-type TSecretAccessApprovalPolicyExistsDep = {
- accessApprovalPolicyDAL: Pick<TAccessApprovalPolicyDALFactory, "findPolicyByEnvIdAndSecretPath">;
- approvalPolicySecretEnvironmentDAL: Pick<
- TApprovalPolicySecretEnvironmentDALFactory,
- "findPolicyByEnvIdsAndSecretPath"
- >;
-};
-
-export const secretAccessApprovalPolicyExists = async (
- { envId, secretPath, excludePolicyId }: { envId: string; secretPath: string; excludePolicyId?: string },
- { accessApprovalPolicyDAL, approvalPolicySecretEnvironmentDAL }: TSecretAccessApprovalPolicyExistsDep
-) => {
- const legacyPolicy = await accessApprovalPolicyDAL.findPolicyByEnvIdAndSecretPath({ envIds: [envId], secretPath });
- if (legacyPolicy && legacyPolicy.id !== excludePolicyId) return true;
-
- const policy = await approvalPolicySecretEnvironmentDAL.findPolicyByEnvIdsAndSecretPath({
- envIds: [envId],
- secretPath,
- excludePolicyId
- });
- return Boolean(policy);
-};
-
-// Legacy stores null on approver rows for a step with no approvalsRequired entry and reviews it as 1,
-// so the top-level `approvals` must not leak into a step's requirement.
-export const buildSecretAccessPolicySteps = <T extends { type: ApproverType; id: string; sequence: number }>(
- approvers: T[],
- approvalsRequired?: { numberOfApprovals: number; stepNumber: number }[]
-) => {
- const approvalsRequiredByStepNumber = groupBy(approvalsRequired || [], (i) => i.stepNumber);
- const approversBySequence = groupBy(approvers, (el) => el.sequence);
- return Object.keys(approversBySequence)
- .map(Number)
- .sort((a, b) => a - b)
- .map((sequence, index) => {
- const seen = new Set<string>();
- const stepApprovers = approversBySequence[sequence].filter((approver) => {
- const key = `${approver.type}:${approver.id}`;
- if (seen.has(key)) return false;
- seen.add(key);
- return true;
- });
- const requiredApprovals = approvalsRequiredByStepNumber[sequence]?.[0]?.numberOfApprovals || 1;
-
- const hasGroupApprover = stepApprovers.some((approver) => approver.type === ApproverType.Group);
- if (!hasGroupApprover && requiredApprovals > stepApprovers.length) {
- throw new BadRequestError({
- message: `Step ${index + 1} requires ${requiredApprovals} approvals but only has ${stepApprovers.length} approver${stepApprovers.length === 1 ? "" : "s"}. Add approvers to the step or lower its required approvals.`
- });
- }
-
- return { requiredApprovals, approvers: stepApprovers };
- });
-};
+import { TSecretAccessApprovalRequestBridgeDALFactory } from "./secret-access-approval-request-bridge-dal";
+import { TSecretAccessApprovalRequestBridgeServiceFactoryDep } from "./secret-access-approval-request-bridge-types";
export type TSecretAccessRequestRow = TApprovalRequests & {
grant: TApprovalRequestGrants | null;
@@ -164,7 +107,7 @@ export const toLegacyAccessApprovalRequest = (
};
type TNotifySecretAccessStepApproversDep = Pick<
- TSecretAccessApprovalBridgeServiceFactoryDep,
+ TSecretAccessApprovalRequestBridgeServiceFactoryDep,
| "userDAL"
| "userGroupMembershipDAL"
| "projectDAL"
@@ -280,7 +223,7 @@ export const notifySecretAccessStepApprovers = async (
};
type TNotifySecretAccessBypassDep = Pick<
- TSecretAccessApprovalBridgeServiceFactoryDep,
+ TSecretAccessApprovalRequestBridgeServiceFactoryDep,
"userDAL" | "userGroupMembershipDAL" | "notificationService" | "smtpService"
>;
@@ -354,10 +297,10 @@ export const notifySecretAccessBypass = async (
};
type TSecretAccessPolicyRow = Awaited<
- ReturnType<TSecretAccessApprovalBridgeDALFactory["findSecretAccessPolicies"]>
+ ReturnType<TSecretAccessApprovalPolicyBridgeDALFactory["findSecretAccessPolicies"]>
>[number];
type TApprovalWithRequestId = Awaited<
- ReturnType<TSecretAccessApprovalBridgeDALFactory["findApprovalsByRequestIds"]>
+ ReturnType<TSecretAccessApprovalRequestBridgeDALFactory["findApprovalsByRequestIds"]>
>[number];
export type TSecretAccessRequestListInput = {
diff --git a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-service.ts b/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-service.ts
similarity index 57%
rename from backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-service.ts
rename to backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-service.ts
index 57054d4eda..f02a698890 100644
--- a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-service.ts
+++ b/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-service.ts
@@ -1,24 +1,13 @@
-import { ForbiddenError, subject } from "@casl/ability";
-import { Knex } from "knex";
+import { subject } from "@casl/ability";
import { ActionProjectType, ProjectMembershipRole } from "@app/db/schemas";
-import { approvalPolicyMembershipVerifierFactory } from "@app/ee/services/access-approval-policy/access-approval-policy-fns";
-import {
- ApproverType,
- BypasserType,
- TCreateAccessApprovalPolicy
-} from "@app/ee/services/access-approval-policy/access-approval-policy-types";
+import { ApproverType } from "@app/ee/services/access-approval-policy/access-approval-policy-types";
import { verifyRequestedPermissions } from "@app/ee/services/access-approval-request/access-approval-request-fns";
import { ApprovalStatus } from "@app/ee/services/access-approval-request/access-approval-request-types";
import { flattenActiveRolesFromMemberships } from "@app/ee/services/permission/permission-service";
-import {
- ProjectPermissionActions,
- ProjectPermissionMemberActions,
- ProjectPermissionSub
-} from "@app/ee/services/permission/project-permission";
+import { ProjectPermissionMemberActions, ProjectPermissionSub } from "@app/ee/services/permission/project-permission";
import { getConfig } from "@app/lib/config/env";
import { BadRequestError, ForbiddenRequestError, NotFoundError } from "@app/lib/errors";
-import { groupBy } from "@app/lib/fn";
import { logger } from "@app/lib/logger";
import { ms } from "@app/lib/ms";
import { alphaNumericNanoId } from "@app/lib/nanoid";
@@ -46,54 +35,31 @@ import { ActorType } from "@app/services/auth/auth-type";
import { AccessRequestWebhookAction, WebhookEvents } from "@app/services/webhook/webhook-types";
import {
- buildSecretAccessPolicySteps,
collectSecretAccessPolicyGroupIds,
collectSecretAccessRequestUserIds,
composeSecretAccessRequestRows,
isPolicySubjectMatch,
notifySecretAccessBypass,
notifySecretAccessStepApprovers,
- secretAccessApprovalPolicyExists,
toLegacyAccessApprovalRequest
-} from "./secret-access-approval-bridge-fns";
+} from "./secret-access-approval-request-bridge-fns";
import {
- TCountSecretAccessApprovalPoliciesDTO,
TCountSecretAccessApprovalRequestsDTO,
- TCreateSecretAccessApprovalPolicyDTO,
TCreateSecretAccessApprovalRequestDTO,
- TDeleteSecretAccessApprovalPolicyDTO,
- TGetSecretAccessApprovalPolicyByIdDTO,
- TListSecretAccessApprovalPoliciesDTO,
TListSecretAccessApprovalRequestsDTO,
TReviewSecretAccessApprovalRequestDTO,
TRevokeSecretAccessApprovalRequestDTO,
- TSecretAccessApprovalBridgeServiceFactoryDep,
- TUpdateSecretAccessApprovalPolicyDTO
-} from "./secret-access-approval-bridge-types";
-
-export type TSecretAccessApprovalBridgeServiceFactory = ReturnType<typeof secretAccessApprovalBridgeServiceFactory>;
-
-type TApproverInput = TCreateAccessApprovalPolicy["approvers"];
-type TBypasserInput = NonNullable<TCreateAccessApprovalPolicy["bypassers"]>;
-type TSequencedSubject = { id: string; sequence?: number };
-type TPolicyStep = {
- requiredApprovals: number;
- approvers: { type: ApproverType; id: string }[];
-};
+ TSecretAccessApprovalRequestBridgeServiceFactoryDep
+} from "./secret-access-approval-request-bridge-types";
-export const secretAccessApprovalBridgeServiceFactory = ({
+export type TSecretAccessApprovalRequestBridgeServiceFactory = ReturnType<
+ typeof secretAccessApprovalRequestBridgeServiceFactory
+>;
+
+export const secretAccessApprovalRequestBridgeServiceFactory = ({
projectDAL,
permissionService,
- projectEnvDAL,
userDAL,
- groupDAL,
- accessApprovalPolicyDAL,
- approvalPolicyDAL,
- approvalPolicyStepsDAL,
- approvalPolicyStepApproversDAL,
- approvalPolicyBypassersDAL,
- approvalPolicySecretEnvironmentDAL,
- secretAccessApprovalBridgeDAL,
userGroupMembershipDAL,
approvalRequestDAL,
approvalRequestStepsDAL,
@@ -101,6 +67,8 @@ export const secretAccessApprovalBridgeServiceFactory = ({
approvalRequestApprovalsDAL,
approvalRequestGrantsDAL,
additionalPrivilegeDAL,
+ secretAccessApprovalPolicyBridgeDAL,
+ secretAccessApprovalRequestBridgeDAL,
smtpService,
notificationService,
kmsService,
@@ -109,511 +77,15 @@ export const secretAccessApprovalBridgeServiceFactory = ({
projectMicrosoftTeamsConfigDAL,
queueService,
secretAccessApprovalResource
-}: TSecretAccessApprovalBridgeServiceFactoryDep) => {
- const { verifyProjectSubjectsMembership } = approvalPolicyMembershipVerifierFactory({ projectDAL });
-
- const $splitApprovers = (approvers: TApproverInput) => ({
- groupApprovers: approvers.filter((approver) => approver.type === ApproverType.Group) as TSequencedSubject[],
- userApprovers: approvers.filter(
- (approver) => approver.type === ApproverType.User && approver.id
- ) as TSequencedSubject[],
- userApproverNames: approvers.filter((approver) => approver.type === ApproverType.User && approver.username) as {
- username: string;
- sequence?: number;
- }[]
- });
-
- const $resolveApprovers = async (
- approvers: TApproverInput,
- { projectId, orgId }: { projectId: string; orgId: string }
- ) => {
- const { groupApprovers, userApprovers, userApproverNames } = $splitApprovers(approvers);
-
- let approverUserIds = userApprovers;
- if (userApproverNames.length) {
- const approverUsersInDB = await userDAL.find({
- $in: {
- username: userApproverNames.map((el) => el.username)
- }
- });
- const approverUsersInDBGroupByUsername = groupBy(approverUsersInDB, (i) => i.username);
- const invalidUsernames = userApproverNames.filter((el) => !approverUsersInDBGroupByUsername?.[el.username]?.[0]);
-
- if (invalidUsernames.length) {
- throw new BadRequestError({
- message: `Invalid approver user: ${invalidUsernames.map((i) => i.username).join(", ")}`
- });
- }
-
- approverUserIds = approverUserIds.concat(
- userApproverNames.map((el) => ({
- id: approverUsersInDBGroupByUsername[el.username]?.[0].id,
- sequence: el.sequence
- }))
- );
- }
-
- if (approverUserIds.length > 0 || groupApprovers.length > 0) {
- await verifyProjectSubjectsMembership({
- userIds: approverUserIds.map((au) => au.id),
- groupIds: groupApprovers.map((ga) => ga.id).filter(Boolean),
- orgId,
- projectId
- });
- }
-
- return { approverUserIds, groupApprovers };
- };
-
- const $resolveBypassers = async (
- bypassers: TBypasserInput | undefined,
- { projectId, orgId }: { projectId: string; orgId: string }
- ) => {
- let groupBypassers: string[] = [];
- let bypasserUserIds: string[] = [];
-
- if (bypassers && bypassers.length) {
- groupBypassers = [
- ...new Set(
- bypassers
- .filter((bypasser) => bypasser.type === BypasserType.Group)
- .map((bypasser) => bypasser.id) as string[]
- )
- ];
-
- const userBypassers = bypassers
- .filter((bypasser) => bypasser.type === BypasserType.User)
- .map((bypasser) => bypasser.id)
- .filter(Boolean) as string[];
-
- const userBypasserNames = bypassers
- .map((bypasser) => (bypasser.type === BypasserType.User ? bypasser.username : undefined))
- .filter(Boolean) as string[];
-
- bypasserUserIds = userBypassers;
- if (userBypasserNames.length) {
- const bypasserUsers = await userDAL.find({
- $in: {
- username: userBypasserNames
- }
- });
-
- const bypasserNamesFromDb = bypasserUsers.map((user) => user.username);
- const invalidUsernames = userBypasserNames.filter((username) => !bypasserNamesFromDb.includes(username));
-
- if (invalidUsernames.length) {
- throw new BadRequestError({
- message: `Invalid bypasser user: ${invalidUsernames.join(", ")}`
- });
- }
-
- bypasserUserIds = bypasserUserIds.concat(bypasserUsers.map((user) => user.id));
- }
- bypasserUserIds = [...new Set(bypasserUserIds)];
-
- if (groupBypassers.length > 0) {
- const orgGroups = await groupDAL.find({
- $in: { id: groupBypassers },
- orgId
- });
-
- if (orgGroups.length !== groupBypassers.length) {
- const foundGroupIdsInOrg = new Set(orgGroups.map((group) => group.id));
- const missingGroupIds = groupBypassers.filter((id) => !foundGroupIdsInOrg.has(id));
- throw new BadRequestError({
- message: `One or more specified bypasser groups are not part of the organization or do not exist. Invalid or non-member group IDs: ${missingGroupIds.join(", ")}`
- });
- }
- }
-
- if (bypasserUserIds.length) {
- await verifyProjectSubjectsMembership({
- userIds: bypasserUserIds,
- groupIds: [],
- orgId,
- projectId
- });
- }
- }
-
- return { bypasserUserIds, groupBypassers };
- };
-
- const $buildSteps = ({
- approverUserIds,
- groupApprovers,
- approvalsRequired
- }: {
- approverUserIds: TSequencedSubject[];
- groupApprovers: TSequencedSubject[];
- approvalsRequired?: { numberOfApprovals: number; stepNumber: number }[];
- }): TPolicyStep[] =>
- buildSecretAccessPolicySteps(
- [
- ...approverUserIds.map((el) => ({ type: ApproverType.User, id: el.id, sequence: el.sequence ?? 1 })),
- ...groupApprovers.map((el) => ({ type: ApproverType.Group, id: el.id, sequence: el.sequence ?? 1 }))
- ],
- approvalsRequired
- );
-
- const $insertStepsAndBypassers = async (
- {
- policyId,
- steps,
- bypasserUserIds,
- groupBypassers
- }: { policyId: string; steps: TPolicyStep[]; bypasserUserIds: string[]; groupBypassers: string[] },
- tx: Knex
- ) => {
- const stepDocs = await approvalPolicyStepsDAL.insertMany(
- steps.map((step, i) => ({
- policyId,
- stepNumber: i + 1,
- requiredApprovals: step.requiredApprovals
- })),
- tx
- );
-
- await approvalPolicyStepApproversDAL.insertMany(
- steps.flatMap((step, i) =>
- step.approvers.map((approver) => ({
- policyStepId: stepDocs[i].id,
- userId: approver.type === ApproverType.User ? approver.id : null,
- groupId: approver.type === ApproverType.Group ? approver.id : null
- }))
- ),
- tx
- );
-
- if (bypasserUserIds.length || groupBypassers.length) {
- await approvalPolicyBypassersDAL.insertMany(
- [
- ...bypasserUserIds.map((userId) => ({ policyId, userId, groupId: null })),
- ...groupBypassers.map((groupId) => ({ policyId, userId: null, groupId }))
- ],
- tx
- );
- }
- };
-
- const $getProjectPermission = async ({
- actor,
- actorId,
- actorAuthMethod,
- actorOrgId,
- projectId
- }: Pick<TUpdateSecretAccessApprovalPolicyDTO, "actor" | "actorId" | "actorAuthMethod" | "actorOrgId"> & {
- projectId: string;
- }) => {
- const { permission } = await permissionService.getProjectPermission({
- actor,
- actorId,
- projectId,
- actorAuthMethod,
- actorOrgId,
- actionProjectType: ActionProjectType.SecretManager
- });
- return permission;
- };
-
+}: TSecretAccessApprovalRequestBridgeServiceFactoryDep) => {
const $findPolicyById = async (policyId: string, message: string) => {
- const [policy] = await secretAccessApprovalBridgeDAL.findSecretAccessPolicies({ policyId });
+ const [policy] = await secretAccessApprovalPolicyBridgeDAL.findSecretAccessPolicies({ policyId });
if (!policy) throw new NotFoundError({ message });
return policy;
};
- const createAccessApprovalPolicy = async ({
- name,
- actor,
- actorId,
- actorOrgId,
- secretPath,
- actorAuthMethod,
- approvals,
- approvers,
- bypassers,
- projectSlug,
- environment,
- environments,
- enforcementLevel,
- allowedSelfApprovals,
- approvalsRequired,
- maxTimePeriod,
- requestExpirationTime
- }: TCreateSecretAccessApprovalPolicyDTO) => {
- const project = await projectDAL.findProjectBySlug(projectSlug, actorOrgId);
- if (!project) throw new NotFoundError({ message: `Project with slug '${projectSlug}' not found` });
-
- const permission = await $getProjectPermission({
- actor,
- actorId,
- actorAuthMethod,
- actorOrgId,
- projectId: project.id
- });
- ForbiddenError.from(permission).throwUnlessCan(
- ProjectPermissionActions.Create,
- ProjectPermissionSub.SecretApproval
- );
-
- const mergedEnvs = (environment ? [environment] : environments) || [];
- if (mergedEnvs.length === 0) {
- throw new BadRequestError({ message: "Must provide either environment or environments" });
- }
- const envs = await projectEnvDAL.find({ $in: { slug: mergedEnvs }, projectId: project.id });
- if (!envs.length || envs.length !== mergedEnvs.length) {
- const notFoundEnvs = mergedEnvs.filter((env) => !envs.find((el) => el.slug === env));
- throw new NotFoundError({ message: `One or more environments not found: ${notFoundEnvs.join(", ")}` });
- }
-
- for (const env of envs) {
- if (
- // eslint-disable-next-line no-await-in-loop
- await secretAccessApprovalPolicyExists(
- { envId: env.id, secretPath },
- { accessApprovalPolicyDAL, approvalPolicySecretEnvironmentDAL }
- )
- ) {
- throw new BadRequestError({
- message: `A policy for secret path '${secretPath}' already exists in environment '${env.slug}'`
- });
- }
- }
-
- const scope = { projectId: project.id, orgId: project.orgId };
- const { approverUserIds, groupApprovers } = await $resolveApprovers(approvers, scope);
- const { bypasserUserIds, groupBypassers } = await $resolveBypassers(bypassers, scope);
- const steps = $buildSteps({ approverUserIds, groupApprovers, approvalsRequired });
-
- const policy = await approvalPolicyDAL.transaction(async (tx) => {
- const doc = await approvalPolicyDAL.create(
- {
- projectId: project.id,
- organizationId: project.orgId,
- type: ApprovalPolicyType.SecretAccess,
- name,
- enforcementLevel,
- bypassForMachineIdentities: false,
- scopeType: null,
- scopeId: null,
- conditions: { version: 1, conditions: {} },
- constraints: {
- version: 1,
- constraints: {
- allowedSelfApprovals,
- requestExpirationTime: requestExpirationTime ?? null,
- maxTimePeriod: maxTimePeriod ?? null
- }
- }
- },
- tx
- );
-
- await approvalPolicySecretEnvironmentDAL.insertMany(
- envs.map((env) => ({ policyId: doc.id, envId: env.id, secretPath })),
- tx
- );
-
- await $insertStepsAndBypassers({ policyId: doc.id, steps, bypasserUserIds, groupBypassers }, tx);
-
- return doc;
- });
-
- return {
- id: policy.id,
- name: policy.name,
- secretPath,
- approvals,
- envId: envs[0].id,
- createdAt: policy.createdAt,
- updatedAt: policy.updatedAt,
- enforcementLevel: policy.enforcementLevel,
- deletedAt: null,
- allowedSelfApprovals,
- bypassForMachineIdentities: false,
- maxTimePeriod: maxTimePeriod ?? null,
- requestExpirationTime: requestExpirationTime ?? null,
- environment: envs[0],
- environments: envs,
- projectId: project.id
- };
- };
-
- const updateAccessApprovalPolicy = async ({
- policyId,
- approvers,
- bypassers,
- secretPath,
- name,
- actorId,
- actor,
- actorOrgId,
- actorAuthMethod,
- enforcementLevel,
- allowedSelfApprovals,
- approvalsRequired,
- environments,
- maxTimePeriod,
- requestExpirationTime
- }: TUpdateSecretAccessApprovalPolicyDTO) => {
- const policy = await $findPolicyById(policyId, `Access approval policy with ID '${policyId}' not found`);
-
- const permission = await $getProjectPermission({
- actor,
- actorId,
- actorAuthMethod,
- actorOrgId,
- projectId: policy.projectId
- });
- ForbiddenError.from(permission).throwUnlessCan(ProjectPermissionActions.Edit, ProjectPermissionSub.SecretApproval);
-
- let envs: { id: string; slug: string }[] = policy.environments;
- if (environments) {
- envs = await projectEnvDAL.find({ $in: { slug: environments }, projectId: policy.projectId });
- if (envs.length !== environments.length) {
- const notFoundEnvs = environments.filter((env) => !envs.find((el) => el.slug === env));
- throw new NotFoundError({ message: `One or more environments not found: ${notFoundEnvs.join(", ")}` });
- }
- }
-
- const nextSecretPath = secretPath || policy.secretPath;
- for (const env of envs) {
- if (
- // eslint-disable-next-line no-await-in-loop
- await secretAccessApprovalPolicyExists(
- { envId: env.id, secretPath: nextSecretPath, excludePolicyId: policy.id },
- { accessApprovalPolicyDAL, approvalPolicySecretEnvironmentDAL }
- )
- ) {
- throw new BadRequestError({
- message: `A policy for secret path '${nextSecretPath}' already exists in environment '${env.slug}'`
- });
- }
- }
-
- const scope = { projectId: policy.projectId, orgId: actorOrgId };
- const { approverUserIds, groupApprovers } = await $resolveApprovers(approvers, scope);
- const { bypasserUserIds, groupBypassers } = await $resolveBypassers(bypassers, scope);
- const steps = $buildSteps({ approverUserIds, groupApprovers, approvalsRequired });
-
- return approvalPolicyDAL.transaction(async (tx) => {
- await approvalPolicyDAL.updateById(
- policy.id,
- {
- name,
- enforcementLevel,
- constraints: {
- version: 1,
- constraints: {
- allowedSelfApprovals,
- requestExpirationTime:
- requestExpirationTime === undefined ? policy.requestExpirationTime : requestExpirationTime,
- maxTimePeriod: maxTimePeriod === undefined ? policy.maxTimePeriod : maxTimePeriod
- }
- }
- },
- tx
- );
-
- await approvalPolicyStepsDAL.delete({ policyId: policy.id }, tx);
- await approvalPolicyBypassersDAL.delete({ policyId: policy.id }, tx);
- await $insertStepsAndBypassers({ policyId: policy.id, steps, bypasserUserIds, groupBypassers }, tx);
-
- if (environments || secretPath) {
- await approvalPolicySecretEnvironmentDAL.delete({ policyId: policy.id }, tx);
- await approvalPolicySecretEnvironmentDAL.insertMany(
- envs.map((env) => ({ policyId: policy.id, envId: env.id, secretPath: nextSecretPath })),
- tx
- );
- }
-
- const [updatedPolicy] = await secretAccessApprovalBridgeDAL.findSecretAccessPolicies({ policyId: policy.id }, tx);
- return updatedPolicy;
- });
- };
-
- const deleteAccessApprovalPolicy = async ({
- policyId,
- actor,
- actorId,
- actorAuthMethod,
- actorOrgId
- }: TDeleteSecretAccessApprovalPolicyDTO) => {
- const policy = await $findPolicyById(policyId, `Secret approval policy with ID '${policyId}' not found`);
-
- const permission = await $getProjectPermission({
- actor,
- actorId,
- actorAuthMethod,
- actorOrgId,
- projectId: policy.projectId
- });
- ForbiddenError.from(permission).throwUnlessCan(
- ProjectPermissionActions.Delete,
- ProjectPermissionSub.SecretApproval
- );
-
- await approvalPolicyDAL.transaction(async (tx) => {
- await approvalRequestDAL.update(
- { policyId: policy.id, status: ApprovalRequestStatus.Pending },
- { status: ApprovalRequestStatus.Cancelled },
- tx
- );
-
- const requests = await approvalRequestDAL.find({ policyId: policy.id }, { tx });
- if (requests.length) {
- const revokedGrants = await approvalRequestGrantsDAL.update(
- { $in: { requestId: requests.map((request) => request.id) }, status: ApprovalRequestGrantStatus.Active },
- {
- status: ApprovalRequestGrantStatus.Revoked,
- revokedAt: new Date(),
- revokedByUserId: actor === ActorType.USER ? actorId : null
- },
- tx
- );
-
- if (revokedGrants.length) {
- await additionalPrivilegeDAL.delete({ $in: { grantId: revokedGrants.map((grant) => grant.id) } }, tx);
- }
- }
-
- await approvalPolicyDAL.deleteById(policy.id, tx);
- });
-
- return policy;
- };
-
- const getAccessApprovalPolicyById = async ({
- policyId,
- actor,
- actorId,
- actorAuthMethod,
- actorOrgId
- }: TGetSecretAccessApprovalPolicyByIdDTO) => {
- const policy = await $findPolicyById(policyId, `Cannot find access approval policy with ID ${policyId}`);
-
- const permission = await $getProjectPermission({
- actor,
- actorId,
- actorAuthMethod,
- actorOrgId,
- projectId: policy.projectId
- });
- ForbiddenError.from(permission).throwUnlessCan(ProjectPermissionActions.Read, ProjectPermissionSub.SecretApproval);
-
- return policy;
- };
-
- const listAccessApprovalPolicies = ({ projectId }: TListSecretAccessApprovalPoliciesDTO) =>
- secretAccessApprovalBridgeDAL.findSecretAccessPolicies({ projectId });
-
- const countAccessApprovalPolicies = async ({ projectId, envId }: TCountSecretAccessApprovalPoliciesDTO) => {
- const policies = await secretAccessApprovalBridgeDAL.findSecretAccessPolicies({ projectId, envId });
- return policies.length;
- };
-
const $findRequestById = async (requestId: string) => {
- const request = await secretAccessApprovalBridgeDAL.findSecretAccessRequestById(requestId);
+ const request = await secretAccessApprovalRequestBridgeDAL.findSecretAccessRequestById(requestId);
if (!request) throw new NotFoundError({ message: `Access request with ID '${requestId}' not found` });
return request;
};
@@ -624,25 +96,25 @@ export const secretAccessApprovalBridgeServiceFactory = ({
};
const $loadRequestRows = async (filter: { projectId: string; policyId?: string; requesterId?: string }) => {
- const requests = await secretAccessApprovalBridgeDAL.findSecretAccessRequests(filter);
+ const requests = await secretAccessApprovalRequestBridgeDAL.findSecretAccessRequests(filter);
if (!requests.length) return [];
const requestIds = requests.map((request) => request.id);
const [policies, grants, approvals] = await Promise.all([
- secretAccessApprovalBridgeDAL.findSecretAccessPolicies({ projectId: filter.projectId }),
- secretAccessApprovalBridgeDAL.findGrantsByRequestIds(requestIds),
- secretAccessApprovalBridgeDAL.findApprovalsByRequestIds(requestIds)
+ secretAccessApprovalPolicyBridgeDAL.findSecretAccessPolicies({ projectId: filter.projectId }),
+ secretAccessApprovalRequestBridgeDAL.findGrantsByRequestIds(requestIds),
+ secretAccessApprovalRequestBridgeDAL.findApprovalsByRequestIds(requestIds)
]);
const [privileges, groupMembers] = await Promise.all([
- secretAccessApprovalBridgeDAL.findPrivilegesByGrantIds(grants.map((grant) => grant.id)),
- secretAccessApprovalBridgeDAL.findGroupMembers(collectSecretAccessPolicyGroupIds(policies))
+ secretAccessApprovalRequestBridgeDAL.findPrivilegesByGrantIds(grants.map((grant) => grant.id)),
+ secretAccessApprovalRequestBridgeDAL.findGroupMembers(collectSecretAccessPolicyGroupIds(policies))
]);
const userIds = collectSecretAccessRequestUserIds({ requests, policies, grants, approvals, groupMembers });
const [users, orgMemberships] = await Promise.all([
- secretAccessApprovalBridgeDAL.findUsersByIds(userIds),
- secretAccessApprovalBridgeDAL.findOrgMembershipActivity(requests[0].organizationId, userIds)
+ secretAccessApprovalRequestBridgeDAL.findUsersByIds(userIds),
+ secretAccessApprovalRequestBridgeDAL.findOrgMembershipActivity(requests[0].organizationId, userIds)
]);
return composeSecretAccessRequestRows({
@@ -841,7 +313,7 @@ export const secretAccessApprovalBridgeServiceFactory = ({
throw new BadRequestError({ message: "You already have an active privilege with the same criteria" });
}
- const pendingRequests = await secretAccessApprovalBridgeDAL.findPendingRequests({
+ const pendingRequests = await secretAccessApprovalRequestBridgeDAL.findPendingRequests({
policyId: policy.id,
requesterId: requestedByUserId
});
@@ -1232,7 +704,9 @@ export const secretAccessApprovalBridgeServiceFactory = ({
let isApprover = false;
if (!canAssignAdditionalPrivileges && !canGrantPrivilegesLegacy && request.policyId) {
- const [policy] = await secretAccessApprovalBridgeDAL.findSecretAccessPolicies({ policyId: request.policyId });
+ const [policy] = await secretAccessApprovalPolicyBridgeDAL.findSecretAccessPolicies({
+ policyId: request.policyId
+ });
if (policy) {
const actorGroupIds = await $getActorGroupIds(actorId, actorOrgId);
isApprover = isPolicySubjectMatch(policy.approvers, actorId, actorGroupIds);
@@ -1272,12 +746,6 @@ export const secretAccessApprovalBridgeServiceFactory = ({
};
return {
- createAccessApprovalPolicy,
- updateAccessApprovalPolicy,
- deleteAccessApprovalPolicy,
- getAccessApprovalPolicyById,
- listAccessApprovalPolicies,
- countAccessApprovalPolicies,
isGlobalAccessApprovalRequest,
listAccessApprovalRequests,
countAccessApprovalRequests,
diff --git a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-types.ts b/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-types.ts
similarity index 62%
rename from backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-types.ts
rename to backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-types.ts
index 5bd53825ea..48061ca0b0 100644
--- a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-types.ts
+++ b/backend/src/services/secret-access-approval-request-bridge/secret-access-approval-request-bridge-types.ts
@@ -1,26 +1,11 @@
-import { TAccessApprovalPolicyDALFactory } from "@app/ee/services/access-approval-policy/access-approval-policy-dal";
-import {
- TCreateAccessApprovalPolicy,
- TDeleteAccessApprovalPolicy,
- TGetAccessApprovalPolicyByIdDTO,
- TUpdateAccessApprovalPolicy
-} from "@app/ee/services/access-approval-policy/access-approval-policy-types";
import {
TReviewAccessRequestDTO,
TRevokeAccessRequestDTO
} from "@app/ee/services/access-approval-request/access-approval-request-types";
-import { TGroupDALFactory } from "@app/ee/services/group/group-dal";
import { TUserGroupMembershipDALFactory } from "@app/ee/services/group/user-group-membership-dal";
import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service-types";
import { TQueueServiceFactory } from "@app/queue";
import { TAdditionalPrivilegeDALFactory } from "@app/services/additional-privilege/additional-privilege-dal";
-import {
- TApprovalPolicyBypassersDALFactory,
- TApprovalPolicyDALFactory,
- TApprovalPolicySecretEnvironmentDALFactory,
- TApprovalPolicyStepApproversDALFactory,
- TApprovalPolicyStepsDALFactory
-} from "@app/services/approval-policy/approval-policy-dal";
import {
TApprovalRequestApprovalsDALFactory,
TApprovalRequestDALFactory,
@@ -35,41 +20,30 @@ import { TMicrosoftTeamsServiceFactory } from "@app/services/microsoft-teams/mic
import { TProjectMicrosoftTeamsConfigDALFactory } from "@app/services/microsoft-teams/project-microsoft-teams-config-dal";
import { TNotificationServiceFactory } from "@app/services/notification/notification-service";
import { TProjectDALFactory } from "@app/services/project/project-dal";
-import { TProjectEnvDALFactory } from "@app/services/project-env/project-env-dal";
+import { TSecretAccessApprovalPolicyBridgeDALFactory } from "@app/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-dal";
import { TProjectSlackConfigDALFactory } from "@app/services/slack/project-slack-config-dal";
import { TSmtpService } from "@app/services/smtp/smtp-service";
import { TUserDALFactory } from "@app/services/user/user-dal";
-import { TSecretAccessApprovalBridgeDALFactory } from "./secret-access-approval-bridge-dal";
+import { TSecretAccessApprovalRequestBridgeDALFactory } from "./secret-access-approval-request-bridge-dal";
-export type TSecretAccessApprovalBridgeServiceFactoryDep = {
- projectDAL: Pick<TProjectDALFactory, "findProjectBySlug" | "findEffectiveProjectSubjectsMembership" | "findById">;
+export type TSecretAccessApprovalRequestBridgeServiceFactoryDep = {
+ projectDAL: Pick<TProjectDALFactory, "findById">;
permissionService: Pick<TPermissionServiceFactory, "getProjectPermission">;
- projectEnvDAL: Pick<TProjectEnvDALFactory, "find">;
userDAL: Pick<TUserDALFactory, "find" | "findById">;
- groupDAL: Pick<TGroupDALFactory, "find">;
userGroupMembershipDAL: Pick<TUserGroupMembershipDALFactory, "find" | "findGroupMembershipsByUserIdInOrg">;
- accessApprovalPolicyDAL: Pick<TAccessApprovalPolicyDALFactory, "findPolicyByEnvIdAndSecretPath">;
- approvalPolicyDAL: Pick<TApprovalPolicyDALFactory, "create" | "transaction" | "updateById" | "deleteById">;
- approvalPolicyStepsDAL: Pick<TApprovalPolicyStepsDALFactory, "insertMany" | "delete">;
- approvalPolicyStepApproversDAL: Pick<TApprovalPolicyStepApproversDALFactory, "insertMany">;
- approvalPolicyBypassersDAL: Pick<TApprovalPolicyBypassersDALFactory, "insertMany" | "delete">;
- approvalPolicySecretEnvironmentDAL: Pick<
- TApprovalPolicySecretEnvironmentDALFactory,
- "insertMany" | "delete" | "findPolicyByEnvIdsAndSecretPath"
- >;
approvalRequestDAL: Pick<
TApprovalRequestDALFactory,
- "create" | "transaction" | "find" | "findOne" | "findByIdForUpdate" | "update" | "updateById"
+ "create" | "transaction" | "findOne" | "findByIdForUpdate" | "updateById"
>;
approvalRequestStepsDAL: Pick<TApprovalRequestStepsDALFactory, "create" | "find" | "updateById">;
approvalRequestStepEligibleApproversDAL: Pick<TApprovalRequestStepEligibleApproversDALFactory, "create" | "find">;
approvalRequestApprovalsDAL: Pick<TApprovalRequestApprovalsDALFactory, "create" | "find">;
- approvalRequestGrantsDAL: Pick<TApprovalRequestGrantsDALFactory, "update" | "updateById" | "findByIdForUpdate">;
+ approvalRequestGrantsDAL: Pick<TApprovalRequestGrantsDALFactory, "updateById" | "findByIdForUpdate">;
additionalPrivilegeDAL: Pick<TAdditionalPrivilegeDALFactory, "delete">;
- secretAccessApprovalBridgeDAL: Pick<
- TSecretAccessApprovalBridgeDALFactory,
- | "findSecretAccessPolicies"
+ secretAccessApprovalPolicyBridgeDAL: Pick<TSecretAccessApprovalPolicyBridgeDALFactory, "findSecretAccessPolicies">;
+ secretAccessApprovalRequestBridgeDAL: Pick<
+ TSecretAccessApprovalRequestBridgeDALFactory,
| "findSecretAccessRequestById"
| "findSecretAccessRequests"
| "findPendingRequests"
@@ -93,14 +67,6 @@ export type TSecretAccessApprovalBridgeServiceFactoryDep = {
>;
};
-export type TCreateSecretAccessApprovalPolicyDTO = TCreateAccessApprovalPolicy;
-export type TUpdateSecretAccessApprovalPolicyDTO = TUpdateAccessApprovalPolicy;
-export type TDeleteSecretAccessApprovalPolicyDTO = TDeleteAccessApprovalPolicy;
-export type TGetSecretAccessApprovalPolicyByIdDTO = TGetAccessApprovalPolicyByIdDTO;
-
-export type TListSecretAccessApprovalPoliciesDTO = { projectId: string };
-export type TCountSecretAccessApprovalPoliciesDTO = { projectId: string; envId: string };
-
export type TCreateSecretAccessApprovalRequestDTO = {
policy: TSecretAccessPolicy;
projectId: string;