From e2faa312c1735b9ba335f5c5b82ddf556a87fd71 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Wed, 20 Nov 2013 09:52:14 +1100
Subject: [PATCH 01/24] TST: test case for horde

---
 testcases/files/logs/horde | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 testcases/files/logs/horde

diff --git a/testcases/files/logs/horde b/testcases/files/logs/horde
new file mode 100644
index 00000000..55f2a6af
--- /dev/null
+++ b/testcases/files/logs/horde
@@ -0,0 +1,2 @@
+Nov 11 18:57:57 HORDE [error] [horde] FAILED LOGIN for graham [203.16.208.190] to Horde [on line 116 of "/home/ace-hosting/public_html/horde/login.php"]
+

From 83f3aeb308253f9fba22001db71860461753f541 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Thu, 2 Jan 2014 23:12:36 +1100
Subject: [PATCH 02/24] ENH: filter for horde

---
 ChangeLog                  |  1 +
 config/filter.d/horde.conf | 16 ++++++++++++++++
 testcases/files/logs/horde |  4 ++++
 3 files changed, 21 insertions(+)
 create mode 100644 config/filter.d/horde.conf

diff --git a/ChangeLog b/ChangeLog
index c092037a..edf4591c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,7 @@ ver. 0.8.12 (2013/12/XX) - things-can-only-get-better
   - Add filter for apache-modsecurity
   - filter.d/nsd.conf -- also amended Unix date template to match nsd format
   - Added filter.d/openwebmail filter thanks Ivo Truxa. Closes gh-543
+  - Added filter.d/horde
 
 - Enhancements:
   - loglines now also report "[PID]" after the name portion
diff --git a/config/filter.d/horde.conf b/config/filter.d/horde.conf
new file mode 100644
index 00000000..b94ebf64
--- /dev/null
+++ b/config/filter.d/horde.conf
@@ -0,0 +1,16 @@
+# fail2ban filter configuration for horde
+
+
+[Definition]
+
+
+failregex = ^ HORDE \[error\] \[(horde|imp)\] FAILED LOGIN for \S+ \[<HOST>\](\(forwarded for \[\S+\]\))? to (Horde|{[^}]+}) \[(pid \d+ )?on line \d+ of \S+\]$
+
+
+ignoreregex = 
+
+# DEV NOTES:
+# https://github.com/horde/horde/blob/master/imp/lib/Auth.php#L132
+# https://github.com/horde/horde/blob/master/horde/login.php
+# 
+# Author: Daniel Black
diff --git a/testcases/files/logs/horde b/testcases/files/logs/horde
index 55f2a6af..135deee3 100644
--- a/testcases/files/logs/horde
+++ b/testcases/files/logs/horde
@@ -1,2 +1,6 @@
+# failJSON: { "time": "2004-11-11T18:57:57", "match": true , "host": "203.16.208.190" }
 Nov 11 18:57:57 HORDE [error] [horde] FAILED LOGIN for graham [203.16.208.190] to Horde [on line 116 of "/home/ace-hosting/public_html/horde/login.php"]
 
+# failJSON: { "time": "2004-12-15T08:59:59", "match": true , "host": "1.2.3.4" }
+Dec 15 08:59:59 HORDE [error] [imp] FAILED LOGIN for emai.user@somedomain.com [1.2.3.4] to {mx.somedomain.com:993 [imap/ssl/novalidate-cert]} [pid 68394 on line 139 of /usr/local/www/www.somedomain.com/public_html/horde/imp/lib/Auth/imp.php"]
+

From 04d28fd2e1bb2be5ac82555fb8898fb5239ca658 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Fri, 3 Jan 2014 13:00:37 +1100
Subject: [PATCH 03/24] ENH: add filter freeswitch - as raised on mailing list

---
 ChangeLog                       |  2 ++
 config/filter.d/freeswitch.conf | 14 ++++++++++++++
 config/jail.conf                | 12 ++++++++++++
 testcases/files/logs/freeswitch |  2 ++
 4 files changed, 30 insertions(+)
 create mode 100644 config/filter.d/freeswitch.conf
 create mode 100644 testcases/files/logs/freeswitch

diff --git a/ChangeLog b/ChangeLog
index c092037a..d4dae353 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,8 @@ ver. 0.8.12 (2013/12/XX) - things-can-only-get-better
   - Add filter for apache-modsecurity
   - filter.d/nsd.conf -- also amended Unix date template to match nsd format
   - Added filter.d/openwebmail filter thanks Ivo Truxa. Closes gh-543
+  - Added filter for freeswitch. Thanks Jim and editors and authors of 
+    http://wiki.freeswitch.org/wiki/Fail2ban
 
 - Enhancements:
   - loglines now also report "[PID]" after the name portion
diff --git a/config/filter.d/freeswitch.conf b/config/filter.d/freeswitch.conf
new file mode 100644
index 00000000..3835c5ad
--- /dev/null
+++ b/config/filter.d/freeswitch.conf
@@ -0,0 +1,14 @@
+# Fail2Ban configuration file
+#
+# In freeswitch configuration: <param name="log-auth-failures" value="true"/>
+#
+
+[Definition]
+
+failregex = ^\.\d+ \[WARNING\] sofia_reg.c:\d+ SIP auth (failure|challenge) \((REGISTER|INVITE)\) on sofia profile \'[^']+\' for \[.*\] from ip <HOST>
+
+ignoreregex =
+
+# Author: Rupa SChomaker, soapee01, Daniel Black
+# http://wiki.freeswitch.org/wiki/Fail2ban
+#
diff --git a/config/jail.conf b/config/jail.conf
index e9441416..3f660d2c 100644
--- a/config/jail.conf
+++ b/config/jail.conf
@@ -382,6 +382,18 @@ action   = iptables-multiport[name=asterisk-tcp, port="5060,5061", protocol=tcp]
 logpath  = /var/log/asterisk/messages
 maxretry = 10
 
+
+[freeswitch]
+
+enabled  = false
+port     = 5060,5061,5080,5081
+filter   = freeswitch
+logpath  = /var/log/freeswitch.log
+maxretry = 10
+action   = iptables-multiport[name=freeswitch-tcp, port="5060,5061,5080,5081", protocol=tcp]
+           iptables-multiport[name=freeswitch-udp, port="5060,5061,5080,5081", protocol=udp]
+
+
 #  Historical support (before https://github.com/fail2ban/fail2ban/issues/37 was fixed )
 #  use [asterisk] for new jails
 [asterisk-tcp]
diff --git a/testcases/files/logs/freeswitch b/testcases/files/logs/freeswitch
new file mode 100644
index 00000000..96e2b1cf
--- /dev/null
+++ b/testcases/files/logs/freeswitch
@@ -0,0 +1,2 @@
+# failJSON: { "time": "2013-12-31T17:39:54", "match": true, "host": "81.94.202.251" }
+2013-12-31 17:39:54.767815 [WARNING] sofia_reg.c:1533 SIP auth challenge (INVITE) on sofia profile 'internal' for [011448708752617@192.168.2.51] from ip 81.94.202.251

