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
Minor improvement on customExtensions for renewals
Carlos Monastyrski29df1449a9ce
diff --git a/backend/src/services/certificate-v3/certificate-renewal-fns.test.ts b/backend/src/services/certificate-v3/certificate-renewal-fns.test.tsindex 8311b787f7..7b4b87b74e 100644--- a/backend/src/services/certificate-v3/certificate-renewal-fns.test.ts+++ b/backend/src/services/certificate-v3/certificate-renewal-fns.test.ts@@ -20,6 +20,7 @@ import {importKeyPairFromPem,isCertificateContentEdit,resolveRenewalAltNames,+ resolveRenewalCustomExtensions,resolveRenewalKeySource,resolveRenewalSubject,resolveRenewalUsages@@ -138,6 +139,42 @@ describe("resolveRenewalSubject", () => {});});+describe("resolveRenewalCustomExtensions", () => {+ const CUSTOM_OID = "1.3.6.1.4.1.99001.1";+ const SCT_OID = "1.3.6.1.4.1.11129.2.4.2";+ const asked = { oid: CUSTOM_OID, value: encodeCustomExtensionValue(CUSTOM_OID, "mine"), critical: false };++ it("keeps what the request asked for even when the authority dropped it", () => {+ expect(+ resolveRenewalCustomExtensions({ exists: true, customExtensions: [asked] }, { customExtensions: null })+ ).toEqual([{ oid: CUSTOM_OID, value: "mine", critical: false }]);+ });++ it("asks for nothing when the request asked for nothing, whatever the authority stamped on", () => {+ expect(+ resolveRenewalCustomExtensions(+ { exists: true, customExtensions: null },+ { customExtensions: [{ oid: SCT_OID, value: "BAIAQg==", critical: false, issuerAdded: true }] }+ )+ ).toEqual([]);+ });++ it("reads the certificate back when there is no request behind it, for imports and discovery", () => {+ expect(+ resolveRenewalCustomExtensions({ exists: false, customExtensions: null }, { customExtensions: [asked] })+ ).toEqual([{ oid: CUSTOM_OID, value: "mine", critical: false }]);+ });++ it("still drops an issuer-generated oid when falling back to the certificate", () => {+ expect(+ resolveRenewalCustomExtensions(+ { exists: false, customExtensions: null },+ { customExtensions: [{ oid: SCT_OID, value: "BAIAQg==", critical: false }] }+ )+ ).toEqual([]);+ });+});+describe("resolveRenewalUsages", () => {const issued = { keyUsages: ["digitalSignature", "keyEncipherment"], extendedKeyUsages: ["serverAuth"] };diff --git a/backend/src/services/certificate-v3/certificate-renewal-fns.ts b/backend/src/services/certificate-v3/certificate-renewal-fns.tsindex f200f5975a..55e94215f4 100644--- a/backend/src/services/certificate-v3/certificate-renewal-fns.ts+++ b/backend/src/services/certificate-v3/certificate-renewal-fns.ts@@ -256,6 +256,12 @@ type TRenewalSubject = {domainComponents?: string[];};+export const resolveRenewalCustomExtensions = (+ requested: { exists: boolean; customExtensions: unknown },+ certificate: { customExtensions?: unknown }+): TRequestCustomExtension[] =>+ toRequestCustomExtensions(requested.exists ? requested.customExtensions : certificate.customExtensions);+export const resolveRenewalUsages = (requested: { exists: boolean; keyUsages: string[] | null; extendedKeyUsages: string[] | null },certificate: { keyUsages?: unknown; extendedKeyUsages?: unknown }diff --git a/backend/src/services/certificate-v3/certificate-renewal-service.ts b/backend/src/services/certificate-v3/certificate-renewal-service.tsindex f38f8504d8..f5bf45c6c6 100644--- a/backend/src/services/certificate-v3/certificate-renewal-service.ts+++ b/backend/src/services/certificate-v3/certificate-renewal-service.ts@@ -27,7 +27,6 @@ import { assertCaInProfileProject } from "@app/services/certificate-authority/ceimport { caSupportsCapability } from "@app/services/certificate-authority/certificate-authority-maps";import { TInternalCertificateAuthorityServiceFactory } from "@app/services/certificate-authority/internal/internal-certificate-authority-service";import {- toRequestCustomExtensions,TProfileCustomExtension,TResolvedCustomExtension} from "@app/services/certificate-common/certificate-extension-fns";@@ -108,6 +107,7 @@ import {importKeyPairFromPem,isCertificateContentEdit,resolveRenewalAltNames,+ resolveRenewalCustomExtensions,resolveRenewalKeySource,resolveRenewalSubject,resolveRenewalUsages,@@ -743,7 +743,7 @@ export const certificateRenewalServiceFactory = ({}) => {const originalTtl = certificateSpanToTtl(originalCert.notBefore, originalCert.notAfter);- const carriedCustomExtensions = toRequestCustomExtensions(originalCert.customExtensions);+ const carriedCustomExtensions = resolveRenewalCustomExtensions(issuedFrom, originalCert);const requested = issuedFrom.exists ? issuedFrom : null;diff --git a/backend/src/services/certificate-v3/certificate-v3-service.test.ts b/backend/src/services/certificate-v3/certificate-v3-service.test.tsindex d64a71d090..da9bfd5ad0 100644--- a/backend/src/services/certificate-v3/certificate-v3-service.test.ts+++ b/backend/src/services/certificate-v3/certificate-v3-service.test.ts@@ -265,7 +265,8 @@ describe("CertificateV3Service", () => {domainComponents: null,altNames: null,keyUsages: null,- extendedKeyUsages: null+ extendedKeyUsages: null,+ customExtensions: null});mockCertificateIssuanceQueue.queueCertificateIssuance.mockResolvedValue(undefined);@@ -2828,7 +2829,8 @@ describe("CertificateV3Service", () => {domainComponents: null,altNames: null,keyUsages: null,- extendedKeyUsages: null+ extendedKeyUsages: null,+ customExtensions: null});vi.mocked(mockCertificateDAL.transaction).mockImplementation(async (callback: (tx: any) => Promise<unknown>) => {@@ -2861,7 +2863,8 @@ describe("CertificateV3Service", () => {domainComponents: null,altNames: null,keyUsages: null,- extendedKeyUsages: null+ extendedKeyUsages: null,+ customExtensions: null});vi.mocked(mockCertificateSecretDAL.findOne).mockResolvedValue({ id: "secret-123", certId: "cert-123" } as any);diff --git a/backend/src/services/certificate/certificate-dal.ts b/backend/src/services/certificate/certificate-dal.tsindex 435de018c1..770c322687 100644--- a/backend/src/services/certificate/certificate-dal.ts+++ b/backend/src/services/certificate/certificate-dal.ts@@ -64,6 +64,7 @@ export type TOriginatingCertificateRequest = {altNames: { type: CertSubjectAlternativeNameType; value: string }[] | null;keyUsages: string[] | null;extendedKeyUsages: string[] | null;+ customExtensions: unknown;};export const certificateDALFactory = (db: TDbClient) => {@@ -775,7 +776,8 @@ export const certificateDALFactory = (db: TDbClient) => {`${TableName.CertificateRequests}.domainComponents`,`${TableName.CertificateRequests}.altNames`,`${TableName.CertificateRequests}.keyUsages`,- `${TableName.CertificateRequests}.extendedKeyUsages`+ `${TableName.CertificateRequests}.extendedKeyUsages`,+ `${TableName.CertificateRequests}.customExtensions`).first()) as Partial<TOriginatingCertificateRequest> | undefined;@@ -792,7 +794,8 @@ export const certificateDALFactory = (db: TDbClient) => {domainComponents: row?.domainComponents ?? null,altNames: row?.altNames ?? null,keyUsages: row?.keyUsages ?? null,- extendedKeyUsages: row?.extendedKeyUsages ?? null+ extendedKeyUsages: row?.extendedKeyUsages ?? null,+ customExtensions: row?.customExtensions ?? null};} catch (error) {throw new DatabaseError({ error, name: "Get originating request by cert id" });