Skip to content

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

Greptile comments fixes

Carlos Monastyrskifde6e38623cb
diff --git a/backend/src/ee/services/pki-scep/pki-scep-service.ts b/backend/src/ee/services/pki-scep/pki-scep-service.ts
index 48dabc2689..cba29781ef 100644
--- a/backend/src/ee/services/pki-scep/pki-scep-service.ts
+++ b/backend/src/ee/services/pki-scep/pki-scep-service.ts
@@ -89,7 +89,7 @@ type TPkiScepServiceFactoryDep = {
scepEnrollmentConfigDAL: Pick<TScepEnrollmentConfigDALFactory, "findById">;
scepDynamicChallengeDAL: TScepDynamicChallengeDALFactory;
scepTransactionDAL: TScepTransactionDALFactory;
- certificateDAL: Pick<TCertificateDALFactory, "findOne" | "transaction">;
+ certificateDAL: Pick<TCertificateDALFactory, "findOne" | "transaction" | "primaryNode">;
certificateAuthorityDAL: Pick<TCertificateAuthorityDALFactory, "findById" | "findByIdWithAssociatedCa">;
certificateAuthorityCertDAL: Pick<TCertificateAuthorityCertDALFactory, "find" | "findById">;
certificateRequestDAL: Pick<TCertificateRequestDALFactory, "findById" | "find">;
@@ -669,7 +669,10 @@ export const pkiScepServiceFactory = ({
const storedSignerCert =
isValidSigner && signerCertObj
- ? await certificateDAL.findOne({ serialNumber: signerCertObj.serialNumber, caId: profile.caId! })
+ ? await certificateDAL.findOne(
+ { serialNumber: signerCertObj.serialNumber, caId: profile.caId! },
+ certificateDAL.primaryNode()
+ )
: null;
const certRequests =
diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.ts
index 5c50e4a5b1..b10b15b382 100644
--- a/backend/src/server/routes/index.ts
+++ b/backend/src/server/routes/index.ts
@@ -3967,6 +3967,7 @@ export const registerRoutes = async (
usageCounterDAL,
keyStore,
certificateDAL,
+ certificateRequestDAL,
certificateBodyDAL,
certificateSecretDAL,
certificateAuthorityDAL,
diff --git a/backend/src/services/certificate-request/certificate-request-dal.ts b/backend/src/services/certificate-request/certificate-request-dal.ts
index e7b4b74168..753262fb17 100644
--- a/backend/src/services/certificate-request/certificate-request-dal.ts
+++ b/backend/src/services/certificate-request/certificate-request-dal.ts
@@ -10,8 +10,8 @@ import {
type ProcessedPermissionRules
} from "@app/lib/knex/permission-filter-utils";
import { ApprovalRequestStatus } from "@app/services/approval-policy/approval-policy-enums";
-import { CertStatus } from "@app/services/certificate/certificate-types";
import { CaStatus } from "@app/services/certificate-authority/certificate-authority-enums";
+import { CertStatus } from "@app/services/certificate/certificate-types";
import { applyMetadataFilter } from "@app/services/resource-metadata/resource-metadata-fns";
import { CertificateRequestStatus } from "./certificate-request-types";
diff --git a/backend/src/services/certificate-v3/certificate-renewal-service.ts b/backend/src/services/certificate-v3/certificate-renewal-service.ts
index 4e0d667bcd..b4716a8853 100644
--- a/backend/src/services/certificate-v3/certificate-renewal-service.ts
+++ b/backend/src/services/certificate-v3/certificate-renewal-service.ts
@@ -267,6 +267,9 @@ export const certificateRenewalServiceFactory = ({
},
tx: Knex
) => {
+ const lockedOriginalCert = await certificateDAL.findByIdForUpdate(originalCert.id, tx);
+ if (lockedOriginalCert) assertCertificateNotDeleted(lockedOriginalCert);
+
const renewalUpdate: {
profileId?: string | null;
renewedFromCertificateId?: string;
@@ -594,8 +597,6 @@ export const certificateRenewalServiceFactory = ({
throw new NotFoundError({ message: "Certificate not found" });
}
- assertCertificateNotDeleted(originalCert);
-
if (!originalCert.profileId) {
throw new ForbiddenRequestError({
message:
@@ -623,7 +624,12 @@ export const certificateRenewalServiceFactory = ({
const originalCsr =
!certificateSecret && keySource === CertificateRenewalKeySource.Reuse ? originatingRequest.csr : null;
- if (keySource === CertificateRenewalKeySource.Reuse && !certificateSecret && !originalCsr) {
+ if (
+ !originalCert.deletedAt &&
+ keySource === CertificateRenewalKeySource.Reuse &&
+ !certificateSecret &&
+ !originalCsr
+ ) {
throw new BadRequestError({
message:
"This certificate's key pair cannot be reused because Infisical holds neither its private key nor the signing request it was issued from. Renew with a new key pair, or for a CA-issued certificate supply a CSR generated from the existing key."
@@ -1124,6 +1130,8 @@ export const certificateRenewalServiceFactory = ({
? undefined
: await $authorizeRenewal({ originalCert, profile, actorCtx, isEditingCertificate }, tx);
+ assertCertificateNotDeleted(originalCert);
+
const { issuerType, ca, caType, policy } = await $resolveRenewalIssuer(
{
originalCert,
diff --git a/backend/src/services/certificate/certificate-service.test.ts b/backend/src/services/certificate/certificate-service.test.ts
index 994dbc2ca2..ec52125648 100644
--- a/backend/src/services/certificate/certificate-service.test.ts
+++ b/backend/src/services/certificate/certificate-service.test.ts
@@ -65,6 +65,7 @@ const buildService = () => {
},
pkiApplicationDAL: { findById: vi.fn() },
pkiSyncDAL: { find: vi.fn().mockResolvedValue([]) },
+ certificateRequestDAL: { update: vi.fn().mockResolvedValue([]) },
pkiSyncQueue: {},
auditLogService: { createAuditLog: vi.fn() },
usageMeteringService: { emitForProject: vi.fn() }
diff --git a/backend/src/services/certificate/certificate-service.ts b/backend/src/services/certificate/certificate-service.ts
index 9629b8561a..1d128977bf 100644
--- a/backend/src/services/certificate/certificate-service.ts
+++ b/backend/src/services/certificate/certificate-service.ts
@@ -43,6 +43,7 @@ import {
import { TCertificatePolicyServiceFactory } from "@app/services/certificate-policy/certificate-policy-service";
import { TCertificateProfileDALFactory } from "@app/services/certificate-profile/certificate-profile-dal";
import { IssuerType } from "@app/services/certificate-profile/certificate-profile-types";
+import { TCertificateRequestDALFactory } from "@app/services/certificate-request/certificate-request-dal";
import { TCertificateSyncDALFactory } from "@app/services/certificate-sync/certificate-sync-dal";
import {
CertificateApplicationAlertEvent,
@@ -160,6 +161,7 @@ type TCertificateServiceFactoryDep = {
kmsService: Pick<TKmsServiceFactory, "generateKmsKey" | "encryptWithKmsKey" | "decryptWithKmsKey">;
permissionService: Pick<TPermissionServiceFactory, "getProjectPermission" | "getResourcePermission">;
certificateSyncDAL: Pick<TCertificateSyncDALFactory, "findPkiSyncIdsByCertificateId" | "delete">;
+ certificateRequestDAL: Pick<TCertificateRequestDALFactory, "update">;
signerDAL: Pick<TSignerDALFactory, "findOne">;
userDAL: Pick<TUserDALFactory, "findById">;
identityDAL: Pick<TIdentityDALFactory, "findById">;
@@ -197,6 +199,7 @@ export const certificateServiceFactory = ({
kmsService,
permissionService,
certificateSyncDAL,
+ certificateRequestDAL,
auditLogService,
pkiSyncDAL,
pkiSyncQueue,
@@ -595,6 +598,7 @@ export const certificateServiceFactory = ({
await certificateBodyDAL.delete({ certId: cert.id }, tx);
await certificateSecretDAL.delete({ certId: cert.id }, tx);
+ await certificateRequestDAL.update({ certificateId: cert.id }, { encryptedPrivateKey: null }, tx);
await pkiCollectionItemDAL.delete({ certId: cert.id }, tx);
const removedSyncLinks = await certificateSyncDAL.delete({ certificateId: cert.id }, tx);
diff --git a/frontend/src/pages/cert-manager/CertificateDetailsByIDPage/CertificateDetailsByIDPage.tsx b/frontend/src/pages/cert-manager/CertificateDetailsByIDPage/CertificateDetailsByIDPage.tsx
index 065d379b8c..bd16c4b518 100644
--- a/frontend/src/pages/cert-manager/CertificateDetailsByIDPage/CertificateDetailsByIDPage.tsx
+++ b/frontend/src/pages/cert-manager/CertificateDetailsByIDPage/CertificateDetailsByIDPage.tsx
@@ -541,7 +541,7 @@ const Page = () => {
/>
<ConfirmationAlertDialog
isOpen={popUp.deleteCertificate.isOpen}
- title={`Delete certificate ${displayName}?`}
+ title={`Delete Certificate ${displayName}?`}
description={getCertificateDeletionWarning(
certificate,
supportsRevocation,
diff --git a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesSection.tsx b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesSection.tsx
index 4bf3b3ca18..7c68ea0a64 100644
--- a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesSection.tsx
+++ b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesSection.tsx
@@ -234,7 +234,7 @@ export const CertificatesSection = ({
/>
<ConfirmationAlertDialog
isOpen={popUp.deleteCertificate.isOpen}
- title={`Delete certificate ${
+ title={`Delete Certificate ${
(popUp?.deleteCertificate?.data as { commonName: string })?.commonName || ""
}?`}
description={getCertificateDeletionWarning(