From a0c2de3e4db65f429382e8ccaed66cb0f0ca88e6 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Fri, 3 Jan 2014 16:51:38 +1100
Subject: [PATCH 04/24] DOC: document incompatiblity between APF and iptables-*
 actions. Closes gh-510

---
 config/action.d/apf.conf | 39 ++++++---------------------------------
 1 file changed, 6 insertions(+), 33 deletions(-)

diff --git a/config/action.d/apf.conf b/config/action.d/apf.conf
index f1d54dd2..f0dde977 100644
--- a/config/action.d/apf.conf
+++ b/config/action.d/apf.conf
@@ -1,45 +1,17 @@
 # Fail2Ban configuration file
+# https://www.rfxn.com/projects/advanced-policy-firewall/
 #
-# Author: Mark McKinstry
+# Note: APF doesn't play nicely with other actions. It has been observed to
+# remove bans created by other iptables based actions. If you are going to use
+# this action, use it for all of your jails.
 #
+# DON'T MIX APF and other IPTABLES based actions
 [Definition]
 
-# Option:  actionstart
-# Notes.:  command executed once at the start of Fail2Ban.
-# Values:  CMD
-#
 actionstart = 
-
-# Option:  actionstop
-# Notes.:  command executed once at the end of Fail2Ban
-# Values:  CMD
-#
 actionstop = 
-
-# Option:  actioncheck
-# Notes.:  command executed once before each actionban command
-# Values:  CMD
-#
 actioncheck = 
-
-# Option:  actionban
-# Notes.:  command executed when banning an IP. Take care that the
-#          command is executed with Fail2Ban user rights.
-# Tags:    <ip>  IP address
-#          <failures>  number of failures
-#          <time>  unix timestamp of the ban time
-# Values:  CMD
-#
 actionban = apf --deny <ip> "banned by Fail2Ban <name>"
-
-# Option:  actionunban
-# Notes.:  command executed when unbanning an IP. Take care that the
-#          command is executed with Fail2Ban user rights.
-# Tags:    <ip>  IP address
-#          <failures>  number of failures
-#          <time>  unix timestamp of the ban time
-# Values:  CMD
-#
 actionunban = apf --remove <ip>
 
 [Init]
@@ -48,3 +20,4 @@ actionunban = apf --remove <ip>
 #
 name = default
 
+# Author: Mark McKinstry

From b5b581555c94cd1c42e64f5ff26b5912099a2130 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Fri, 3 Jan 2014 19:56:49 +1100
Subject: [PATCH 05/24] BF: nagios fix

---
 files/nagios/check_fail2ban | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/nagios/check_fail2ban b/files/nagios/check_fail2ban
index 9bf14305..d4f9834f 100755
--- a/files/nagios/check_fail2ban
+++ b/files/nagios/check_fail2ban
@@ -108,6 +108,7 @@ my ($critical,$warning) = (2,1);
 my $fail2ban_client_path = '/usr/bin/fail2ban-client';
 my $fail2ban_socket = '';
 my $jail_specific = '';
+my $jail_name = '';
 
 GetOptions (
     'P=s' => \ $fail2ban_client_path,

From d1faae3b3bb91ba170d50a25c8621550c8670fa1 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Sat, 4 Jan 2014 08:01:42 +1100
Subject: [PATCH 06/24] BF: port not used in jail definition for freeswitch

---
 config/jail.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/jail.conf b/config/jail.conf
index 3f660d2c..1d58edbe 100644
--- a/config/jail.conf
+++ b/config/jail.conf
@@ -386,7 +386,6 @@ maxretry = 10
 [freeswitch]
 
 enabled  = false
-port     = 5060,5061,5080,5081
 filter   = freeswitch
 logpath  = /var/log/freeswitch.log
 maxretry = 10

From 36533de6bcf5cfa0a9c5c90d653bd0bf211ef97d Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Sat, 4 Jan 2014 08:21:22 +1100
Subject: [PATCH 07/24] ENH: more filter expressions for freeswitch. Anchored
 existing one at end too

---
 config/filter.d/freeswitch.conf | 5 ++++-
 testcases/files/logs/freeswitch | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/config/filter.d/freeswitch.conf b/config/filter.d/freeswitch.conf
index 3835c5ad..7356286a 100644
--- a/config/filter.d/freeswitch.conf
+++ b/config/filter.d/freeswitch.conf
@@ -5,10 +5,13 @@
 
 [Definition]
 
-failregex = ^\.\d+ \[WARNING\] sofia_reg.c:\d+ SIP auth (failure|challenge) \((REGISTER|INVITE)\) on sofia profile \'[^']+\' for \[.*\] from ip <HOST>
+failregex = ^\.\d+ \[WARNING\] sofia_reg\.c:\d+ SIP auth (failure|challenge) \((REGISTER|INVITE)\) on sofia profile \'[^']+\' for \[.*\] from ip <HOST>$
+            ^\.\d+ \[WARNING\] sofia_reg\.c:\d+ Can't find user \[\d+@\d+\.\d+\.\d+\.\d+\] from <HOST>$
+            ^\.\d+ \[DEBUG\] sofia\.c:\d+ IP <HOST> Rejected by acl "\S+"\. Falling back to Digest auth\.$
 
 ignoreregex =
 
 # Author: Rupa SChomaker, soapee01, Daniel Black
 # http://wiki.freeswitch.org/wiki/Fail2ban
+# Thanks to Jim on mailing list of samples and guidance
 #
diff --git a/testcases/files/logs/freeswitch b/testcases/files/logs/freeswitch
index 96e2b1cf..8b0ebec4 100644
--- a/testcases/files/logs/freeswitch
+++ b/testcases/files/logs/freeswitch
@@ -1,2 +1,11 @@
 # failJSON: { "time": "2013-12-31T17:39:54", "match": true, "host": "81.94.202.251" }
 2013-12-31 17:39:54.767815 [WARNING] sofia_reg.c:1533 SIP auth challenge (INVITE) on sofia profile 'internal' for [011448708752617@192.168.2.51] from ip 81.94.202.251
+# failJSON: { "time": "2013-12-31T17:39:54", "match": true, "host": "5.11.47.236" }
+2013-12-31 17:39:54.767815 [WARNING] sofia_reg.c:1478 SIP auth failure (INVITE) on sofia profile 'internal' for [000972543480510@192.168.2.51] from ip 5.11.47.236
+# failJSON: { "time": "2013-12-31T17:39:54", "match": true, "host": "185.24.234.141" }
+2013-12-31 17:39:54.767815 [DEBUG] sofia.c:7954 IP 185.24.234.141 Rejected by acl "domains". Falling back to Digest auth.
+
+# failJSON: { "time": "2013-12-31T17:39:54", "match": true, "host": "5.11.47.236" }
+2013-12-31 17:39:54.767815 [WARNING] sofia_reg.c:2531 Can't find user [1001@192.168.2.51] from 5.11.47.236
+# failJSON: { "time": "2013-12-31T17:39:54", "match": true, "host": "185.24.234.141" }
+2013-12-31 17:39:54.767815 [WARNING] sofia_reg.c:2531 Can't find user [100@192.168.2.51] from 185.24.234.141

