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
Merge remote-tracking branch 'origin/main' into PKI-390
Carlos Monastyrskiace715606d2d
diff --cc backend/src/services/certificate/certificate-service.tsindex 0862852039,f6352e71a3..f05dbb316b--- a/backend/src/services/certificate/certificate-service.ts+++ b/backend/src/services/certificate/certificate-service.ts@@@ -48,9 -61,20 +61,21 @@@ import { TProjectDALFactory } from "@apimport { getProjectKmsCertificateKeyId } from "@app/services/project/project-fns";import { TResourceMetadataDALFactory } from "@app/services/resource-metadata/resource-metadata-dal";- import { expandInternalCa, getCaCertChain, rebuildCaCrl } from "../certificate-authority/certificate-authority-fns";+ import {+ expandInternalCa,+ getCaCertChain,+ getCaCertChains,+ rebuildCaCrl+ } from "../certificate-authority/certificate-authority-fns";+import { parseImportedCustomExtensions } from "../certificate-common/certificate-extension-fns";+ import {+ calculateFinalRenewBeforeDays,+ detectSanType,+ resolveEffectiveApiConfig+ } from "../certificate-common/certificate-issuance-utils";import { validatePqcLicense } from "../certificate-common/certificate-utils";+ import { certificateSpanToTtl } from "../certificate-v3/certificate-renewal-fns";+ import { parseExtendedKeyUsages, parseKeyUsages } from "../certificate-v3/certificate-v3-fns";import {CertificateThumbprintAlgorithm,extractCertificateAlgorithms,@@@ -921,6 -1220,38 +1221,39 @@@ export const certificateServiceFactoryconst { serialNumber, notBefore, notAfter } = leafCert;+ const keyUsagesExt = leafCert.getExtension("2.5.29.15") as x509.KeyUsagesExtension;++ let keyUsages: CertKeyUsage[] = [];+ if (keyUsagesExt) {+ keyUsages = Object.values(CertKeyUsage).filter(+ // eslint-disable-next-line no-bitwise+ (keyUsage) => (x509.KeyUsageFlags[keyUsage] & keyUsagesExt.usages) !== 0+ );+ }++ const extKeyUsageExt = leafCert.getExtension("2.5.29.37") as x509.ExtendedKeyUsageExtension;+ let extendedKeyUsages: CertExtendedKeyUsage[] = [];+ if (extKeyUsageExt) {+ extendedKeyUsages = extKeyUsageExt.usages.map((ekuOid) => CertExtendedKeyUsageOIDToName[ekuOid as string]);+ }++ const certificateBuffer = Buffer.from(certificatePem);+ const certificateFields = extractCertificateFields(certificateBuffer);+ const certificateAlgorithms = extractCertificateAlgorithms(certificateBuffer);++ const importedCustomExtensions = parseImportedCustomExtensions(certificateBuffer);++ await linkage?.verifyCertificate({+ serialNumber,+ commonName,+ altNames,+ keyUsages,+ extendedKeyUsages,+ notBefore,+ notAfter,+ fields: certificateFields,+ algorithms: certificateAlgorithms+ });+// Encrypt certificate for storageconst certificateManagerKeyId = await getProjectKmsCertificateKeyId({projectId,@@@ -988,13 -1309,17 +1311,18 @@@notAfter,projectId,applicationId: applicationId ?? null,+ profileId: profileId ?? null,+ caId: linkage?.caId ?? null,+ externalMetadata: linkage?.externalMetadata ?? null,+ source: CertificateSource.Imported,+ renewBeforeDays,keyUsages,extendedKeyUsages,- ...parsedFields,+ ...certificateFields,// Issuance records these from what it was asked to produce. An imported certificate has// no such request, so they come from the certificate itself.- ...extractCertificateAlgorithms(certificateBuffer),- ...certificateAlgorithms++ ...certificateAlgorithms,+ customExtensions: importedCustomExtensions.length ? JSON.stringify(importedCustomExtensions) : null},tx);diff --cc frontend/src/pages/cert-manager/CertificatesPage/components/CertificateIssuanceModal.tsxindex c991c8e83d,ff29479d94..78a3ca5fcf--- a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateIssuanceModal.tsx+++ b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateIssuanceModal.tsx@@@ -55,9 -54,8 +56,9 @@@ importisExternalTemplateCa,rowErrorsOf} from "./certificateUtils";- import { CertificateWizardSheet, useWizardSteps, WizardStep } from "./CertificateWizardSheet";+ import { CertificateWizardSheet, WizardStep } from "./CertificateWizardSheet";import { KeyUsageSection } from "./KeyUsageSection";+import { RequestCustomExtensionsField } from "./RequestCustomExtensionsField";import { SubjectAltNamesField } from "./SubjectAltNamesField";import { SubjectAttributesField } from "./SubjectAttributesField";import { useCertificatePolicy } from "./useCertificatePolicy";diff --cc frontend/src/pages/cert-manager/CertificatesPage/components/CertificateRenewalModal.tsxindex bf83b5bb2d,c644d4234e..3f947cd587--- a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateRenewalModal.tsx+++ b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateRenewalModal.tsx@@@ -52,9 -49,8 +53,9 @@@ importunionUsageOptions} from "./certificateRenewalUtils";import { isExternalTemplateCa, rowErrorsOf } from "./certificateUtils";- import { CertificateWizardSheet, useWizardSteps, WizardStep } from "./CertificateWizardSheet";+ import { CertificateWizardSheet, WizardStep } from "./CertificateWizardSheet";import { KeyUsageSection } from "./KeyUsageSection";+import { RequestCustomExtensionsField } from "./RequestCustomExtensionsField";import { SubjectAltNamesField } from "./SubjectAltNamesField";import { SubjectAttributesField } from "./SubjectAttributesField";import {