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

[Netfilter] Further improvements to catch invalid input

master
andryyy 2021-03-23 20:53:04 +01:00
parent 3fcf260dde
commit 8eb757bea3
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/Dockerfiles/netfilter/server.py
View File

@ -301,8 +301,8 @@ def watch():
pubsub.subscribe('F2B_CHANNEL') pubsub.subscribe('F2B_CHANNEL')
while not quit_now: while not quit_now:
try:
for item in pubsub.listen(): for item in pubsub.listen():
try:
refreshF2bregex() refreshF2bregex()
for rule_id, rule_regex in f2bregex.items(): for rule_id, rule_regex in f2bregex.items():
if item['data'] and item['type'] == 'message': if item['data'] and item['type'] == 'message':
@ -319,6 +319,7 @@ def watch():
ban(addr) ban(addr)
except Exception as ex: except Exception as ex:
logWarn('Could not read logline from pubsub, skipping...') logWarn('Could not read logline from pubsub, skipping...')
continue
def snat4(snat_target): def snat4(snat_target):
global lock global lock

2
docker-compose.yml
View File

@ -390,7 +390,7 @@ services:
- acme - acme
netfilter-mailcow: netfilter-mailcow:
image: mailcow/netfilter:1.40 image: mailcow/netfilter:1.41
stop_grace_period: 30s stop_grace_period: 30s
depends_on: depends_on:
- dovecot-mailcow - dovecot-mailcow