From 477f30665a2ac8f5a8bb0c6beaa2427d3f2f7243 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Sat, 4 Jan 2014 08:31:42 +1100
Subject: [PATCH 08/24] DOC: ignoreip for internal ips on freeswitch

---
 config/filter.d/freeswitch.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/filter.d/freeswitch.conf b/config/filter.d/freeswitch.conf
index 7356286a..13204a1e 100644
--- a/config/filter.d/freeswitch.conf
+++ b/config/filter.d/freeswitch.conf
@@ -2,6 +2,9 @@
 #
 # In freeswitch configuration: <param name="log-auth-failures" value="true"/>
 #
+# In the fail2ban jail.local file for this filter set ignoreip to the internal
+# IP addresses on your LAN.
+#
 
 [Definition]
 

From 5fe75436cc1943f2b1ce701019f60a863674c08f Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Sat, 4 Jan 2014 08:53:45 +1100
Subject: [PATCH 09/24] DOC: DEV NOTES before author names

---
 config/action.d/apf.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/action.d/apf.conf b/config/action.d/apf.conf
index f0dde977..5c4a2614 100644
--- a/config/action.d/apf.conf
+++ b/config/action.d/apf.conf
@@ -20,4 +20,6 @@ actionunban = apf --remove <ip>
 #
 name = default
 
+# DEV NOTES:
+#
 # Author: Mark McKinstry

From 69b3a1cf64e8c6960db7ebb0b6d11d0df4d52909 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Sat, 4 Jan 2014 12:10:51 +1100
Subject: [PATCH 10/24] BF: catchin DEBUG messages will result in duplicates

---
 config/filter.d/freeswitch.conf | 3 ++-
 testcases/files/logs/freeswitch | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/filter.d/freeswitch.conf b/config/filter.d/freeswitch.conf
index 13204a1e..70a1b810 100644
--- a/config/filter.d/freeswitch.conf
+++ b/config/filter.d/freeswitch.conf
@@ -10,7 +10,6 @@
 
 failregex = ^\.\d+ \[WARNING\] sofia_reg\.c:\d+ SIP auth (failure|challenge) \((REGISTER|INVITE)\) on sofia profile \'[^']+\' for \[.*\] from ip <HOST>$
             ^\.\d+ \[WARNING\] sofia_reg\.c:\d+ Can't find user \[\d+@\d+\.\d+\.\d+\.\d+\] from <HOST>$
-            ^\.\d+ \[DEBUG\] sofia\.c:\d+ IP <HOST> Rejected by acl "\S+"\. Falling back to Digest auth\.$
 
 ignoreregex =
 
@@ -18,3 +17,5 @@ ignoreregex =
 # http://wiki.freeswitch.org/wiki/Fail2ban
 # Thanks to Jim on mailing list of samples and guidance
 #
+# No need to match the following. Its a duplicate of the SIP auth regex.
+#  ^\.\d+ \[DEBUG\] sofia\.c:\d+ IP <HOST> Rejected by acl "\S+"\. Falling back to Digest auth\.$
diff --git a/testcases/files/logs/freeswitch b/testcases/files/logs/freeswitch
index 8b0ebec4..f151995c 100644
--- a/testcases/files/logs/freeswitch
+++ b/testcases/files/logs/freeswitch
@@ -2,7 +2,7 @@
 2013-12-31 17:39:54.767815 [WARNING] sofia_reg.c:1533 SIP auth challenge (INVITE) on sofia profile 'internal' for [011448708752617@192.168.2.51] from ip 81.94.202.251
 # failJSON: { "time": "2013-12-31T17:39:54", "match": true, "host": "5.11.47.236" }
 2013-12-31 17:39:54.767815 [WARNING] sofia_reg.c:1478 SIP auth failure (INVITE) on sofia profile 'internal' for [000972543480510@192.168.2.51] from ip 5.11.47.236
-# failJSON: { "time": "2013-12-31T17:39:54", "match": true, "host": "185.24.234.141" }
+# failJSON: { "time": "2013-12-31T17:39:54", "match": false }
 2013-12-31 17:39:54.767815 [DEBUG] sofia.c:7954 IP 185.24.234.141 Rejected by acl "domains". Falling back to Digest auth.
 
 # failJSON: { "time": "2013-12-31T17:39:54", "match": true, "host": "5.11.47.236" }

From d7666c89424e5c267d6da8bf9833012ab2b22339 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Sat, 4 Jan 2014 12:39:48 +1100
Subject: [PATCH 11/24] DOC: bit more on how to use freeswitch

---
 config/filter.d/freeswitch.conf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/filter.d/freeswitch.conf b/config/filter.d/freeswitch.conf
index 70a1b810..ecc4a8bd 100644
--- a/config/filter.d/freeswitch.conf
+++ b/config/filter.d/freeswitch.conf
@@ -1,6 +1,8 @@
 # Fail2Ban configuration file
 #
-# In freeswitch configuration: <param name="log-auth-failures" value="true"/>
+# Enable "log-auth-failures" on each Sofia profile to monitor
+# <param name="log-auth-failures" value="true"/>
+# -- this requires a high enough loglevel on your logs to save these messages.
 #
 # In the fail2ban jail.local file for this filter set ignoreip to the internal
 # IP addresses on your LAN.

From 6602937ee161bec57f4bd1453c2644f2982c6797 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Sun, 5 Jan 2014 11:24:20 +1100
Subject: [PATCH 12/24] DOC: filter.d./pure-ftpd doco from wiki

---
 config/filter.d/pure-ftpd.conf | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config/filter.d/pure-ftpd.conf b/config/filter.d/pure-ftpd.conf
index 1698c9ec..e96009b2 100644
--- a/config/filter.d/pure-ftpd.conf
+++ b/config/filter.d/pure-ftpd.conf
@@ -1,7 +1,11 @@
 # Fail2Ban filter for pureftp
 #
+# Disable hostname based logging by:
+#
+# Start pure-ftpd with the -H switch or on Ubuntu 'echo yes > /etc/pure-ftpd/conf/DontResolve'
 #
 #
+
 [INCLUDES]
 
 before = common.conf
@@ -17,3 +21,4 @@ ignoreregex =
 
 # Author: Cyril Jaquier
 # Modified: Yaroslav Halchenko for pure-ftpd
+# Documentation thanks to Blake on http://www.fail2ban.org/wiki/index.php?title=Fail2ban:Community_Portal

From c37ee4cc52701a4e2158c29fe7a39e0bd0e14fa9 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Sun, 5 Jan 2014 11:30:56 +1100
Subject: [PATCH 13/24] DOC: filter.d/vsftpd doco from wiki

