From 370d08fd33316471ca9b6c6d84c087a61ea2bb28 Mon Sep 17 00:00:00 2001
From: Nils Knappmeier <github@knappi.org>
Date: Fri, 10 Apr 2020 22:21:40 +0200
Subject: [PATCH] fail2ban: use filter.d/dovecot.conf from distribution

closes #972
---
 Dockerfile                            |  1 -
 target/fail2ban/filter.d/dovecot.conf | 16 ----------------
 2 files changed, 17 deletions(-)
 delete mode 100644 target/fail2ban/filter.d/dovecot.conf

diff --git a/Dockerfile b/Dockerfile
index 6ef229e0..97f3a126 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -175,7 +175,6 @@ RUN sed -i -r 's/#(@|   \\%)bypass/\1bypass/g' /etc/amavis/conf.d/15-content_fil
 
 # Configure Fail2ban
 COPY target/fail2ban/jail.conf /etc/fail2ban/jail.conf
-COPY target/fail2ban/filter.d/dovecot.conf /etc/fail2ban/filter.d/dovecot.conf
 COPY target/fail2ban/filter.d/postfix-sasl.conf /etc/fail2ban/filter.d/postfix-sasl.conf
 RUN mkdir /var/run/fail2ban
 
diff --git a/target/fail2ban/filter.d/dovecot.conf b/target/fail2ban/filter.d/dovecot.conf
deleted file mode 100644
index c83ecef4..00000000
--- a/target/fail2ban/filter.d/dovecot.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-[INCLUDES]
-
-before = common.conf
-
-[Definition]
-
-_daemon = (auth|dovecot(-auth)?|auth-worker)
-
-failregex = ^%(__prefix_line)s(pam_unix(\(dovecot:auth\))?:)?\s+authentication failure; logname=\S* uid=\S* euid=\S* tty=dovecot ruser=\S* rhost=<HOST>(\s+user=\S*)?\s*$
-            ^%(__prefix_line)s(pop3|imap)-login: (Info: )?(Aborted login|Disconnected)(: Inactivity)? \(((no auth attempts|auth failed, \d+ attempts)( in \d+ secs)?|tried to use (disabled|disallowed) \S+ auth)\):( user=<\S*>,)?( method=\S+,)? rip=<HOST>, lip=(\d{1,3}\.){3}\d{1,3}(, session=<\w+>)?(, TLS( handshaking)?(: Disconnected)?)?\s*$
-            ^%(__prefix_line)s(Info|dovecot: auth\(default\)): pam\(\S+,<HOST>\): pam_authenticate\(\) failed: (User not known to the underlying authentication module: \d+ Time\(s\)|Authentication failure \(password mismatch\?\))\s*$
-            ^\s.*passwd-file\(\S*,<HOST>\): unknown user.*$
-            (?: pop3-login|imap-login): .*(?:Authentication failure|Aborted login \(auth failed|Aborted login \(tried to use disabled|Disconnected \(auth failed).*rip=(<HOST>),.*
-
-## ^%(__prefix_line)spasswd-file\(\S*,<HOST>\): unknown user.*$
-ignoreregex =