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(acme): wait for DNS record locks as long as they can be held
bernie-g358e188fe976
diff --git a/backend/src/services/certificate-authority/acme/dns-providers/dns-record-lock.ts b/backend/src/services/certificate-authority/acme/dns-providers/dns-record-lock.tsindex 97e00a393f..ad7701c7ec 100644--- a/backend/src/services/certificate-authority/acme/dns-providers/dns-record-lock.ts+++ b/backend/src/services/certificate-authority/acme/dns-providers/dns-record-lock.ts@@ -1,7 +1,15 @@import { KeyStorePrefixes, TKeyStoreFactory } from "@app/keystore/keystore";import { logger } from "@app/lib/logger";-const RECORD_LOCK_RETRY = { retryCount: 50, retryDelay: 2_000, retryJitter: 300 };+const RECORD_LOCK_RETRY_DELAY_MS = 2_000;+const RECORD_LOCK_MIN_RETRY_COUNT = 50;++// a waiter must outlast the holder's lock TTL, or it gives up while the holder is still within bounds+const getLockRetrySettings = (lockTtlMs: number) => ({+ retryCount: Math.max(RECORD_LOCK_MIN_RETRY_COUNT, Math.ceil(lockTtlMs / RECORD_LOCK_RETRY_DELAY_MS)),+ retryDelay: RECORD_LOCK_RETRY_DELAY_MS,+ retryJitter: 300+});export type TDnsRecordLockKeyStore = Pick<TKeyStoreFactory, "acquireLock">;@@ -38,7 +46,11 @@ export const withDnsRecordLock = async <T>(if (!keyStore) return operation();const lock = await keyStore- .acquireLock([KeyStorePrefixes.AcmeDnsRecordLock(connectionId, zoneId, name)], lockTtlMs, RECORD_LOCK_RETRY)+ .acquireLock(+ [KeyStorePrefixes.AcmeDnsRecordLock(connectionId, zoneId, name)],+ lockTtlMs,+ getLockRetrySettings(lockTtlMs)+ ).catch(() => null);if (!lock) {diff --git a/backend/src/services/certificate-authority/acme/dns-providers/gcp-cloud-dns.test.ts b/backend/src/services/certificate-authority/acme/dns-providers/gcp-cloud-dns.test.tsindex 31c7423069..d0ec3cee14 100644--- a/backend/src/services/certificate-authority/acme/dns-providers/gcp-cloud-dns.test.ts+++ b/backend/src/services/certificate-authority/acme/dns-providers/gcp-cloud-dns.test.ts@@ -117,6 +117,12 @@ describe("gcpCloudDnsInsertTxtRecord", () => {expect.any(Number),expect.anything());+ const [, lockTtlMs, retry] = acquireLock.mock.calls[0] as [+ string[],+ number,+ { retryCount: number; retryDelay: number }+ ];+ expect(retry.retryCount * retry.retryDelay).toBeGreaterThanOrEqual(lockTtlMs);expect(postMock).toHaveBeenCalledTimes(1);expect(release).toHaveBeenCalledTimes(1);});