---
 config/filter.d/vsftpd.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/filter.d/vsftpd.conf b/config/filter.d/vsftpd.conf
index 59ce49a3..4de2befb 100644
--- a/config/filter.d/vsftpd.conf
+++ b/config/filter.d/vsftpd.conf
@@ -1,5 +1,8 @@
 # Fail2Ban filter for vsftp
 #
+# Configure VSFTP for "dual_log_enable=YES", and have fail2ban watch
+# /var/log/vsftpd.log instead of /var/log/secure. vsftpd.log file shows the
+# incoming ip address rather than domain names.
 
 [INCLUDES]
 
@@ -16,3 +19,4 @@ failregex = ^%(__prefix_line)s%(__pam_re)s\s+authentication failure; logname=\S*
 ignoreregex = 
 
 # Author: Cyril Jaquier
+# Documentation from fail2ban wiki

From 51f014fedec58fd497b352bc7c9cf38fd3f816f2 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Sun, 5 Jan 2014 18:24:13 +1100
Subject: [PATCH 14/24] DOC: add more content to jail.conf man page

---
 man/jail.conf.5 | 63 +++++++++++++++++++++++++++++++++++++------------
 1 file changed, 48 insertions(+), 15 deletions(-)

diff --git a/man/jail.conf.5 b/man/jail.conf.5
index 4d964341..94329fc8 100644
--- a/man/jail.conf.5
+++ b/man/jail.conf.5
@@ -3,22 +3,24 @@
 jail.conf \- configuration for the fail2ban server
 .SH SYNOPSIS
 
