Free, Open Source, Self-Hosted WhatsApp API Gateway
TypeScript apibotgatewayself-hostedwhatsappwhatsapp-apiwhatsapp-automationwhatsapp-botwhatsapp-gatewaywhatsapp-gateway-apiwhatsapp-webwhatsapp-web-api
fix(ssrf): ignore an SSRF_DNS_TIMEOUT_MS that overflows a timer
Yudhi Armyndharis3d251ca6af45
diff --git a/src/common/security/ssrf-guard.spec.ts b/src/common/security/ssrf-guard.spec.tsindex 41f7af9ff..83bfff4eb 100644--- a/src/common/security/ssrf-guard.spec.ts+++ b/src/common/security/ssrf-guard.spec.ts@@ -253,6 +253,23 @@ describe('resolveSafeFetchTarget', () => {else process.env.SSRF_DNS_TIMEOUT_MS = prev;}}, 1000);++ it('falls back to the default deadline when SSRF_DNS_TIMEOUT_MS overflows a Node timer', async () => {+ // Node clamps a delay above 2^31-1 ms to 1 ms, which would fail every lookup at once.+ const prev = process.env.SSRF_DNS_TIMEOUT_MS;+ process.env.SSRF_DNS_TIMEOUT_MS = '9999999999';+ (dnsPromises.lookup as jest.Mock).mockReturnValueOnce(+ new Promise(resolve => setTimeout(() => resolve([{ address: '93.184.216.34', family: 4 }]), 50)),+ );+ try {+ await expect(resolveSafeFetchTarget('https://slow.example/hook')).resolves.toEqual([+ { address: '93.184.216.34', family: 4 },+ ]);+ } finally {+ if (prev === undefined) delete process.env.SSRF_DNS_TIMEOUT_MS;+ else process.env.SSRF_DNS_TIMEOUT_MS = prev;+ }+ }, 1000);});describe('withSafeFetch (guarded + pinned fetch)', () => {diff --git a/src/common/security/ssrf-guard.ts b/src/common/security/ssrf-guard.tsindex e04f283a9..cfb4612eb 100644--- a/src/common/security/ssrf-guard.ts+++ b/src/common/security/ssrf-guard.ts@@ -263,10 +263,13 @@ export function assertNoRedirect(response: { status: number; type?: string }, ur/** Default DNS resolution deadline (ms) — generous for healthy resolvers; bounds a hang. */const DEFAULT_DNS_TIMEOUT_MS = 10000;+/** Node clamps a longer timer delay to 1 ms, which would fail every lookup at once. */+const MAX_TIMER_MS = 2147483647;+function resolveDnsTimeoutMs(): number {const raw = process.env.SSRF_DNS_TIMEOUT_MS;const n = raw !== undefined ? Number(raw) : NaN;- return Number.isInteger(n) && n > 0 ? n : DEFAULT_DNS_TIMEOUT_MS;+ return Number.isInteger(n) && n > 0 && n <= MAX_TIMER_MS ? n : DEFAULT_DNS_TIMEOUT_MS;}/** Redirect hops followed on the guarded download path before the chain is refused. */