gabrieljablonski
112385fd9e
Merge branch 'main' into chore/merge-4.13.0
...
Resolves 26 conflicts via manual review. Key decisions:
- signature: kept fork's send-time architecture (PR #79 ), discarded upstream's
editor-manipulation functions
- WhatsApp incoming: combined fork's two-layer locking (source_id + contact
phone) with upstream's blocked-contact drop. Fixed pre-existing regression
where echoes were silently dropped
- InstallationConfig: upstream's simplified coder (validated against legacy
YAML-in-jsonb data)
- schema.rb: regenerated, stripped kanban tables from other branches,
restored f_unaccent SQL function
2026-04-17 16:23:47 -03:00
Vishnu Narayanan
c884cdefde
feat: add per-account daily rate limit for outbound emails ( #13411 )
...
Introduce a daily cap on non-channel outbound emails to prevent abuse.
Fixes https://linear.app/chatwoot/issue/CW-6418/ses-incident-jan-28
## Type of change
- [x] New feature (non-breaking change which adds functionality)
- [x] Breaking change (fix or feature that would cause existing
functionality not to work as expected)
## Summary
- Adds a Redis-based daily counter to rate limit outbound emails per
account, preventing email abuse
- Covers continuity emails (WebWidget/API), conversation transcripts,
and agent notifications
- Email channel replies are excluded (paid feature, not abusable)
- Adds account suspension check in `ConversationReplyMailer` to block
already-queued emails for suspended accounts
## Limit Resolution Hierarchy
1. Per-account override (`account.limits['emails']`) — SuperAdmin
configurable
2. Enterprise plan-based (`ACCOUNT_EMAILS_PLAN_LIMITS`
InstallationConfig)
3. Global default (`ACCOUNT_EMAILS_LIMIT` InstallationConfig, default:
100)
4. Fallback (`ChatwootApp.max_limit` — effectively unlimited)
## Enforcement Points
| Path | Where | Behavior |
|------|-------|----------|
| WebWidget/API continuity |
`SendEmailNotificationService#should_send_email_notification?` |
Silently skipped |
| Widget transcript | `Widget::ConversationsController#transcript` |
Returns 429 |
| API transcript | `ConversationsController#transcript` | Returns 429 |
| Agent notifications | `Notification::EmailNotificationService#perform`
| Silently skipped |
| Email channel replies | Not rate limited | Paid feature |
| Suspended accounts | `ConversationReplyMailer` | Blocked at mailer
level |
2026-02-03 02:06:51 +05:30