-.I fail2ban.conf fail2ban.d/*.conf fail2ban.d/*.local
+.I fail2ban.conf fail2ban.d/*.conf / fail2ban.local / fail2ban.d/*.local
 
-.I jail.conf / jail.local
+.I jail.conf / jail.d/*.conf / jail.local / jail.d/*.local
 
 .I action.d/*.conf action.d/*.local
 
 .I filter.d/*.conf filter.d/*.local
+
 .SH DESCRIPTION
-Fail2ban has three configuration file types. Action files are the commands for banning and unbanning of IP address,
-Filter files tell fail2ban how to detect authentication failures, and Jail configurations combine filters with actions into jails.
+Fail2ban has four configuration file types. Failban configuration files that contain global configuration items, Action configuration files are the commands for banning and unbanning of IP address, Filter configuration files tell fail2ban how to detect authentication failures, and Jail configuration files combine filters with actions into jails.
+
+.SH "CONFIGUATION FILES"
 
 There are *.conf files that are distributed by fail2ban and *.local file that contain user customizations.
 It is recommended that *.conf files should remain unchanged.  If needed, customizations should be provided in *.local files.
 For instance, if you would like to customize the [ssh-iptables-ipset] jail, create a jail.local to extend jail.conf
 (the configuration for the fail2ban server).  The jail.local file will be the following if you only need to enable
-it:
+it as follows:
 
 .TP
 \fIjail.local\fR
@@ -32,7 +34,7 @@ Override only the settings you need to change and the rest of the configuration
 
 \fI*.d/\fR
 .RS
-In addition to .local, for any .conf file there can be a corresponding
+In addition to .local, for any jail.conf or fail2ban.conf file there can be a corresponding
 \fI.d/\fR directory to contain additional .conf files that will be read after the
 appropriate .local file.  Last parsed file will take precidence over
 identical entries, parsed alphabetically, e.g.
@@ -55,43 +57,74 @@ jail.d/*.conf (in alphabetical order),
 jail.local, followed by
 jail.d/*.local (in alphabetical order).
 
-Likewise for fail2ban configuration.
+Likewise for fail2ban configuration except the filenames/directories begin with "fail2ban" and not "jail".
 
-Comments: use '#' for comment lines and ';' (following a space) for inline comments
+Configuration files have sections, those specified with [section name], and name = value pairs. For those name items that can accept multiple values, specify the values separated by spaces, or new lines between the values which also requires space at the beginning of the line before the second value..
 
+Comments: use '#' for comment lines and ';' (following a space) for inline comments. When using Python2.X ';' can only be used on the first line due to an Python library bug.
 
-.SH DEFAULT
-The following options are applicable to all jails. Their meaning is described in the default \fIjail.conf\fR file.
+.SH "FAIL2BAN CONFIGURATION FILES"
+
+These files have one section, [Definition].
+
+The items that can be set are:
+.TP
+\fBloglevel\fR
+Set the log level output. , 1 = ERROR, 2 = WARN, 3 = INFO, 4 = DEBUG. Default: 1
+.TP
+\fBlogtarget\fR
+Set the log target. This could be a file, SYSLOG, STDERR or STDOUT. Only one log target can be specified.
+If you change logtarget from the default value and you are using logrotate -- also adjust or disable rotation in the
+corresponding configuration file (e.g. /etc/logrotate.d/fail2ban on Debian systems). Values can be [ STDOUT | STDERR | SYSLOG | FILE ]  Default: STDERR.
+.TP
+\fBsocket\fR
+Set the socket file. This is used to communicate with the fail2ban server daemon. Do not remove this file when Fail2ban runs. It will not be possible to communicate with the server afterwards. Default: /var/run/fail2ban/fail2ban.sock
+.TP
+\fBpidfile\fR
+Set the PID file. This is used to store the process ID of the fail2ban server.
+# Values: [ FILE ]  Default: /var/run/fail2ban/fail2ban.pid
+
+.SH "JAIL CONFIGURATION FILES"
+The following options are applicable to all jails. They appear in a section specifing the jail name or in the \fI[DEFAULT]\fR section which is used if individual sections don't have a value specified.
 .TP
 \fBfilter\fR 
+This maps to the filename of the filter in /etc/fail2ban/filter.d/ without the .conf/.local extension. Only one filter can be specified.
 .TP
 \fBlogpath\fR 
+This is the log filename(s). Globs, like paths containing * and ? or [0-9], can be used however only the files that exist at startup matching this glob pattern will be read.
 .TP
 \fBaction\fR 
+This maps to the action(s) from \fI/etc/fail2ban/action.d/\fR without the \fI.conf\fR/\fI.local\fR extension. Arguements can be passed to actions to override the default values from the [Init] section. Arguements are specified by [name=value,name2=value]. Values can also be quoted. More that one action can be specified.
 .TP
 \fBignoreip\fR 
-A space separated list of IPs not to ban.
+A list of IPs not to ban. These can include a CIDR mask too.
 .TP
 \fBignorecommand\fR
 A command that is executed to determine if the current ban's actionban is to be executed. This command will return true if the current ban should be ignored. A false return value will result in the ban's actionban executed.
 Like ACTION FILES, tags like <ip> are can be included in the ignore command value and will be substitued before execution. Currently only <ip> is supported however more will be added later.
 .TP
 \fBbantime\fR
+When a ban occurs the ban stays in effect for this long (measured in seconds) after which the actionunban command in the action(s) are called.
 .TP
 \fBfindtime\fR
+Specifies the time interval in seconds before the current time where failures will count towards a ban.
 .TP
 \fBmaxretry\fR
+This is the number of failures that can occur in the last findtime seconds before a ban of that IP will result.
 .TP
 \fBbackend\fR
+This is the backend used to detect changes in the logpath. It defaults to "auto" which will try "pyinotify", "gamin" before "polling". Any of these can be specified. "pyinotify" is only valid on Linux systems with the "pyinotify" Python libraries. "gamin" requires the "gamin" libraries.
 .TP
 \fBusedns\fR
+This tells fail2ban to use DNS to resolve HOST names that appear in the logs. By default it is "warn" which will preform the resolving hostnames to IPs however it will also log a warning. If you are using DNS here you could be blocking the wrong IPs due to the asymetric nature of reverse DNS (that the application used to write the domain name to log) compared to forward DNS that fail2ban uses to resolve this back to an IP (but not necessarly the same one). Idealy configure your applications to log a real IP. This can be set to "yes" to prevent warnings in the log or "no" to disable DNS resolution.
 .TP
 \fBfailregex\fR
+Here a failregex can be added which is effectively added to the filter's failregexes. If this is useful for others using your application please tell the fail2ban developers by reporting an issue (REPORTING BUGS below). 
 .TP
 \fBignoreregex\fR
+Here you can specify a Python regex that when applied to a log file line will be ignored. This will be ignored even if it matches a failregex of the jail or any of its filters.
 
-
-.SH "ACTION FILES"
+.SH "ACTION CONFIGURATION FILES"
 Action files specify which commands are executed to ban and unban an IP address. They are located under \fI/etc/fail2ban/action.d\fR.
 
 Like with jail.conf files, if you desire local changes create an \fI[actionname].local\fR file in the \fI/etc/fail2ban/action.d\fR directory
@@ -140,7 +173,7 @@ An IPv4 ip address to be banned. e.g. 192.168.0.2
 The number of times the failure occurred in the log file. e.g. 3
 .TP
 \fBtime\fR
-The unix time of the ban. e.g. 1357508484
+The unix (epoch) time of the ban. e.g. 1357508484
 .TP
 \fBmatches\fR
 The concatenated string of the log file lines of the matches that generated the ban. Many characters interpreted by shell get escaped.
@@ -183,7 +216,7 @@ indicates that this file is read after the [Definition] section.
 
 .SH AUTHOR
 Fail2ban was originally written by Cyril Jaquier <cyril.jaquier@fail2ban.org>.
-At the moment it is maintained and further developed by Yaroslav O. Halchenko <debian@onerussian.com> and a number of contributors.  See \fBTHANKS\fR file shipped with Fail2Ban for a full list.
+At the moment it is maintained and further developed by Yaroslav O. Halchenko <debian@onerussian.com>, Daniel Black <daniel.subs@internode.on.net> and Steven Hiscocks <steven-fail2ban@hiscocks.me.uk> along with a number of contributors.  See \fBTHANKS\fR file shipped with Fail2Ban for a full list.
 .
 Manual page written by Daniel Black and Yaroslav Halchenko.
 .SH "REPORTING BUGS"

From 3d21c4edf9b04ac4355afd61bec3df87a90bc261 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Sun, 5 Jan 2014 18:53:31 +1100
Subject: [PATCH 15/24] DOC: consistent filename separator in SYNOPIS

---
 man/jail.conf.5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/jail.conf.5 b/man/jail.conf.5
index 94329fc8..79324258 100644
--- a/man/jail.conf.5
+++ b/man/jail.conf.5
@@ -3,9 +3,9 @@
 jail.conf \- configuration for the fail2ban server
 .SH SYNOPSIS
 
-.I fail2ban.conf fail2ban.d/*.conf / fail2ban.local / fail2ban.d/*.local
+.I fail2ban.conf fail2ban.d/*.conf fail2ban.local fail2ban.d/*.local
 
-.I jail.conf / jail.d/*.conf / jail.local / jail.d/*.local
+.I jail.conf jail.d/*.conf jail.local jail.d/*.local
 
 .I action.d/*.conf action.d/*.local
 

From a9f804e443a723170c86891a8adc826950aff390 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Sun, 5 Jan 2014 21:03:16 +1100
Subject: [PATCH 16/24] ENH: complete stock jail.conf to contain all filters

---
 config/jail.conf | 167 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 163 insertions(+), 4 deletions(-)

diff --git a/config/jail.conf b/config/jail.conf
index 1d58edbe..1db5b5da 100644
--- a/config/jail.conf
+++ b/config/jail.conf
@@ -75,6 +75,22 @@ usedns = warn
 # The mail-whois action send a notification e-mail with a whois request
 # in the body.
 
+[pam-generic]
+
+enabled = false
+filter  = pam-generic
+action  = iptables-allports[name=pam,protocol=all]
+logpath = /var/log/secure
+
+
+[xinetd-fail]
+
+enabled = false
+filter  = xinetd-fail
+action  = iptables-allports[name=xinetd,protocol=all]
+logpath = /var/log/daemon*log
+
+
 [ssh-iptables]
 
 enabled  = false
@@ -84,6 +100,25 @@ action   = iptables[name=SSH, port=ssh, protocol=tcp]
 logpath  = /var/log/sshd.log
 maxretry = 5
 
+
+[ssh-ddos]
+
+enabled  = false
+filter   = sshd-ddos
+action   = iptables[name=SSHDDOS, port=ssh, protocol=tcp]
+logpath  = /var/log/sshd.log
+maxretry = 2
+
+
+[dropbear]
+
+enabled  = false
+filter   = dropbear
+action   = iptables[name=dropbear, port=ssh, protocol=tcp]
+logpath  = /var/log/messages
+maxretry = 5
+
+
 [proftpd-iptables]
 
 enabled  = false
@@ -94,6 +129,35 @@ logpath  = /var/log/proftpd/proftpd.log
 maxretry = 6
 
 
+[gssftpd-iptables]
+
+enabled  = false
+filter   = gssftpd
+action   = iptables[name=GSSFTPd, port=ftp, protocol=tcp]
+           sendmail-whois[name=GSSFTPd, dest=you@example.com]
+logpath  = /var/log/daemon.log
+maxretry = 6
+
+
+[pure-ftpd]
+
+enabled  = false
+filter   = pure-ftpd
+action   = iptables[name=pureftpd, port=ftp, protocol=tcp]
+logpath  = /var/log/pureftpd.log
+maxretry = 6
+
+
+[wuftpd]
+
+enabled  = false
+filter   = wuftpd
+action   = iptables[name=wuftpd, port=ftp, protocol=tcp]
+logpath  = /var/log/daemon.log
+maxretry = 6
+
+
+
 # This jail forces the backend to "polling".
 [sasl-iptables]
 
@@ -197,7 +261,26 @@ logpath  = /var/log/apache*/*error.log
 maxretry = 2
 
 
