From e57a7b2c21f4f06c8deae99b1db89bbe0a8eb81d Mon Sep 17 00:00:00 2001
From: Thuban <thuban@yeuxdelibad.net>
Date: Sun, 28 Apr 2019 10:57:45 +0000
Subject: [PATCH] update regex, thx mimoza

---
 vilain.conf |   39 ++++++++++++++++++++++++++++++---------
 1 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/vilain.conf b/vilain.conf
index 907460e..00c3a22 100644
--- a/vilain.conf
+++ b/vilain.conf
@@ -1,7 +1,6 @@
 [DEFAULT]
-# 24h + 5min
-# Time to keep banned a bad ip
-watch_while = 86700
+# Duration (in sec) to keep banned a bad ip, reduce value if too much memory consumption
+watch_while = 3602
 # Max tries before being banned
 maxtries = 3
 # pf table to keep bad IP.
@@ -17,8 +16,7 @@
 
 ### Ip ignored ###
 [ignoreip]
-ip1 = 92.150.160.157
-ip2 = 92.150.160.156
+ip1 = 127.0.0.1
 
 ### Guardians
 #[name of the guardian]
@@ -26,13 +24,28 @@
 #regex = regex that return the bad guy IP
 #maxtries = 2 #facultative
 
-[ssh]
+[sshfail]
 logfile = /var/log/authlog
 regex = .* Failed .* from ([\S]+) .*
 
-[ssh2]
+[sshrootauth]
 logfile = /var/log/authlog
-regex = .* Connection closed by ([\S]+) .*
+regex = .* Disconnected from authenticating user root ([\S]+) .*
+maxtries = 1
+
+[sshinvaliduser]
+logfile = /var/log/authlog
+regex = .* Invalid user \w+ from ([\S]+) .*
+maxtries = 1
+
+[sshroot]
+logfile = /var/log/authlog
+regex = .* Failed .* for root from ([\S]+) .*
+maxtries = 1
+
+[sshbadprotocol]
+logfile = /var/log/authlog
+regex = .*Bad protocol version identification .* from ([\S]+) .*
 
 #[http404]
 #logfile = /var/www/logs/access.log
@@ -48,16 +61,24 @@
 
 [smtp]
 logfile = /var/log/maillog
-regex = .* event=failed-command address=([\S]+) .*
+regex = .* failed-command address=([\S]+) .* result=\"535 Authentication failed\"
+maxtries = 2
 
 [dovecot]
 logfile = /var/log/maillog
 regex = .*auth failed.*rip=([\S]+),.*
+maxtries = 2
+
+[dovecot2]
+logfile = /var/log/maillog
+regex = .*no auth attempts in.*rip=([\S]+),.*failed.*
+maxtries = 2
 
 [wordpress]
 # don't use if you have wordpress
 logfile = /var/www/logs/access.log
 regex = (?:\S+\s){1}(\S+).*wp-login.php.*
+maxtries = 1
 
 # Nextcloud: login page
 # Nextcloud 12 brings protection against brute-force attacks

--
Gitblit v1.9.3