Skip to content

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

Merge remote-tracking branch 'origin/main' into feat/PKI-406

Carlos Monastyrski63f8b47cb45f
diff --cc backend/src/server/routes/v1/pki-sync-routers/pki-sync-endpoints.ts
index 9bd8667d91,464e8606a6..3a7375dc34
--- a/backend/src/server/routes/v1/pki-sync-routers/pki-sync-endpoints.ts
+++ b/backend/src/server/routes/v1/pki-sync-routers/pki-sync-endpoints.ts
@@@ -199,8 -191,8 +200,9 @@@ export const registerSyncPkiEndpoints
hasCredentials: Boolean(req.body.credentials?.exportPassword),
hasPostSyncCommand: Boolean(req.body.syncOptions?.postSyncCommand),
hasHealthCheckCommand: Boolean(req.body.syncOptions?.healthCheckCommand),
+ hasFilters: Boolean(req.body.filters),
- ...(pkiSync.applicationId && { applicationId: pkiSync.applicationId })
+ ...(pkiSync.applicationId && { applicationId: pkiSync.applicationId }),
+ ...(pkiSync.applicationName && { applicationName: pkiSync.applicationName })
}
}
});
diff --cc backend/src/services/certificate-v3/certificate-v3-service.ts
index 92fbd146cf,9d1de6862c..0daa3b5411
--- a/backend/src/services/certificate-v3/certificate-v3-service.ts
+++ b/backend/src/services/certificate-v3/certificate-v3-service.ts
@@@ -2200,13 -2209,17 +2226,21 @@@ export const certificateV3ServiceFactor
});
});
updatedMetadata = metadata;
+
+ if (certificate.applicationId) {
+ await queueCertificateFilterReconcile(certificateId, certificate.applicationId, pkiSyncQueue);
+ }
}
- return { metadata: updatedMetadata, projectId: certificate.projectId, commonName: certificate.commonName };
+ return {
+ metadata: updatedMetadata,
+ projectId: certificate.projectId,
+ commonName: certificate.commonName,
+ applicationId: certificate.applicationId ?? null,
+ applicationName: certificate.applicationId
+ ? ((await pkiApplicationDAL.findById(certificate.applicationId))?.name ?? null)
+ : null
+ };
};
const renewalService = certificateRenewalServiceFactory({
diff --cc backend/src/services/pki-application/pki-application-service.ts
index a52f3d5aca,57333ae927..df25a51033
--- a/backend/src/services/pki-application/pki-application-service.ts
+++ b/backend/src/services/pki-application/pki-application-service.ts
@@@ -541,27 -539,8 +543,27 @@@ export const pkiApplicationServiceFacto
subject(ProjectPermissionSub.CertificateProfiles, { slug: profile.slug })
);
+ const pkiSyncs = await pkiSyncDAL.find({ applicationId });
+ const syncsFilteringOnProfile = pkiSyncs.filter((pkiSync) =>
+ ((pkiSync.filters as TPkiSyncFilters | null)?.profileIds ?? []).includes(profileId)
+ );
+
+ if (syncsFilteringOnProfile.length > 0) {
+ const names = syncsFilteringOnProfile.map(({ name }) => name).sort();
+ const preview = names.slice(0, 5).join(", ");
+ const remaining = names.length - 5;
+ const isSingular = names.length === 1;
+ throw new BadRequestError({
+ message: `Cannot detach this certificate profile while ${names.length} certificate sync${
+ isSingular ? " selects" : "s select"
+ } certificates by it (${
+ remaining > 0 ? `${preview}, and ${remaining} more` : preview
+ }). Remove the certificate profile filter from ${isSingular ? "that sync" : "those syncs"} first.`
+ });
+ }
+
await pkiApplicationProfileDAL.delete({ applicationId, profileId });
- return { applicationId, profileId };
+ return { applicationId, applicationName: application.name, profileId };
};
const getApplicationPermissions = async ({