refactor: move config to application.rb

chore: don't allow pdf inline
fix: raise open file descriptor limit to prevent EMFILE errors (#13895 )
2026-03-26 10:00:45 +05:30 · 2026-03-26 09:57:02 +05:30 · 2026-03-24 17:37:07 -07:00 · 2026-03-24 16:58:11 +05:30 · 2026-03-24 16:16:35 +05:30 · 2026-03-24 15:40:31 +05:30
7 changed files with 14 additions and 2 deletions
@@ -57,7 +57,7 @@ class Api::V1::Accounts::Captain::TasksController < Api::V1::Accounts::BaseContr
    if result.nil?
      render json: { message: nil }
    elsif result[:error]
-      render json: { error: result[:error] }, status: :unprocessable_entity
+      render json: { error: result[:error] }, status: :unprocessable_content
    else
      response_data = { message: result[:message] }
      response_data[:follow_up_context] = result[:follow_up_context] if result[:follow_up_context]
@@ -69,3 +69,5 @@ class Api::V1::Accounts::Captain::TasksController < Api::V1::Accounts::BaseContr
    authorize(:'captain/tasks')
  end
 end
+
+Api::V1::Accounts::Captain::TasksController.prepend_mod_with('Api::V1::Accounts::Captain::TasksController')
@@ -54,6 +54,7 @@ describe('#dateFormat', () => {
 describe('#shortTimestamp', () => {
  // Test cases when withAgo is false or not provided
  it('returns correct value without ago', () => {
+    expect(shortTimestamp('in less than a minute')).toEqual('now');
    expect(shortTimestamp('less than a minute ago')).toEqual('now');
    expect(shortTimestamp('1 minute ago')).toEqual('1m');
    expect(shortTimestamp('12 minutes ago')).toEqual('12m');
@@ -68,6 +68,7 @@ export const shortTimestamp = (time, withAgo = false) => {
  const suffix = withAgo ? ' ago' : '';
  const timeMappings = {
    'less than a minute ago': 'now',
+    'in less than a minute': 'now',
    'a minute ago': `1m${suffix}`,
    'an hour ago': `1h${suffix}`,
    'a day ago': `1d${suffix}`,
@@ -8,7 +8,7 @@ class AgentBots::WebhookJob < WebhookJob
  def perform(url, payload, webhook_type = :agent_bot_webhook)
    super(url, payload, webhook_type)
  rescue RestClient::TooManyRequests, RestClient::InternalServerError => e
-    Rails.logger.warn("[AgentBots::WebhookJob] attempt #{executions} failed #{e.class.name}")
+    Rails.logger.warn("[AgentBots::WebhookJob] attempt #{executions} failed #{e.class.name} payload=#{payload.to_json}")
    raise
  end
 end
@@ -69,6 +69,12 @@ module Chatwoot
    # Disable PDF/video preview generation as we don't use them
    config.active_storage.previewers = []

+    # Restrict content types served inline to prevent XSS via uploaded files (e.g. PDFs with embedded JavaScript).
+    config.active_storage.content_types_allowed_inline = %w[
+      image/png image/gif image/jpeg image/tiff image/vnd.adobe.photoshop
+      image/vnd.microsoft.icon image/webp image/avif image/heic image/heif
+    ]
+
    # Active Record Encryption configuration
    # Required for MFA/2FA features - skip if not using encryption
    if ENV['ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY'].present?
@@ -15,6 +15,7 @@ TimeoutStopSec=30
 KillMode=mixed
 StandardInput=null
 SyslogIdentifier=%p
+LimitNOFILE=65536

 Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.4.4/bin:/home/chatwoot/.rvm/gems/ruby-3.4.4@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.4.4/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
 Environment="PORT=3000"
@@ -15,6 +15,7 @@ TimeoutStopSec=30
 KillMode=mixed
 StandardInput=null
 SyslogIdentifier=%p
+LimitNOFILE=65536

 MemoryMax=1.2G
 MemoryHigh=infinity
Author	SHA1	Message	Date
Shivam Mishra	805ee8403c	refactor: move config to application.rb	2026-03-26 10:00:45 +05:30
Shivam Mishra	a0abd167dc	chore: don't allow pdf inline	2026-03-26 09:57:02 +05:30
Vishnu NarayananandGitHub	775b73d1f9	fix: raise open file descriptor limit to prevent EMFILE errors (#13895 ) ## Summary - Adds `LimitNOFILE=65536` to both web and worker systemd service units - Fixes recurring `Errno::EMFILE` (Too many open files) errors during peak traffic after deploys ## Context Puma workers idle at 720-770 open FDs against the default soft limit of 1024, leaving ~250 FDs of headroom. During deploy-triggered instance refreshes at peak traffic, concurrent requests exhaust the remaining FDs, causing EMFILE across all web instances. 3 incidents in March 2026 with escalating event counts. The hard limit is already 524288, so this just raises the soft limit to a standard production value. Self-hosted instances pick this up automatically via `cwctl --upgrade`. Fixes https://linear.app/chatwoot/issue/CW-6685/errnoemfile-too-many-open-files-rb-sysopen	2026-03-24 17:37:07 -07:00
Aakash Bakhle GitHub Shivam Mishra	14df7b3bc1	fix: ai-assist 404 on CE (#13891 ) # Pull Request Template ## Description Relocate controller from enterprise/ to app/ and add Api::V1::Accounts::Captain::TasksController.prepend_mod_with for EE overrides. Fixes: Ai assist giving 404 on CE ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) ## How Has This Been Tested? Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration. before: <img width="482" height="130" alt="image" src="https://github.com/user-attachments/assets/f51dc28a-ac54-45c4-9015-6f956fdf5057" /> after: <img width="458" height="182" alt="image" src="https://github.com/user-attachments/assets/eb86a679-5482-4157-9f4e-f3e9953d8649" /> ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [x] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [x] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [x] Any dependent changes have been merged and published in downstream modules Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>	2026-03-24 16:58:11 +05:30
Sivin VargheseandGitHub	6946859ba4	fix: normalize "in less than a minute" to "now" in chat list timestamp (#13874 ) # Pull Request Template ## Description This PR fixes the conversation list showing raw "in less than a minute" text instead of "now" for very recent conversations. Fixes https://linear.app/chatwoot/issue/CW-6666/issue-with-timestamps ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [ ] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules	2026-03-24 16:16:35 +05:30
Sivin VargheseandGitHub	c129ab00ba	fix: normalize "in less than a minute" to "now" in chat list timestamp (#13874 )	2026-03-24 15:40:31 +05:30
Muhsin Keloth GitHub Claude Opus 4.6	7edae93ee8	fix(agent-bot): Include payload in webhook retry failure logs (#13879 ) Webhook retry failure logs for agent-bot now include the event payload, making it easier to identify which event failed when debugging transient upstream errors (429/500). Previously the log only showed: `[AgentBots::WebhookJob] attempt 1 failed RestClient::InternalServerError` Now it includes the payload: `[AgentBots::WebhookJob] attempt 1 failed RestClient::InternalServerError payload={"event":"message_created",...}` Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-03-24 10:52:37 +04:00