Free, Open Source, Self-Hosted WhatsApp API Gateway
TypeScript apibotgatewayself-hostedwhatsappwhatsapp-apiwhatsapp-automationwhatsapp-botwhatsapp-gatewaywhatsapp-gateway-apiwhatsapp-webwhatsapp-web-api
fix(plugins): pin config-derived net grants to the https origin
Yudhi Armyndharis6790bd9c72ca
diff --git a/src/core/plugins/plugin-net.spec.ts b/src/core/plugins/plugin-net.spec.tsindex 8ec3bff0d..da396425b 100644--- a/src/core/plugins/plugin-net.spec.ts+++ b/src/core/plugins/plugin-net.spec.ts@@ -137,12 +137,25 @@ describe('performPluginFetch', () => {});describe('effectiveNetAllow', () => {- it('adds the host of each named config URL to the static allowlist', () => {+ it('adds the https origin of each named config URL to the static allowlist', () => {expect(effectiveNetAllow(['api.static.com'], ['baseUrl'], { baseUrl: 'https://chat.acme.com' })).toEqual(['api.static.com',- 'chat.acme.com',+ 'https://chat.acme.com:443',]);});+ it('grants a config host over https on its configured port only', () => {+ const allow = effectiveNetAllow([], ['baseUrl'], { baseUrl: 'https://chat.example.com' });+ expect(isNetHostAllowed(allow, 'https://chat.example.com/api')).toBe(true);+ expect(isNetHostAllowed(allow, 'https://chat.example.com:443/api')).toBe(true);+ expect(isNetHostAllowed(allow, 'http://chat.example.com/')).toBe(false);+ expect(isNetHostAllowed(allow, 'http://chat.example.com:6379/')).toBe(false);+ expect(isNetHostAllowed(allow, 'https://chat.example.com:6379/')).toBe(false);++ const withPort = effectiveNetAllow([], ['baseUrl'], { baseUrl: 'https://host.com:8443' });+ expect(isNetHostAllowed(withPort, 'https://host.com:8443/x')).toBe(true);+ expect(isNetHostAllowed(withPort, 'https://host.com/x')).toBe(false);+ expect(isNetHostAllowed(withPort, 'http://host.com:8443/x')).toBe(false);+ });it('ignores missing / non-string / non-https / credentialed config values', () => {expect(effectiveNetAllow([], ['baseUrl'], {})).toEqual([]);expect(effectiveNetAllow([], ['baseUrl'], { baseUrl: 42 })).toEqual([]);@@ -154,6 +167,6 @@ describe('effectiveNetAllow', () => {expect(effectiveNetAllow([], ['baseUrl'], { baseUrl: 'https://*' })).toEqual([]); // bare '*' would open all hostsexpect(effectiveNetAllow([], ['baseUrl'], { baseUrl: 'https://%2A' })).toEqual([]); // encoded '*' tooexpect(effectiveNetAllow([], ['baseUrl'], { baseUrl: 'https://*:443/x' })).toEqual([]);- expect(effectiveNetAllow([], ['baseUrl'], { baseUrl: 'https://host.com:8443' })).toEqual(['host.com:8443']);+ expect(effectiveNetAllow([], ['baseUrl'], { baseUrl: 'https://host.com:8443' })).toEqual(['https://host.com:8443']);});});diff --git a/src/core/plugins/plugin-net.ts b/src/core/plugins/plugin-net.tsindex f29ab4c34..585c76a86 100644--- a/src/core/plugins/plugin-net.ts+++ b/src/core/plugins/plugin-net.ts@@ -37,10 +37,12 @@ export interface PluginNetResponse {}/**- * The effective outbound-host allowlist for a plugin: its static manifest `net.allow` plus the host of- * every `net.allowConfigHosts` config key that resolves to an https URL. Lets a marketplace adapter reach- * an operator-configured host (e.g. a Chatwoot base URL) without `net.allow:['*']`. Credentialed or- * non-https values are ignored; the SSRF guard still blocks private IPs at connect regardless.+ * The effective outbound-host allowlist for a plugin: its static manifest `net.allow` plus the https+ * origin of every `net.allowConfigHosts` config key that resolves to an https URL. Lets a marketplace+ * adapter reach an operator-configured host (e.g. a Chatwoot base URL) without `net.allow:['*']`. The+ * origin is pinned as `https://host:port`, so the grant covers that scheme and port only, never plain+ * http or another port of the host. Credentialed or non-https values are ignored; the SSRF guard still+ * blocks private IPs at connect regardless.*/export function effectiveNetAllow(allow: string[] | undefined,@@ -55,7 +57,7 @@ export function effectiveNetAllow(const u = new URL(raw);if (u.protocol !== 'https:' || u.username || u.password) continue;if (u.hostname.includes('*')) continue; // never let a config value inject the '*' wildcard sentinel- out.push(u.host); // host:port when a port is set, else bare host+ out.push(`https://${u.hostname}:${u.port || '443'}`);} catch {// Not a URL — skip.}@@ -64,9 +66,10 @@ export function effectiveNetAllow(}/**- * Is `url` allowed by a plugin's manifest `net.allow` list? Deny-by-default. `'*'` allows any host- * (the SSRF guard still blocks internal IPs at connect time); an entry may be `host:port` (exact) or- * a bare `host` (any port). Only http(s) is ever allowed.+ * Is `url` allowed by a plugin's effective allowlist? Deny-by-default. `'*'` allows any host (the SSRF+ * guard still blocks internal IPs at connect time); an entry may be `scheme://host:port` (exact origin,+ * as {@link effectiveNetAllow} emits for config hosts), `host:port` (exact) or a bare `host` (any port).+ * Only http(s) is ever allowed.*/export function isNetHostAllowed(allow: string[] | undefined, url: string): boolean {let parsed: URL;@@ -81,7 +84,11 @@ export function isNetHostAllowed(allow: string[] | undefined, url: string): boolif (list.includes('*')) return true;const port = parsed.port || (parsed.protocol === 'https:' ? '443' : '80');- return list.includes(`${parsed.hostname}:${port}`) || list.includes(parsed.hostname);+ return (+ list.includes(`${parsed.protocol}//${parsed.hostname}:${port}`) ||+ list.includes(`${parsed.hostname}:${port}`) ||+ list.includes(parsed.hostname)+ );}/**