Free, Open Source, Self-Hosted WhatsApp API Gateway
TypeScript apibotgatewayself-hostedwhatsappwhatsapp-apiwhatsapp-automationwhatsapp-botwhatsapp-gatewaywhatsapp-gateway-apiwhatsapp-webwhatsapp-web-api
fix(infra): refuse a backup holding malformed rule conditions
Yudhi Armyndharis4a4bdaf6f478
diff --git a/src/modules/infra/infra-data.controller.spec.ts b/src/modules/infra/infra-data.controller.spec.tsindex 7bc7e87a3..1d453ce4f 100644--- a/src/modules/infra/infra-data.controller.spec.ts+++ b/src/modules/infra/infra-data.controller.spec.ts@@ -2261,7 +2261,7 @@ describe('InfraDataController.importData status_updates + runtime reconciliationsessionId: 's1',name: 'office hours',enabled: true,- conditions: { bodyContains: ['hello'] } as never,+ conditions: { conditions: [{ field: 'body', operator: 'contains', value: 'hello' }] },replyText: 'We are closed',cooldownSeconds: 120,}),@@ -2280,7 +2280,7 @@ describe('InfraDataController.importData status_updates + runtime reconciliationexpect(restored.replyText).toBe('We are closed');expect(restored.cooldownSeconds).toBe(120);expect(restored.enabled).toBe(true);- expect(restored.conditions).toEqual({ bodyContains: ['hello'] });+ expect(restored.conditions).toEqual({ conditions: [{ field: 'body', operator: 'contains', value: 'hello' }] });});it('exports and restores status_updates (the table the docs promise is covered)', async () => {diff --git a/src/modules/infra/table-importers.spec.ts b/src/modules/infra/table-importers.spec.tsindex 42d238ecc..1ba47949d 100644--- a/src/modules/infra/table-importers.spec.ts+++ b/src/modules/infra/table-importers.spec.ts@@ -77,3 +77,31 @@ describe('webhooks table importer', () => {},);});++/**+ * A restore bypasses the automation rule DTOs. A conditions value without a conditions array matches+ * every inbound message, so a malformed one stored verbatim would autoreply to every contact.+ */+describe('automationRules table importer', () => {+ const automationRules = TABLE_IMPORTERS.find(importer => importer.key === 'automationRules');+ const skip = (overrides: Record<string, unknown>) =>+ automationRules?.skip?.({ id: 'rule-1', conditions: null, ...overrides } as never);+ const chatCondition = { conditions: [{ field: 'isGroup', operator: 'is', value: false }] };++ it('accepts no conditions, or conditions in either decoded or JSON-text form', () => {+ expect(skip({})).toBeNull();+ expect(skip({ conditions: undefined })).toBeNull();+ expect(skip({ conditions: chatCondition })).toBeNull();+ expect(skip({ conditions: JSON.stringify(chatCondition) })).toBeNull();+ });++ it.each([+ [{ condition: [] }],+ [{ conditions: 'x' }],+ [{ conditions: [null] }],+ ['not json'],+ [{ conditions: [{ field: 'nope', operator: 'is' }] }],+ ])('skips a row whose conditions is %j', conditions => {+ expect(skip({ conditions })).toMatch(/Skipped automation rule rule-1: invalid conditions/);+ });+});diff --git a/src/modules/infra/table-importers.ts b/src/modules/infra/table-importers.tsindex c4e0a66e0..751df2450 100644--- a/src/modules/infra/table-importers.ts+++ b/src/modules/infra/table-importers.ts@@ -445,6 +445,14 @@ export const TABLE_IMPORTERS: AnyTableImporter[] = [sql: `INSERT INTO automation_rules (id, "sessionId", name, enabled, conditions, "replyText", "cooldownSeconds", "createdAt", "updatedAt")VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`,id: (rule: AutomationRuleRow) => rule.id,+ // This path bypasses the rule DTOs. A conditions value without a conditions array matches every+ // inbound message, so a malformed one stored verbatim would autoreply to every contact; veto the+ // row with a warning, like the webhooks guard.+ skip: (rule: AutomationRuleRow) => {+ const errors = collectFilterErrors(decodeJsonColumn(rule.conditions));+ if (errors.length === 0) return null;+ return `Skipped automation rule ${rule.id}: invalid conditions (${errors.join('; ')})`;+ },map: (rule: AutomationRuleRow) => [rule.id,rule.sessionId,