浏览代码

[Postfix, Dovecot, SOGo] Sanitize F2B logs

andryyy 4 年之前
父节点
当前提交
f60143e983

+ 1 - 1
data/Dockerfiles/dovecot/syslog-ng-redis_slave.conf

@@ -27,7 +27,7 @@ destination d_redis_f2b_channel {
     host("`REDIS_SLAVEOF_IP`")
     persist-name("redis2")
     port(`REDIS_SLAVEOF_PORT`)
-    command("PUBLISH" "F2B_CHANNEL" "$MESSAGE")
+    command("PUBLISH" "F2B_CHANNEL" "$(sanitize $MESSAGE)")
   );
 };
 filter f_mail { facility(mail); };

+ 1 - 1
data/Dockerfiles/dovecot/syslog-ng.conf

@@ -27,7 +27,7 @@ destination d_redis_f2b_channel {
     host("redis-mailcow")
     persist-name("redis2")
     port(6379)
-    command("PUBLISH" "F2B_CHANNEL" "$MESSAGE")
+    command("PUBLISH" "F2B_CHANNEL" "$(sanitize $MESSAGE)")
   );
 };
 filter f_mail { facility(mail); };

+ 1 - 1
data/Dockerfiles/postfix/syslog-ng-redis_slave.conf

@@ -28,7 +28,7 @@ destination d_redis_f2b_channel {
     host("`REDIS_SLAVEOF_IP`")
     persist-name("redis2")
     port(`REDIS_SLAVEOF_PORT`)
-    command("PUBLISH" "F2B_CHANNEL" "$MESSAGE")
+    command("PUBLISH" "F2B_CHANNEL" "$(sanitize $MESSAGE)")
   );
 };
 filter f_mail { facility(mail); };

+ 1 - 1
data/Dockerfiles/postfix/syslog-ng.conf

@@ -28,7 +28,7 @@ destination d_redis_f2b_channel {
     host("redis-mailcow")
     persist-name("redis2")
     port(6379)
-    command("PUBLISH" "F2B_CHANNEL" "$MESSAGE")
+    command("PUBLISH" "F2B_CHANNEL" "$(sanitize $MESSAGE)")
   );
 };
 filter f_mail { facility(mail); };

+ 1 - 1
data/Dockerfiles/sogo/syslog-ng-redis_slave.conf

@@ -30,7 +30,7 @@ destination d_redis_f2b_channel {
     host("`REDIS_SLAVEOF_IP`")
     persist-name("redis2")
     port(`REDIS_SLAVEOF_PORT`)
-    command("PUBLISH" "F2B_CHANNEL" "$MESSAGE")
+    command("PUBLISH" "F2B_CHANNEL" "$(sanitize $MESSAGE)")
   );
 };
 log {

+ 1 - 1
data/Dockerfiles/sogo/syslog-ng.conf

@@ -30,7 +30,7 @@ destination d_redis_f2b_channel {
     host("redis-mailcow")
     persist-name("redis2")
     port(6379)
-    command("PUBLISH" "F2B_CHANNEL" "$MESSAGE")
+    command("PUBLISH" "F2B_CHANNEL" "$(sanitize $MESSAGE)")
   );
 };
 log {

+ 3 - 3
docker-compose.yml

@@ -164,7 +164,7 @@ services:
             - phpfpm
 
     sogo-mailcow:
-      image: mailcow/sogo:1.97
+      image: mailcow/sogo:1.98
       environment:
         - DBNAME=${DBNAME}
         - DBUSER=${DBUSER}
@@ -200,7 +200,7 @@ services:
             - sogo
 
     dovecot-mailcow:
-      image: mailcow/dovecot:1.144
+      image: mailcow/dovecot:1.145
       depends_on:
         - mysql-mailcow
       dns:
@@ -261,7 +261,7 @@ services:
             - dovecot
 
     postfix-mailcow:
-      image: mailcow/postfix:1.60
+      image: mailcow/postfix:1.61
       depends_on:
         - mysql-mailcow
       volumes: