extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 15:33:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove DKIM-Signature before forward, as we change From, and restore it after

Browse Source
This commit is contained in:
ralf 2024-11-13 19:54:01 +01:00
parent 457cf3e348
commit bda2c62e58
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Mail/Script.php
View File

@ -411,6 +411,9 @@ class Script
// we need to delete From header, to be able to overwrite it! // we need to delete From header, to be able to overwrite it!
$newruletext .= "\t".'deleteheader "from";'."\n"; $newruletext .= "\t".'deleteheader "from";'."\n";
$newruletext .= "\t".'addheader "From" "\'${from}\' <${user_email}>";'."\n\n"; $newruletext .= "\t".'addheader "From" "\'${from}\' <${user_email}>";'."\n\n";
// we need to delete the DKIM-Signature header, as we change the from
$newruletext .= 'if header :matches "DKIM-Signature" "*" { set "dkim_signature" "${1}"; }'."\n";
$newruletext .= "\t".'deleteheader "dkim-signature";'."\n";
} }
foreach(preg_split('/, ?/',$rule['action_arg']) as $addr) foreach(preg_split('/, ?/',$rule['action_arg']) as $addr)
@ -422,6 +425,8 @@ class Script
// we restore the From header, in case we keep the mail, or other rules // we restore the From header, in case we keep the mail, or other rules
$newruletext .= "\n\t".'deleteheader "from";'."\n"; $newruletext .= "\n\t".'deleteheader "from";'."\n";
$newruletext .= "\t".'addheader "From" "${from_header}";'."\n"; $newruletext .= "\t".'addheader "From" "${from_header}";'."\n";
// we restore the DKIM-Signature header
$newruletext .= "\t".'addheader "DKIM-Signature" "${dkim_signature}";'."\n";
} }
} }
if (preg_match("/discard/i",$rule['action'])) { if (preg_match("/discard/i",$rule['action'])) {