Skip to content

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

fix(pki-sync): check ownership across orgs and mark failed claims

bernie-gc91230b8a7e9
diff --git a/backend/src/services/certificate-sync/certificate-sync-dal.ts b/backend/src/services/certificate-sync/certificate-sync-dal.ts
index fd404474a3..1a48dd6c27 100644
--- a/backend/src/services/certificate-sync/certificate-sync-dal.ts
+++ b/backend/src/services/certificate-sync/certificate-sync-dal.ts
@@ -77,24 +77,11 @@ export const certificateSyncDALFactory = (db: TDbClient) => {
): Promise<Set<string>> => {
try {
if (externalIdentifiers.length === 0) return new Set();
- const knex = tx || db;
- const excludedSyncRootOrgId = knex(TableName.PkiSync)
- .join(TableName.Project, `${TableName.Project}.id`, `${TableName.PkiSync}.projectId`)
- .join(TableName.Organization, `${TableName.Organization}.id`, `${TableName.Project}.orgId`)
- .where(`${TableName.PkiSync}.id`, excludePkiSyncId)
- .select(knex.raw("COALESCE(??, ??)", [`${TableName.Organization}.rootOrgId`, `${TableName.Organization}.id`]));
- const docs = (await knex(TableName.CertificateSync)
+ const docs = (await (tx || db)(TableName.CertificateSync)
.join(TableName.PkiSync, `${TableName.PkiSync}.id`, `${TableName.CertificateSync}.pkiSyncId`)
- .join(TableName.Project, `${TableName.Project}.id`, `${TableName.PkiSync}.projectId`)
- .join(TableName.Organization, `${TableName.Organization}.id`, `${TableName.Project}.orgId`)
.whereIn(`${TableName.CertificateSync}.externalIdentifier`, externalIdentifiers)
.where(`${TableName.PkiSync}.destination`, destination)
.whereNot(`${TableName.CertificateSync}.pkiSyncId`, excludePkiSyncId)
- .whereRaw("COALESCE(??, ??) = (?)", [
- `${TableName.Organization}.rootOrgId`,
- `${TableName.Organization}.id`,
- excludedSyncRootOrgId
- ])
.select(`${TableName.CertificateSync}.externalIdentifier`)) as Array<{ externalIdentifier: string | null }>;
return new Set(docs.map((doc) => doc.externalIdentifier).filter((v): v is string => Boolean(v)));
} catch (error) {
diff --git a/backend/src/services/pki-sync/azure-key-vault/azure-key-vault-pki-sync-fns.ts b/backend/src/services/pki-sync/azure-key-vault/azure-key-vault-pki-sync-fns.ts
index 31291a7992..64752db1ca 100644
--- a/backend/src/services/pki-sync/azure-key-vault/azure-key-vault-pki-sync-fns.ts
+++ b/backend/src/services/pki-sync/azure-key-vault/azure-key-vault-pki-sync-fns.ts
@@ -569,6 +569,15 @@ export const azureKeyVaultPkiSyncFactory = ({
return { key, success: true, response: response.data as unknown };
} catch (error) {
+ if (certificateId) {
+ await certificateSyncDAL.updateSyncStatus(
+ pkiSync.id,
+ certificateId,
+ CertificateSyncStatus.Failed,
+ error instanceof Error ? error.message : String(error)
+ );
+ }
+
if (error instanceof AxiosError) {
const errorMessage =
error.response?.data && typeof error.response.data === "object" && "error" in error.response.data
diff --git a/backend/src/services/pki-sync/chef/chef-pki-sync-fns.ts b/backend/src/services/pki-sync/chef/chef-pki-sync-fns.ts
index 92a6d80a1e..8457a6af6b 100644
--- a/backend/src/services/pki-sync/chef/chef-pki-sync-fns.ts
+++ b/backend/src/services/pki-sync/chef/chef-pki-sync-fns.ts
@@ -522,15 +522,12 @@ export const chefPkiSyncFactory = ({
certificateId = certificate.certificateId;
errorMessage = error instanceof Error ? error.message : String(error);
- const existingSyncRecord = syncRecordsByCertId.get(certificateId);
- if (existingSyncRecord) {
- await certificateSyncDAL.updateSyncStatus(
- pkiSync.id,
- certificateId,
- CertificateSyncStatus.Failed,
- errorMessage
- );
- }
+ await certificateSyncDAL.updateSyncStatus(
+ pkiSync.id,
+ certificateId,
+ CertificateSyncStatus.Failed,
+ errorMessage
+ );
})
);