[Feature] support for CommuniGate Pro self-generated messages

diff --git a/conf/cgp.inc b/conf/cgp.inc
new file mode 100644 (file)
index 0000000..fd71fa5
--- /dev/null
+++ b/conf/cgp.inc
@@ -0,0 +1,11 @@
+arc {
+    sign_networks = [127.2.4.7];
+}
+
+dkim_signing {
+    sign_networks = [127.2.4.7];
+}
+
+options {
+    local_addrs = [127.2.4.7];
+}

diff --git a/conf/options.inc b/conf/options.inc
index 9238cca3c3f3640abba075ead3859e88bad360f2..f374fe76cf2b7d3c5fc192589bf0e202abcb8e14 100644 (file)
--- a/conf/options.inc
+++ b/conf/options.inc
@@ -40,5 +40,5 @@ words_decay = 200;
 rrd = "${DBDIR}/rspamd.rrd";
 
 # Local networks
-local_addrs = "192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12, fd00::/8, 169.254.0.0/16, fe80::/10";
+local_addrs = [192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12, fd00::/8, 169.254.0.0/16, fe80::/10];
 hs_cache_dir = "${DBDIR}/";

diff --git a/conf/rspamd.conf b/conf/rspamd.conf
index e340eb08f9859bfec442896f107dc904a65ff27f..115fa54037d0a3676b44339c48f0a7169b3d0df8 100644 (file)
--- a/conf/rspamd.conf
+++ b/conf/rspamd.conf
@@ -24,6 +24,9 @@ options {
     .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/options.inc"
 }
 
+.include(try=true; duplicate=merge) "$CONFDIR/cgp.inc"
+.include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/cgp.inc"
+
 logging {
     type = "file";
     filename = "$LOGDIR/rspamd.log";

diff --git a/utils/cgp_rspamd.pl b/utils/cgp_rspamd.pl
index 986c0804ede644ee9fe2b87345980e1465225fbc..5a4bd109afe7bc65b9ba0953b41648071ecc0a74 100644 (file)
--- a/utils/cgp_rspamd.pl
+++ b/utils/cgp_rspamd.pl
@@ -209,6 +209,12 @@ sub rspamd_scan {
               $ip = $2;
             }
           }
+          elsif ( $elt =~ /^S (?:<([^>]+)> )?(?:DSN|GROUP|LIST|PBX|PIPE|RULE) \[0\.0\.0\.0\]/ ) {
+            if ($1) {
+              $user = $1;
+            }
+            $ip = '127.2.4.7';
+          }
         }
 
         my $headers = {};