Skip to content

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

feat(secret-approval): add error handling and logging for email notifications

Victor Hugo dos Santos82daa0811aa6
diff --git a/backend/src/ee/services/secret-approval-request/secret-approval-request-fns.ts b/backend/src/ee/services/secret-approval-request/secret-approval-request-fns.ts
index 38aeaf90ba..f16ed4818f 100644
--- a/backend/src/ee/services/secret-approval-request/secret-approval-request-fns.ts
+++ b/backend/src/ee/services/secret-approval-request/secret-approval-request-fns.ts
@@ -1,5 +1,6 @@
import { TSecretApprovalRequests } from "@app/db/schemas";
import { getConfig } from "@app/lib/config/env";
+import { logger } from "@app/lib/logger";
import { OrderByDirection } from "@app/lib/types";
import { TNotificationServiceFactory } from "@app/services/notification/notification-service";
import { NotificationType } from "@app/services/notification/notification-types";
@@ -43,20 +44,26 @@ export const sendApprovalEmailsFn = async ({
}))
);
- // now we need to go through each of the reviewers and print out all the commits that they need to approve
for await (const reviewerUser of policy.userApprovers) {
- await smtpService.sendMail({
- recipients: [reviewerUser?.email as string],
- subjectLine: "Infisical Secret Change Request",
+ try {
+ await smtpService.sendMail({
+ recipients: [reviewerUser?.email as string],
+ subjectLine: "Infisical Secret Change Request",
- substitutions: {
- firstName: reviewerUser.firstName,
- projectName: project.name,
- organizationName: project.organization.name,
- approvalUrl: `${cfg.SITE_URL}/organizations/${project.orgId}/projects/secret-management/${project.id}/approval?requestId=${secretApprovalRequest.id}`
- },
- template: SmtpTemplates.SecretApprovalRequestNeedsReview
- });
+ substitutions: {
+ firstName: reviewerUser.firstName,
+ projectName: project.name,
+ organizationName: project.organization.name,
+ approvalUrl: `${cfg.SITE_URL}/organizations/${project.orgId}/projects/secret-management/${project.id}/approval?requestId=${secretApprovalRequest.id}`
+ },
+ template: SmtpTemplates.SecretApprovalRequestNeedsReview
+ });
+ } catch (error) {
+ logger.error(
+ error,
+ `Failed to send secret change request email to approver [requestId=${secretApprovalRequest.id}] [userId=${reviewerUser.userId}]`
+ );
+ }
}
};
diff --git a/backend/src/ee/services/secret-approval-request/secret-approval-request-merge-fns.ts b/backend/src/ee/services/secret-approval-request/secret-approval-request-merge-fns.ts
index 663bd71301..fd6c8bdf77 100644
--- a/backend/src/ee/services/secret-approval-request/secret-approval-request-merge-fns.ts
+++ b/backend/src/ee/services/secret-approval-request/secret-approval-request-merge-fns.ts
@@ -7,6 +7,7 @@ import { AUDIT_LOG_SENSITIVE_VALUE } from "@app/lib/config/const";
import { getConfig } from "@app/lib/config/env";
import { NotFoundError } from "@app/lib/errors";
import { groupBy } from "@app/lib/fn";
+import { logger } from "@app/lib/logger";
import { ActorType } from "@app/services/auth/auth-type";
import { TFolderCommitServiceFactory } from "@app/services/folder-commit/folder-commit-service";
import { TKmsServiceFactory } from "@app/services/kms/kms-service";
@@ -656,20 +657,27 @@ export const secretApprovalRequestMergeFnsFactory = ({
const recipients = approverUsers.filter((approver) => approver.email).map((approver) => approver.email!);
if (recipients?.length) {
- await smtpService.sendMail({
- recipients,
- subjectLine: "Infisical Secret Change Policy Bypassed",
- substitutions: {
- projectName: project.name,
- requesterFullName: `${requestedByUser.firstName} ${requestedByUser.lastName}`,
- requesterEmail: requestedByUser.email,
- bypassReason,
- secretPath,
- environment: environmentName,
- approvalUrl: `${cfg.SITE_URL}/organizations/${project.orgId}/projects/secret-management/${project.id}/approval`
- },
- template: SmtpTemplates.AccessSecretRequestBypassed
- });
+ try {
+ await smtpService.sendMail({
+ recipients,
+ subjectLine: "Infisical Secret Change Policy Bypassed",
+ substitutions: {
+ projectName: project.name,
+ requesterFullName: `${requestedByUser.firstName} ${requestedByUser.lastName}`,
+ requesterEmail: requestedByUser.email,
+ bypassReason,
+ secretPath,
+ environment: environmentName,
+ approvalUrl: `${cfg.SITE_URL}/organizations/${project.orgId}/projects/secret-management/${project.id}/approval`
+ },
+ template: SmtpTemplates.AccessSecretRequestBypassed
+ });
+ } catch (error) {
+ logger.error(
+ error,
+ `Failed to send secret change policy bypass email [projectId=${project.id}] [actorId=${actorId}]`
+ );
+ }
}
};
diff --git a/backend/src/ee/services/secret-change-global-request-bridge/secret-change-global-request-bridge-fns.ts b/backend/src/ee/services/secret-change-global-request-bridge/secret-change-global-request-bridge-fns.ts
index 3bd9bbce49..70c52f4c3d 100644
--- a/backend/src/ee/services/secret-change-global-request-bridge/secret-change-global-request-bridge-fns.ts
+++ b/backend/src/ee/services/secret-change-global-request-bridge/secret-change-global-request-bridge-fns.ts
@@ -222,17 +222,24 @@ export const secretChangeGlobalRequestFnsFactory = ({
for await (const approver of approvers) {
if (!approver.email) continue;
- await smtpService.sendMail({
- recipients: [approver.email],
- subjectLine: "Infisical Secret Change Request",
- substitutions: {
- firstName: approver.firstName,
- projectName: project.name,
- organizationName: project.organization.name,
- approvalUrl
- },
- template: SmtpTemplates.SecretApprovalRequestNeedsReview
- });
+ try {
+ await smtpService.sendMail({
+ recipients: [approver.email],
+ subjectLine: "Infisical Secret Change Request",
+ substitutions: {
+ firstName: approver.firstName,
+ projectName: project.name,
+ organizationName: project.organization.name,
+ approvalUrl
+ },
+ template: SmtpTemplates.SecretApprovalRequestNeedsReview
+ });
+ } catch (error) {
+ logger.error(
+ error,
+ `Failed to send secret change request email to approver [requestId=${requestId}] [userId=${approver.id}]`
+ );
+ }
}
};