Skip to content

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

Address PR comments

Carlos Monastyrski26076d1c003c
diff --git a/backend/src/db/migrations/20260923181422_backfill-certificate-request-from-certificate.ts b/backend/src/db/migrations/20260923181422_backfill-certificate-request-from-certificate.ts
index b5dbb0b763..3025548fc9 100644
--- a/backend/src/db/migrations/20260923181422_backfill-certificate-request-from-certificate.ts
+++ b/backend/src/db/migrations/20260923181422_backfill-certificate-request-from-certificate.ts
@@ -4,11 +4,13 @@ import { TableName } from "../schemas";
const BACKFILL_BATCH_SIZE = 5_000;
const MAX_BACKFILL_BATCHES = 10_000;
+const SUBJECT_PASSTHROUGH_EXTERNAL_CA_TYPE = "aws-pca";
export async function up(knex: Knex): Promise<void> {
if (!(await knex.schema.hasTable(TableName.CertificateRequests))) return;
- const gapPredicate = `EXISTS (SELECT 1 FROM ?? AS i WHERE i."caId" = c."caId")
+ const gapPredicate = `(EXISTS (SELECT 1 FROM ?? AS i WHERE i."caId" = c."caId")
+ OR EXISTS (SELECT 1 FROM ?? AS e WHERE e."caId" = c."caId" AND e.type = ?))
AND ((r.organization IS NULL AND c."subjectOrganization" IS NOT NULL)
OR (r."organizationalUnit" IS NULL AND c."subjectOrganizationalUnit" IS NOT NULL)
OR (r.country IS NULL AND c."subjectCountry" IS NOT NULL)
@@ -30,7 +32,8 @@ export async function up(knex: Knex): Promise<void> {
AND r.id IN (
SELECT r2.id FROM ?? AS r2
JOIN ?? AS c2 ON c2.id = r2."certificateId"
- WHERE EXISTS (SELECT 1 FROM ?? AS i2 WHERE i2."caId" = c2."caId")
+ WHERE (EXISTS (SELECT 1 FROM ?? AS i2 WHERE i2."caId" = c2."caId")
+ OR EXISTS (SELECT 1 FROM ?? AS e2 WHERE e2."caId" = c2."caId" AND e2.type = ?))
AND ((r2.organization IS NULL AND c2."subjectOrganization" IS NOT NULL)
OR (r2."organizationalUnit" IS NULL AND c2."subjectOrganizationalUnit" IS NOT NULL)
OR (r2.country IS NULL AND c2."subjectCountry" IS NOT NULL)
@@ -42,9 +45,13 @@ export async function up(knex: Knex): Promise<void> {
TableName.CertificateRequests,
TableName.Certificate,
TableName.InternalCertificateAuthority,
+ TableName.ExternalCertificateAuthority,
+ SUBJECT_PASSTHROUGH_EXTERNAL_CA_TYPE,
TableName.CertificateRequests,
TableName.Certificate,
TableName.InternalCertificateAuthority,
+ TableName.ExternalCertificateAuthority,
+ SUBJECT_PASSTHROUGH_EXTERNAL_CA_TYPE,
BACKFILL_BATCH_SIZE
]
);
diff --git a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateRenewalModal.tsx b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateRenewalModal.tsx
index a502463af0..24b57dee34 100644
--- a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateRenewalModal.tsx
+++ b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateRenewalModal.tsx
@@ -57,7 +57,7 @@ import {
} from "./certificateRenewalUtils";
import { isExternalTemplateCa, rowErrorsOf } from "./certificateUtils";
import { CertificateWizardSheet, WizardStep } from "./CertificateWizardSheet";
-import { IssuerModifiedHint, IssuerModifiedNotice } from "./IssuerModifiedNotice";
+import { IssuerModifiedNotice } from "./IssuerModifiedNotice";
import { KeyUsageSection } from "./KeyUsageSection";
import { RequestCustomExtensionsField } from "./RequestCustomExtensionsField";
import { SubjectAltNamesField } from "./SubjectAltNamesField";
@@ -259,10 +259,6 @@ export const CertificateRenewalModal = ({ popUp, applicationName, handlePopUpTog
useGetCertificateRenewalPreview(isOpen && certificateId ? certificateId : "");
const hasOriginatingRequest = renewalPreview?.hasOriginatingRequest ?? false;
const issuerModifiedFields = renewalPreview?.issuerModifiedFields ?? [];
- const issuerModifiedByField = useMemo(
- () => new Map(issuerModifiedFields.map((entry) => [entry.field, entry])),
- [issuerModifiedFields]
- );
const { data: profile } = useGetCertificateProfileById({
profileId: certificate?.profileId ?? ""
@@ -493,6 +489,16 @@ export const CertificateRenewalModal = ({ popUp, applicationName, handlePopUpTog
[issuerModifiedFields]
);
+ const optionsIssuerChanges = useMemo(
+ () =>
+ issuerModifiedFields.filter(
+ (entry) =>
+ !SUBJECT_ISSUER_FIELDS.has(entry.field) &&
+ (entry.field === "keyAlgorithm" || !isExternalTemplateProfile)
+ ),
+ [issuerModifiedFields, isExternalTemplateProfile]
+ );
+
const [isSeeded, setIsSeeded] = useState(false);
const seededCertificateIdRef = useRef<string | null>(null);
useEffect(() => {
@@ -794,10 +800,6 @@ export const CertificateRenewalModal = ({ popUp, applicationName, handlePopUpTog
: "Select key algorithm"
}
/>
- {!isExternalTemplateProfile && (
- <IssuerModifiedHint field={issuerModifiedByField.get("signatureAlgorithm")} />
- )}
- <IssuerModifiedHint field={issuerModifiedByField.get("keyAlgorithm")} />
{!isExternalTemplateProfile && (
<div className="mt-4 space-y-6">
@@ -809,7 +811,6 @@ export const CertificateRenewalModal = ({ popUp, applicationName, handlePopUpTog
options={selectableKeyUsages}
requiredUsages={constraints.requiredKeyUsages}
/>
- <IssuerModifiedHint field={issuerModifiedByField.get("keyUsages")} />
</div>
<div>
<KeyUsageSection
@@ -819,7 +820,6 @@ export const CertificateRenewalModal = ({ popUp, applicationName, handlePopUpTog
options={selectableExtendedKeyUsages}
requiredUsages={constraints.requiredExtendedKeyUsages}
/>
- <IssuerModifiedHint field={issuerModifiedByField.get("extendedKeyUsages")} />
</div>
{constraints.templateAllowsCA && (
<BasicConstraintsField
@@ -835,6 +835,7 @@ export const CertificateRenewalModal = ({ popUp, applicationName, handlePopUpTog
)}
</div>
)}
+ <IssuerModifiedNotice fields={optionsIssuerChanges} />
</div>
)}
</CertificateWizardSheet>
diff --git a/frontend/src/pages/cert-manager/CertificatesPage/components/IssuerModifiedNotice.tsx b/frontend/src/pages/cert-manager/CertificatesPage/components/IssuerModifiedNotice.tsx
index bebc1f9602..e9322a91c3 100644
--- a/frontend/src/pages/cert-manager/CertificatesPage/components/IssuerModifiedNotice.tsx
+++ b/frontend/src/pages/cert-manager/CertificatesPage/components/IssuerModifiedNotice.tsx
@@ -57,34 +57,12 @@ export const IssuerModifiedNotice = ({ fields }: Props) => {
return (
<Alert variant="warning">
<InfoIcon />
- <AlertTitle>The certificate authority set these values at last issuance.</AlertTitle>
+ <AlertTitle>Additional values set by the certificate authority</AlertTitle>
<AlertDescription>
{fields.map((field) => (
<p key={field.field}>{describeIssuerChange(field)}</p>
))}
- <p>
- Edit a field above to request a different value, or renew unchanged to let the authority
- set it again.
- </p>
</AlertDescription>
</Alert>
);
};
-
-const describeIssuerHint = (requested: string, issued: string) => {
- if (!issued) return `The certificate authority omitted ${requested} at last issuance.`;
- return `The certificate authority set ${issued} at last issuance.`;
-};
-
-type HintProps = {
- field?: TIssuerModifiedField;
-};
-
-export const IssuerModifiedHint = ({ field }: HintProps) => {
- if (!field) return null;
-
- const requested = formatIssuerValue(field, field.requested);
- const issued = formatIssuerValue(field, field.issued);
-
- return <p className="mt-1 text-xs text-warning">{describeIssuerHint(requested, issued)}</p>;
-};