paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Postfix, Dovecot, SOGo] Sanitize F2B logs

master
andryyy 2021-04-07 21:27:05 +02:00
parent d71ce15dca
commit f60143e983
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/Dockerfiles/dovecot/syslog-ng-redis_slave.conf
View File

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

2
data/Dockerfiles/dovecot/syslog-ng.conf
View File

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

2
data/Dockerfiles/postfix/syslog-ng-redis_slave.conf
View File

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

2
data/Dockerfiles/postfix/syslog-ng.conf
View File

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

2
data/Dockerfiles/sogo/syslog-ng-redis_slave.conf
View File

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

2
data/Dockerfiles/sogo/syslog-ng.conf
View File

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

6
docker-compose.yml
View File

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