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
fix(pki): submit policy-required key usages and EKUs on certificate renewal
Devin AIfc3d32d4e661
diff --git a/frontend/src/pages/cert-manager/CertificatesPage/components/certificateRenewalUtils.test.ts b/frontend/src/pages/cert-manager/CertificatesPage/components/certificateRenewalUtils.test.tsindex 4178034e63..3cde3acd10 100644--- a/frontend/src/pages/cert-manager/CertificatesPage/components/certificateRenewalUtils.test.ts+++ b/frontend/src/pages/cert-manager/CertificatesPage/components/certificateRenewalUtils.test.ts@@ -1,8 +1,9 @@import { describe, expect, it } from "vitest";+import { CertificateRenewalKeySource } from "@app/hooks/api/certificates/enums";import { CertSubjectAlternativeNameType } from "@app/pages/cert-manager/PoliciesPage/components/CertificatePoliciesTab/shared/certificate-constants";-import { buildRenewalFormDefaults } from "./certificateRenewalUtils";+import { buildRenewalFormDefaults, buildRenewalRequestAttributes } from "./certificateRenewalUtils";const certificate = {id: "cert-1",@@ -68,3 +69,26 @@ describe("buildRenewalFormDefaults", () => {expect(defaults.signatureAlgorithm).toBe("RSA-SHA384");});});++describe("buildRenewalRequestAttributes", () => {+ it("submits policy-required usages even when their checkboxes were never toggled", () => {+ const formData = {+ ...buildRenewalFormDefaults(certificate, constraints),+ keySource: CertificateRenewalKeySource.New,+ keyUsages: { key_agreement: true, key_encipherment: false },+ extendedKeyUsages: {}+ };++ const attributes = buildRenewalRequestAttributes({+ formData,+ constraints: {+ ...(constraints as object),+ requiredKeyUsages: ["digital_signature"],+ requiredExtendedKeyUsages: ["client_auth"]+ } as never+ });++ expect(attributes.keyUsages).toEqual(["key_agreement", "digital_signature"]);+ expect(attributes.extendedKeyUsages).toEqual(["client_auth"]);+ });+});diff --git a/frontend/src/pages/cert-manager/CertificatesPage/components/certificateRenewalUtils.ts b/frontend/src/pages/cert-manager/CertificatesPage/components/certificateRenewalUtils.tsindex e9027b3a36..a79ce213ff 100644--- a/frontend/src/pages/cert-manager/CertificatesPage/components/certificateRenewalUtils.ts+++ b/frontend/src/pages/cert-manager/CertificatesPage/components/certificateRenewalUtils.ts@@ -206,6 +206,10 @@ const buildBasicConstraints = (return { isCA, ...(isCA && pathLength !== null && pathLength !== undefined && { pathLength }) };};+// Required usages render as checked but are never written to the form, so they must be added here.+const withRequiredUsages = (usages: Record<string, boolean>, required: string[] = []) =>+ Array.from(new Set([...filterUsages(usages), ...required]));+export const buildRenewalRequestAttributes = ({formData,constraints,@@ -236,8 +240,14 @@ export const buildRenewalRequestAttributes = ({}: {ttl: formData.ttl,- keyUsages: filterUsages(formData.keyUsages as Record<string, boolean>),- extendedKeyUsages: filterUsages(formData.extendedKeyUsages as Record<string, boolean>),+ keyUsages: withRequiredUsages(+ formData.keyUsages as Record<string, boolean>,+ constraints.requiredKeyUsages+ ),+ extendedKeyUsages: withRequiredUsages(+ formData.extendedKeyUsages as Record<string, boolean>,+ constraints.requiredExtendedKeyUsages+ ),...(formData.signatureAlgorithm && { signatureAlgorithm: formData.signatureAlgorithm }),...(formData.keySource !== CertificateRenewalKeySource.Reuse &&formData.keyAlgorithm && { keyAlgorithm: formData.keyAlgorithm }),