-[nginx-http-auth]
+[apache-overflows]
+
+enabled  = false
+filter	 = apache-overflows
+action   = iptables-multiport[name=apache-overflows,port="80,443"]
+logpath  = /var/log/apache*/*error.log
+           /home/www/myhomepage/error.log
+maxretry = 2
+
+
+[apache-nohome]
+
+enabled  = false
+filter	 = apache-nohome
+action   = iptables-multiport[name=apache-nohome,port="80,443"]
+logpath  = /var/log/apache*/*error.log
+           /home/www/myhomepage/error.log
+maxretry = 2
+
+
 [nginx-http-auth]
 
 enabled = false
@@ -206,6 +289,14 @@ action  = iptables-multiport[name=nginx-http-auth,port="80,443"]
 logpath = /var/log/nginx/error.log
 
 
+[squid]
+
+enabled = false
+filter  = squid
+action  = iptables-multiport[name=squid,port="80,443,8080"]
+logpath = /var/log/squid/access.log
+
+
 # The hosts.deny path can be defined with the "file" argument if it is
 # not in /etc.
 [postfix-tcpwrapper]
@@ -218,6 +309,46 @@ logpath  = /var/log/postfix.log
 bantime  = 300
 
 
+[cyrus-imap]
+
+enabled = false
+filter  = cyrus-imap
+action  = iptables-multiport[name=cyrus-imap,port="143,993"]
+logpath = /var/log/mail*log
+
+
+[courierlogin]
+
+enabled = false
+filter  = courierlogin
+action  = iptables-multiport[name=courierlogin,port="25,110,143,465,587,993,995"]
+logpath = /var/log/mail*log
+
+
+[couriersmtp]
+
+enabled = false
+filter  = couriersmtp
+action  = iptables-multiport[name=couriersmtp,port="25,465,587"]
+logpath = /var/log/mail*log
+
+
+[qmail-rbl]
+
+enabled = false
+filter  = qmail
+action  = iptables-multiport[name=qmail-rbl,port="25,465,587"]
+logpath = /service/qmail/log/main/current
+
+
+[sieve]
+
+enabled = false
+filter  = sieve
+action  = iptables-multiport[name=sieve,port="25,465,587"]
+logpath = /var/log/mail*log
+
+
 # Do not ban anybody. Just report information about the remote host.
 # A notification is sent at most every 600 seconds (bantime).
 [vsftpd-notification]
@@ -295,6 +426,25 @@ action   = ipfw
 maxretry = 5
 
 
