Răsfoiți Sursa

Merge pull request #5221 from mailcow/fix/dot-stuffing-bcc

[Rspamd] add dot-stuffing to bcc forwarding
Patrick Schult 2 ani în urmă
părinte
comite
a0723f60d2
1 a modificat fișierele cu 6 adăugiri și 2 ștergeri
  1. 6 2
      data/conf/rspamd/lua/rspamd.local.lua

+ 6 - 2
data/conf/rspamd/lua/rspamd.local.lua

@@ -340,6 +340,10 @@ rspamd_config:register_symbol({
       if not bcc_dest then
         return -- stop
       end
+      -- dot stuff content before sending
+      local email_content = tostring(task:get_content())
+      email_content = string.gsub(email_content, "\r\n%.", "\r\n..")
+      -- send mail
       lua_smtp.sendmail({
         task = task,
         host = os.getenv("IPV4_NETWORK") .. '.253',
@@ -347,8 +351,8 @@ rspamd_config:register_symbol({
         from = task:get_from(stp)[1].addr,
         recipients = bcc_dest,
         helo = 'bcc',
-        timeout = 10,
-      }, task:get_content(), sendmail_cb)
+        timeout = 20,
+      }, email_content, sendmail_cb)
     end
 
     -- determine from