Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.
TypeScript acmeagentsai-agentscertificate-managementdevsecopsenvironment-variableskubernetesopen-sourcepampkipostgresprivate-caprivileged-access-managementsecret-managementsecret-managersecretssecrets-managementsecuritysecurity-toolsvault
Address greptile comments
Carlos Monastyrski01125f47311d
diff --git a/backend/src/services/certificate-authority/certificate-issuance-queue.ts b/backend/src/services/certificate-authority/certificate-issuance-queue.tsindex dd0fa9664a..0108b93ba9 100644--- a/backend/src/services/certificate-authority/certificate-issuance-queue.ts+++ b/backend/src/services/certificate-authority/certificate-issuance-queue.ts@@ -897,8 +897,13 @@ export const certificateIssuanceQueueFactory = ({};const digicertResult =- externalConfiguration?.reissue && renewalOfOrderId !== undefined- ? await digicertFns.reissueCertificate({ ...digicertRequest, orderId: renewalOfOrderId })+ externalConfiguration?.reissue && renewalOfOrderId !== undefined && originalCertificateId+ ? await digicertFns.reissueCertificate({+ ...digicertRequest,+ orderId: renewalOfOrderId,+ ttl,+ originalCertificateId+ }): await digicertFns.orderCertificate({...digicertRequest,ttl,diff --git a/backend/src/services/certificate-authority/digicert/digicert-certificate-authority-fns.ts b/backend/src/services/certificate-authority/digicert/digicert-certificate-authority-fns.tsindex b7bfd607c9..f7bfa864f0 100644--- a/backend/src/services/certificate-authority/digicert/digicert-certificate-authority-fns.ts+++ b/backend/src/services/certificate-authority/digicert/digicert-certificate-authority-fns.ts@@ -89,6 +89,8 @@ const assertPurposeMatchesProduct = (purpose: DigiCertCaPurpose | undefined, pro}};+const DIGICERT_MAX_CERTIFICATE_VALIDITY_DAYS = 199;+const TTL_RE2 = new RE2("^(\\d+)([dhm])$");const parseTtlToDays = (ttl: string): number => {const match = ttl.match(TTL_RE2);@@ -527,10 +529,14 @@ export const DigiCertCertificateAuthorityFns = ({altNames = [],signatureAlgorithm,keyAlgorithm = CertKeyAlgorithm.RSA_2048,- csr+ csr,+ ttl,+ originalCertificateId}: {caId: string;orderId: number;+ ttl: string;+ originalCertificateId: string;commonName: string;altNames?: string[];signatureAlgorithm?: string;@@ -559,6 +565,17 @@ export const DigiCertCertificateAuthorityFns = ({}const previousCertificateId = order.certificate.id;+ const originalCertificate = await certificateDAL.findById(originalCertificateId);+ const originalMetadata = DigiCertExternalMetadataSchema.safeParse(originalCertificate?.externalMetadata);+ if (originalCertificate && originalMetadata.success && !originalMetadata.data.certificateId) {+ const previousSerialNumber = await $getCertificateSerialNumber(client, previousCertificateId);+ if (previousSerialNumber === originalCertificate.serialNumber.toLowerCase()) {+ await certificateDAL.updateById(originalCertificate.id, {+ externalMetadata: { ...originalMetadata.data, certificateId: previousCertificateId }+ });+ }+ }+const { certificate, privateKeyPem } = await $buildCertificatePayload({caId,commonName,@@ -568,7 +585,12 @@ export const DigiCertCertificateAuthorityFns = ({csr});- const reissuePayload: TReissueOrderRequest = { certificate, dcv_method: "dns-txt-token", skip_approval: true };+ const reissuePayload: TReissueOrderRequest = {+ certificate,+ cert_validity: { days: Math.min(parseTtlToDays(ttl), DIGICERT_MAX_CERTIFICATE_VALIDITY_DAYS) },+ dcv_method: "dns-txt-token",+ skip_approval: true+ };const reissueResponse = await client.reissueOrder(orderId, reissuePayload);const immediateCertificateId =reissueResponse.certificate_id && reissueResponse.certificate_id !== previousCertificateIddiff --git a/backend/src/services/certificate-authority/digicert/digicert-certificate-authority-types.ts b/backend/src/services/certificate-authority/digicert/digicert-certificate-authority-types.tsindex 02745d46e4..eeab3867a6 100644--- a/backend/src/services/certificate-authority/digicert/digicert-certificate-authority-types.ts+++ b/backend/src/services/certificate-authority/digicert/digicert-certificate-authority-types.ts@@ -38,6 +38,7 @@ export type TReissueOrderRequest = {csr: string;signature_hash?: string;};+ cert_validity?: { days: number };dcv_method?: "dns-txt-token";skip_approval?: boolean;};diff --git a/backend/src/services/certificate-common/certificate-permission-fns.ts b/backend/src/services/certificate-common/certificate-permission-fns.tsindex e18e561cc3..ff052a0126 100644--- a/backend/src/services/certificate-common/certificate-permission-fns.ts+++ b/backend/src/services/certificate-common/certificate-permission-fns.ts@@ -91,6 +91,62 @@ export const assertCanEditCertificate = async ({return { certMetadata, projectPermission: permission };};+type TAssertCanRevokeCertificateDTO = Omit<TAssertCanEditCertificateDTO, "certificate"> & {+ certificate: TCertificateSubjectFields & { friendlyName?: string | null; status?: string | null };+};++export const assertCanRevokeCertificate = async ({+ certificate,+ actor,+ actorId,+ actorAuthMethod,+ actorOrgId,+ permissionService,+ resourceMetadataDAL,+ tx+}: TAssertCanRevokeCertificateDTO) => {+ if (certificate.applicationId) {+ const { permission } = await permissionService.getResourcePermission({+ actor,+ actorId,+ projectId: certificate.projectId,+ resourceType: ResourceType.CertificateApplication,+ resourceId: certificate.applicationId,+ actorAuthMethod,+ actorOrgId+ });+ ForbiddenError.from(permission).throwUnlessCan(+ ResourcePermissionCertificateActions.Delete,+ ResourcePermissionSub.Certificates+ );+ return;+ }++ const metadataRows = await resourceMetadataDAL.find({ certificateId: certificate.id }, { tx });+ const certMetadata = metadataRows.map(({ key, value }) => ({ key, value: value || "" }));++ const { permission } = await permissionService.getProjectPermission({+ actor,+ actorId,+ projectId: certificate.projectId,+ actorAuthMethod,+ actorOrgId,+ actionProjectType: ActionProjectType.CertificateManager+ });++ ForbiddenError.from(permission).throwUnlessCan(+ ProjectPermissionCertificateActions.Delete,+ subject(ProjectPermissionSub.Certificates, {+ commonName: certificate.commonName ?? undefined,+ altNames: certificate.altNames?.split(",").map((s) => s.trim()),+ serialNumber: certificate.serialNumber ?? undefined,+ friendlyName: certificate.friendlyName ?? undefined,+ status: certificate.status ?? undefined,+ metadata: certMetadata+ })+ );+};+export const assertCanEditCertificateResult = ({projectPermission,commonName,diff --git a/backend/src/services/certificate-v3/certificate-renewal-service.ts b/backend/src/services/certificate-v3/certificate-renewal-service.tsindex ade3c219d8..99e7c1cd66 100644--- a/backend/src/services/certificate-v3/certificate-renewal-service.ts+++ b/backend/src/services/certificate-v3/certificate-renewal-service.ts@@ -67,7 +67,8 @@ import {} from "../certificate-common/certificate-issuance-utils";import {assertCanEditCertificate,- assertCanEditCertificateResult+ assertCanEditCertificateResult,+ assertCanRevokeCertificate} from "../certificate-common/certificate-permission-fns";import { TCertificateQuotaDeps } from "../certificate-common/certificate-quota-fns";import { buildCertificateQuotaKey } from "../certificate-common/certificate-quota-key";@@ -1167,6 +1168,39 @@ export const certificateRenewalServiceFactory = ({changedAttributes = buildRenewalAuditChanges(replayedRequest, { ...certificateRequest, validity: { ttl } });+ if (externalConfiguration?.reissue && !internal) {+ const requestedNames = new Set(+ [+ certificateRequest.commonName,+ ...(certificateRequest.subjectAlternativeNames ?? []).map((san) => san.value)+ ]+ .filter(Boolean)+ .map((name) => (name as string).trim().toLowerCase())+ );+ const isRemovingName = [originalCert.commonName, ...(originalCert.altNames?.split(",") ?? [])]+ .filter(Boolean)+ .some((name) => !requestedNames.has((name as string).trim().toLowerCase()));+ if (isRemovingName) {+ try {+ await assertCanRevokeCertificate({+ certificate: originalCert,+ ...actorCtx,+ permissionService,+ resourceMetadataDAL,+ tx+ });+ } catch (error) {+ if (error instanceof ForbiddenError) {+ throw new ForbiddenRequestError({+ message:+ "Removing or changing a name on a reissue revokes this certificate, which requires permission to revoke it."+ });+ }+ throw error;+ }+ }+ }+if (renewalAuth?.projectPermission) {assertCanEditCertificateResult({projectPermission: renewalAuth.projectPermission,diff --git a/backend/src/services/certificate/certificate-service.ts b/backend/src/services/certificate/certificate-service.tsindex 591b244e77..dcbf175bdf 100644--- a/backend/src/services/certificate/certificate-service.ts+++ b/backend/src/services/certificate/certificate-service.ts@@ -86,6 +86,7 @@ import {detectSanType,resolveEffectiveApiConfig} from "../certificate-common/certificate-issuance-utils";+import { assertCanRevokeCertificate } from "../certificate-common/certificate-permission-fns";import { validatePqcLicense } from "../certificate-common/certificate-utils";import { certificateSpanToTtl } from "../certificate-v3/certificate-renewal-fns";import { parseExtendedKeyUsages, parseKeyUsages } from "../certificate-v3/certificate-v3-fns";@@ -673,45 +674,15 @@ export const certificateServiceFactory = ({});}- const metadataRows = await resourceMetadataDAL.find({ certificateId: cert.id });- const certMetadata = metadataRows.map(({ key, value }) => ({ key, value: value || "" }));-- if (cert.applicationId) {- const { permission } = await permissionService.getResourcePermission({- actor,- actorId,- projectId: ca.projectId,- resourceType: ResourceType.CertificateApplication,- resourceId: cert.applicationId,- actorAuthMethod,- actorOrgId- });- ForbiddenError.from(permission).throwUnlessCan(- ResourcePermissionCertificateActions.Delete,- ResourcePermissionSub.Certificates- );- } else {- const { permission } = await permissionService.getProjectPermission({- actor,- actorId,- projectId: ca.projectId,- actorAuthMethod,- actorOrgId,- actionProjectType: ActionProjectType.CertificateManager- });-- ForbiddenError.from(permission).throwUnlessCan(- ProjectPermissionCertificateActions.Delete,- subject(ProjectPermissionSub.Certificates, {- commonName: cert.commonName,- altNames: cert.altNames?.split(",").map((s) => s.trim()),- serialNumber: cert.serialNumber,- friendlyName: cert.friendlyName,- status: cert.status,- metadata: certMetadata- })- );- }+ await assertCanRevokeCertificate({+ certificate: { ...cert, projectId: ca.projectId },+ actor,+ actorId,+ actorAuthMethod,+ actorOrgId,+ permissionService,+ resourceMetadataDAL+ });if (cert.status === CertStatus.REVOKED) throw new Error("Certificate already revoked");diff --git a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateRenewalModal.tsx b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateRenewalModal.tsxindex 2765aa5f65..600850dc03 100644--- a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateRenewalModal.tsx+++ b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateRenewalModal.tsx@@ -727,13 +727,13 @@ export const CertificateRenewalModal = ({ popUp, applicationName, handlePopUpTogisOpen={isOpen}onOpenChange={(open) => (open ? handlePopUpToggle("renewCertificate", true) : closeWizard())}icon={<RefreshCw className="h-5 w-5" />}- title={isReissuing ? "Reissue certificate" : "Renew certificate"}+ title={isReissuing ? "Reissue Certificate" : "Renew Certificate"}description={certificate?.commonName || certificate?.friendlyName || "Certificate"}steps={steps}activeStep={step}onStepChange={setStep}docsHref={PkiDocsUrls.applications.certificateRenewal}- submitLabel={isReissuing ? "Reissue certificate" : "Renew certificate"}+ submitLabel={isReissuing ? "Reissue Certificate" : "Renew Certificate"}onSubmit={handleSubmit(onFormSubmit, onFormInvalid)}onBack={goBack}onContinue={goNext}@@ -762,7 +762,8 @@ export const CertificateRenewalModal = ({ popUp, applicationName, handlePopUpTog{value: DigiCertOrderChoice.Reissue,label: "Reissue the existing order",- description: "Issues the certificate on the same DigiCert order."+ description:+ "Issues the certificate on the same DigiCert order. Removing or changing a name revokes the current certificate within 72 hours."}]}/>