+[horde]
+
+enabled  = false
+filter   = horde
+logpath  = /var/log/horde/horde.log
+action   = iptables-multiport[name=horde, port="http,https"]
+maxretry = 5
+
+
+# Ban attackers that try to use PHP's URL-fopen() functionality
+# through GET/POST variables. - Experimental, with more than a year
+# of usage in production environments.
+[php-url-fopen]
+
+enabled  = false
+action   = iptables-multiport[name=php-url-open, port="http,https"]
+filter   = php-url-fopen
+logpath  = /var/www/*/logs/access_log
+maxretry = 1
 # Ban attackers that try to use PHP's URL-fopen() functionality
 # through GET/POST variables. - Experimental, with more than a year
 # of usage in production environments.
@@ -372,6 +522,15 @@ logpath  = /var/log/named/security.log
 ignoreip = 168.192.0.1
 
 
+[nsd]
+
+enabled = false
+filter  = nsd
+action  = iptables-multiport[name=nsd-tcp, port="domain", protocol=tcp]
+          iptables-multiport[name=nsd-udp, port="domain", protocol=udp]
+logpath = /var/log/nsd.log
+
+
 [asterisk]
 
 enabled  = false
@@ -565,9 +724,9 @@ logpath = /var/log/mail.log
 
 
 [selinux-ssh]
-enabled = false
-filter  = selinux-ssh
-action  = iptables[name=SELINUX-SSH, port=ssh, protocol=tcp]
+enabled  = false
+filter   = selinux-ssh
+action   = iptables[name=SELINUX-SSH, port=ssh, protocol=tcp]
 logpath  = /var/log/audit/audit.log
 maxretry = 5
 

From c70091015559917e1c5c3a2879a891433711b70e Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Sun, 5 Jan 2014 21:06:30 +1100
Subject: [PATCH 17/24] TST: ensure stock jail has all filters

---
 client/jailreader.py              |  4 ++++
 client/jailsreader.py             |  3 +++
 testcases/clientreadertestcase.py | 17 ++++++++++++++++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/client/jailreader.py b/client/jailreader.py
index fb92d806..0750d25e 100644
--- a/client/jailreader.py
+++ b/client/jailreader.py
@@ -43,7 +43,11 @@ class JailReader(ConfigReader):
 		self.__filter = None
 		self.__force_enable = force_enable
 		self.__actions = list()
+		self.__opts = None
 	
+	def getRawOptions(self):
+		return self.__opts
+
 	def setName(self, value):
 		self.__name = value
 	
diff --git a/client/jailsreader.py b/client/jailsreader.py
index d32e6561..9c7c3dee 100644
--- a/client/jailsreader.py
+++ b/client/jailsreader.py
@@ -45,6 +45,9 @@ class JailsReader(ConfigReader):
 		self.__jails = list()
 		self.__force_enable = force_enable
 
+	def getJails(self):
+		return self.__jails
+
 	def read(self):
 		return ConfigReader.read(self, "jail")
 
diff --git a/testcases/clientreadertestcase.py b/testcases/clientreadertestcase.py
index 28387703..97f22dd4 100644
--- a/testcases/clientreadertestcase.py
+++ b/testcases/clientreadertestcase.py
@@ -21,7 +21,7 @@ __author__ = "Cyril Jaquier, Yaroslav Halchenko"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier, 2011-2013 Yaroslav Halchenko"
 __license__ = "GPL"
 
-import os, tempfile, shutil, unittest
+import os, glob, tempfile, shutil, unittest
 
 from client.configreader import ConfigReader
 from client.jailreader import JailReader
@@ -251,6 +251,7 @@ class JailsReaderTest(LogCaptureTestCase):
 		comm_commands = jails.convert()
 		# by default None of the jails is enabled and we get no
 		# commands to communicate to the server
+		self.maxDiff = None
 		self.assertEqual(comm_commands, [])
 
 		# We should not "read" some bogus jail
@@ -260,6 +261,20 @@ class JailsReaderTest(LogCaptureTestCase):
 		# and there should be no side-effects
 		self.assertEqual(jails.convert(), old_comm_commands)
 
+	def testReadSockJailConfComplete(self):
+		jails = JailsReader(basedir='config', force_enable=True)
+		self.assertTrue(jails.read())		  # opens fine
+		self.assertTrue(jails.getOptions())	  # reads fine
+		# grab all filter names
+		filters = set(os.path.splitext(os.path.split(a)[1])[0]
+			for a in glob.glob(os.path.join('config', 'filter.d', '*.conf'))
+				if not a.endswith('common.conf'))
+		filters_jail = set(jail.getRawOptions()['filter'] for jail in jails.getJails())
+		self.maxDiff = None
+		self.assertTrue(filters.issubset(filters_jail),
+			"More filters exists than are referenced in stock jail.conf %r" % filters.difference(filters_jail))
+		self.assertTrue(filters_jail.issubset(filters),
+			"Stock jail.conf references non-existent filters %r" % filters_jail.difference(filters))
 
 	def testReadStockJailConfForceEnabled(self):
 		# more of a smoke test to make sure that no obvious surprises

From a8e04983896d20a11edbb812a7e0c7b3f12c28b9 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Sun, 5 Jan 2014 21:26:26 +1100
Subject: [PATCH 18/24] BF: add expression for ssh filter for code 3:
 SSH2_DISCONNECT_KEY_EXCHANGE_FAILED. closes gh-289

---
 ChangeLog                 | 2 ++
 config/filter.d/sshd.conf | 1 +
 testcases/files/logs/sshd | 4 ++++
 3 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index b412c0f3..9ca3382b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,8 @@ ver. 0.8.12 (2013/12/XX) - things-can-only-get-better
   - exim-spam filter to match spamassassin log entry for option SAdevnull.
     Thanks Ivo Truxa. Closes gh-533
   - Added filter.d/openwebmail filter thanks Ivo Truxa. Closes gh-543
+  - Added to sshd filter expression for "Received disconnect from <HOST>: 3:
+    ...: Auth fail". Thanks Marcel Dopita. Closes gh-289
 
 - New Features:
 
diff --git a/config/filter.d/sshd.conf b/config/filter.d/sshd.conf
index a36b050c..9d289e87 100644
--- a/config/filter.d/sshd.conf
+++ b/config/filter.d/sshd.conf
@@ -21,6 +21,7 @@ failregex = ^%(__prefix_line)s(?:error: PAM: )?[aA]uthentication (?:failure|erro
             ^%(__prefix_line)sUser .+ from <HOST> not allowed because listed in DenyUsers\s*$
             ^%(__prefix_line)sUser .+ from <HOST> not allowed because not in any group\s*$
             ^%(__prefix_line)srefused connect from \S+ \(<HOST>\)\s*$
+            ^%(__prefix_line)sReceived disconnect from <HOST>: 3: \S+: Auth fail$
             ^%(__prefix_line)sUser .+ from <HOST> not allowed because a group is listed in DenyGroups\s*$
             ^%(__prefix_line)sUser .+ from <HOST> not allowed because none of user's groups are listed in AllowGroups\s*$
 
diff --git a/testcases/files/logs/sshd b/testcases/files/logs/sshd
index 3c50dcfd..639c0cba 100644
--- a/testcases/files/logs/sshd
+++ b/testcases/files/logs/sshd
@@ -103,3 +103,7 @@ Sep 29 17:15:02 spaceman sshd[12946]: Failed password for user from 127.0.0.1 po
 
 # failJSON: { "time": "2004-11-11T08:04:51", "match": true , "host": "127.0.0.1", "desc": "Injecting on username ssh 'from 10.10.1.1'@localhost" }
 Nov 11 08:04:51 redbamboo sshd[2737]: Failed password for invalid user from 10.10.1.1 from 127.0.0.1 port 58946 ssh2
+
+# failJSON: { "time": "2005-07-13T18:44:28", "match": true , "host": "89.24.13.192", "desc": "from gh-289" }
+Jul 13 18:44:28 mdop sshd[4931]: Received disconnect from 89.24.13.192: 3: com.jcraft.jsch.JSchException: Auth fail
+

From 5428f5bbc3bf9bf347244376cd289ba5dd5551d1 Mon Sep 17 00:00:00 2001
From: alasdairdc <alasdair@softhome.net>
Date: Mon, 6 Jan 2014 10:43:32 +0000
Subject: [PATCH 19/24] Update check_fail2ban

Removed unnecessary reference to as yet undeclared $jail_name when checking a specific jail.
---
 files/nagios/check_fail2ban | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/nagios/check_fail2ban b/files/nagios/check_fail2ban
index 9bf14305..90c58713 100755
--- a/files/nagios/check_fail2ban
+++ b/files/nagios/check_fail2ban
@@ -190,7 +190,7 @@ if ($jail_specific) {
     else {
         $how_many_banned = int($current_ban_number);
         $return_print = $how_many_banned.' current banned IP(s) for the specific jail '.$jail_specific;
-        $perf_print .= "$jail_name.currentBannedIP=$current_ban_number " if ($perfdata_value);
+        $perf_print .= "$current_ban_number " if ($perfdata_value);
     }
 }
 ### To analyze all the jail

From 67c44a500199b10d7dd5cddc792ea486adb7730d Mon Sep 17 00:00:00 2001
From: alasdairdc <alasdair@softhome.net>
Date: Mon, 6 Jan 2014 10:44:21 +0000
Subject: [PATCH 20/24] Update ChangeLog

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 77fd6a03..ffe27d73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,7 @@ ver. 0.8.12 (2013/12/XX) - things-can-only-get-better
   - complain action - ensure where not matching other IPs in log sample.
     Closes gh-467
   - Fix firewall-cmd actioncheck - patch from Adam Tkac. Redhat Bug #979622
+  - Removed unnecessary reference to as yet undeclared $jail_name when checking a specific jail.
 
 - Enhancements:
   - long names on jails documented based on iptables limit of 30 less

From 50eab4df815e3ccb8b7d98040dfc52980be6b59b Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Mon, 6 Jan 2014 21:56:22 +1100
Subject: [PATCH 21/24] ENH: add filter groupoffice. Closes gh-566

---
 MANIFEST                         |  2 ++
 config/filter.d/groupoffice.conf | 14 ++++++++++++++
 testcases/files/logs/groupoffice |  4 ++++
 3 files changed, 20 insertions(+)
 create mode 100644 config/filter.d/groupoffice.conf
 create mode 100644 testcases/files/logs/groupoffice

diff --git a/MANIFEST b/MANIFEST
index a8195b54..98a98532 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -59,6 +59,7 @@ testcases/files/logs/assp
 testcases/files/logs/asterisk
 testcases/files/logs/dovecot
 testcases/files/logs/exim
+testcases/files/logs/groupoffice
 testcases/files/logs/suhosin
 testcases/files/logs/mysqld-auth
 testcases/files/logs/named-refused
@@ -181,6 +182,7 @@ config/filter.d/3proxy.conf
 config/filter.d/apache-common.conf
 config/filter.d/exim-common.conf
 config/filter.d/exim-spam.conf
+config/filter.d/groupoffice.conf
 config/filter.d/perdition.conf
 config/filter.d/uwimap-auth.conf
 config/action.d/apf.conf
diff --git a/config/filter.d/groupoffice.conf b/config/filter.d/groupoffice.conf
new file mode 100644
index 00000000..d5a4e4d8
--- /dev/null
+++ b/config/filter.d/groupoffice.conf
@@ -0,0 +1,14 @@
+# Fail2Ban filter for Group-Office
+#
+# Enable logging with:
+# $config['info_log']='/home/groupoffice/log/info.log';
+#
+
+[Definition]
+
+failregex = ^\[\]LOGIN FAILED for user: "\S+" from IP: <HOST>$
+
+
+
+# Author: Daniel Black
+
diff --git a/testcases/files/logs/groupoffice b/testcases/files/logs/groupoffice
new file mode 100644
index 00000000..7809f018
--- /dev/null
+++ b/testcases/files/logs/groupoffice
@@ -0,0 +1,4 @@
+# failJSON: { "time": "2014-01-06T10:59:38", "match": true, "host": "127.0.0.1" }
+[2014-01-06 10:59:38]LOGIN FAILED for user: "asdsad" from IP: 127.0.0.1
+# failJSON: { "time": "2014-01-06T10:59:49", "match": false, "host": "127.0.0.1" }
+[2014-01-06 10:59:49]LOGIN SUCCESS for user: "admin" from IP: 127.0.0.1

From db7b7bfefacdbc03fdeb3cc4e0de16f8438eda14 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Mon, 6 Jan 2014 22:00:12 +1100
Subject: [PATCH 22/24] Credits for groupoffice

---
 ChangeLog | 2 ++
 THANKS    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 9ca3382b..1e5ab543 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,8 @@ ver. 0.8.12 (2013/12/XX) - things-can-only-get-better
   - exim-spam filter to match spamassassin log entry for option SAdevnull.
     Thanks Ivo Truxa. Closes gh-533
   - Added filter.d/openwebmail filter thanks Ivo Truxa. Closes gh-543
+  - Added filter.d/groupoffice filter thanks to logs from Merijn Schering.
+    Closes gh-566
   - Added to sshd filter expression for "Received disconnect from <HOST>: 3:
     ...: Auth fail". Thanks Marcel Dopita. Closes gh-289
 
diff --git a/THANKS b/THANKS
index 04aa1f20..efbcbe75 100644
--- a/THANKS
+++ b/THANKS
@@ -61,6 +61,7 @@ Markus Hoffmann
 Marvin Rouge
 mEDI
 Мернов Георгий
+Merijn Schering
 Michael C. Haller
 Michael Hanselmann
 Nick Munger

From 90fdf5fc215e14c5ac98699e5b6e2b1c5ba5d24f Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Tue, 7 Jan 2014 06:55:38 +1100
Subject: [PATCH 23/24] ENH: jail.conf entry for groupoffice

---
 config/jail.conf | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/config/jail.conf b/config/jail.conf
index 1d58edbe..6f9622c8 100644
--- a/config/jail.conf
+++ b/config/jail.conf
@@ -285,6 +285,14 @@ action   = iptables-multiport[name=SOGo, port="http,https"]
 logpath  = /var/log/sogo/sogo.log
 
 
+[groupoffice]
+
+enabled  = false
+filter   = groupoffice
+action   = iptables-multiport[name=groupoffice, port="http,https"]
+logpath  = /home/groupoffice/log/info.log 
+
+
 [openwebmail]
 
 enabled  = false

From 0b6c9b52d264c678ebd55aebbcca9e0513b6563a Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Tue, 7 Jan 2014 08:29:06 +1100
Subject: [PATCH 24/24] DOC: man page description shorting and clarification

---
 man/jail.conf.5 | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/man/jail.conf.5 b/man/jail.conf.5
index 79324258..4f1ae6b5 100644
--- a/man/jail.conf.5
+++ b/man/jail.conf.5
@@ -32,7 +32,12 @@ enabled = true
 Override only the settings you need to change and the rest of the configuration will come from the corresponding
 *.conf file.
 
-\fI*.d/\fR
+\fIfilter.d/\fR and \fIaction.d/\fR
+These directories contains \fI*.conf\fR and \fI*.local\fR files that contain filter and action configurations.
+\fI.local\fR files are read first and only need to set the directives that are different from the \fI.conf\fR file.
+Directives not overwritten are read from the \fI.conf\fR file.
+.RS
+\fIjail.d/\fR and \fIfail2ban.d/\fR
 .RS
 In addition to .local, for any jail.conf or fail2ban.conf file there can be a corresponding
 \fI.d/\fR directory to contain additional .conf files that will be read after the
@@ -88,13 +93,13 @@ Set the PID file. This is used to store the process ID of the fail2ban server.
 The following options are applicable to all jails. They appear in a section specifing the jail name or in the \fI[DEFAULT]\fR section which is used if individual sections don't have a value specified.
 .TP
 \fBfilter\fR 
-This maps to the filename of the filter in /etc/fail2ban/filter.d/ without the .conf/.local extension. Only one filter can be specified.
+The filename of the filter in /etc/fail2ban/filter.d/ without the .conf/.local extension. Only one filter can be specified.
 .TP
 \fBlogpath\fR 
 This is the log filename(s). Globs, like paths containing * and ? or [0-9], can be used however only the files that exist at startup matching this glob pattern will be read.
 .TP
 \fBaction\fR 
-This maps to the action(s) from \fI/etc/fail2ban/action.d/\fR without the \fI.conf\fR/\fI.local\fR extension. Arguements can be passed to actions to override the default values from the [Init] section. Arguements are specified by [name=value,name2=value]. Values can also be quoted. More that one action can be specified.
+action(s) from \fI/etc/fail2ban/action.d/\fR without the \fI.conf\fR/\fI.local\fR extension. Arguements can be passed to actions to override the default values from the [Init] section. Arguements are specified by [name=value,name2=value]. Values can also be quoted. More that one action can be specified.
 .TP
 \fBignoreip\fR 
 A list of IPs not to ban. These can include a CIDR mask too.
@@ -104,13 +109,13 @@ A command that is executed to determine if the current ban's actionban is to be
 Like ACTION FILES, tags like <ip> are can be included in the ignore command value and will be substitued before execution. Currently only <ip> is supported however more will be added later.
 .TP
 \fBbantime\fR
-When a ban occurs the ban stays in effect for this long (measured in seconds) after which the actionunban command in the action(s) are called.
+effective ban duration (measured in seconds).
 .TP
 \fBfindtime\fR
-Specifies the time interval in seconds before the current time where failures will count towards a ban.
+time interval (in seconds) before the current time where failures will count towards a ban.
 .TP
 \fBmaxretry\fR
-This is the number of failures that can occur in the last findtime seconds before a ban of that IP will result.
+number of failures that can occur in the last \fBfindtime\fR seconds before a ban of that IP will result.
 .TP
 \fBbackend\fR
 This is the backend used to detect changes in the logpath. It defaults to "auto" which will try "pyinotify", "gamin" before "polling". Any of these can be specified. "pyinotify" is only valid on Linux systems with the "pyinotify" Python libraries. "gamin" requires the "gamin" libraries.