disabling entirely named-refused-udp jail with a big fat warning

git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@762 a942ae1a-1317-0410-a47c-b1dcaea8d605
ENH: adding gen_badbots script to generate apache-badbots.conf
2010-06-29 01:38:05 +00:00 · 2010-06-22 14:33:05 +00:00 · 2010-05-01 13:26:02 +00:00 · 2009-08-28 22:26:17 +00:00 · 2009-08-28 16:05:17 +00:00 · 2008-05-21 22:17:00 +00:00
116 changed files with 2592 additions and 2323 deletions
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>fail2ban-head</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?>
+
+<pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.3</pydev_property>
+<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+<path>/fail2ban-head/client</path>
+<path>/fail2ban-head/server</path>
+<path>/fail2ban-head/testcases</path>
+<path>/fail2ban-head</path>
+</pydev_pathproperty>
+</pydev_project>
@@ -0,0 +1,3 @@
+#Wed Sep 20 22:14:25 GMT 2006
+eclipse.preferences.version=1
+encoding//server/datestrptime.py=UTF-8
@@ -1,149 +1,98 @@
-                         __      _ _ ___ _               
-                        / _|__ _(_) |_  ) |__  __ _ _ _  
-                       |  _/ _` | | |/ /| '_ \/ _` | ' \ 
-                       |_| \__,_|_|_/___|_.__/\__,_|_||_|
+               __      _ _ ___ _               
+              / _|__ _(_) |_  ) |__  __ _ _ _  
+             |  _/ _` | | |/ /| '_ \/ _` | ' \ 
+             |_| \__,_|_|_/___|_.__/\__,_|_||_|

-================================================================================
-Fail2Ban (version 0.8.5)                                              2011/07/28
-================================================================================
+=============================================================
+Fail2Ban (version 0.9.0)                           2009/??/??
+=============================================================

-ver. 0.8.5 (2011/07/28) - stable
+ver. 0.9.0 (2009/??/??) - alpha
 ----------
- Fix: use addfailregex instead of failregex while processing per-jail
-  "failregex" parameter (Fixed Debian bug #635830, LP: #635036). Thanks to
-  Marat Khayrullin for the patch and Daniel T Chen for forwarding to
-  Debian.
- Fix: use os.path.join to generate full path - fixes includes in configs
-  given local filename (5 weeks ago) [yarikoptic]
- Fix: allowed for trailing spaces in proftpd logs
- Fix: escaped () in pure-ftpd filter. Thanks to Teodor
- Fix: allowed space in the trailing of failregex for sasl.conf:
-  see http://bugs.debian.org/573314
- Fix: use /var/run/fail2ban instead of /tmp for temp files in actions:
-  see http://bugs.debian.org/544232
- Fix: Tai64N stores time in GMT, needed to convert to local time before
-  returning
- Fix: disabled named-refused-udp jail entirely with a big fat warning
- Fix: added time module. Bug reported in buanzo's blog:
-  see http://blogs.buanzo.com.ar/2009/04/fail2ban-patch-ban-ip-address-manually.html
- Fix: Patch to make log file descriptors cloexec to stop leaking file
-  descriptors on fork/exec. Thanks to Jonathan Underwood:
-  see https://bugzilla.redhat.com/show_bug.cgi?id=230191#c24
- Enhancement: added author for dovecot filter and pruned unneeded space
-  in the regexp
- Enhancement: proftpd filter -- if login failed -- count regardless of the
-  reason for failure
- Enhancement: added <chain> to action.d/iptables*. Thanks to Matthijs Kooijman:
-  see http://bugs.debian.org/515599
- Enhancement: added filter.d/dovecot.conf from Martin Waschbuesch
- Enhancement: made filter.d/apache-overflows.conf catch more:
-  see http://bugs.debian.org/574182
- Enhancement: added dropbear filter from Francis Russell and Zak B. Elep:
-  see http://bugs.debian.org/546913
- Enhancement: changed default ignoreip to ignore entire loopback zone (/8):
-  see http://bugs.debian.org/598200
- Minor: spell-checked jail.conf. Thanks to Christoph Anton Mitterer
- Few minor cosmetic changes
+- Added new prefix remover.
+- Added ISO 8601 date/time format.
+- Removed deprecated mail*.conf actions.

-ver. 0.8.4 (2009/09/07) - stable
+ver. 0.8.4 (2009/??/??) - beta
 ----------
- Check the inode number for rotation in addition to checking the first line of
-  the file. Thanks to Jonathan Kamens. Red Hat #503852. Tracker #2800279.
- Moved the shutdown of the logging subsystem out of Server.quit() to
-  the end of Server.start(). Fixes the 'cannot release un-acquired lock'
-  error.
- Added "Ban IP" command. Thanks to Arturo 'Buanzo' Busleiman.
- Added two new filters: lighttpd-fastcgi and php-url-fopen.
- Fixed the 'unexpected communication error' problem by means of
-  use_poll=False in Python >= 2.6.
- Merged patches from Debian package. Thanks to Yaroslav Halchenko.
- Use current day and month instead of Jan 1st if both are not available in the
-  log. Thanks to Andreas Itzchak Rehberg.
- Try to match the regex even if the line does not contain a valid date/time.
-  Described in Debian #491253. Thanks to Yaroslav Halchenko.
- Added/improved filters and date formats.
- Added actions to report abuse to ISP, DShield and myNetWatchman. Thanks to
-  Russell Odom.
- Suse init script. Remove socket file on startup is fail2ban crashed. Thanks to
-  Detlef Reichelt.
- Removed begin-line anchor for "standard" timestamp. Fixed Debian bug #500824.
- Added nagios script. Thanks to Sebastian Mueller.
- Added CPanel date format. Thanks to David Collins. Tracker #1967610.
- Improved SASL filter. Thanks to Loic Pefferkorn. Tracker #2310410.
- Added NetBSD ipfilter (ipf command) action. Thanks to Ed Ravin. Tracker
-  #2484115.
- Added cyrus-imap and sieve filters. Thanks to Jan Wagner. Debian bug #513953.
- Changed <HOST> template to be more restrictive. Debian bug #514163.
- Use timetuple instead of utctimetuple for ISO 8601. Maybe not a 100% correct
-  fix but seems to work. Tracker #2500276.
- Made the named-refused regex a bit less restrictive in order to match logs
-  with "view". Thanks to Stephen Gildea.
- Fixed maxretry/findtime rate. Many thanks to Christos Psonis. Tracker
-  #2019714.
+- Added "banip" command to fail2ban-client. Manually ban a given IP for a given jail.
+- Added jails lighttpd-fastci and php-url-fopen

-ver. 0.8.3 (2008/07/17) - stable
+ver. 0.8.3 (2008/07/18) - stable
 ----------
 - Process failtickets as long as failmanager is not empty.
- Added "pam-generic" filter and more configuration fixes. Thanks to Yaroslav
-  Halchenko.
- Fixed socket path in redhat and suse init script. Thanks to Jim Wight.
- Fixed PID file while started in daemon mode. Thanks to Christian Jobic who
-  submitted a similar patch.
+- Added "pam-generic" filter and more configuration fixes.
+  Thanks to Yaroslav Halchenko.
+- Fixed socket path in redhat and suse init script. Thanks to
+  Jim Wight.
+- Fixed PID file while started in daemon mode. Thanks to
+  Christian Jobic who submitted a similar patch.
 - Fixed "fail2ban-client get <jail> logpath". Bug #1916986.
+- Changed some log levels.
 - Added gssftpd filter. Thanks to Kevin Zembower.
- Added "Day/Month/Year Hour:Minute:Second" date template. Thanks to Dennis
-  Winter.
- Fixed ignoreregex processing in fail2ban-client. Thanks to René Berber.
- Added ISO 8601 date/time format.
- Added and changed some logging level and messages.
- Added missing ignoreregex to filters. Thanks to Klaus Lehmann.
- Use poll instead of select in asyncore.loop. This should solve the "Unknown
-  error 514". Thanks to Michael Geiger and Klaus Lehmann.
+- Added "Day/Month/Year Hour:Minute:Second" date template.
+  Thanks to Dennis Winter.

 ver. 0.8.2 (2008/03/06) - stable
 ----------
 - Fixed named filter. Thanks to Yaroslav Halchenko
- Fixed wrong path for apache-auth in jail.conf. Thanks to Vincent Deffontaines
- Fixed timezone bug with epoch date template. Thanks to Michael Hanselmann
- Added "full line failregex" patch. Thanks to Yaroslav Halchenko. It will be
-  possible to create stronger failregex against log injection
+- Fixed wrong path for apache-auth in jail.conf. Thanks to
+  Vincent Deffontaines
+- Fixed timezone bug with epoch date template. Thanks to
+  Michael Hanselmann
+- Added "full line failregex" patch. Thanks to Yaroslav
+  Halchenko. It will be possible to create stronger failregex
+  against log injection
 - Fixed ipfw action script. Thanks to Nick Munger
- Removed date from logging message when using SYSLOG. Thanks to Iain Lea
- Fixed "ignore IPs". Only the first value was taken into account. Thanks to
-  Adrien Clerc
+- Removed date from logging message when using SYSLOG. Thanks
+  to Iain Lea
+- Fixed "ignore IPs". Only the first value was taken into
+  account. Thanks to Adrien Clerc
 - Moved socket to /var/run/fail2ban.
 - Rewrote the communication server.
 - Refactoring. Reduced number of files.
- Removed Python 2.4. Minimum required version is now Python 2.3.
+- Removed Python 2.4. Minimum required version is now Python
+  2.3.
 - New log rotation detection algorithm.
 - Print monitored files in status.
- Create a PID file in /var/run/fail2ban/. Thanks to Julien Perez.
- Fixed "Feb 29" bug. Thanks to James Andrewartha who pointed this out. Thanks
-  to Yaroslav Halchenko for the fix.
- "reload <jail>" reloads a single jail and the parameters in fail2ban.conf.
+- Create a PID file in /var/run/fail2ban/. Thanks to Julien
+  Perez.
+- Fixed "Feb 29" bug. Thanks to James Andrewartha who pointed
+  this out. Thanks to Yaroslav Halchenko for the fix.
+- "reload <jail>" reloads a single jail and the parameters in
+  fail2ban.conf.
 - Added Mac OS/X startup script. Thanks to Bill Heaton.
 - Absorbed some Debian patches. Thanks to Yaroslav Halchenko.
 - Replaced "echo" with "printf" in actions. Fix #1839673
- Replaced "reject" with "drop" in shorwall action. Fix #1854875
+- Replaced "reject" with "drop" in shorwall action. Fix
+  #1854875
 - Fixed Debian bug #456567, #468477, #462060, #461426
- readline is now optional in fail2ban-client (not needed in fail2ban-server).
+- readline is now optional in fail2ban-client (not needed in
+  fail2ban-server).

 ver. 0.8.1 (2007/08/14) - stable
 ----------
 - Fixed vulnerability in sshd.conf. Thanks to Daniel B. Cid
 - Expand <HOST> in ignoreregex. Thanks to Yaroslav Halchenko
- Improved regular expressions. Thanks to Yaroslav Halchenko and others
- Added sendmail actions. The action started with "mail" are now deprecated.
-  Thanks to Raphaël Marichez
+- Improved regular expressions. Thanks to Yaroslav Halchenko
+  and others
+- Added sendmail actions. The action started with "mail" are
+  now deprecated. Thanks to Raphaël Marichez
 - Added "ignoreregex" support to fail2ban-regex
- Updated suse-initd and added it to MANIFEST. Thanks to Christian Rauch
- Tightening up the pid check in redhat-initd. Thanks to David Nutter
- Added webmin authentication filter. Thanks to Guillaume Delvit
- Removed textToDns() which is not required anymore. Thanks to Yaroslav
+- Updated suse-initd and added it to MANIFEST. Thanks to
+  Christian Rauch
+- Tightening up the pid check in redhat-initd. Thanks to
+  David Nutter
+- Added webmin authentication filter. Thanks to Guillaume
+  Delvit
+- Removed textToDns() which is not required anymore. Thanks
+  to Yaroslav Halchenko
+- Added new action iptables-allports. Thanks to Yaroslav
+  Halchenko
+- Added "named" date format to date detector. Thanks to
+  Yaroslav Halchenko
+- Added filter file for named (bind9). Thanks to Yaroslav
  Halchenko
- Added new action iptables-allports. Thanks to Yaroslav Halchenko
- Added "named" date format to date detector. Thanks to Yaroslav Halchenko
- Added filter file for named (bind9). Thanks to Yaroslav Halchenko
 - Fixed vsftpd filter. Thanks to Yaroslav Halchenko

 ver. 0.8.0 (2007/05/03) - stable
@@ -163,17 +112,20 @@ ver. 0.7.8 (2007/03/21) - release candidate
 ----------
 - Fixed asctime pattern in datedetector.py
 - Added new filters/actions. Thanks to Yaroslav Halchenko
- Added Suse init script and modified gentoo-initd. Thanks to Christian Rauch
+- Added Suse init script and modified gentoo-initd. Thanks to
+  Christian Rauch
 - Moved every locking statements in a try..finally block

 ver. 0.7.7 (2007/02/08) - release candidate
 ----------
 - Added signal handling in fail2ban-client
 - Added a wonderful visual effect when waiting on the server
- fail2ban-client returns an error code if configuration is not valid
+- fail2ban-client returns an error code if configuration is
+  not valid
 - Added new filters/actions. Thanks to Yaroslav Halchenko
 - Call Python interpreter directly (instead of using "env")
- Added file support to fail2ban-regex. Benchmark feature has been removed
+- Added file support to fail2ban-regex. Benchmark feature has
+  been removed
 - Added cacti script and template.
 - Added IP list in "status <JAIL>". Thanks to Eric Gerbier

@@ -183,53 +135,60 @@ ver. 0.7.6 (2007/01/04) - beta
 - Use /dev/log for SYSLOG output. Thanks to Joerg Sommrey
 - Use numeric output for iptables in "actioncheck"
 - Fixed removal of host in hosts.deny. Thanks to René Berber
- Added new date format (2006-12-21 06:43:20) and Exim4 filter. Thanks to mEDI
- Several "failregex" and "ignoreregex" are now accepted. Creation of rules
-  should be easier now.
+- Added new date format (2006-12-21 06:43:20) and Exim4
+  filter. Thanks to mEDI
+- Several "failregex" and "ignoreregex" are now accepted.
+  Creation of rules should be easier now.
 - Added license in COPYING. Thanks to Axel Thimm
- Allow comma in action options. The value of the option must be escaped with "
-  or '. Thanks to Yaroslav Halchenko
- Now Fail2ban goes in /usr/share/fail2ban instead of /usr/lib/fail2ban. This is
-  more compliant with FHS. Thanks to Axel Thimm and Yaroslav Halchenko
+- Allow comma in action options. The value of the option must
+  be escaped with " or '. Thanks to Yaroslav Halchenko
+- Now Fail2ban goes in /usr/share/fail2ban instead of
+  /usr/lib/fail2ban. This is more compliant with FHS. Thanks
+  to Axel Thimm and Yaroslav Halchenko

 ver. 0.7.5 (2006/12/07) - beta
 ----------
- Do not ban a host that is currently banned. Thanks to Yaroslav Halchenko
- The supported tags in "action(un)ban" are <ip>, <failures> and <time>
+- Do not ban a host that is currently banned. Thanks to
+  Yaroslav Halchenko
+- The supported tags in "action(un)ban" are <ip>, <failures>
+  and <time>
 - Fixed refactoring bug (getLastcommand -> getLastAction)
- Added option "ignoreregex" in filter scripts and jail.conf. Feature Request
-  #1283304
+- Added option "ignoreregex" in filter scripts and jail.conf.
+  Feature Request #1283304
 - Fixed a bug in user defined time regex/pattern
 - Improved documentation
 - Moved version.py and protocol.py to common/
 - Merged "maxtime" option with "findtime"
- Added "<HOST>" tag support in failregex which matches default IP
-  address/hostname. "(?P<host>\S)" is still valid and supported
- Fixed exception when calling fail2ban-server with unknown option
- Fixed Debian bug 400162. The "socket" option is now handled correctly by
-  fail2ban-client
+- Added "<HOST>" tag support in failregex which matches
+  default IP address/hostname. "(?P<host>\S)" is still valid
+  and supported
+- Fixed exception when calling fail2ban-server with unknown
+  option
+- Fixed Debian bug 400162. The "socket" option is now handled
+  correctly by fail2ban-client
 - Fixed RedHat init script. Thanks to Justin Shore
- Changed timeout to 30 secondes before assuming the server cannot be started.
-  Thanks to Joël Bertrand
+- Changed timeout to 30 secondes before assuming the server
+  cannot be started. Thanks to Joël Bertrand

 ver. 0.7.4 (2006/11/01) - beta
 ----------
 - Improved configuration files. Thanks to Yaroslav Halchenko
 - Added man page for "fail2ban-regex"
 - Moved ban/unban messages from "info" level to "warn"
- Added "-s" option to specify the socket path and "socket" option in
-  "fail2ban.conf"
+- Added "-s" option to specify the socket path and "socket"
+  option in "fail2ban.conf"
 - Added "backend" option in "jail.conf"
- Added more filters/actions and jail samples. Thanks to Nick Munger, Christoph
-  Haas
+- Added more filters/actions and jail samples. Thanks to Nick
+  Munger, Christoph Haas
 - Improved testing framework
- Fixed a bug in the return code handling of the executed commands. Thanks to
-  Yaroslav Halchenko
- Signal handling. There is a bug with join() and signal in Python
+- Fixed a bug in the return code handling of the executed
+  commands. Thanks to Yaroslav Halchenko
+- Signal handling. There is a bug with join() and signal in
+  Python
 - Better debugging output for "fail2ban-regex"
 - Added support for more date format
- cPickle does not work with Python 2.5. Use pickle instead (performance is not
-  a problem in our case)
+- cPickle does not work with Python 2.5. Use pickle instead
+  (performance is not a problem in our case)

 ver. 0.7.3 (2006/09/28) - beta
 ----------
@@ -249,13 +208,15 @@ ver. 0.7.2 (2006/09/10) - beta
 - Improved client output
 - Added more get/set commands
 - Added more configuration templates
- Removed "logpath" and "maxretry" from filter templates. They must be defined
-  in jail.conf now
+- Removed "logpath" and "maxretry" from filter templates.
+  They must be defined in jail.conf now
 - Added interactive mode. Use "-i"
- Added a date detector. "timeregex" and "timepattern" are no more needed
- Added "fail2ban-regex". This is a tool to help finding "failregex"
- Improved server communication. Start a new thread for each incoming request.
-  Fail2ban is not really thread-safe yet
+- Added a date detector. "timeregex" and "timepattern" are no
+  more needed
+- Added "fail2ban-regex". This is a tool to help finding
+  "failregex"
+- Improved server communication. Start a new thread for each
+  incoming request. Fail2ban is not really thread-safe yet

 ver. 0.7.1 (2006/08/23) - alpha
 ----------
@@ -266,91 +227,106 @@ ver. 0.7.1 (2006/08/23) - alpha

 ver. 0.7.0 (2006/08/23) - alpha
 ----------
- Almost a complete rewrite :) Fail2ban design is really better (IMHO). There is
-  a lot of new features
+- Almost a complete rewrite :) Fail2ban design is really
+  better (IMHO). There is a lot of new features
 - Client/Server architecture
- Multithreading. Each jail has its own threads: one for the log reading and
-  another for the actions
+- Multithreading. Each jail has its own threads: one for the
+  log reading and another for the actions
 - Execute several actions
- Split configuration files. They are more readable and easy to use
- failregex uses group (<host>) now. This feature was already present in the
-  Debian package
+- Split configuration files. They are more readable and easy
+  to use
+- failregex uses group (<host>) now. This feature was already
+  present in the Debian package
 - lots of things...

 ver. 0.6.1 (2006/03/16) - stable
 ----------
- Added permanent banning. Set banTime to a negative value to enable this
-  feature (-1 is perfect). Thanks to Mannone
+- Added permanent banning. Set banTime to a negative value to
+  enable this feature (-1 is perfect). Thanks to Mannone
 - Fixed locale bug. Thanks to Fernando José
 - Fixed crash when time format does not match data
- Propagated patch from Debian to fix fail2ban search path addition to the path
-  search list: now it is added first. Thanks to Nick Craig-Wood
- Added SMTP authentification for mail notification. Thanks to Markus Hoffmann
+- Propagated patch from Debian to fix fail2ban search path 
+  addition to the path search list: now it is added first. 
+  Thanks to Nick Craig-Wood
+- Added SMTP authentification for mail notification. Thanks
+  to Markus Hoffmann
 - Removed debug mode as it is confusing for people
- Added parsing of timestamp in TAI64N format (#1275325). Thanks to Mark
-  Edgington
- Added patch #1382936 (Default formatted syslog logging). Thanks to Patrick
-  B�rjesson
- Removed 192.168.0.0/16 from ignoreip. Attacks could also come from the local
-  network.
- Robust startup: if iptables module does not get fully initialized after
-  startup of fail2ban, fail2ban will do "maxreinit" attempts to initialize its
-  own firewall. It will sleep between attempts for "polltime" number of seconds
-  (closes Debian: #334272). Thanks to Yaroslav Halchenko
- Added "interpolations" in fail2ban.conf. This is provided by the ConfigParser
-  module. Old configuration files still work. Thanks to Yaroslav Halchenko
- Added initial support for hosts.deny and shorewall. Need more testing. Please
-  test. Thanks to kojiro from Gentoo forum for hosts.deny support
+- Added parsing of timestamp in TAI64N format (#1275325).
+  Thanks to Mark Edgington
+- Added patch #1382936 (Default formatted syslog logging).
+  Thanks to Patrick B�rjesson
+- Removed 192.168.0.0/16 from ignoreip. Attacks could also
+  come from the local network.
+- Robust startup: if iptables module does not get fully
+  initialized after startup of fail2ban, fail2ban will do
+  "maxreinit" attempts to initialize its own firewall. It
+  will sleep between attempts for "polltime" number of
+  seconds (closes Debian: #334272). Thanks to Yaroslav
+  Halchenko
+- Added "interpolations" in fail2ban.conf. This is provided
+  by the ConfigParser module. Old configuration files still
+  work. Thanks to Yaroslav Halchenko
+- Added initial support for hosts.deny and shorewall. Need
+  more testing. Please test. Thanks to kojiro from Gentoo
+  forum for hosts.deny support
 - Added support for vsftpd. Thanks to zugeschmiert

 ver. 0.6.0 (2005/11/20) - stable
 ----------
- Propagated patches introduced by Debian maintainer (Yaroslav Halchenko):
-  * Added an option to report local time (including timezone) or GMT in mail
-    notification.
+- Propagated patches introduced by Debian maintainer 
+  (Yaroslav Halchenko):
+  * Added an option to report local time (including timezone)
+    or GMT in mail notification.

 ver. 0.5.5 (2005/10/26) - beta
 ----------
- Propagated patches introduced by Debian maintainer (Yaroslav Halchenko):
-  * Introduced fwcheck option to verify consistency of the chains. Implemented
-    automatic restart of fail2ban main function in case check of fwban or
-    fwunban command failed (closes: #329163, #331695). (Introduced patch was
-    further adjusted by upstream author).
+- Propagated patches introduced by Debian maintainer 
+  (Yaroslav Halchenko):
+  * Introduced fwcheck option to verify consistency of the
+    chains. Implemented automatic restart of fail2ban main
+    function in case check of fwban or fwunban command failed
+    (closes: #329163, #331695). (Introduced patch was further
+    adjusted by upstream author).
  * Added -f command line parameter for [findtime].
-  * Added a cleanup of firewall rules on emergency shutdown when unknown
-    exception is catched.
-  * Fail2ban should not crash now if a wrong file name is specified in config.
-  * reordered code a bit so that log targets are setup right after background
-    and then only loglevel (verbose, debug) is processed, so the warning could
-    be seen in the logs
-  * Added a keyword <section> in parsing of the subject and the body of an email
-    sent out by fail2ban (closes: #330311)
+  * Added a cleanup of firewall rules on emergency shutdown
+    when unknown exception is catched.
+  * Fail2ban should not crash now if a wrong file name is
+    specified in config.
+  * reordered code a bit so that log targets are setup right
+    after background and then only loglevel (verbose, debug)
+    is processed, so the warning could be seen in the logs
+  * Added a keyword <section> in parsing of the subject and
+    the body of an email sent out by fail2ban (closes:
+    #330311)

 ver. 0.5.4 (2005/09/13) - beta
 ----------
 - Fixed bug #1286222.
- Propagated patches introduced by Debian maintainer (Yaroslav Halchenko):
-  * Fixed handling of SYSLOG logging target. Now it can log to any SYSLOG target
-    and facility as directed by the config
+- Propagated patches introduced by Debian maintainer 
+  (Yaroslav Halchenko):
+  * Fixed handling of SYSLOG logging target. Now it can log
+    to any SYSLOG target and facility as directed by the 
+    config
  * Format of SYSLOG entries fixed to look closer to standard
  * Fixed errata in config/gentoo-confd
-  * Introduced findtime configuration variable to control the lifetime of caught
-    "failed" log entries
+  * Introduced findtime configuration variable to control the
+    lifetime of caught "failed" log entries
 	
 ver. 0.5.3 (2005/09/08) - beta
 ----------
- Fixed a bug when overriding "maxfailures" or "bantime". Thanks to Yaroslav
-  Halchenko
- Added more debug output if an error occurs when sending mail. Thanks to
-  Stephen Gildea
- Renamed "maxretry" to "maxfailures" and changed default value to 5. Thanks to
-  Stephen Gildea
+- Fixed a bug when overriding "maxfailures" or "bantime".
+  Thanks to Yaroslav Halchenko
+- Added more debug output if an error occurs when sending
+  mail. Thanks to Stephen Gildea
+- Renamed "maxretry" to "maxfailures" and changed default
+  value to 5. Thanks to Stephen Gildea
 - Hopefully fixed bug #1256075
 - Fixed bug #1262345
 - Fixed exception handling in PIDLock
- Removed warning when using "-V" or "-h" with no config file. Thanks to
-  Yaroslav Halchenko
- Removed "-i eth0" from config file. Thanks to Yaroslav Halchenko
+- Removed warning when using "-V" or "-h" with no config
+  file. Thanks to Yaroslav Halchenko
+- Removed "-i eth0" from config file. Thanks to Yaroslav
+  Halchenko

 ver. 0.5.2 (2005/08/06) - beta
 ----------
@@ -366,9 +342,11 @@ ver. 0.5.1 (2005/07/23) - beta
 ----------
 - Fixed bugs #1241756, #1239557
 - Added log targets in configuration file. Removed -l option
- Changed iptables rules in order to create a separated chain for each section
+- Changed iptables rules in order to create a separated chain
+  for each section
 - Fixed static banList in firewall.py
- Added an initd script for Debian. Thanks to Yaroslav Halchenko
+- Added an initd script for Debian. Thanks to Yaroslav
+  Halchenko
 - Check for obsolete files after install

 ver. 0.5.0 (2005/07/12) - beta
@@ -376,22 +354,24 @@ ver. 0.5.0 (2005/07/12) - beta
 - Added support for CIDR mask in ignoreip
 - Added mail notification support
 - Fixed bug #1234699
- Added tags replacement in rules definition. Should allow a clean solution for
-  Feature Request #1229479
+- Added tags replacement in rules definition. Should allow a
+  clean solution for Feature Request #1229479
 - Removed "interface" and "firewall" options
- Added start and end commands in the configuration file. Thanks to Yaroslav
-  Halchenko
+- Added start and end commands in the configuration file.
+  Thanks to Yaroslav Halchenko
 - Added firewall rules definition in the configuration file
 - Cleaned fail2ban.py
- Added an initd script for RedHat/Fedora. Thanks to Andrey G. Grozin
+- Added an initd script for RedHat/Fedora. Thanks to Andrey
+  G. Grozin

 ver. 0.4.1 (2005/06/30) - stable
 ----------
- Fixed textToDNS method which generated wrong matches for "rhost=12-xyz...".
-  Thanks to Tom Pike
+- Fixed textToDNS method which generated wrong matches for
+  "rhost=12-xyz...". Thanks to Tom Pike
 - fail2ban.conf modified for readability. Thanks to Iain Lea
 - Added an initd script for Gentoo
- Changed default PID lock file location from /tmp to /var/run
+- Changed default PID lock file location from /tmp to
+  /var/run

 ver. 0.4.0 (2005/04/24) - stable
 ----------
@@ -407,8 +387,8 @@ ver. 0.3.1 (2005/03/31) - beta

 ver. 0.3.0 (2005/02/24) - beta
 ----------
- Re-writting of parts of the code in order to handle several log files with
-  different rules
+- Re-writting of parts of the code in order to handle several
+  log files with different rules
 - Removed sshd.py because it is no more needed
 - Fixed a bug when exiting with IP in the ban list
 - Added PID lock file
@@ -418,22 +398,26 @@ ver. 0.3.0 (2005/02/24) - beta

 ver. 0.1.2 (2004/11/21) - beta
 ----------
- Add ipfw and ipfwadm support. The rules are taken from BlockIt. Thanks to
-  Robert Edeker
- Add -e option which allows to set the interface. Thanks to Robert Edeker who
-  reminded me this
+- Add ipfw and ipfwadm support. The rules are taken from
+  BlockIt. Thanks to Robert Edeker
+- Add -e option which allows to set the interface. Thanks to
+  Robert Edeker who reminded me this
 - Small code cleaning

 ver. 0.1.1 (2004/10/23) - beta
 ----------
- Add SIGTERM handler in order to exit nicely when in daemon mode
- Add -r option which allows to set the maximum number of login failures
- Remove the Metalog class as the log file are not so syslog daemon specific
- Rewrite log reader to be service centered. Sshd support added. Match "Failed
-  password" and "Illegal user"
+- Add SIGTERM handler in order to exit nicely when in daemon
+  mode
+- Add -r option which allows to set the maximum number of
+  login failures
+- Remove the Metalog class as the log file are not so syslog
+  daemon specific
+- Rewrite log reader to be service centered. Sshd support
+  added. Match "Failed password" and "Illegal user"
 - Add /etc/fail2ban.conf configuration support
 - Code documentation

+
 ver. 0.1.0 (2004/10/12) - alpha
 ----------
 - Initial release
@@ -0,0 +1,111 @@
+README
+ChangeLog
+TODO
+COPYING
+fail2ban-client
+fail2ban-server
+fail2ban-testcases
+fail2ban-regex
+client/configreader.py
+client/configparserinc.py
+client/jailreader.py
+client/fail2banreader.py
+client/jailsreader.py
+client/beautifier.py
+client/filterreader.py
+client/actionreader.py
+client/__init__.py
+client/configurator.py
+client/csocket.py
+server/asyncserver.py
+server/filter.py
+server/filtergamin.py
+server/filterpoll.py
+server/server.py
+server/iso8601.py
+server/actions.py
+server/faildata.py
+server/failmanager.py
+server/jailthread.py
+server/transmitter.py
+server/template.py
+server/hosttemplate.py
+server/action.py
+server/ticket.py
+server/jail.py
+server/jails.py
+server/__init__.py
+server/banmanager.py
+server/timetemplate.py
+server/prefixtemplate.py
+server/mytime.py
+server/failregex.py
+testcases/banmanagertestcase.py
+testcases/failmanagertestcase.py
+testcases/clientreadertestcase.py
+testcases/filtertestcase.py
+testcases/__init__.py
+testcases/actiontestcase.py
+testcases/servertestcase.py
+testcases/files/testcase01.log
+testcases/files/testcase02.log
+testcases/files/testcase03.log
+testcases/files/testcase04.log
+setup.py
+setup.cfg
+common/__init__.py
+common/version.py
+common/protocol.py
+config/jail.conf
+config/filter.d/common.conf
+config/filter.d/apache-auth.conf
+config/filter.d/apache-badbots.conf
+config/filter.d/apache-noscript.conf
+config/filter.d/apache-overflows.conf
+config/filter.d/courierlogin.conf
+config/filter.d/couriersmtp.conf
+config/filter.d/exim.conf
+config/filter.d/gssftpd.conf
+config/filter.d/named-refused.conf
+config/filter.d/postfix.conf
+config/filter.d/proftpd.conf
+config/filter.d/pure-ftpd.conf
+config/filter.d/qmail.conf
+config/filter.d/pam-generic.conf
+config/filter.d/sasl.conf
+config/filter.d/sshd.conf
+config/filter.d/sshd-ddos.conf
+config/filter.d/vsftpd.conf
+config/filter.d/webmin-auth.conf
+config/filter.d/wuftpd.conf
+config/filter.d/xinetd-fail.conf
+config/action.d/hostsdeny.conf
+config/action.d/ipfw.conf
+config/action.d/iptables.conf
+config/action.d/iptables-allports.conf
+config/action.d/iptables-multiport.conf
+config/action.d/iptables-multiport-log.conf
+config/action.d/iptables-new.conf
+config/action.d/sendmail.conf
+config/action.d/sendmail-buffered.conf
+config/action.d/sendmail-whois.conf
+config/action.d/sendmail-whois-lines.conf
+config/action.d/shorewall.conf
+config/fail2ban.conf
+man/fail2ban-client.1
+man/fail2ban-client.h2m
+man/fail2ban-server.1
+man/fail2ban-server.h2m
+man/fail2ban-regex.1
+man/fail2ban-regex.h2m
+man/generate-man
+files/gentoo-initd
+files/gentoo-confd
+files/redhat-initd
+files/macosx-initd
+files/solaris-fail2ban.xml
+files/solaris-svc-fail2ban
+files/suse-initd
+files/cacti/fail2ban_stats.sh
+files/cacti/cacti_host_template_fail2ban.xml
+files/cacti/README
@@ -1,15 +0,0 @@
-Metadata-Version: 1.0
-Name: fail2ban
-Version: 0.8.4
-Summary: Ban IPs that make too many password failure
-Home-page: http://www.fail2ban.org
-Author: Cyril Jaquier
-Author-email: cyril.jaquier@fail2ban.org
-License: GPL
-Description: 
-        Fail2Ban scans log files like /var/log/pwdfail or
-        /var/log/apache/error_log and bans IP that makes
-        too many password failures. It updates firewall rules
-        to reject the IP address or executes user defined
-        commands.
-Platform: Posix
@@ -1,19 +1,21 @@
-                         __      _ _ ___ _               
-                        / _|__ _(_) |_  ) |__  __ _ _ _  
-                       |  _/ _` | | |/ /| '_ \/ _` | ' \ 
-                       |_| \__,_|_|_/___|_.__/\__,_|_||_|
+               __      _ _ ___ _               
+              / _|__ _(_) |_  ) |__  __ _ _ _  
+             |  _/ _` | | |/ /| '_ \/ _` | ' \ 
+             |_| \__,_|_|_/___|_.__/\__,_|_||_|

-================================================================================
-Fail2Ban (version 0.8.5)                                              2011/07/26
-================================================================================
+=============================================================
+Fail2Ban (version 0.8.3)                           2008/??/??
+=============================================================

-Fail2Ban scans log files like /var/log/pwdfail and bans IP that makes too many
-password failures. It updates firewall rules to reject the IP address. These
-rules can be defined by the user. Fail2Ban can read multiple log files such as
-sshd or Apache web server ones.
+Fail2Ban scans log files like /var/log/pwdfail and bans IP
+that makes too many password failures. It updates firewall
+rules to reject the IP address. These rules can be defined by
+the user. Fail2Ban can read multiple log files such as sshd
+or Apache web server ones.

-This README is a quick introduction to Fail2ban. More documentation, FAQ, HOWTOs
-are available on the project website: http://www.fail2ban.org
+This README is a quick introduction to Fail2ban. More
+documentation, FAQ, HOWTOs are available on the project
+website: http://www.fail2ban.org

 Installation:
 -------------
@@ -26,36 +28,37 @@ Optional:

 To install, just do:

-> tar xvfj fail2ban-0.8.4.tar.bz2
-> cd fail2ban-0.8.4
+> tar xvfj fail2ban-0.8.3.tar.bz2
+> cd fail2ban-0.8.3
 > python setup.py install

-This will install Fail2Ban into /usr/share/fail2ban. The executable scripts are
-placed into /usr/bin.
+This will install Fail2Ban into /usr/share/fail2ban. The
+executable scripts are placed into /usr/bin.

-It is possible that Fail2ban is already packaged for your distribution. In this
-case, you should use it.
+It is possible that Fail2ban is already packaged for your
+distribution. In this case, you should use it.

 Fail2Ban should be correctly installed now. Just type:

 > fail2ban-client -h

-to see if everything is alright. You should always use fail2ban-client and never
-call fail2ban-server directly.
+to see if everything is alright. You should always use
+fail2ban-client and never call fail2ban-server directly.

 Configuration:
 --------------

-You can configure Fail2ban using the files in /etc/fail2ban. It is possible to
-configure the server using commands sent to it by fail2ban-client. The available
-commands are described in the man page of fail2ban-client. Please refer to it or
-to the website: http://www.fail2ban.org
+You can configure Fail2ban using the files in /etc/fail2ban.
+It is possible to configure the server using commands sent to
+it by fail2ban-client. The available commands are described
+in the man page of fail2ban-client. Please refer to it or to
+the website: http://www.fail2ban.org

 Contact:
 --------

-You need some new features, you found bugs or you just appreciate this program,
-you can contact me at:
+You need some new features, you found bugs or you just
+appreciate this program, you can contact me at:

 Website: http://www.fail2ban.org

@@ -64,28 +67,33 @@ Cyril Jaquier: <cyril.jaquier@fail2ban.org>
 Thanks:
 -------

-Kévin Drapel, Marvin Rouge, Sireyessire, Robert Edeker, Tom Pike, Iain Lea,
-Andrey G. Grozin, Yaroslav Halchenko, Jonathan Kamens, Stephen Gildea, Markus
-Hoffmann, Mark Edgington, Patrick Börjesson, kojiro, zugeschmiert, Tyler, Nick
-Munger, Christoph Haas, Justin Shore, Joël Bertrand, René Berber, mEDI, Axel
-Thimm, Eric Gerbier, Christian Rauch, Michael C. Haller, Jonathan Underwood,
-Hanno 'Rince' Wagner, Daniel B. Cid, David Nutter, Raphaël Marichez, Guillaume
-Delvit, Vaclav Misek, Adrien Clerc, Michael Hanselmann, Vincent Deffontaines,
-Bill Heaton, Russell Odom, Christos Psonis, Arturo 'Buanzo' Busleiman and many
-others.
+Kévin Drapel, Marvin Rouge, Sireyessire, Robert Edeker,
+Tom Pike, Iain Lea, Andrey G. Grozin, Yaroslav Halchenko,
+Jonathan Kamens, Stephen Gildea, Markus Hoffmann, Mark
+Edgington, Patrick Börjesson, kojiro, zugeschmiert, Tyler,
+Nick Munger, Christoph Haas, Justin Shore, Joël Bertrand,
+René Berber, mEDI, Axel Thimm, Eric Gerbier, Christian Rauch,
+Michael C. Haller, Jonathan Underwood, Hanno 'Rince' Wagner,
+Daniel B. Cid, David Nutter, Raphaël Marichez, Guillaume
+Delvit, Vaclav Misek, Adrien Clerc, Michael Hanselmann,
+Vincent Deffontaines, Bill Heaton and many others.

 License:
 --------

-Fail2Ban is free software; you can redistribute it and/or modify it under the
-terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
+Fail2Ban is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later
 version.

-Fail2Ban is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Fail2Ban is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied
+warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.  See the GNU General Public License for more
+details.

-You should have received a copy of the GNU General Public License along with
-Fail2Ban; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-Suite 330, Boston, MA  02111-1307  USA
+You should have received a copy of the GNU General Public
+License along with Fail2Ban; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330,
+Boston, MA  02111-1307  USA
@@ -1,11 +1,11 @@
-                         __      _ _ ___ _               
-                        / _|__ _(_) |_  ) |__  __ _ _ _  
-                       |  _/ _` | | |/ /| '_ \/ _` | ' \ 
-                       |_| \__,_|_|_/___|_.__/\__,_|_||_|
+               __      _ _ ___ _               
+              / _|__ _(_) |_  ) |__  __ _ _ _  
+             |  _/ _` | | |/ /| '_ \/ _` | ' \ 
+             |_| \__,_|_|_/___|_.__/\__,_|_||_|

-================================================================================
-ToDo                                                            $Revision: 732 $
-================================================================================
+=============================================================
+ToDo                                         $Revision$
+=============================================================

 Legend:
 - not yet done
@@ -15,24 +15,26 @@ Legend:

 - Removed relative imports

- Cleanup fail2ban-client and fail2ban-server. Move code to server/ and client/
+- Cleanup fail2ban-client and fail2ban-server. Move code to
+  server/ and client/

- Add timeout to external commands (signal alarm, watchdog thread, etc)
+- Add timeout to external commands (signal alarm, watchdog
+  thread, etc)

 - New backend: pyinotify

- Uniformize filters and actions name. Use the software name (openssh, postfix,
-  proftp)
+- Uniformize filters and actions name. Use the software name
+  (openssh, postfix, proftp)

- Added <USER> tag for failregex. Add features using this information. Maybe add
-  more tags
+- Added <USER> tag for failregex. Add features using this
+  information. Maybe add more tags

 - Look at the memory consumption. Decrease memory usage

 - More detailed statistics

- Auto-enable function (search for log files), check modification date to see if
-  service is still in use
+- Auto-enable function (search for log files), check
+  modification date to see if service is still in use

 - Improve parsing of the action parameters in jailreader.py

@@ -42,8 +44,8 @@ Legend:

 - Multiline log reading

- Improve execution of action. Why does subprocess.call deadlock with
-  multi-jails?
+- Improve execution of action. Why does subprocess.call
+  deadlock with multi-jails?

 # see Feature Request Tracking System at SourceForge.net

@@ -16,10 +16,10 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 433 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 433 $"
-__date__ = "$Date: 2006-10-24 21:40:51 +0200 (Tue, 24 Oct 2006) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"
@@ -16,11 +16,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 433 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 433 $"
-__date__ = "$Date: 2006-10-24 21:40:51 +0200 (Tue, 24 Oct 2006) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -16,11 +16,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 644 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 644 $"
-__date__ = "$Date: 2008-01-15 00:12:21 +0100 (Tue, 15 Jan 2008) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -43,7 +43,7 @@ class SafeConfigParserWithIncludes(SafeConfigParser):

 [INCLUDES]
 before = 1.conf
-         3.conf
+			   3.conf

 after = 1.conf

@@ -54,8 +54,8 @@ after = 1.conf
 	the tree.

 	I wasn't sure what would be the right way to implement generic (aka c++
-	template) so we could base at any *configparser class... so I will
-	leave it for the future
+    template) so we could base at any *configparser class... so I will
+    leave it for the future

 	"""

@@ -86,7 +86,7 @@ after = 1.conf
 						if os.path.isabs(newResource):
 							r = newResource
 						else:
-							r = os.path.join(resourceDir, newResource)
+							r = "%s/%s" % (resourceDir, newResource)
 						if r in seen:
 							continue
 						s = seen + [resource]
@@ -16,11 +16,11 @@

 # Author: Cyril Jaquier
 # Modified by: Yaroslav Halchenko (SafeConfigParserWithIncludes)
-# $Revision: 656 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 656 $"
-__date__ = "$Date: 2008-03-04 01:17:56 +0100 (Tue, 04 Mar 2008) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -16,11 +16,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 655 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 655 $"
-__date__ = "$Date: 2008-03-04 01:13:39 +0100 (Tue, 04 Mar 2008) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -16,11 +16,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 635 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 635 $"
-__date__ = "$Date: 2007-12-16 22:38:04 +0100 (Sun, 16 Dec 2007) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -16,11 +16,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 407 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 407 $"
-__date__ = "$Date: 2006-10-09 20:05:13 +0200 (Mon, 09 Oct 2006) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -16,11 +16,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 711 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 711 $"
-__date__ = "$Date: 2008-08-13 00:05:13 +0200 (Wed, 13 Aug 2008) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -53,14 +53,20 @@ class FilterReader(ConfigReader):
 		return ConfigReader.read(self, "filter.d/" + self.__file)
 	
 	def getOptions(self, pOpts):
-		opts = [["string", "ignoreregex", ""],
+		opts = [["string", "timeregex", None],
+				["string", "timepattern", None],
+				["string", "ignoreregex", ""],
 				["string", "failregex", ""]]
 		self.__opts = ConfigReader.getOptions(self, "Definition", opts, pOpts)
 	
 	def convert(self):
 		stream = list()
 		for opt in self.__opts:
-			if opt == "failregex":
+			if opt == "timeregex":
+				stream.append(["set", self.__name, "timeregex", self.__opts[opt]])
+			elif opt == "timepattern":
+				stream.append(["set", self.__name, "timepattern", self.__opts[opt]])
+			elif opt == "failregex":
 				for regex in self.__opts[opt].split('\n'):
 					# Do not send a command if the rule is empty.
 					if regex != '':
@@ -16,11 +16,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 690 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 690 $"
-__date__ = "$Date: 2008-05-12 10:34:42 +0200 (Mon, 12 May 2008) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -120,7 +120,7 @@ class JailReader(ConfigReader):
 			elif opt == "bantime":
 				stream.append(["set", self.__name, "bantime", self.__opts[opt]])
 			elif opt == "failregex":
-				stream.append(["set", self.__name, "addfailregex", self.__opts[opt]])
+				stream.append(["set", self.__name, "failregex", self.__opts[opt]])
 			elif opt == "ignoreregex":
 				for regex in self.__opts[opt].split('\n'):
 					# Do not send a command if the rule is empty.
@@ -16,11 +16,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 655 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 655 $"
-__date__ = "$Date: 2008-03-04 01:13:39 +0100 (Tue, 04 Mar 2008) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -16,10 +16,10 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 504 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 504 $"
-__date__ = "$Date: 2006-12-23 17:37:17 +0100 (Sat, 23 Dec 2006) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"
@@ -16,11 +16,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 751 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 751 $"
-__date__ = "$Date: 2009-09-01 22:25:32 +0200 (Tue, 01 Sep 2009) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -52,7 +52,7 @@ protocol = [
 ["set <JAIL> addignoreip <IP>", "adds <IP> to the ignore list of <JAIL>"], 
 ["set <JAIL> delignoreip <IP>", "removes <IP> from the ignore list of <JAIL>"], 
 ["set <JAIL> addlogpath <FILE>", "adds <FILE> to the monitoring list of <JAIL>"], 
-["set <JAIL> dellogpath <FILE>", "removes <FILE> from the monitoring list of <JAIL>"],
+["set <JAIL> dellogpath <FILE>", "removes <FILE> to the monitoring list of <JAIL>"],
 ["set <JAIL> addfailregex <REGEX>", "adds the regular expression <REGEX> which must match failures for <JAIL>"], 
 ["set <JAIL> delfailregex <INDEX>", "removes the regular expression at <INDEX> for failregex"], 
 ["set <JAIL> addignoreregex <REGEX>", "adds the regular expression <REGEX> which should match pattern to exclude for <JAIL>"],
@@ -73,6 +73,8 @@ protocol = [
 ['', "JAIL INFORMATION", ""],
 ["get <JAIL> logpath", "gets the list of the monitored files for <JAIL>"],
 ["get <JAIL> ignoreip", "gets the list of ignored IP addresses for <JAIL>"],
+["get <JAIL> timeregex", "gets the regular expression used for the time detection for <JAIL>"],
+["get <JAIL> timepattern", "gets the pattern used for the time detection for <JAIL>"],
 ["get <JAIL> failregex", "gets the list of regular expressions which matches the failures for <JAIL>"],
 ["get <JAIL> ignoreregex", "gets the list of regular expressions which matches patterns to ignore for <JAIL>"],
 ["get <JAIL> findtime", "gets the time for which the filter will look back for failures for <JAIL>"],
@@ -16,12 +16,12 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 754 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 754 $"
-__date__ = "$Date: 2009-09-07 21:13:45 +0200 (Mon, 07 Sep 2009) $"
-__copyright__ = "Copyright (c) 2004 Cyril Jaquier, 2011 Yaroslav Halchenko"
+__version__ = "$Revision$"
+__date__ = "$Date$"
+__copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

-version = "0.8.5"
+version = "0.9-SVN"
@@ -1,86 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Russell Odom <russ@gloomytrousers.co.uk>
-# Sends a complaint e-mail to addresses listed in the whois record for an
-# offending IP address.
-#
-# You should provide the <logpath> in the jail config - lines from the log
-# matching the given IP address will be provided in the complaint as evidence.
-#
-# Note that we will try to use e-mail addresses that are most likely to be abuse
-# addresses (based on various keywords). If they aren't found we fall back on
-# any other addresses found in the whois record, with a few exceptions.
-# If no addresses are found, no e-mail is sent.
-#
-# $Revision: 717 $
-#
-
-[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
-#          <failtime>  unix timestamp of the last failure
-#          <bantime>  unix timestamp of the ban time
-# Values:  CMD
-#
-actionban = ADDRESSES=`whois <ip> | perl -e 'while (<STDIN>) { next if /^changed|@(ripe|apnic)\.net/io; $m += (/abuse|trouble:|report|spam|security/io?3:0); if (/([a-z0-9_\-\.+]+@[a-z0-9\-]+(\.[[a-z0-9\-]+)+)/io) { while (s/([a-z0-9_\-\.+]+@[a-z0-9\-]+(\.[[a-z0-9\-]+)+)//io) { if ($m) { $a{lc($1)}=$m } else { $b{lc($1)}=$m } } $m=0 } else { $m && --$m } } if (%%a) {print join(",",keys(%%a))} else {print join(",",keys(%%b))}'`
-	    IP=<ip>
-            if [ ! -z "$ADDRESSES" ]; then
-                (printf %%b "<message>\n"; date '+Note: Local timezone is %%z (%%Z)'; grep '<ip>' <logpath>) | <mailcmd> "Abuse from <ip>" $ADDRESSES <mailargs>
-            fi
-
-# Option:  actionunban
-# Notes.:  command executed when unbanning an IP. Take care that the
-#          command is executed with Fail2Ban user rights.
-# Tags:    <ip>  IP address
-#          <bantime>  unix timestamp of the ban time
-#          <unbantime>  unix timestamp of the unban time
-# Values:  CMD
-#
-actionunban =
-
-[Init]
-message = Dear Sir/Madam,\n\nWe have detected abuse from the IP address $IP, which according to a whois lookup is on your network. We would appreciate if you would investigate and take action as appropriate.\n\nLog lines are given below, but please ask if you require any further information.\n\n(If you are not the correct person to contact about this please accept our apologies - your e-mail address was extracted from the whois record by an automated process. This mail was generated by Fail2Ban.)\n
-
-# Path to the log files which contain relevant lines for the abuser IP
-#
-logpath = /dev/null
-
-# Option:  mailcmd
-# Notes.:  Your system mail command. Is passed 2 args: subject and recipient
-# Values:  CMD  Default: mail -s
-#
-mailcmd = mail -s
-
-# Option:  mailargs
-# Notes.:  Additional arguments to mail command. e.g. for standard Unix mail:
-#          CC reports to another address:
-#              -c me@example.com
-#          Appear to come from a different address - the '--' indicates
-#          arguments to be passed to Sendmail:
-#              -- -f me@example.com
-# Values:  [ STRING ]  Default: (empty)
-#
-mailargs =
-
@@ -1,210 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Russell Odom <russ@gloomytrousers.co.uk>
-# Submits attack reports to DShield (http://www.dshield.org/)
-#
-# You MUST configure at least:
-# <port> (the port that's being attacked - use number not name).
-#
-# You SHOULD also provide:
-# <myip> (your public IP address, if it's not the address of eth0)
-# <userid> (your DShield userID, if you have one - recommended, but reports will
-# be used anonymously if not)
-# <protocol> (the protocol in use - defaults to tcp)
-#
-# Best practice is to provide <port> and <protocol> in jail.conf like this:
-# action = dshield[port=1234,protocol=tcp]
-#
-# ...and create "dshield.local" with contents something like this:
-# [Init]
-# myip = 10.0.0.1
-# userid = 12345
-#
-# Other useful configuration values are <mailargs> (you can use for specifying
-# a different sender address for the report e-mails, which should match what is
-# configured at DShield), and <lines>/<minreportinterval>/<maxbufferage> (to
-# configure how often the buffer is flushed).
-#
-# $Revision$
-
-[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 = if [ -f <tmpfile>.buffer ]; then
-                 cat <tmpfile>.buffer | <mailcmd> "FORMAT DSHIELD USERID <userid> TZ `date +%%z | sed 's/\([+-]..\)\(..\)/\1:\2/'` Fail2Ban" <dest> <mailargs>
-                 date +%%s > <tmpfile>.lastsent
-             fi
-             rm -f <tmpfile>.buffer <tmpfile>.first
-
-# 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
-#
-# See http://www.dshield.org/specs.html for more on report format/notes
-#
-# Note: We are currently using <time> for the timestamp because no tag is
-# available to indicate the timestamp of the log message(s) which triggered the
-# ban. Therefore the timestamps we are using in the report, whilst often only a
-# few seconds out, are incorrect. See
-# http://sourceforge.net/tracker/index.php?func=detail&aid=2017795&group_id=121032&atid=689047
-#
-actionban = TZONE=`date +%%z | sed 's/\([+-]..\)\(..\)/\1:\2/'`
-            DATETIME="`perl -e '@t=localtime(<time>);printf "%%4d-%%02d-%%02d %%02d:%%02d:%%02d",1900+$t[5],$t[4]+1,$t[3],$t[2],$t[1],$t[0]'` $TZONE"
-	    PROTOCOL=`awk '{IGNORECASE=1;if($1=="<protocol>"){print $2;exit}}' /etc/protocols`
-	    if [ -z "$PROTOCOL" ]; then PROTOCOL=<protocol>; fi
-            printf %%b "$DATETIME\t<userid>\t<failures>\t<ip>\t<srcport>\t<myip>\t<port>\t$PROTOCOL\t<tcpflags>\n" >> <tmpfile>.buffer
-            NOW=`date +%%s`
-            if [ ! -f <tmpfile>.first ]; then
-                echo <time> | cut -d. -f1 > <tmpfile>.first
-            fi
-            if [ ! -f <tmpfile>.lastsent ]; then
-                echo 0 > <tmpfile>.lastsent
-            fi
-            LOGAGE=$(($NOW - `cat <tmpfile>.first`))
-            LASTREPORT=$(($NOW - `cat <tmpfile>.lastsent`))
-            LINES=$( wc -l <tmpfile>.buffer | awk '{ print $1 }' )
-            if [ $LINES -ge <lines> && $LASTREPORT -gt <minreportinterval> ] || [ $LOGAGE -gt <maxbufferage> ]; then
-                cat <tmpfile>.buffer | <mailcmd> "FORMAT DSHIELD USERID <userid> TZ $TZONE Fail2Ban" <dest> <mailargs>
-                rm -f <tmpfile>.buffer <tmpfile>.first
-                echo $NOW > <tmpfile>.lastsent
-            fi
-
-# 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 = if [ -f <tmpfile>.first ]; then
-                  NOW=`date +%%s`
-                  LOGAGE=$(($NOW - `cat <tmpfile>.first`))
-                  if [ $LOGAGE -gt <maxbufferage> ]; then
-                      cat <tmpfile>.buffer | <mailcmd> "FORMAT DSHIELD USERID <userid> TZ `date +%%z | sed 's/\([+-]..\)\(..\)/\1:\2/'` Fail2Ban" <dest> <mailargs>
-                      rm -f <tmpfile>.buffer <tmpfile>.first
-                      echo $NOW > <tmpfile>.lastsent
-                  fi
-              fi
-
-
-[Init]
-# Option:  port
-# Notes.:  The target port for the attack (numerical). MUST be provided in the
-#          jail config, as it cannot be detected here.
-# Values:  [ NUM ]  Default: ???
-#
-port = ???
-
-# Option:  userid
-# Notes.:  Your DSheild user ID. Should be provided either in the jail config or
-#          in a .local file.
-#          Register at https://secure.dshield.org/register.html
-# Values:  [ NUM ]  Default: 0
-#
-userid = 0
-
-# Option:  myip
-# Notes.:  TThe target IP for the attack (your public IP). Should be provided
-#          either in the jail config or in a .local file unless your PUBLIC IP
-#          is the first IP assigned to eth0
-# Values:  [ an IP address ]  Default: Tries to find the IP address of eth0,
-#          which in most cases will be a private IP, and therefore incorrect
-#
-myip = `ip -4 addr show dev eth0 | grep inet | head -1 | sed -r 's/.*inet ([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/\1/'`
-
-# Option:  protocol
-# Notes.:  The protocol over which the attack is happening
-# Values:  [ tcp | udp | icmp | (any other protocol name from /etc/protocols) | NUM ] Default: tcp
-#
-protocol = tcp
-
-# Option:  lines
-# Notes.:  How many lines to buffer before making a report. Regardless of this,
-#          reports are sent a minimum of <minreportinterval> apart, or if the
-#          buffer contains an event over <maxbufferage> old, or on shutdown
-# Values:  [ NUM ]  Default: 50
-#
-lines = 50
-
-# Option:  minreportinterval
-# Notes.:  Minimum period (in seconds) that must elapse before we submit another
-#          batch of reports. DShield request a minimum of 1 hour (3600 secs)
-#          between reports.
-# Values:  [ NUM ]  Default: 3600
-#
-minreportinterval = 3600
-
-# Option:  maxbufferage
-# Notes.:  Maximum age (in seconds) of the oldest report in the buffer before we
-#          submit the batch, even if we haven't reached <lines> yet. Note that
-#          this is only checked on each ban/unban, and that we always send
-#          anything in the buffer on shutdown. Must be greater than
-#          <minreportinterval>.
-# Values:  [ NUM ]  Default: 21600 (6 hours)
-#
-maxbufferage = 21600
-
-# Option:  srcport
-# Notes.:  The source port of the attack. You're unlikely to have this info, so
-#          you can leave the default
-# Values:  [ NUM ]  Default: ???
-#
-srcport = ???
-
-# Option:  tcpflags
-# Notes.:  TCP flags on attack. You're unlikely to have this info, so you can
-#          leave empty
-# Values:  [ STRING ]  Default: (empty)
-#
-tcpflags =
-
-# Option:  mailcmd
-# Notes.:  Your system mail command. Is passed 2 args: subject and recipient
-# Values:  CMD  Default: mail -s
-#
-mailcmd = mail -s
-
-# Option:  mailargs
-# Notes.:  Additional arguments to mail command. e.g. for standard Unix mail:
-#          CC reports to another address:
-#              -c me@example.com
-#          Appear to come from a different address (the From address must match
-#          the one configured at DShield - the '--' indicates arguments to be
-#          passed to Sendmail):
-#              -- -f me@example.com
-# Values:  [ STRING ]  Default: (empty)
-#
-mailargs =
-
-# Option:  dest
-# Notes.:  Destination e-mail address for reports
-# Values:  [ STRING ]  Default: reports@dshield.org
-#
-dest = reports@dshield.org
-
-# Option:  tmpfile
-# Notes.:  Base name of temporary files used for buffering
-# Values:  [ STRING ]  Default: /tmp/fail2ban-dshield
-#
-tmpfile = /var/run/fail2ban/tmp-dshield
-
@@ -1,9 +1,8 @@
 # Fail2Ban configuration file
 #
-# NetBSD ipfilter (ipf command) ban/unban
-#
-# Author: Ed Ravin <eravin@panix.com>
+# Author: Cyril Jaquier
 #
+# $Revision$
 #

 [Definition]
@@ -12,17 +11,14 @@
 # Notes.:  command executed once at the start of Fail2Ban.
 # Values:  CMD
 #
-# enable IPF if not already enabled
-actionstart = /sbin/ipf -E
-
+actionstart = touch /tmp/fail2ban.dummy
+              printf %%b "<init>\n" >> /tmp/fail2ban.dummy

 # Option:  actionstop
 # Notes.:  command executed once at the end of Fail2Ban
 # Values:  CMD
 #
-# don't disable IPF with "/sbin/ipf -D", there may be other filters in use
-actionstop = 
-
+actionstop = rm -f /tmp/fail2ban.dummy

 # Option:  actioncheck
 # Notes.:  command executed once before each actionban command
@@ -30,7 +26,6 @@ actionstop =
 #
 actioncheck = 

-
 # Option:  actionban
 # Notes.:  command executed when banning an IP. Take care that the
 #          command is executed with Fail2Ban user rights.
@@ -39,8 +34,7 @@ actioncheck =
 #          <time>  unix timestamp of the ban time
 # Values:  CMD
 #
-actionban = echo block in quick from <ip>/32 | /sbin/ipf -f -
-
+actionban = printf %%b "+<ip>\n" >> /tmp/fail2ban.dummy

 # Option:  actionunban
 # Notes.:  command executed when unbanning an IP. Take care that the
@@ -50,8 +44,9 @@ actionban = echo block in quick from <ip>/32 | /sbin/ipf -f -
 #          <time>  unix timestamp of the ban time
 # Values:  CMD
 #
-# note -r option used to remove matching rule
-actionunban = echo block in quick from <ip>/32 | /sbin/ipf -r -f -
+actionunban = printf %%b "-<ip>\n" >> /tmp/fail2ban.dummy

 [Init]

+init = 123
+
@@ -2,7 +2,7 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 660 $
+# $Revision$
 #

 [Definition]
@@ -3,7 +3,7 @@
 # Author: Nick Munger
 # Modified by: Cyril Jaquier
 #
-# $Revision: 658 $
+# $Revision$
 #

 [Definition]
@@ -15,13 +15,13 @@
 #
 actionstart = iptables -N fail2ban-<name>
              iptables -A fail2ban-<name> -j RETURN
-              iptables -I <chain> -p <protocol> -j fail2ban-<name>
+              iptables -I INPUT -p <protocol> -j fail2ban-<name>

 # Option:  actionstop
 # Notes.:  command executed once at the end of Fail2Ban
 # Values:  CMD
 #
-actionstop = iptables -D <chain> -p <protocol> -j fail2ban-<name>
+actionstop = iptables -D INPUT -p <protocol> -j fail2ban-<name>
             iptables -F fail2ban-<name>
             iptables -X fail2ban-<name>

@@ -29,7 +29,7 @@ actionstop = iptables -D <chain> -p <protocol> -j fail2ban-<name>
 # Notes.:  command executed once before each actionban command
 # Values:  CMD
 #
-actioncheck = iptables -n -L <chain> | grep -q fail2ban-<name>
+actioncheck = iptables -n -L INPUT | grep -q fail2ban-<name>

 # Option:  actionban
 # Notes.:  command executed when banning an IP. Take care that the
@@ -63,8 +63,3 @@ name = default
 #
 protocol = tcp

-# Option:  chain
-# Notes    specifies the iptables chain to which the fail2ban rules should be
-#          added
-# Values:  STRING  Default: INPUT
-chain = INPUT
@@ -5,7 +5,7 @@
 #
 # make "fail2ban-<name>" chain to match drop IP
 # make "fail2ban-<name>-log" chain to log and drop
-# insert a jump to fail2ban-<name> from -I <chain> if proto/port match
+# insert a jump to fail2ban-<name> from -I INPUT if proto/port match
 #
 # $Revision: 668 $
 #
@@ -18,7 +18,7 @@
 #
 actionstart = iptables -N fail2ban-<name>
              iptables -A fail2ban-<name> -j RETURN
-              iptables -I <chain> 1 -p <protocol> -m multiport --dports <port> -j fail2ban-<name>
+              iptables -I INPUT 1 -p <protocol> -m multiport --dports <port> -j fail2ban-<name>
              iptables -N fail2ban-<name>-log
              iptables -I fail2ban-<name>-log -j LOG --log-prefix "$(expr fail2ban-<name> : '\(.\{1,23\}\)'):DROP " --log-level warning -m limit --limit 6/m --limit-burst 2
              iptables -A fail2ban-<name>-log -j DROP
@@ -27,7 +27,7 @@ actionstart = iptables -N fail2ban-<name>
 # Notes.:  command executed once at the end of Fail2Ban
 # Values:  CMD
 #
-actionstop = iptables -D <chain> -p <protocol> -m multiport --dports <port> -j fail2ban-<name>
+actionstop = iptables -D INPUT -p <protocol> -m multiport --dports <port> -j fail2ban-<name>
             iptables -F fail2ban-<name>
             iptables -F fail2ban-<name>-log
             iptables -X fail2ban-<name>
@@ -76,9 +76,3 @@ port = ssh
 # Values:  [ tcp | udp | icmp | all ] Default: tcp
 #
 protocol = tcp
-
-# Option:  chain
-# Notes    specifies the iptables chain to which the fail2ban rules should be
-#          added
-# Values:  STRING  Default: INPUT
-chain = INPUT
@@ -2,7 +2,7 @@
 #
 # Author: Cyril Jaquier
 # Modified by Yaroslav Halchenko for multiport banning
-# $Revision: 658 $
+# $Revision$
 #

 [Definition]
@@ -13,13 +13,13 @@
 #
 actionstart = iptables -N fail2ban-<name>
              iptables -A fail2ban-<name> -j RETURN
-              iptables -I <chain> -p <protocol> -m multiport --dports <port> -j fail2ban-<name>
+              iptables -I INPUT -p <protocol> -m multiport --dports <port> -j fail2ban-<name>

-# Option:  actionstop
+# Option:  actionend
 # Notes.:  command executed once at the end of Fail2Ban
 # Values:  CMD
 #
-actionstop = iptables -D <chain> -p <protocol> -m multiport --dports <port> -j fail2ban-<name>
+actionstop = iptables -D INPUT -p <protocol> -m multiport --dports <port> -j fail2ban-<name>
             iptables -F fail2ban-<name>
             iptables -X fail2ban-<name>

@@ -27,7 +27,7 @@ actionstop = iptables -D <chain> -p <protocol> -m multiport --dports <port> -j f
 # Notes.:  command executed once before each actionban command
 # Values:  CMD
 #
-actioncheck = iptables -n -L <chain> | grep -q fail2ban-<name>
+actioncheck = iptables -n -L INPUT | grep -q fail2ban-<name>

 # Option:  actionban
 # Notes.:  command executed when banning an IP. Take care that the
@@ -67,8 +67,3 @@ port = ssh
 #
 protocol = tcp

-# Option:  chain
-# Notes    specifies the iptables chain to which the fail2ban rules should be
-#          added
-# Values:  STRING  Default: INPUT
-chain = INPUT
@@ -4,7 +4,7 @@
 # Copied from iptables.conf and modified by Yaroslav Halchenko 
 #  to fullfill the needs of bugreporter dbts#350746.
 #
-# $Revision: 658 $
+# $Revision$
 #

 [Definition]
@@ -15,13 +15,13 @@
 #
 actionstart = iptables -N fail2ban-<name>
              iptables -A fail2ban-<name> -j RETURN
-              iptables -I <chain> -m state --state NEW -p <protocol> --dport <port> -j fail2ban-<name>
+              iptables -I INPUT -m state --state NEW -p <protocol> --dport <port> -j fail2ban-<name>

 # Option:  actionstop
 # Notes.:  command executed once at the end of Fail2Ban
 # Values:  CMD
 #
-actionstop = iptables -D <chain> -m state --state NEW -p <protocol> --dport <port> -j fail2ban-<name>
+actionstop = iptables -D INPUT -m state --state NEW -p <protocol> --dport <port> -j fail2ban-<name>
             iptables -F fail2ban-<name>
             iptables -X fail2ban-<name>

@@ -29,7 +29,7 @@ actionstop = iptables -D <chain> -m state --state NEW -p <protocol> --dport <por
 # Notes.:  command executed once before each actionban command
 # Values:  CMD
 #
-actioncheck = iptables -n -L <chain> | grep -q fail2ban-<name>
+actioncheck = iptables -n -L INPUT | grep -q fail2ban-<name>

 # Option:  actionban
 # Notes.:  command executed when banning an IP. Take care that the
@@ -69,8 +69,3 @@ port = ssh
 #
 protocol = tcp

-# Option:  chain
-# Notes    specifies the iptables chain to which the fail2ban rules should be
-#          added
-# Values:  STRING  Default: INPUT
-chain = INPUT
@@ -2,7 +2,7 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 658 $
+# $Revision$
 #

 [Definition]
@@ -13,13 +13,13 @@
 #
 actionstart = iptables -N fail2ban-<name>
              iptables -A fail2ban-<name> -j RETURN
-              iptables -I <chain> -p <protocol> --dport <port> -j fail2ban-<name>
+              iptables -I INPUT -p <protocol> --dport <port> -j fail2ban-<name>

-# Option:  actionstop
+# Option:  actionend
 # Notes.:  command executed once at the end of Fail2Ban
 # Values:  CMD
 #
-actionstop = iptables -D <chain> -p <protocol> --dport <port> -j fail2ban-<name>
+actionstop = iptables -D INPUT -p <protocol> --dport <port> -j fail2ban-<name>
             iptables -F fail2ban-<name>
             iptables -X fail2ban-<name>

@@ -27,7 +27,7 @@ actionstop = iptables -D <chain> -p <protocol> --dport <port> -j fail2ban-<name>
 # Notes.:  command executed once before each actionban command
 # Values:  CMD
 #
-actioncheck = iptables -n -L <chain> | grep -q fail2ban-<name>
+actioncheck = iptables -n -L INPUT | grep -q fail2ban-<name>

 # Option:  actionban
 # Notes.:  command executed when banning an IP. Take care that the
@@ -67,8 +67,3 @@ port = ssh
 #
 protocol = tcp

-# Option:  chain
-# Notes    specifies the iptables chain to which the fail2ban rules should be
-#          added
-# Values:  STRING  Default: INPUT
-chain = INPUT
@@ -1,88 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Cyril Jaquier
-#
-# $Revision: 701 $
-#
-
-[Definition]
-
-# Option:  actionstart
-# Notes.:  command executed once at the start of Fail2Ban.
-# Values:  CMD
-#
-actionstart = printf %%b "Hi,\n
-              The jail <name> has been started successfully.\n
-              Output will be buffered until <lines> lines are available.\n
-              Regards,\n
-              Fail2Ban"|mail -s "[Fail2Ban] <name>: started" <dest>
-
-# Option:  actionstop
-# Notes.:  command executed once at the end of Fail2Ban
-# Values:  CMD
-#
-actionstop = if [ -f <tmpfile> ]; then
-                 printf %%b "Hi,\n
-                 These hosts have been banned by Fail2Ban.\n
-                 `cat <tmpfile>`
-                 Regards,\n
-                 Fail2Ban"|mail -s "[Fail2Ban] <name>: Summary" <dest>
-                 rm <tmpfile>
-             fi
-             printf %%b "Hi,\n
-             The jail <name> has been stopped.\n
-             Regards,\n
-             Fail2Ban"|mail -s "[Fail2Ban] <name>: stopped" <dest>
-
-# 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 = printf %%b "`date`: <ip> (<failures> failures)\n" >> <tmpfile>
-            LINE=$( wc -l <tmpfile> | awk '{ print $1 }' )
-            if [ $LINE -ge <lines> ]; then
-                printf %%b "Hi,\n
-                These hosts have been banned by Fail2Ban.\n
-                `cat <tmpfile>`
-                \nRegards,\n
-                Fail2Ban"|mail -s "[Fail2Ban] <name>: Summary" <dest>
-                rm <tmpfile>
-            fi
-
-# 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 = 
-
-[Init]
-
-# Default name of the chain
-#
-name = default
-
-# Default number of lines that are buffered
-#
-lines = 5
-
-# Default temporary file
-#
-tmpfile = /var/run/fail2ban/tmp-mail.txt
-
-# Destination/Addressee of the mail
-#
-dest = root
@@ -1,75 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Cyril Jaquier
-# Modified-By: Yaroslav Halchenko to include grepping on IP over log files
-# $Revision: 660 $
-#
-
-[Definition]
-
-# Option:  actionstart
-# Notes.:  command executed once at the start of Fail2Ban.
-# Values:  CMD
-#
-actionstart = printf %%b "Hi,\n
-              The jail <name> has been started successfully.\n
-              Regards,\n
-              Fail2Ban"|mail -s "[Fail2Ban] <name>: started" <dest>
-
-# Option:  actionstop
-# Notes.:  command executed once at the end of Fail2Ban
-# Values:  CMD
-#
-actionstop = printf %%b "Hi,\n
-             The jail <name> has been stopped.\n
-             Regards,\n
-             Fail2Ban"|mail -s "[Fail2Ban] <name>: stopped" <dest>
-
-# 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
-#          <failtime>  unix timestamp of the last failure
-#          <bantime>  unix timestamp of the ban time
-# Values:  CMD
-#
-actionban = printf %%b "Hi,\n
-            The IP <ip> has just been banned by Fail2Ban after
-            <failures> attempts against <name>.\n\n
-            Here are more information about <ip>:\n
-            `whois <ip>`\n\n
-            Lines containing IP:<ip> in <logpath>\n
-            `grep '\<<ip>\>' <logpath>`\n\n
-            Regards,\n
-            Fail2Ban"|mail -s "[Fail2Ban] <name>: banned <ip>" <dest>
-
-# Option:  actionunban
-# Notes.:  command executed when unbanning an IP. Take care that the
-#          command is executed with Fail2Ban user rights.
-# Tags:    <ip>  IP address
-#          <bantime>  unix timestamp of the ban time
-#          <unbantime>  unix timestamp of the unban time
-# Values:  CMD
-#
-actionunban = 
-
-[Init]
-
-# Defaut name of the chain
-#
-name = default
-
-# Destinataire of the mail
-#
-dest = root
-
-# Path to the log files which contain relevant lines for the abuser IP
-#
-logpath = /dev/null
@@ -1,69 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Cyril Jaquier
-#
-# $Revision: 660 $
-#
-
-[Definition]
-
-# Option:  actionstart
-# Notes.:  command executed once at the start of Fail2Ban.
-# Values:  CMD
-#
-actionstart = printf %%b "Hi,\n
-              The jail <name> has been started successfully.\n
-              Regards,\n
-              Fail2Ban"|mail -s "[Fail2Ban] <name>: started" <dest>
-
-# Option:  actionstop
-# Notes.:  command executed once at the end of Fail2Ban
-# Values:  CMD
-#
-actionstop = printf %%b "Hi,\n
-             The jail <name> has been stopped.\n
-             Regards,\n
-             Fail2Ban"|mail -s "[Fail2Ban] <name>: stopped" <dest>
-
-# 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 = printf %%b "Hi,\n
-            The IP <ip> has just been banned by Fail2Ban after
-            <failures> attempts against <name>.\n\n
-            Here are more information about <ip>:\n
-            `whois <ip>`\n
-            Regards,\n
-            Fail2Ban"|mail -s "[Fail2Ban] <name>: banned <ip>" <dest>
-
-# 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 = 
-
-[Init]
-
-# Defaut name of the chain
-#
-name = default
-
-# Destination/Addressee of the mail
-#
-dest = root
-
@@ -1,67 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Cyril Jaquier
-#
-# $Revision: 660 $
-#
-
-[Definition]
-
-# Option:  actionstart
-# Notes.:  command executed once at the start of Fail2Ban.
-# Values:  CMD
-#
-actionstart = printf %%b "Hi,\n
-              The jail <name> has been started successfully.\n
-              Regards,\n
-              Fail2Ban"|mail -s "[Fail2Ban] <name>: started" <dest>
-
-# Option:  actionstop
-# Notes.:  command executed once at the end of Fail2Ban
-# Values:  CMD
-#
-actionstop = printf %%b "Hi,\n
-             The jail <name> has been stopped.\n
-             Regards,\n
-             Fail2Ban"|mail -s "[Fail2Ban] <name>: stopped" <dest>
-
-# 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 = printf %%b "Hi,\n
-            The IP <ip> has just been banned by Fail2Ban after
-            <failures> attempts against <name>.\n
-            Regards,\n
-            Fail2Ban"|mail -s "[Fail2Ban] <name>: banned <ip>" <dest>
-
-# 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 = 
-
-[Init]
-
-# Defaut name of the chain
-#
-name = default
-
-# Destination/Addressee of the mail
-#
-dest = root
-
@@ -1,144 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Russell Odom <russ@gloomytrousers.co.uk>
-# Submits attack reports to myNetWatchman (http://www.mynetwatchman.com/)
-#
-# You MUST configure at least:
-# <port> (the port that's being attacked - use number not name).
-# <mnwlogin> (your mNW login).
-# <mnwpass> (your mNW password).
-#
-# You SHOULD also provide:
-# <myip> (your public IP address, if it's not the address of eth0)
-# <protocol> (the protocol in use - defaults to tcp)
-#
-# Best practice is to provide <port> and <protocol> in jail.conf like this:
-# action = mynetwatchman[port=1234,protocol=udp]
-#
-# ...and create "mynetwatchman.local" with contents something like this:
-# [Init]
-# mnwlogin = me@example.com
-# mnwpass = SECRET
-# myip = 10.0.0.1
-#
-# Another useful configuration value is <getcmd>, if you don't have wget
-# installed (an example config for curl is given below)
-#
-# $Revision$
-
-[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
-#
-#
-# Note: We are currently using <time> for the timestamp because no tag is
-# available to indicate the timestamp of the log message(s) which triggered the
-# ban. Therefore the timestamps we are using in the report, whilst often only a
-# few seconds out, are incorrect. See
-# http://sourceforge.net/tracker/index.php?func=detail&aid=2017795&group_id=121032&atid=689047
-#
-actionban = MNWLOGIN=`perl -e '$s=shift;$s=~s/([\W])/"%%".uc(sprintf("%%2.2x",ord($1)))/eg;print $s' '<mnwlogin>'`
-            MNWPASS=`perl -e '$s=shift;$s=~s/([\W])/"%%".uc(sprintf("%%2.2x",ord($1)))/eg;print $s' '<mnwpass>'`
-	    PROTOCOL=`awk '{IGNORECASE=1;if($1=="<protocol>"){print $2;exit}}' /etc/protocols`
-	    if [ -z "$PROTOCOL" ]; then PROTOCOL=<protocol>; fi
-	    DATETIME=`perl -e '@t=gmtime(<time>);printf "%%4d-%%02d-%%02d+%%02d:%%02d:%%02d",1900+$t[5],$t[4]+1,$t[3],$t[2],$t[1],$t[0]'`
-            <getcmd> "<mnwurl>?AT=2&AV=0&AgentEmail=$MNWLOGIN&AgentPassword=$MNWPASS&AttackerIP=<ip>&SrcPort=<srcport>&ProtocolID=$PROTOCOL&DestPort=<port>&AttackCount=<failures>&VictimIP=<myip>&AttackDateTime=$DATETIME" 2>&1 >> <tmpfile>.out && grep -q 'Attack Report Insert Successful' <tmpfile>.out && rm -f <tmpfile>.out
-
-# 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 =
-
-[Init]
-# Option:  port
-# Notes.:  The target port for the attack (numerical). MUST be provided in
-#          the jail config, as it cannot be detected here.
-# Values:  [ NUM ]  Default: ???
-#
-port = 0
-
-# Option:  mnwlogin
-# Notes.:  Your mNW login e-mail address. MUST be provided either in the jail
-#          config or in a .local file.
-#          Register at http://www.mynetwatchman.com/reg.asp
-# Values:  [ STRING ]  Default: (empty)
-#
-mnwlogin =
-
-# Option:  mnwpass
-# Notes.:  The password corresponding to your mNW login e-mail address. MUST be
-#          provided either in the jail config or in a .local file.
-# Values:  [ STRING ]  Default: (empty)
-#
-mnwpass =
-
-# Option:  myip
-# Notes.:  TThe target IP for the attack (your public IP). Should be overridden
-#          either in the jail config or in a .local file unless your PUBLIC IP
-#          is the first IP assigned to eth0
-# Values:  [ an IP address ]  Default: Tries to find the IP address of eth0,
-#          which in most cases will be a private IP, and therefore incorrect
-#
-myip = `ip -4 addr show dev eth0 | grep inet | head -1 | sed -r 's/.*inet ([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/\1/'`
-
-# Option:  protocol
-# Notes.:  The protocol over which the attack is happening
-# Values:  [ tcp | udp | icmp | (any other protocol name from /etc/protocols) | NUM ] Default: tcp
-#
-protocol = tcp
-
-# Option:  getcmd
-# Notes.:  A command to fetch a URL. Should output page to STDOUT
-# Values:  CMD  Default: wget
-#
-getcmd = wget --no-verbose --tries=3 --waitretry=10 --connect-timeout=10 --read-timeout=60 --retry-connrefused --output-document=- --user-agent=Fail2Ban
-# Alternative value:
-# getcmd = curl --silent --show-error --retry 3 --connect-timeout 10 --max-time 60 --user-agent Fail2Ban
-
-# Option:  srcport
-# Notes.:  The source port of the attack. You're unlikely to have this info, so
-#          you can leave the default
-# Values:  [ NUM ]  Default: 0
-#
-srcport = 0
-
-# Option:  mnwurl
-# Notes.:  The report service URL on the mNW site
-# Values:  STRING  Default: http://mynetwatchman.com/insertwebreport.asp
-#
-mnwurl = http://mynetwatchman.com/insertwebreport.asp
-
-# Option:  tmpfile
-# Notes.:  Base name of temporary files
-# Values:  [ STRING ]  Default: /tmp/fail2ban-mynetwatchman
-#
-tmpfile = /var/run/fail2ban/tmp-mynetwatchman
@@ -2,7 +2,7 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 701 $
+# $Revision: 660 $
 #

 [Definition]
@@ -59,7 +59,7 @@ actioncheck =
 #
 actionban = printf %%b "`date`: <ip> (<failures> failures)\n" >> <tmpfile>
            LINE=$( wc -l <tmpfile> | awk '{ print $1 }' )
-            if [ $LINE -ge <lines> ]; then
+            if [ $LINE -eq <lines> ]; then
                printf %%b "Subject: [Fail2Ban] <name>: summary
                From: Fail2Ban <<sender>>
                To: <dest>\n
@@ -101,5 +101,5 @@ lines = 5

 # Default temporary file
 #
-tmpfile = /var/run/fail2ban/tmp-mail.txt
+tmpfile = /tmp/fail2ban-mail.txt

@@ -2,16 +2,8 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 661 $
+# $Revision$
 #
-# The default Shorewall configuration is with "BLACKLISTNEWONLY=Yes" (see
-# file /etc/shorewall/shorewall.conf). This means that when Fail2ban adds a
-# new shorewall rule to ban an IP address, that rule will affect only new
-# connections. So if the attempter goes on trying using the same connection
-# he could even log in. In order to get the same behavior of the iptable
-# action (so that the ban is immediate) the /etc/shorewall/shorewall.conf
-# file should me modified with "BLACKLISTNEWONLY=No".
-# 

 [Definition]

@@ -21,7 +13,7 @@
 #
 actionstart = 

-# Option:  actionstop
+# Option:  actionend
 # Notes.:  command executed once at the end of Fail2Ban
 # Values:  CMD
 #
@@ -41,7 +33,7 @@ actioncheck =
 #          <time>  unix timestamp of the ban time
 # Values:  CMD
 #
-actionban = shorewall drop <ip>
+actionban = shorewall reject <ip>

 # Option:  actionunban
 # Notes.:  command executed when unbanning an IP. Take care that the
@@ -2,7 +2,7 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 629 $
+# $Revision$
 #

 [Definition]
@@ -2,7 +2,7 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 728 $
+# $Revision$
 #

 [Definition]
@@ -11,7 +11,7 @@
 # Notes.:  regex to match the password failure messages in the logfile. The
 #          host must be matched by a group named "host". The tag "<HOST>" can
 #          be used for standard IP/hostname matching and is only an alias for
-#          (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)
+#          (?:::f{4,6}:)?(?P<host>\S+)
 # Values:  TEXT
 #
 failregex = [[]client <HOST>[]] user .* authentication failure
@@ -1,7 +1,7 @@
 # Fail2Ban configuration file
 #
 # List of bad bots fetched from http://www.user-agents.org
-# Generated on Sun Feb 11 01:09:15 EST 2007 by ./badbots.sh
+# Generated on Sun Feb 11 01:09:15 EST 2007 by gen_badbots
 #
 # Author: Yaroslav Halchenko
 #
@@ -1,23 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Yaroslav O. Halchenko <debian@onerussian.com>
-#
-# $Revision: 716 $
-#
-
-[Definition]
-
-# Option:  failregex
-# Notes.:  regex to match failures to find a home directory on a server, which
-#          became popular last days. Most often attacker just uses IP instead of
-#          domain name -- so expect to see them in generic error.log if you have
-#          per-domain log files.
-# Values:  TEXT
-#
-failregex = [[]client <HOST>[]] File does not exist: .*/~.*
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 
@@ -2,7 +2,7 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 728 $
+# $Revision$
 #

 [Definition]
@@ -11,11 +11,10 @@
 # Notes.:  regex to match the password failure messages in the logfile. The
 #          host must be matched by a group named "host". The tag "<HOST>" can
 #          be used for standard IP/hostname matching and is only an alias for
-#          (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)
+#          (?:::f{4,6}:)?(?P<host>\S+)
 # Values:  TEXT
 #
-failregex = [[]client <HOST>[]] (File does not exist|script not found or unable to stat): /\S*(\.php|\.asp|\.exe|\.pl)
-            [[]client <HOST>[]] script '/\S*(\.php|\.asp|\.exe|\.pl)\S*' not found or unable to stat *$
+failregex = [[]client <HOST>[]] (File does not exist|script not found or unable to stat): .*(\.php|\.asp|\.exe|\.pl)

 # Option:  ignoreregex
 # Notes.:  regex to ignore. If this regex matches, the line is ignored.
@@ -11,7 +11,7 @@
 # Notes.:  Regexp to catch Apache overflow attempts.
 # Values:  TEXT
 #
-failregex = [[]client <HOST>[]] (Invalid (method|URI) in request|request failed: URI too long|erroneous characters after protocol string)
+failregex = [[]client <HOST>[]] (Invalid method in request|request failed: URI too long|erroneous characters after protocol string)

 # Option:  ignoreregex
 # Notes.:  regex to ignore. If this regex matches, the line is ignored.
@@ -3,7 +3,7 @@
 #
 # Author: Yaroslav Halchenko
 #
-# $Revision: 728 $
+# $Revision:  $
 #

 [INCLUDES]
@@ -3,7 +3,7 @@
 # Author: Christoph Haas
 # Modified by: Cyril Jaquier
 #
-# $Revision: 728 $
+# $Revision$
 #

 [Definition]
@@ -12,7 +12,7 @@
 # Notes.:  regex to match the password failures messages in the logfile. The
 #          host must be matched by a group named "host". The tag "<HOST>" can
 #          be used for standard IP/hostname matching and is only an alias for
-#          (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)
+#          (?:::f{4,6}:)?(?P<host>\S+)
 # Values:  TEXT
 #
 failregex = LOGIN FAILED, .*, ip=\[<HOST>\]$
@@ -2,7 +2,7 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 728 $
+# $Revision$
 #

 [Definition]
@@ -11,7 +11,7 @@
 # Notes.:  regex to match the password failures messages in the logfile. The
 #          host must be matched by a group named "host". The tag "<HOST>" can
 #          be used for standard IP/hostname matching and is only an alias for
-#          (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)
+#          (?:::f{4,6}:)?(?P<host>\S+)
 # Values:  TEXT
 #
 failregex = error,relay=<HOST>,.*550 User unknown
@@ -1,26 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Jan Wagner <waja@cyconet.org>
-#
-# $Revision: 728 $
-#
-
-[Definition]
-
-# Option:  failregex
-# Notes.:  regex to match the password failures messages in the logfile. The
-#          host must be matched by a group named "host". The tag "<HOST>" can
-#          be used for standard IP/hostname matching and is only an alias for
-#          (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)
-# Values:  TEXT
-#
-failregex = : badlogin: .*\[<HOST>\] plaintext .*SASL\(-13\): authentication failure: checkpass failed$
-	    : badlogin: .*\[<HOST>\] LOGIN \[SASL\(-13\): authentication failure: checkpass failed\]$
-	    : badlogin: .*\[<HOST>\] (?:CRAM-MD5|NTLM) \[SASL\(-13\): authentication failure: incorrect (?:digest|NTLM) response\]$
-	    : badlogin: .*\[<HOST>\] DIGEST-MD5 \[SASL\(-13\): authentication failure: client response doesn't match what we generated\]$
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 
@@ -1,23 +0,0 @@
-# Fail2Ban configuration file for dovcot
-#
-# Author: Martin Waschbuesch
-#
-# $Revision: $
-#
-
-[Definition]
-
-# Option:  failregex
-# Notes.:  regex to match the password failures messages in the logfile. The
-#          host must be matched by a group named "host". The tag "<HOST>" can
-#          be used for standard IP/hostname matching and is only an alias for
-#          (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)
-# Values:  TEXT
-#
-failregex = .*(?:pop3-login|imap-login):.*(?:Authentication failure|Aborted login \(auth failed|Aborted login \(tried to use disabled|Disconnected \(auth failed).*rip=(?P<host>\S*),.*
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 
@@ -1,52 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Francis Russell
-#         Zak B. Elep
-#
-# $Revision$
-#
-# More information: http://bugs.debian.org/546913
-
-[INCLUDES]
-
-# Read common prefixes. If any customizations available -- read them from
-# common.local
-before = common.conf
-
-
-[Definition]
-
-_daemon = dropbear
-
-# Option:  failregex
-# Notes.:  regex to match the password failures messages in the logfile. The
-#          host must be matched by a group named "host". The tag "<HOST>" can
-#          be used for standard IP/hostname matching and is only an alias for
-#          (?:::f{4,6}:)?(?P<host>\S+)
-# Values:  TEXT
-
-# These match the unmodified dropbear messages. It isn't possible to
-# match the source of the 'exit before auth' messages from dropbear.
-#
-failregex = ^%(__prefix_line)slogin attempt for nonexistent user ('.*' )?from <HOST>:.*\s*$
-            ^%(__prefix_line)sbad password attempt for .+ from <HOST>:.*\s*$
-
-# The only line we need to match with the modified dropbear.
-
-# NOTE: The failregex below is ONLY intended to work with a patched
-# version of Dropbear as described here:
-# http://www.unchartedbackwaters.co.uk/pyblosxom/static/patches
-#
-# The standard Dropbear output doesn't provide enough information to
-# ban all types of attack.  The Dropbear patch adds IP address
-# information to the 'exit before auth' message which is always
-# produced for any form of non-successful login. It is that message
-# which this file matches.
-
-# failregex = ^%(__prefix_line)sexit before auth from <HOST>.*\s*$
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 
@@ -2,7 +2,7 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 728 $
+# $Revision$
 #

 [Definition]
@@ -11,7 +11,7 @@
 # Notes.:  regex to match the password failures messages in the logfile. The
 #          host must be matched by a group named "host". The tag "<HOST>" can
 #          be used for standard IP/hostname matching and is only an alias for
-#          (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)
+#          (?:::f{4,6}:)?(?P<host>\S+)
 # Values:  TEXT
 #
 failregex = \[<HOST>\] .*(?:rejected by local_scan|Unrouteable address)
@@ -2,7 +2,7 @@
 #
 # Author: Kevin Zembower (copied from wsftpd.conf)
 #
-# $Revision: 699 $
+# $Revision: 684 $
 #

 [Definition]
@@ -4,7 +4,7 @@
 #
 # Author: Yaroslav Halchenko
 #
-# $Revision: 730 $
+# $Revision: 616 $
 #

 [Definition]
@@ -26,7 +26,7 @@ __line_prefix=(?:\s\S+ %(__daemon_combs_re)s\s+)?
 # Notes.: regex to match the password failures messages in the logfile.
 # Values: TEXT
 #
-failregex = %(__line_prefix)sclient <HOST>#.+: query(?: \(cache\))? '.*' denied\s*$
+failregex = %(__line_prefix)sclient <HOST>#\S+: query(?: \(cache\))? '.*' denied\s*$

 # Option:  ignoreregex
 # Notes.:  regex to ignore. If this regex matches, the line is ignored.
@@ -2,7 +2,7 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 728 $
+# $Revision$
 #

 [Definition]
@@ -11,7 +11,7 @@
 # Notes.:  regex to match the password failures messages in the logfile. The
 #          host must be matched by a group named "host". The tag "<HOST>" can
 #          be used for standard IP/hostname matching and is only an alias for
-#          (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)
+#          (?:::f{4,6}:)?(?P<host>\S+)
 # Values:  TEXT
 #
 failregex = reject: RCPT from (.*)\[<HOST>\]: 554
@@ -2,7 +2,7 @@
 #
 # Author: Yaroslav Halchenko
 #
-# $Revision: 728 $
+# $Revision$
 #

 [Definition]
@@ -11,13 +11,13 @@
 # Notes.: regex to match the password failures messages in the logfile. The
 #          host must be matched by a group named "host". The tag "<HOST>" can
 #          be used for standard IP/hostname matching and is only an alias for
-#          (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)
+#          (?:::f{4,6}:)?(?P<host>\S+)
 # Values: TEXT
 #
-failregex = \(\S+\[<HOST>\]\)[: -]+ USER \S+: no such user found from \S+ \[\S+\] to \S+:\S+ *$
-            \(\S+\[<HOST>\]\)[: -]+ USER \S+ \(Login failed\): .*$
-            \(\S+\[<HOST>\]\)[: -]+ SECURITY VIOLATION: \S+ login attempted\. *$
-            \(\S+\[<HOST>\]\)[: -]+ Maximum login attempts \(\d+\) exceeded *$
+failregex = \(\S+\[<HOST>\]\)[: -]+ USER \S+: no such user found from \S+ \[\S+\] to \S+:\S+$
+            \(\S+\[<HOST>\]\)[: -]+ USER \S+ \(Login failed\): Incorrect password\.$
+            \(\S+\[<HOST>\]\)[: -]+ SECURITY VIOLATION: \S+ login attempted\.$
+            \(\S+\[<HOST>\]\)[: -]+ Maximum login attempts \(\d+\) exceeded$

 # Option:  ignoreregex
 # Notes.:  regex to ignore. If this regex matches, the line is ignored.
@@ -0,0 +1,19 @@
+# Fail2Ban configuration file
+#
+# Author: Arturo 'Buanzo' Busleiman <buanzo@buanzo.com.ar>
+#
+
+[Definition]
+
+# Option:  failregex
+# Notes.:  regex to match psad "scan detected" line, example:
+#
+# Apr 30 23:35:06 mx4 psad: scan detected: 221.192.199.49 -> 85.13.200.90 tcp: [8000] flags: SYN tcp pkts: 1 DL: 2
+#
+failregex = ^.*\ psad\:\ scan\ detected\:\ <HOST>\ \-\>\ .*$
+
+# Option:  ignoreregex
+# Notes.:  regex to ignore. If this regex matches, the line is ignored.
+# Values:  TEXT
+#
+ignoreregex = 
@@ -16,10 +16,10 @@ __errmsg = (?:Authentication failed for user|Erreur d'authentification pour l'ut
 # Notes.: regex to match the password failures messages in the logfile. The
 #         host must be matched by a group named "host". The tag "<HOST>" can
 #         be used for standard IP/hostname matching and is only an alias for
-#         (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)
+#         (?:::f{4,6}:)?(?P<host>\S+)
 # Values: TEXT
 #
-failregex = pure-ftpd(?:\[\d+\])?: \(.+?@<HOST>\) \[WARNING\] %(__errmsg)s \[.+\]\s*$
+failregex = pure-ftpd(?:\[\d+\])?: (.+?@<HOST>) \[WARNING\] %(__errmsg)s \[.+\]$

 # Option:  ignoreregex
 # Notes.:  regex to ignore. If this regex matches, the line is ignored.
@@ -2,7 +2,7 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 728 $
+# $Revision$
 #

 [Definition]
@@ -11,7 +11,7 @@
 # Notes.:  regex to match the password failures messages in the logfile. The
 #          host must be matched by a group named "host". The tag "<HOST>" can
 #          be used for standard IP/hostname matching and is only an alias for
-#          (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)
+#          (?:::f{4,6}:)?(?P<host>\S+)
 # Values:  TEXT
 #
 failregex = (?:[\d,.]+[\d,.] rblsmtpd: |421 badiprbl: ip )<HOST>
@@ -2,7 +2,7 @@
 #
 # Author: Yaroslav Halchenko
 #
-# $Revision: 728 $
+# $Revision$
 #

 [Definition]
@@ -11,10 +11,10 @@
 # Notes.: regex to match the password failures messages in the logfile. The
 #          host must be matched by a group named "host". The tag "<HOST>" can
 #          be used for standard IP/hostname matching and is only an alias for
-#          (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)
+#          (?:::f{4,6}:)?(?P<host>\S+)
 # Values: TEXT
 #
-failregex = (?i): warning: [-._\w]+\[<HOST>\]: SASL (?:LOGIN|PLAIN|(?:CRAM|DIGEST)-MD5) authentication failed(: [ A-Za-z0-9+/]*={0,2})?$
+failregex = : warning: [-._\w]+\[<HOST>\]: SASL (?:LOGIN|PLAIN|(?:CRAM|DIGEST)-MD5) authentication failed$

 # Option:  ignoreregex
 # Notes.:  regex to ignore. If this regex matches, the line is ignored.
@@ -1,22 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Jan Wagner <waja@cyconet.org>
-#
-# $Revision: 727 $
-#
-
-[Definition]
-
-# Option: failregex
-# Notes.: regex to match the password failures messages in the logfile. The
-#          host must be matched by a group named "host". The tag "<HOST>" can
-#          be used for standard IP/hostname matching.
-# Values: TEXT
-#
-failregex = : badlogin: .*\[<HOST>\] (?:LOGIN|PLAIN|(?:CRAM|DIGEST)-MD5) authentication failure$
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 
@@ -2,7 +2,7 @@
 #
 # Author: Yaroslav Halchenko
 #
-# $Revision: 728 $
+# $Revision$
 #

 [Definition]
@@ -11,10 +11,10 @@
 # Notes.:  regex to match the password failures messages in the logfile. The
 #          host must be matched by a group named "host". The tag "<HOST>" can
 #          be used for standard IP/hostname matching and is only an alias for
-#          (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)
+#          (?:::f{4,6}:)?(?P<host>\S+)
 # Values:  TEXT
 #
-failregex = sshd(?:\[\d+\])?: Did not receive identification string from <HOST>$
+failregex = <TIME> <PREFIX> Did not receive identification string from <HOST>$

 # Option:  ignoreregex
 # Notes.:  regex to ignore. If this regex matches, the line is ignored.
@@ -2,37 +2,26 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 728 $
+# $Revision$
 #

-[INCLUDES]
-
-# Read common prefixes. If any customizations available -- read them from
-# common.local
-before = common.conf
-
-
 [Definition]

-_daemon = sshd
-
 # Option:  failregex
 # Notes.:  regex to match the password failures messages in the logfile. The
 #          host must be matched by a group named "host". The tag "<HOST>" can
 #          be used for standard IP/hostname matching and is only an alias for
-#          (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)
+#          (?:::f{4,6}:)?(?P<host>\S+)
 # Values:  TEXT
 #
-failregex = ^%(__prefix_line)s(?:error: PAM: )?Authentication failure for .* from <HOST>\s*$
-            ^%(__prefix_line)s(?:error: PAM: )?User not known to the underlying authentication module for .* from <HOST>\s*$
-            ^%(__prefix_line)sFailed (?:password|publickey) for .* from <HOST>(?: port \d*)?(?: ssh\d*)?$
-            ^%(__prefix_line)sROOT LOGIN REFUSED.* FROM <HOST>\s*$
-            ^%(__prefix_line)s[iI](?:llegal|nvalid) user .* from <HOST>\s*$
-            ^%(__prefix_line)sUser \S+ from <HOST> not allowed because not listed in AllowUsers$
-            ^%(__prefix_line)sauthentication failure; logname=\S* uid=\S* euid=\S* tty=\S* ruser=\S* rhost=<HOST>(?:\s+user=.*)?\s*$
-            ^%(__prefix_line)srefused connect from \S+ \(<HOST>\)\s*$
-            ^%(__prefix_line)sAddress <HOST> .* POSSIBLE BREAK-IN ATTEMPT!*\s*$
-            ^%(__prefix_line)sUser \S+ from <HOST> not allowed because none of user's groups are listed in AllowGroups$
+failregex = <TIME> <PREFIX> (?:error: PAM: )?Authentication failure for .* from <HOST>\s*$
+            <TIME> <PREFIX> Failed [-/\w]+ for .* from <HOST>(?: port \d*)?(?: ssh\d*)?$
+            <TIME> <PREFIX> ROOT LOGIN REFUSED.* FROM <HOST>\s*$
+            <TIME> <PREFIX> [iI](?:llegal|nvalid) user .* from <HOST>\s*$
+            <TIME> <PREFIX> User \S+ from <HOST> not allowed because not listed in AllowUsers$
+            <TIME> <PREFIX> authentication failure; logname=\S* uid=\S* euid=\S* tty=\S* ruser=\S* rhost=<HOST>(?:\s+user=.*)?\s*$
+            <TIME> <PREFIX> refused connect from \S+ \(<HOST>\)\s*$
+            <TIME> <PREFIX> Address <HOST> .* POSSIBLE BREAK-IN ATTEMPT\s*$

 # Option:  ignoreregex
 # Notes.:  regex to ignore. If this regex matches, the line is ignored.
@@ -2,7 +2,7 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 728 $
+# $Revision$
 #

 [Definition]
@@ -11,7 +11,7 @@
 # Notes.: regex to match the password failures messages in the logfile. The
 #          host must be matched by a group named "host". The tag "<HOST>" can
 #          be used for standard IP/hostname matching and is only an alias for
-#          (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)
+#          (?:::f{4,6}:)?(?P<host>\S+)
 # Values: TEXT
 #
 failregex = vsftpd(?:\(pam_unix\))?(?:\[\d+\])?:.* authentication failure; .* rhost=<HOST>(?:\s+user=\S*)?\s*$
@@ -3,7 +3,7 @@
 # Author: Cyril Jaquier
 # Rule by : Delvit Guillaume
 #
-# $Revision: 728 $
+# $Revision: 601 $
 #

 [Definition]
@@ -15,7 +15,7 @@
 # Notes.:  regex to match the password failure messages in the logfile. The
 #          host must be matched by a group named "host". The tag "<HOST>" can
 #          be used for standard IP/hostname matching and is only an alias for
-#          (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)
+#          (?:::f{4,6}:)?(?P<host>\S+)
 # Values:  TEXT
 #
 failregex = webmin.* Non-existent login as .+ from <HOST>$
@@ -2,7 +2,7 @@
 #
 # Author: Yaroslav Halchenko
 #
-# $Revision: 699 $
+# $Revision$
 #

 [Definition]
@@ -2,7 +2,7 @@
 #
 # Author: Guido Bozzetto
 #
-# $Revision: 728 $
+# $Revision: 668 $
 #

 [Definition]
@@ -11,7 +11,7 @@
 # Notes.:  regex to match the password failures messages in the logfile. The
 #          host must be matched by a group named "host". The tag "<HOST>" can
 #          be used for standard IP/hostname matching and is only an alias for
-#          (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)
+#          (?:::f{4,6}:)?(?P<host>\S+)
 # Values:  TEXT
 #
 # Cfr.: /var/log/(daemon\.|sys)log
@@ -2,10 +2,10 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 747 $
+# $Revision$
 #

-# The DEFAULT allows a global definition of the options. They can be overridden
+# The DEFAULT allows a global definition of the options. They can be override
 # in each jail afterwards.

 [DEFAULT]
@@ -13,7 +13,7 @@
 # "ignoreip" can be an IP address, a CIDR mask or a DNS host. Fail2ban will not
 # ban a host which matches an address in this list. Several addresses can be
 # defined using space separator.
-ignoreip = 127.0.0.1/8
+ignoreip = 127.0.0.1

 # "bantime" is the number of seconds that a host is banned.
 bantime  = 600
@@ -45,7 +45,7 @@ backend = auto
 enabled  = false
 filter   = sshd
 action   = iptables[name=SSH, port=ssh, protocol=tcp]
-           sendmail-whois[name=SSH, dest=you@example.com, sender=fail2ban@example.com]
+           sendmail-whois[name=SSH, dest=you@mail.com, sender=fail2ban@mail.com]
 logpath  = /var/log/sshd.log
 maxretry = 5

@@ -54,7 +54,7 @@ maxretry = 5
 enabled  = false
 filter   = proftpd
 action   = iptables[name=ProFTPD, port=ftp, protocol=tcp]
-           sendmail-whois[name=ProFTPD, dest=you@example.com]
+           sendmail-whois[name=ProFTPD, dest=you@mail.com]
 logpath  = /var/log/proftpd/proftpd.log
 maxretry = 6

@@ -66,7 +66,7 @@ enabled  = false
 filter   = sasl
 backend  = polling
 action   = iptables[name=sasl, port=smtp, protocol=tcp]
-           sendmail-whois[name=sasl, dest=you@example.com]
+           sendmail-whois[name=sasl, dest=you@mail.com]
 logpath  = /var/log/mail.log

 # Here we use TCP-Wrappers instead of Netfilter/Iptables. "ignoreregex" is
@@ -77,7 +77,7 @@ logpath  = /var/log/mail.log
 enabled     = false
 filter      = sshd
 action      = hostsdeny
-              sendmail-whois[name=SSH, dest=you@example.com]
+              sendmail-whois[name=SSH, dest=you@mail.com]
 ignoreregex = for myuser from
 logpath     = /var/log/sshd.log

@@ -101,7 +101,7 @@ maxretry = 6
 enabled  = false
 filter   = postfix
 action   = hostsdeny[file=/not/a/standard/path/hosts.deny]
-           sendmail[name=Postfix, dest=you@example.com]
+           sendmail[name=Postfix, dest=you@mail.com]
 logpath  = /var/log/postfix.log
 bantime  = 300

@@ -112,7 +112,7 @@ bantime  = 300

 enabled  = false
 filter   = vsftpd
-action   = sendmail-whois[name=VSFTPD, dest=you@example.com]
+action   = sendmail-whois[name=VSFTPD, dest=you@mail.com]
 logpath  = /var/log/vsftpd.log
 maxretry = 5
 bantime  = 1800
@@ -124,7 +124,7 @@ bantime  = 1800
 enabled  = false
 filter   = vsftpd
 action   = iptables[name=VSFTPD, port=ftp, protocol=tcp]
-           sendmail-whois[name=VSFTPD, dest=you@example.com]
+           sendmail-whois[name=VSFTPD, dest=you@mail.com]
 logpath  = /var/log/vsftpd.log
 maxretry = 5
 bantime  = 1800
@@ -137,7 +137,7 @@ bantime  = 1800
 enabled  = false
 filter   = apache-badbots
 action   = iptables-multiport[name=BadBots, port="http,https"]
-           sendmail-buffered[name=BadBots, lines=5, dest=you@example.com]
+           sendmail-buffered[name=BadBots, lines=5, dest=you@mail.com]
 logpath  = /var/www/*/logs/access_log
 bantime  = 172800
 maxretry = 1
@@ -149,12 +149,13 @@ maxretry = 1
 enabled  = false
 filter   = apache-noscript
 action   = shorewall
-           sendmail[name=Postfix, dest=you@example.com]
+           sendmail[name=Postfix, dest=you@mail.com]
 logpath  = /var/log/apache2/error_log

 # 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.
+# through GET/POST variables.
+# Make sure you edit the filter if you need to allow certain requests.
+# Adapt logpath as required!

 [php-url-fopen]

@@ -173,7 +174,7 @@ maxretry = 1

 [lighttpd-fastcgi]

-enabled = false
+enabled = true
 port    = http,https
 filter  = lighttpd-fastcgi
 # adapt the following two items as needed
@@ -190,7 +191,7 @@ maxretry = 2
 enabled  = false
 filter   = sshd
 action   = ipfw[localhost=192.168.0.1]
-           sendmail-whois[name="SSH,IPFW", dest=you@example.com]
+           sendmail-whois[name="SSH,IPFW", dest=you@mail.com]
 logpath  = /var/log/auth.log
 ignoreip = 168.192.0.1

@@ -206,13 +207,13 @@ ignoreip = 168.192.0.1
 #     category security {
 #         security_file;
 #     };
-# };
+# }
 #
 # in your named.conf to provide proper logging.
 # This jail blocks UDP traffic for DNS requests.

 # !!! WARNING !!!
-#   Since UDP is connection-less protocol, spoofing of IP and imitation
+#   Since UDP is connectionless protocol, spoofing of IP and immitation
 #   of illegal actions is way too simple.  Thus enabling of this filter
 #   might provide an easy way for implementing a DoS against a chosen
 #   victim. See
@@ -224,7 +225,7 @@ ignoreip = 168.192.0.1
 # enabled  = false
 # filter   = named-refused
 # action   = iptables-multiport[name=Named, port="domain,953", protocol=udp]
-#            sendmail-whois[name=Named, dest=you@example.com]
+#            sendmail-whois[name=Named, dest=you@mail.com]
 # logpath  = /var/log/named/security.log
 # ignoreip = 168.192.0.1

@@ -235,7 +236,20 @@ ignoreip = 168.192.0.1
 enabled  = false
 filter   = named-refused
 action   = iptables-multiport[name=Named, port="domain,953", protocol=tcp]
-           sendmail-whois[name=Named, dest=you@example.com]
+           sendmail-whois[name=Named, dest=you@mail.com]
 logpath  = /var/log/named/security.log
 ignoreip = 168.192.0.1

+
+# PSAD support for fail2ban by Buanzo.
+# psad detects portscans, and logs the details to /var/log/messages
+# With this jail, you can ban attackers that portscan you (for example, with the excellent Nmap)
+# TODO: It needs a proper action, and decide on default port range/list
+
+[psad]
+
+enabled	= false
+port	= ssh,http,https,smtp,ftp
+filter	= psad
+logpath	= /var/log/messages
+maxretry = 1
@@ -17,11 +17,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 672 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 672 $"
-__date__ = "$Date: 2008-03-06 00:18:06 +0100 (Thu, 06 Mar 2008) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -17,11 +17,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 672 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 672 $"
-__date__ = "$Date: 2008-03-06 00:18:06 +0100 (Thu, 06 Mar 2008) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -222,7 +222,12 @@ class Fail2banRegex:
 			try:
 				self.__filter.addFailRegex(regex.getFailRegex())
 				try:
-					ret = self.__filter.processLine(line)
+					try:
+						# Decode line to UTF-8
+						l = line.decode('utf-8')
+					except UnicodeDecodeError:
+						l = line
+					ret = self.__filter.findFailure(l)
 					if not len(ret) == 0:
 						if found == True:
 							ret[0].append(True)
@@ -320,12 +325,6 @@ class Fail2banRegex:
 			
 			print
 			
-			print "Date template hits:"
-			for template in self.__filter.dateDetector.getTemplates():
-				print `template.getHits()` + " hit(s): " + template.getName()
-			
-			print
-			
 			print "Success, the total number of match is " + str(total)
 			print
 			print "However, look at the above section 'Running tests' which could contain important"
@@ -333,7 +332,7 @@ class Fail2banRegex:
 			return True

 			
-if __name__ == "__main__":
+def main():
 	fail2banRegex = Fail2banRegex()
 	# Reads the command line options.
 	try:
@@ -388,3 +387,9 @@ if __name__ == "__main__":
 			sys.exit(0)
 		else:
 			sys.exit(-1)
+
+if __name__ == "__main__":
+	try:
+		main()
+	except KeyboardInterrupt:
+		print "Interrupted by the user"
@@ -17,11 +17,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 672 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 672 $"
-__date__ = "$Date: 2008-03-06 00:18:06 +0100 (Thu, 06 Mar 2008) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -17,11 +17,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 522 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 522 $"
-__date__ = "$Date: 2007-01-21 23:19:57 +0100 (Sun, 21 Jan 2007) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -34,7 +34,6 @@ from testcases import clientreadertestcase
 from testcases import failmanagertestcase
 from testcases import filtertestcase
 from testcases import servertestcase
-from testcases import datedetectortestcase
 from testcases import actiontestcase
 from server.mytime import MyTime

@@ -67,8 +66,6 @@ tests.addTest(unittest.makeSuite(failmanagertestcase.AddFailure))
 tests.addTest(unittest.makeSuite(banmanagertestcase.AddFailure))
 # ClientReader
 tests.addTest(unittest.makeSuite(clientreadertestcase.JailReaderTest))
-# DateDetector
-tests.addTest(unittest.makeSuite(datedetectortestcase.DateDetectorTest))

 # Tests runner
 testRunner = unittest.TextTestRunner()
@@ -25,7 +25,7 @@
 #
 # Author: Cyril Jaquier
 # 
-# $Revision: 527 $
+# $Revision$

 FAIL2BAN="fail2ban-client"

@@ -0,0 +1,83 @@
+#!/bin/bash
+#-------------------------- =+- Shell script -+= --------------------------
+#
+# @file      badbots.sh
+# @date      Sun Feb 11 00:49:53 2007
+# @brief
+#
+#
+#  Yaroslav Halchenko                                      CS@UNM, CS@NJIT
+#  web:     http://www.onerussian.com                      & PSYCH@RUTGERS
+#  e-mail:  yoh@onerussian.com                              ICQ#: 60653192
+#
+# DESCRIPTION (NOTES):
+# 
+# Script to fetch list of agent strings from http://www.user-agents.org
+# which are known to be from mailicious bots, and create apache-badbots.conf
+# filter for fail2ban
+#
+# COPYRIGHT: Yaroslav Halchenko 2007-2010
+#
+# LICENSE:
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the 
+#  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+#  MA 02110-1301, USA.
+#
+# On Debian system see /usr/share/common-licenses/GPL for the full license.
+#
+#-----------------\____________________________________/------------------
+
+url=http://www.user-agents.org/index.shtml
+badbots=$(
+for f in "" "?g_l" "?m" "?n_s" "?t_z"; do
+	wget -q -O- $url$f; 
+done \
+| grep -h -B4 '<td class="smallcell" nowrap>S&nbsp;</td>'\
+| sed -e 's/&nbsp;//g' \
+| awk '/^--/{getline; gsub("  ",""); print $0}' \
+| sed -e 's/\([.\:|()]\)/\\\1/g' \
+| tr '\n' '|' \
+| sed -e 's/|$//g'
+)
+
+echo $badbots >| /tmp/badbots.tmp
+
+cat >| apache-badbots.conf <<EOF
+# Fail2Ban configuration file
+#
+# List of bad bots fetched from http://www.user-agents.org
+# Generated on `date` by $0
+#
+# Author: Yaroslav Halchenko
+#
+#
+
+[Definition]
+badbotscustom = EmailCollector|WebEMailExtrac
+badbots = $badbots
+
+# Option:  failregex
+# Notes.:  Regexp to catch known spambots and software alike. Please verify that
+#          it is your intent to block IPs which were driven by abovementioned bots
+# Values:  TEXT
+#
+failregex = ^(?P<host>\S*) -.*"GET.*HTTP.*"(?:%(badbots)s|%(badbotscustom)s)"\$
+
+# Option:  ignoreregex
+# Notes.:  regex to ignore. If this regex matches, the line is ignored.
+# Values:  TEXT
+#
+ignoreregex =
+EOF
@@ -17,7 +17,7 @@
 #
 # Author: Sireyessire, Cyril Jaquier
 # 
-# $Revision: 559 $
+# $Revision$

 opts="start stop restart reload showlog"

@@ -1,106 +0,0 @@
-#!/bin/bash
-#
-# Usage: ./check_fail2ban
-###############################################################################################
-# Description: 
-#		This plugin will check the status of Fail2ban.  
-#
-# Created:      2008-10-25 (Sebastian Mueller)
-#
-# Changes:      2008-10-26 fixed some issues (Sebastian Mueller)
-# Changes:      2009-01-25 add the second check, when server is not replying and the
-#		process is hang-up (Sebastian Mueller)
-#
-# please visit my website http://www.elchtest.eu or my personal WIKI http://wiki.elchtest.eu
-#
-################################################################################################
-# if you have any questions, send a mail to linux@krabbe-offline.de 
-#
-# this script is for my personal use. read the script before running/using it!!!
-#
-#
-# YOU HAVE BEEN WARNED. THIS MAY DESTROY YOUR MACHINE. I ACCEPT NO RESPONSIBILITY.
-###############################################################################################
-
-
-SECOND_CHECK=0 
-STATE_OK=0
-STATE_CRITICAL=2
-
-######################################################################
-# Read the Status from fail2ban-client 
-######################################################################
-check_processes_fail2ban()
-{
-        
-  F2B=`sudo -u root fail2ban-client ping | awk -F " " '{print $3}'`
-  exit_fail2ban=0
-
-  if  [[ $F2B = "pong" ]]; then
-   exit_fail2ban=$STATE_OK
- else
- exit_fail2ban=$STATE_CRITICAL
- fi
-
-}
-######################################################################
-# first check in the Background, PID will be killed when no response
-# after 10 seconds, might be possible, otherwise the scipt will be
-# pressent in your memory all the time
-#
-######################################################################
-
-check_processes_fail2ban &
-pid=$!
-
-typeset -i i=0
-while ps $pid >/dev/null
-do
- sleep 1
- i=$i+1
-if [ $i -ge 10 ]
- then
- kill $pid 
-   SECOND_CHECK=1
-   exit_fail2ban=$STATE_CRITICAL
-   break
-fi
-done
-
-######################################################################
-# when the Server response (doesent mean the FAIL2BAN is working)
-# in the first step, then it will run again and test the Service 
-# and provide the real status
-######################################################################
-
-
-if [ $SECOND_CHECK -eq 0  ]; then
-  check_processes_fail2ban
- elif [ $SECOND_CHECK -eq 1 ]; then
-  exit_fail2ban=$STATE_CRITICAL
-fi
-
-
-
-######################################################################
-# Mainmenu
-######################################################################
-
-
-final_exit=$exit_fail2ban
-if [ $final_exit -eq 0  ]; then
-  echo "SYSTEM OK - Fail2ban is working normaly"
-  exitstatus=$STATE_OK
-elif [ $final_exit -ne "0" ]; then
-  echo "SYSTEM WARNING - Fail2Ban is not working"
-######################################################################
-# If don't have a Nagios Server for monitoring, remove the comment and
-# add your Mail Addres. You can check it with a Cron Job once a hour.
-# put a txt file on your server and describe how to fix the issue, this 
-# could be attached to the mail.
-######################################################################
-#  mutt -s "FAIL2BAN NOT WORKING" your@example.com < /home/f2ban.txt
-
-  exitstatus=$STATE_CRITICAL
-fi
-exit $exitstatus
@@ -1,18 +0,0 @@
-It seems that Fail2ban is currently not working, please login and check
-
-HELP:
-
-1.) stop the Service
-/etc/init.d/fail2ban stop
-
-2.) delete the socket if avalible
-rm /tmp/fail2ban.sock
-
-3.) start the Service 
-/etc/init.d/fail2ban start
-
-4.) check if fail2ban is working
-fail2ban-client ping
-Answer should be "pong"
-
-5.) if the answer is not "pong" run away or  CRY FOR HELP ;-) 
@@ -35,13 +35,6 @@ rc_reset
 case "$1" in
    start)
        echo -n "Starting Fail2Ban "
-        # a cleanup workaround, since /etc/init.d/boot.local removes only. 
-        # regular files, and not sockets 
-        if test -e $FAIL2BAN_SOCKET; then
-            if ! lsof -n $FAIL2BAN_SOCKET &>/dev/null; then
-                rm $FAIL2BAN_SOCKET
-            fi
-        fi
        /sbin/startproc $FAIL2BAN_BIN start &>/dev/null
        rc_status -v
        ;;
@@ -0,0 +1,2 @@
+#!/bin/bash
+kill `ps ax|grep fail2ban|grep -v grep|awk '{print $1}'`
@@ -1,12 +1,11 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH FAIL2BAN-CLIENT "1" "March 2008" "fail2ban-client v0.8.2" "User Commands"
+.TH FAIL2BAN-CLIENT "1" "May 2007" "fail2ban-client v0.8.0" "User Commands"
 .SH NAME
 fail2ban-client \- configure and control the server
-.SH SYNOPSIS
-.B fail2ban-client
-[\fIOPTIONS\fR] \fI<COMMAND>\fR
 .SH DESCRIPTION
-Fail2Ban v0.8.2 reads log file that contains password failure report
+[?1034hUsage: ../fail2ban\-client [OPTIONS] <COMMAND>
+.PP
+Fail2Ban v0.8.0 reads log file that contains password failure report
 and bans the corresponding IP addresses using firewall rules.
 .SH OPTIONS
 .TP
@@ -46,9 +45,6 @@ starts the server and the jails
 \fBreload\fR
 reloads the configuration
 .TP
-\fBreload <JAIL>\fR
-reloads the jail <JAIL>
-.TP
 \fBstop\fR
 stops all jails and terminate the
 server
@@ -113,6 +109,18 @@ of <JAIL>
 removes <FILE> to the monitoring
 list of <JAIL>
 .TP
+\fBset <JAIL> timeregex <REGEX>\fR
+sets the regular expression
+<REGEX> to match the date format
+for <JAIL>. This will disable the
+autodetection feature.
+.TP
+\fBset <JAIL> timepattern <PATTERN>\fR
+sets the pattern <PATTERN> to
+match the date format for <JAIL>.
+This will disable the
+autodetection feature.
+.TP
 \fBset <JAIL> addfailregex <REGEX>\fR
 adds the regular expression
 <REGEX> which must match failures
@@ -248,12 +256,12 @@ action <ACT> for <JAIL>
 .SH FILES
 \fI/etc/fail2ban/*\fR
 .SH AUTHOR
-Written by Cyril Jaquier <cyril.jaquier@fail2ban.org>.
+Written by Cyril Jaquier <lostcontrol@users.sourceforge.net>.
 Many contributions by Yaroslav O. Halchenko <debian@onerussian.com>.
 .SH "REPORTING BUGS"
-Report bugs to <cyril.jaquier@fail2ban.org>
+Report bugs to <lostcontrol@users.sourceforge.net>
 .SH COPYRIGHT
-Copyright \(co 2004-2008 Cyril Jaquier
+Copyright \(co 2004-2006 Cyril Jaquier
 .br
 Copyright of modifications held by their respective authors.
 Licensed under the GNU General Public License v2 (GPL).
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH FAIL2BAN-REGEX "1" "March 2008" "fail2ban-regex v0.8.2" "User Commands"
+.TH FAIL2BAN-REGEX "1" "May 2007" "fail2ban-regex v0.8.0" "User Commands"
 .SH NAME
 fail2ban-regex \- test Fail2ban "failregex" option
 .SH SYNOPSIS
 .B fail2ban-regex
-[\fIOPTIONS\fR] \fI<LOG> <REGEX> \fR[\fIIGNOREREGEX\fR]
+[\fIOPTIONS\fR] \fI<LOG> <REGEX>\fR
 .SH DESCRIPTION
-Fail2Ban v0.8.2 reads log file that contains password failure report
+Fail2Ban v0.8.0 reads log file that contains password failure report
 and bans the corresponding IP addresses using firewall rules.
 .PP
 This tools can test regular expressions for "fail2ban".
@@ -31,20 +31,13 @@ a string representing a 'failregex'
 .TP
 \fBfilename\fR
 path to a filter file (filter.d/sshd.conf)
-.SS "IgnoreRegex:"
-.TP
-\fBstring\fR
-a string representing an 'ignoreregex'
-.TP
-\fBfilename\fR
-path to a filter file (filter.d/sshd.conf)
 .SH AUTHOR
-Written by Cyril Jaquier <cyril.jaquier@fail2ban.org>.
+Written by Cyril Jaquier <lostcontrol@users.sourceforge.net>.
 Many contributions by Yaroslav O. Halchenko <debian@onerussian.com>.
 .SH "REPORTING BUGS"
-Report bugs to <cyril.jaquier@fail2ban.org>
+Report bugs to <lostcontrol@users.sourceforge.net>
 .SH COPYRIGHT
-Copyright \(co 2004-2008 Cyril Jaquier
+Copyright \(co 2004-2006 Cyril Jaquier
 .br
 Copyright of modifications held by their respective authors.
 Licensed under the GNU General Public License v2 (GPL).
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH FAIL2BAN-SERVER "1" "March 2008" "fail2ban-server v0.8.2" "User Commands"
+.TH FAIL2BAN-SERVER "1" "May 2007" "fail2ban-server v0.8.0" "User Commands"
 .SH NAME
 fail2ban-server \- start the server
 .SH SYNOPSIS
 .B fail2ban-server
 [\fIOPTIONS\fR]
 .SH DESCRIPTION
-Fail2Ban v0.8.2 reads log file that contains password failure report
+Fail2Ban v0.8.0 reads log file that contains password failure report
 and bans the corresponding IP addresses using firewall rules.
 .PP
 Only use this command for debugging purpose. Start the server with
@@ -32,12 +32,12 @@ display this help message
 \fB\-V\fR, \fB\-\-version\fR
 print the version
 .SH AUTHOR
-Written by Cyril Jaquier <cyril.jaquier@fail2ban.org>.
+Written by Cyril Jaquier <lostcontrol@users.sourceforge.net>.
 Many contributions by Yaroslav O. Halchenko <debian@onerussian.com>.
 .SH "REPORTING BUGS"
-Report bugs to <cyril.jaquier@fail2ban.org>
+Report bugs to <lostcontrol@users.sourceforge.net>
 .SH COPYRIGHT
-Copyright \(co 2004-2008 Cyril Jaquier
+Copyright \(co 2004-2006 Cyril Jaquier
 .br
 Copyright of modifications held by their respective authors.
 Licensed under the GNU General Public License v2 (GPL).
@@ -16,10 +16,10 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 433 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 433 $"
-__date__ = "$Date: 2006-10-24 21:40:51 +0200 (Tue, 24 Oct 2006) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"
@@ -16,11 +16,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 682 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 682 $"
-__date__ = "$Date: 2008-04-08 00:25:16 +0200 (Tue, 08 Apr 2008) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -16,11 +16,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 567 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 567 $"
-__date__ = "$Date: 2007-03-26 23:17:31 +0200 (Mon, 26 Mar 2007) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -25,8 +25,7 @@ __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

 from pickle import dumps, loads, HIGHEST_PROTOCOL
-from common import helpers
-import asyncore, asynchat, socket, os, logging, sys, traceback
+import asyncore, asynchat, socket, os, logging

 # Gets the instance of the logger.
 logSys = logging.getLogger("fail2ban.server")
@@ -70,9 +69,7 @@ class RequestHandler(asynchat.async_chat):
 		self.close_when_done()
 		
 	def handle_error(self):
-		e1,e2 = helpers.formatExceptionInfo()
-		logSys.error("Unexpected communication error: "+e2)
-		logSys.error(traceback.format_exc().splitlines())
+		logSys.error("Unexpected communication error")
 		self.close()
 		
 ##
@@ -135,13 +132,7 @@ class AsyncServer(asyncore.dispatcher):
 		# Sets the init flag.
 		self.__init = True
 		# TODO Add try..catch
-		# There's a bug report for Python 2.6/3.0 that use_poll=True yields some 2.5 incompatibilities:
-		if sys.version_info >= (2, 6): # if python 2.6 or greater...
-			logSys.debug("Detected Python 2.6 or greater. asyncore.loop() not using poll")
-			asyncore.loop(use_poll = False) # fixes the "Unexpected communication problem" issue on Python 2.6 and 3.0
-		else:
-			logSys.debug("NOT Python 2.6/3.* - asyncore.loop() using poll")
-			asyncore.loop(use_poll = True)
+		asyncore.loop()
 	
 	##
 	# Stops the communication server.
@@ -16,11 +16,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 638 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 638 $"
-__date__ = "$Date: 2007-12-17 21:00:36 +0100 (Mon, 17 Dec 2007) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -1,178 +0,0 @@
-# This file is part of Fail2Ban.
-#
-# Fail2Ban is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# Fail2Ban is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Fail2Ban; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-# Author: Cyril Jaquier
-# 
-# $Revision: 722 $
-
-__author__ = "Cyril Jaquier"
-__version__ = "$Revision: 722 $"
-__date__ = "$Date: 2009-01-28 00:21:55 +0100 (Wed, 28 Jan 2009) $"
-__copyright__ = "Copyright (c) 2004 Cyril Jaquier"
-__license__ = "GPL"
-
-import time, logging
-
-from datetemplate import DateStrptime, DateTai64n, DateEpoch, DateISO8601
-from threading import Lock
-
-# Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.filter.datedetector")
-
-class DateDetector:
-	
-	def __init__(self):
-		self.__lock = Lock()
-		self.__templates = list()
-	
-	def addDefaultTemplate(self):
-		self.__lock.acquire()
-		try:
-			# standard
-			template = DateStrptime()
-			template.setName("MONTH Day Hour:Minute:Second")
-			template.setRegex("\S{3}\s{1,2}\d{1,2} \d{2}:\d{2}:\d{2}")
-			template.setPattern("%b %d %H:%M:%S")
-			self.__templates.append(template)
-			# asctime
-			template = DateStrptime()
-			template.setName("WEEKDAY MONTH Day Hour:Minute:Second Year")
-			template.setRegex("\S{3} \S{3}\s{1,2}\d{1,2} \d{2}:\d{2}:\d{2} \d{4}")
-			template.setPattern("%a %b %d %H:%M:%S %Y")
-			self.__templates.append(template)
-			# asctime without year
-			template = DateStrptime()
-			template.setName("WEEKDAY MONTH Day Hour:Minute:Second")
-			template.setRegex("\S{3} \S{3}\s{1,2}\d{1,2} \d{2}:\d{2}:\d{2}")
-			template.setPattern("%a %b %d %H:%M:%S")
-			self.__templates.append(template)
-			# simple date
-			template = DateStrptime()
-			template.setName("Year/Month/Day Hour:Minute:Second")
-			template.setRegex("\d{4}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}")
-			template.setPattern("%Y/%m/%d %H:%M:%S")
-			self.__templates.append(template)
-			# simple date too (from x11vnc)
-			template = DateStrptime()
-			template.setName("Day/Month/Year Hour:Minute:Second")
-			template.setRegex("\d{2}/\d{2}/\d{4} \d{2}:\d{2}:\d{2}")
-			template.setPattern("%d/%m/%Y %H:%M:%S")
-			self.__templates.append(template)
-			# Apache format [31/Oct/2006:09:22:55 -0000]
-			template = DateStrptime()
-			template.setName("Day/MONTH/Year:Hour:Minute:Second")
-			template.setRegex("\d{2}/\S{3}/\d{4}:\d{2}:\d{2}:\d{2}")
-			template.setPattern("%d/%b/%Y:%H:%M:%S")
-			self.__templates.append(template)
-			# CPanel 05/20/2008:01:57:39
-			template = DateStrptime()
-			template.setName("Month/Day/Year:Hour:Minute:Second")
-			template.setRegex("\d{2}/\d{2}/\d{4}:\d{2}:\d{2}:\d{2}")
-			template.setPattern("%m/%d/%Y:%H:%M:%S")
-			self.__templates.append(template)
-			# Exim 2006-12-21 06:43:20
-			template = DateStrptime()
-			template.setName("Year-Month-Day Hour:Minute:Second")
-			template.setRegex("\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}")
-			template.setPattern("%Y-%m-%d %H:%M:%S")
-			self.__templates.append(template)
-			# named 26-Jul-2007 15:20:52.252 
-			template = DateStrptime()
-			template.setName("Day-MONTH-Year Hour:Minute:Second[.Millisecond]")
-			template.setRegex("\d{2}-\S{3}-\d{4} \d{2}:\d{2}:\d{2}")
-			template.setPattern("%d-%b-%Y %H:%M:%S")
-			self.__templates.append(template)
-			# 17-07-2008 17:23:25
-			template = DateStrptime()
-			template.setName("Day-Month-Year Hour:Minute:Second")
-			template.setRegex("\d{2}-\d{2}-\d{4} \d{2}:\d{2}:\d{2}")
-			template.setPattern("%d-%m-%Y %H:%M:%S")
-			self.__templates.append(template)
-			# TAI64N
-			template = DateTai64n()
-			template.setName("TAI64N")
-			self.__templates.append(template)
-			# Epoch
-			template = DateEpoch()
-			template.setName("Epoch")
-			self.__templates.append(template)
-			# ISO 8601
-			template = DateISO8601()
-			template.setName("ISO 8601")
-			self.__templates.append(template)
-			# Only time information in the log
-			template = DateStrptime()
-			template.setName("Hour:Minute:Second")
-			template.setRegex("^\d{2}:\d{2}:\d{2}")
-			template.setPattern("%H:%M:%S")
-			self.__templates.append(template)
-			# <09/16/08@05:03:30>
-			template = DateStrptime()
-			template.setName("<Month/Day/Year@Hour:Minute:Second>")
-			template.setRegex("^<\d{2}/\d{2}/\d{2}@\d{2}:\d{2}:\d{2}>")
-			template.setPattern("<%m/%d/%y@%H:%M:%S>")
-			self.__templates.append(template)
-		finally:
-			self.__lock.release()
-	
-	def getTemplates(self):
-		return self.__templates
-	
-	def matchTime(self, line):
-		self.__lock.acquire()
-		try:
-			for template in self.__templates:
-				match = template.matchDate(line)
-				if not match == None:
-					return match
-			return None
-		finally:
-			self.__lock.release()
-
-	def getTime(self, line):
-		self.__lock.acquire()
-		try:
-			for template in self.__templates:
-				try:
-					date = template.getDate(line)
-					if date == None:
-						continue
-					return date
-				except ValueError:
-					pass
-			return None
-		finally:
-			self.__lock.release()
-
-	def getUnixTime(self, line):
-		date = self.getTime(line)
-		if date == None:
-			return None
-		else:
-			return time.mktime(date)
-
-	##
-	# Sort the template lists using the hits score. This method is not called
-	# in this object and thus should be called from time to time.
-	
-	def sortTemplate(self):
-		self.__lock.acquire()
-		try:
-			logSys.debug("Sorting the template list")
-			self.__templates.sort(lambda x, y: cmp(x.getHits(), y.getHits()))
-			self.__templates.reverse()
-		finally:
-			self.__lock.release()
@@ -1,192 +0,0 @@
-# -*- coding: utf-8 -*-
-# This file is part of Fail2Ban.
-#
-# Fail2Ban is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# Fail2Ban is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Fail2Ban; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-# Author: Cyril Jaquier
-# 
-# $Revision: 729 $
-
-__author__ = "Cyril Jaquier"
-__version__ = "$Revision: 729 $"
-__date__ = "$Date: 2009-02-08 20:50:44 +0100 (Sun, 08 Feb 2009) $"
-__copyright__ = "Copyright (c) 2004 Cyril Jaquier"
-__license__ = "GPL"
-
-import re, time
-
-from mytime import MyTime
-import iso8601
-
-class DateTemplate:
-	
-	def __init__(self):
-		self.__name = ""
-		self.__regex = ""
-		self.__cRegex = None
-		self.__hits = 0
-	
-	def setName(self, name):
-		self.__name = name
-		
-	def getName(self):
-		return self.__name
-	
-	def setRegex(self, regex):
-		self.__regex = regex.strip()
-		self.__cRegex = re.compile(regex)
-		
-	def getRegex(self):
-		return self.__regex
-	
-	def getHits(self):
-		return self.__hits
-	
-	def matchDate(self, line):
-		dateMatch = self.__cRegex.search(line)
-		if not dateMatch == None:
-			self.__hits += 1
-		return dateMatch
-	
-	def getDate(self, line):
-		raise Exception("matchDate() is abstract")
-
-
-class DateEpoch(DateTemplate):
-	
-	def __init__(self):
-		DateTemplate.__init__(self)
-		# We already know the format for TAI64N
-		self.setRegex("^\d{10}(\.\d{6})?")
-	
-	def getDate(self, line):
-		date = None
-		dateMatch = self.matchDate(line)
-		if dateMatch:
-			# extract part of format which represents seconds since epoch
-			date = list(time.localtime(float(dateMatch.group())))
-		return date
-
-
-##
-# Use strptime() to parse a date. Our current locale is the 'C'
-# one because we do not set the locale explicitly. This is POSIX
-# standard.
-
-class DateStrptime(DateTemplate):
-	
-	TABLE = dict()
-	TABLE["Jan"] = []
-	TABLE["Feb"] = [u"Fév"]
-	TABLE["Mar"] = [u"Mär"]
-	TABLE["Apr"] = ["Avr"]
-	TABLE["May"] = ["Mai"]
-	TABLE["Jun"] = []
-	TABLE["Jul"] = []
-	TABLE["Aug"] = ["Aou"]
-	TABLE["Sep"] = []
-	TABLE["Oct"] = ["Okt"]
-	TABLE["Nov"] = []
-	TABLE["Dec"] = [u"Déc", "Dez"]
-	
-	def __init__(self):
-		DateTemplate.__init__(self)
-		self.__pattern = ""
-	
-	def setPattern(self, pattern):
-		self.__pattern = pattern.strip()
-		
-	def getPattern(self):
-		return self.__pattern
-	
-	#@staticmethod
-	def convertLocale(date):
-		for t in DateStrptime.TABLE:
-			for m in DateStrptime.TABLE[t]:
-				if date.find(m) >= 0:
-					return date.replace(m, t)
-		return date
-	convertLocale = staticmethod(convertLocale)
-	
-	def getDate(self, line):
-		date = None
-		dateMatch = self.matchDate(line)
-		if dateMatch:
-			try:
-				# Try first with 'C' locale
-				date = list(time.strptime(dateMatch.group(), self.getPattern()))
-			except ValueError:
-				# Try to convert date string to 'C' locale
-				conv = self.convertLocale(dateMatch.group())
-				try:
-					date = list(time.strptime(conv, self.getPattern()))
-				except ValueError, e:
-					# Try to add the current year to the pattern. Should fix
-					# the "Feb 29" issue.
-					conv += " %s" % MyTime.gmtime()[0]
-					pattern = "%s %%Y" % self.getPattern()
-					date = list(time.strptime(conv, pattern))
-			if date[0] < 2000:
-				# There is probably no year field in the logs
-				date[0] = MyTime.gmtime()[0]
-				# Bug fix for #1241756
-				# If the date is greater than the current time, we suppose
-				# that the log is not from this year but from the year before
-				if time.mktime(date) > MyTime.time():
-					date[0] -= 1
-				elif date[1] == 1 and date[2] == 1:
-					# If it is Jan 1st, it is either really Jan 1st or there
-					# is neither month nor day in the log.
-					date[1] = MyTime.gmtime()[1]
-					date[2] = MyTime.gmtime()[2]
-		return date
-
-
-class DateTai64n(DateTemplate):
-	
-	def __init__(self):
-		DateTemplate.__init__(self)
-		# We already know the format for TAI64N
-		self.setRegex("@[0-9a-f]{24}")
-	
-	def getDate(self, line):
-		date = None
-		dateMatch = self.matchDate(line)
-		if dateMatch:
-			# extract part of format which represents seconds since epoch
-			value = dateMatch.group()
-			seconds_since_epoch = value[2:17]
-			# convert seconds from HEX into local time stamp
-			date = list(time.localtime(int(seconds_since_epoch, 16)))
-		return date
-
-
-class DateISO8601(DateTemplate):
-
-	def __init__(self):
-		DateTemplate.__init__(self)
-		date_re = "[0-9]{4}-[0-9]{1,2}-[0-9]{1,2}" \
-		".[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]+)?" \
-		"(Z|(([-+])([0-9]{2}):([0-9]{2})))?"
-		self.setRegex(date_re)
-	
-	def getDate(self, line):
-		date = None
-		dateMatch = self.matchDate(line)
-		if dateMatch:
-			# Parses the date.
-			value = dateMatch.group()
-			date = list(iso8601.parse_date(value).timetuple())
-		return date
@@ -16,11 +16,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 731 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 731 $"
-__date__ = "$Date: 2009-02-09 23:08:21 +0100 (Mon, 09 Feb 2009) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -34,7 +34,6 @@ class FailData:
 	def __init__(self):
 		self.__retry = 0
 		self.__lastTime = 0
-		self.__lastReset = 0
 	
 	def setRetry(self, value):
 		self.__retry = value
@@ -51,9 +50,4 @@ class FailData:
 	
 	def getLastTime(self):
 		return self.__lastTime
-
-	def getLastReset(self):
-		return self.__lastReset
-
-	def setLastReset(self, value):
-		self.__lastReset = value
+	
@@ -16,11 +16,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 731 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 731 $"
-__date__ = "$Date: 2009-02-09 23:08:21 +0100 (Mon, 09 Feb 2009) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -90,15 +90,11 @@ class FailManager:
 			unixTime = ticket.getTime()
 			if self.__failList.has_key(ip):
 				fData = self.__failList[ip]
-				if fData.getLastReset() < unixTime - self.__maxTime:
-					fData.setLastReset(unixTime)
-					fData.setRetry(0)
 				fData.inc()
 				fData.setLastTime(unixTime)
 			else:
 				fData = FailData()
 				fData.inc()
-				fData.setLastReset(unixTime)
 				fData.setLastTime(unixTime)
 				self.__failList[ip] = fData
 			self.__failTotal += 1
@@ -16,74 +16,127 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 728 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 728 $"
-__date__ = "$Date: 2009-02-08 18:31:24 +0100 (Sun, 08 Feb 2009) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

-import re, sre_constants
+import re, sre_constants, logging

-##
-# Regular expression class.
-#
-# This class represents a regular expression with its compiled version.
+from template import Template
+from timetemplate import TimeTemplates
+from prefixtemplate import PrefixTemplates
+from hosttemplate import HostTemplates
+
+# Gets the instance of the logger.
+logSys = logging.getLogger("fail2ban.filter.failregex")

 class Regex:
-
-	##
-	# Constructor.
-	#
-	# Creates a new object. This method can throw RegexException in order to
-	# avoid construction of invalid object.
-	# @param value the regular expression
 	
 	def __init__(self, regex):
-		self._matchCache = None
-		# Perform shortcuts expansions.
-		# Replace "<HOST>" with default regular expression for host.
-		regex = regex.replace("<HOST>", "(?:::f{4,6}:)?(?P<host>[\w\-.^_]+)")
-		if regex.lstrip() == '':
-			raise RegexException("Cannot add empty regex")
+		self.__originalRegex = regex
+		self.__convertedRegex = None
+		self.__compiledRegex = None
+		self.__templates = dict()
+		self.__hostRegex = None
+		self.__dateRegex = None
+		self.__prefixRegex = None
+		
+	def process(self):
+		regex = self.__originalRegex
+		for item in self.__templates.values():
+			regex = regex.replace(item.getTag(), item.getRegex(), 1)
 		try:
-			self._regexObj = re.compile(regex)
-			self._regex = regex
+			self.__compiledRegex = re.compile(regex)
+			self.__convertedRegex = regex
 		except sre_constants.error:
 			raise RegexException("Unable to compile regular expression '%s'" %
 								 regex)
+
+	def register(self, template):
+		self.__templates[template.getName()] = template
 	
-	##
-	# Gets the regular expression.
-	#
-	# The effective regular expression used is returned.
-	# @return the regular expression
+	def getTemplate(self, tag):
+		return self.__templates[tag]
+
+	def match(self, line):
+		return self.__compiledRegex.match(line)
 	
-	def getRegex(self):
-		return self._regex
+	def getOriginalRegex(self):
+		return self.__originalRegex
 	
-	##
-	# Searches the regular expression.
-	#
-	# Sets an internal cache (match object) in order to avoid searching for
-	# the pattern again. This method must be called before calling any other
-	# method of this object.
-	# @param value the line
+	def getConvertedRegex(self):
+		return self.__convertedRegex
+
+
+class FailRegex:
 	
-	def search(self, value):
-		self._matchCache = self._regexObj.search(value)
+	HOST_TEMPLATES = HostTemplates()
+	PREFIX_TEMPLATES = PrefixTemplates()
+	TIME_TEMPLATES = TimeTemplates()
 	
-	##
-	# Checks if the previous call to search() matched.
-	#
-	# @return True if a match was found, False otherwise
+	def __init__(self, regex):
+		self.__regex = Regex(regex)
+		self.__match = None
+		self.__found = False
+
+	def __autoDetection(self, line):
+		for host in self.HOST_TEMPLATES.getTemplates():
+			self.__regex.register(host)
+			for date in self.TIME_TEMPLATES.getTemplates():
+				self.__regex.register(date)
+				for prefix in self.PREFIX_TEMPLATES.getTemplates():
+					self.__regex.register(prefix)
+					self.__regex.process()
+					match = self.__regex.match(line)
+					if match:
+						self.__found = True
+						#logSys.debug("Auto-detection succeeded")
+						#logSys.debug("failregex is %s" %
+						#			self.__regex.getConvertedRegex())
+						return match
+		return None
+
+	def search(self, line):
+		if self.__found:
+			self.__match = self.__regex.match(line)
+		else:
+			self.__match = self.__autoDetection(line)
 	
 	def hasMatched(self):
-		if self._matchCache:
+		if self.__match:
 			return True
 		else:
 			return False
+	
+	def getOriginalRegex(self):
+		return self.__regex.getOriginalRegex()
+	
+	def getHost(self):
+		template = self.__regex.getTemplate(Template.TEMPLATE_HOST)
+		host = self.__match.group(template.getName())
+		if host == None:
+			# Gets a few information.
+			s = self.__match.string
+			r = self.__match.re
+			raise RegexException("No 'host' found in '%s' using '%s'" % (s, r))
+		return host
+	
+	def getTime(self):
+		template = self.__regex.getTemplate(Template.TEMPLATE_TIME)
+		time = self.__match.group(template.getName())
+		if time == None:
+			# Gets a few information.
+			s = self.__match.string
+			r = self.__match.re
+			raise RegexException("No 'time' found in '%s' using '%s'" % (s, r))
+		try:
+			return template.getTime(time)
+		except Exception:
+			return None


 ##
@@ -91,40 +144,3 @@ class Regex:

 class RegexException(Exception):
 	pass
-
-
-##
-# Regular expression class.
-#
-# This class represents a regular expression with its compiled version.
-
-class FailRegex(Regex):
-
-	##
-	# Constructor.
-	#
-	# Creates a new object. This method can throw RegexException in order to
-	# avoid construction of invalid object.
-	# @param value the regular expression
-	
-	def __init__(self, regex):
-		# Initializes the parent.
-		Regex.__init__(self, regex)
-		# Check for group "host"
-		if "host" not in self._regexObj.groupindex:
-			raise RegexException("No 'host' group in '%s'" % self._regex)
-	
-	##
-	# Returns the matched host.
-	#
-	# This corresponds to the pattern matched by the named group "host".
-	# @return the matched host
-	
-	def getHost(self):
-		host = self._matchCache.group("host")
-		if host == None:
-			# Gets a few information.
-			s = self._matchCache.string
-			r = self._matchCache.re
-			raise RegexException("No 'host' found in '%s' using '%s'" % (s, r))
-		return host
@@ -16,22 +16,21 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 752 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 752 $"
-__date__ = "$Date: 2009-09-01 23:21:30 +0200 (Tue, 01 Sep 2009) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

 from failmanager import FailManager
 from ticket import FailTicket
 from jailthread import JailThread
-from datedetector import DateDetector
 from mytime import MyTime
 from failregex import FailRegex, Regex, RegexException

-import logging, re, os, fcntl, time
+import logging, re, time

 # Gets the instance of the logger.
 logSys = logging.getLogger("fail2ban.filter")
@@ -65,9 +64,6 @@ class Filter(JailThread):
 		self.__findTime = 6000
 		## The ignore IP list.
 		self.__ignoreIpList = []
-		
-		self.dateDetector = DateDetector()
-		self.dateDetector.addDefaultTemplate()
 		logSys.debug("Created Filter")


@@ -101,7 +97,7 @@ class Filter(JailThread):
 	def getFailRegex(self):
 		failRegex = list()
 		for regex in self.__failRegex:
-			failRegex.append(regex.getRegex())
+			failRegex.append(regex.getOriginalRegex())
 		return failRegex
 	
 	##
@@ -243,36 +239,17 @@ class Filter(JailThread):
 			if a == b:
 				return True
 		return False
-	

-	def processLine(self, line):
+	def processLineAndAdd(self, line):
 		try:
 			# Decode line to UTF-8
 			l = line.decode('utf-8')
 		except UnicodeDecodeError:
 			l = line
-		timeMatch = self.dateDetector.matchTime(l)
-		if timeMatch:
-			# Lets split into time part and log part of the line
-			timeLine = timeMatch.group()
-			# Lets leave the beginning in as well, so if there is no
-			# anchore at the beginning of the time regexp, we don't
-			# at least allow injection. Should be harmless otherwise
-			logLine  = l[:timeMatch.start()] + l[timeMatch.end():]
-		else:
-			timeLine = l
-			logLine = l
-		return self.findFailure(timeLine, logLine)
-
-	def processLineAndAdd(self, line):
-		for element in self.processLine(line):
+		for element in self.findFailure(l):
 			ip = element[0]
 			unixTime = element[1]
-			logSys.debug("Processing line with time:%s and ip:%s"
-						 % (unixTime, ip))
 			if unixTime < MyTime.time() - self.getFindTime():
-				logSys.debug("Ignore line since time %s < %s - %s"
-							 % (unixTime, MyTime.time(), self.getFindTime()))
 				break
 			if self.inIgnoreIPList(ip):
 				logSys.debug("Ignore %s" % ip)
@@ -289,8 +266,8 @@ class Filter(JailThread):

 	def ignoreLine(self, line):
 		for ignoreRegex in self.__ignoreRegex:
-			ignoreRegex.search(line)
-			if ignoreRegex.hasMatched():
+			ignoreRegex.process()
+			if ignoreRegex.match(line):
 				return True
 		return False

@@ -301,35 +278,33 @@ class Filter(JailThread):
 	# to find the logging time.
 	# @return a dict with IP and timestamp.

-	def findFailure(self, timeLine, logLine):
+	def findFailure(self, line):
 		failList = list()
 		# Checks if we must ignore this line.
-		if self.ignoreLine(logLine):
+		if self.ignoreLine(line):
 			# The ignoreregex matched. Return.
 			return failList
 		# Iterates over all the regular expressions.
 		for failRegex in self.__failRegex:
-			failRegex.search(logLine)
+			failRegex.search(line)
 			if failRegex.hasMatched():
 				# The failregex matched.
-				date = self.dateDetector.getUnixTime(timeLine)
-				if date == None:
-					logSys.debug("Found a match for '" + logLine +"' but no "
-								 + "valid date/time found for '"
-								 + timeLine + "'. Please contact the "
-								 + "author in order to get support for this "
-								 + "format")
-				else:
-					try:
-						host = failRegex.getHost()
-						ipMatch = DNSUtils.textToIp(host)
-						if ipMatch:
-							for ip in ipMatch:
-								failList.append([ip, date])
-							# We matched a regex, it is enough to stop.
-							break
-					except RegexException, e:
-						logSys.error(e)
+				try:
+					host = failRegex.getHost()
+					date = failRegex.getTime()
+					if not date:
+						logSys.warning("Unable to get a valid date: %s" % line)
+						break
+					# Use Unix timestamp.
+					dateUnix = time.mktime(date)
+					ipMatch = DNSUtils.textToIp(host)
+					if ipMatch:
+						for ip in ipMatch:
+							failList.append([ip, dateUnix])
+						# We matched a regex, it is enough to stop.
+						break
+				except RegexException, e:
+					logSys.error(e)
 		return failList
 	

@@ -341,7 +316,7 @@ class Filter(JailThread):
 	# @return a list with tuple
 	
 	def status(self):
-		ret = [("Currently failed", self.failManager.size()), 
+		ret = [("Currently failed", self.failManager.size()),
 			   ("Total failed", self.failManager.getFailTotal())]
 		return ret

@@ -358,7 +333,7 @@ class FileFilter(Filter):
 	#
 	# @param path log file path

-	def addLogPath(self, path, tail = False):
+	def addLogPath(self, path, tail = True):
 		container = FileContainer(path, tail)
 		self.__logPath.append(container)
 	
@@ -447,14 +422,12 @@ import md5

 class FileContainer:
 	
-	def __init__(self, filename, tail = False):
+	def __init__(self, filename, tail = True):
 		self.__filename = filename
 		self.__tail = tail
 		self.__handler = None
 		# Try to open the file. Raises an exception if an error occured.
 		handler = open(filename)
-		stats = os.fstat(handler.fileno())
-		self.__ino = stats.st_ino
 		try:
 			firstLine = handler.readline()
 			# Computes the MD5 of the first line.
@@ -473,18 +446,13 @@ class FileContainer:
 	
 	def open(self):
 		self.__handler = open(self.__filename)
-		# Set the file descriptor to be FD_CLOEXEC
-		fd = self.__handler.fileno()
-		fcntl.fcntl(fd, fcntl.F_SETFD, fd | fcntl.FD_CLOEXEC)
 		firstLine = self.__handler.readline()
 		# Computes the MD5 of the first line.
 		myHash = md5.new(firstLine).digest()
-		stats = os.fstat(self.__handler.fileno())
-		# Compare hash and inode
-		if self.__hash != myHash or self.__ino != stats.st_ino:
+		# Compare hash.
+		if not self.__hash == myHash:
 			logSys.info("Log rotation detected for %s" % self.__filename)
 			self.__hash = myHash
-			self.__ino = stats.st_ino
 			self.__pos = 0
 		# Sets the file pointer to the last position.
 		self.__handler.seek(self.__pos)
@@ -514,7 +482,7 @@ import socket, struct

 class DNSUtils:
 	
-	IP_CRE = re.compile("^(?:\d{1,3}\.){3}\d{1,3}$")
+	IP_CRE = re.compile("(?:\d{1,3}\.){3}\d{1,3}")
 	
 	#@staticmethod
 	def dnsToIp(dns):
@@ -16,11 +16,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 696 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 696 $"
-__date__ = "$Date: 2008-05-19 23:05:32 +0200 (Mon, 19 May 2008) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -69,7 +69,7 @@ class FilterGamin(FileFilter):
 	#
 	# @param path log file path

-	def addLogPath(self, path, tail = False):
+	def addLogPath(self, path, tail = True):
 		if self.containsLogPath(path):
 			logSys.error(path + " already exists")
 		else:
@@ -113,7 +113,6 @@ class FilterGamin(FileFilter):
 							self.jail.putFailTicket(ticket)
 					except FailManagerEmpty:
 						self.failManager.cleanup(MyTime.time())
-					self.dateDetector.sortTemplate()
 					self.__modified = False
 				time.sleep(self.getSleepTime())
 			else:
@@ -16,11 +16,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 696 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 696 $"
-__date__ = "$Date: 2008-05-19 23:05:32 +0200 (Mon, 19 May 2008) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -61,7 +61,7 @@ class FilterPoll(FileFilter):
 	#
 	# @param path log file path

-	def addLogPath(self, path, tail = False):
+	def addLogPath(self, path, tail = True):
 		if self.containsLogPath(path):
 			logSys.error(path + " already exists")
 		else:
@@ -108,7 +108,6 @@ class FilterPoll(FileFilter):
 							self.jail.putFailTicket(ticket)
 					except FailManagerEmpty:
 						self.failManager.cleanup(MyTime.time())
-					self.dateDetector.sortTemplate()
 					self.__modified = False
 				time.sleep(self.getSleepTime())
 			else:
@@ -1,3 +1,4 @@
+# -*- coding: utf8 -*-
 # This file is part of Fail2Ban.
 #
 # Fail2Ban is free software; you can redistribute it and/or modify
@@ -15,24 +16,28 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 # Author: Cyril Jaquier
-# Author: Arturo 'Buanzo' Busleiman
 # 
-# $Revision: 741 $
+# $Revision: 645 $

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 741 $"
-__date__ = "$Date: 2009-08-30 16:13:04 +0200 (Sun, 30 Aug 2009) $"
-__copyright__ = "Copyright (c) 2009 Cyril Jaquier"
+__version__ = "$Revision: 645 $"
+__date__ = "$Date: 2008-01-16 23:55:04 +0100 (Wed, 16 Jan 2008) $"
+__copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

+from template import Template, Templates

-def formatExceptionInfo():
-    """ Author: Arturo 'Buanzo' Busleiman """
-    import sys
-    cla, exc = sys.exc_info()[:2]
-    excName = cla.__name__
-    try:
-        excArgs = exc.__dict__["args"]
-    except KeyError:
-        excArgs = str(exc)
-    return (excName, excArgs)
+class HostTemplate(Template):
+
+	def __init__(self):
+		Template.__init__(self, Template.TEMPLATE_HOST, "<HOST>")
+	
+
+class HostTemplates(Templates):
+	
+	def __init__(self):
+		Templates.__init__(self)
+		# ::ffff:141.3.81.106
+		template = HostTemplate()
+		template.setRegex("(?:::f{4,6}:)?(?P<%s>\S+)" % template.getName())
+		self.templates.append(template)
@@ -16,11 +16,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 696 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 696 $"
-__date__ = "$Date: 2008-05-19 23:05:32 +0200 (Mon, 19 May 2008) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -16,11 +16,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 504 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 504 $"
-__date__ = "$Date: 2006-12-23 17:37:17 +0100 (Sat, 23 Dec 2006) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

@@ -16,11 +16,11 @@

 # Author: Cyril Jaquier
 # 
-# $Revision: 567 $
+# $Revision$

 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 567 $"
-__date__ = "$Date: 2007-03-26 23:17:31 +0200 (Mon, 26 Mar 2007) $"
+__version__ = "$Revision$"
+__date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Yaroslav Halchenko	180a98db85	disabling entirely named-refused-udp jail with a big fat warning git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@762 a942ae1a-1317-0410-a47c-b1dcaea8d605	2010-06-29 01:38:05 +00:00
Yaroslav Halchenko	24d8e29ace	ENH: adding gen_badbots script to generate apache-badbots.conf git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@760 a942ae1a-1317-0410-a47c-b1dcaea8d605	2010-06-22 14:33:05 +00:00
Arturo 'Buanzo' Busleiman	4f4f0399ef	added psad filter and jail, needs some reviewing. works OK. git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@759 a942ae1a-1317-0410-a47c-b1dcaea8d605	2010-05-01 13:26:02 +00:00
Arturo 'Buanzo' Busleiman	5aec43ae35	Added a "ban ip" command to fail2ban-client (manual IP banning for a certain jail). Added two new jails: lighttpd-fastcgi and php-url-fopen. Fixed release date for 0.8.3 (was ??/??). Added "beta" version 0.8.4 which new items (see above). git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@734 a942ae1a-1317-0410-a47c-b1dcaea8d605	2009-08-28 22:26:17 +00:00
Arturo 'Buanzo' Busleiman	cdcc0cebfd	Updated Changelog for 0.9.0 with manual IP ban command. Also buanzo's "test-commit". git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@733 a942ae1a-1317-0410-a47c-b1dcaea8d605	2009-08-28 16:05:17 +00:00
Cyril Jaquier	c7151895d8	- Added missing ignoreregex to filters. Thanks to Klaus Lehmann. git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@699 a942ae1a-1317-0410-a47c-b1dcaea8d605	2008-05-21 22:17:00 +00:00
Cyril Jaquier	ba1006bd7d	- Removed deprecated mail*.conf actions. git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@698 a942ae1a-1317-0410-a47c-b1dcaea8d605	2008-05-19 21:09:39 +00:00
Cyril Jaquier	2f629525d9	- Added and changed some logging level and messages. git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@697 a942ae1a-1317-0410-a47c-b1dcaea8d605	2008-05-19 21:08:36 +00:00
Cyril Jaquier	9aa7c96b69	- Modified failregex to support new prefix remover. git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@695 a942ae1a-1317-0410-a47c-b1dcaea8d605	2008-05-18 20:08:34 +00:00
Cyril Jaquier	f9a9d249ef	- Added new prefix remover. - Added ISO 8601 date/time format. git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@694 a942ae1a-1317-0410-a47c-b1dcaea8d605	2008-05-18 20:06:38 +00:00
Cyril Jaquier	419005fd1f	- Fixed ignoreregex processing in fail2ban-client. Thanks to René Berber. git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@691 a942ae1a-1317-0410-a47c-b1dcaea8d605	2008-05-12 09:03:04 +00:00
Cyril Jaquier	1b3828421e	- Initial commit of the new prefix remover. git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@688 a942ae1a-1317-0410-a47c-b1dcaea8d605	2008-05-05 21:22:27 +00:00
Cyril Jaquier	543741f6e8	- Updated a few more files. git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@687 a942ae1a-1317-0410-a47c-b1dcaea8d605	2008-04-13 17:57:44 +00:00
Cyril Jaquier	b070dc89aa	- Overwrote head with some of 0.8. git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@686 a942ae1a-1317-0410-a47c-b1dcaea8d605	2008-04-13 17:48:52 +00:00
Cyril Jaquier	cc57497f5b	- Oupss... Forget to commit this one. Thanks to Robert Vogelgesang git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@625 a942ae1a-1317-0410-a47c-b1dcaea8d605	2007-11-12 22:46:32 +00:00
Cyril Jaquier	155f246354	- Fixed ipfw action script. Thanks to Nick Munger git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@624 a942ae1a-1317-0410-a47c-b1dcaea8d605	2007-10-23 22:07:35 +00:00
Cyril Jaquier	714aa1f46b	- Merged changes from FAIL2BAN-0_8 git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@622 a942ae1a-1317-0410-a47c-b1dcaea8d605	2007-10-06 17:57:50 +00:00
Cyril Jaquier	4c2cdb67c7	- Replaced ssocket.py with asyncore/asynchat implementation. Correct fix for bug #1769616 git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@620 a942ae1a-1317-0410-a47c-b1dcaea8d605	2007-09-09 22:00:45 +00:00
Cyril Jaquier	d0259bb790	- Removed textToDns() which is not required anymore. Thanks to Yaroslav Halchenko git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@619 a942ae1a-1317-0410-a47c-b1dcaea8d605	2007-09-09 21:51:11 +00:00
Cyril Jaquier	9e2430a80c	- Improved regular expressions. Thanks to Yaroslav Halchenko git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@593 a942ae1a-1317-0410-a47c-b1dcaea8d605	2007-06-25 21:59:38 +00:00
Cyril Jaquier	bde90df32c	- Expand <HOST> in ignoreregex. Thanks to Yaroslav Halchenko git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@591 a942ae1a-1317-0410-a47c-b1dcaea8d605	2007-06-25 21:52:58 +00:00
Cyril Jaquier	475aa68c11	- Fixed vulnerability in sshd.conf. Thanks to Daniel B. Cid git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@588 a942ae1a-1317-0410-a47c-b1dcaea8d605	2007-06-07 21:29:25 +00:00
Cyril Jaquier	2f0dedf206	- Fixed pure-ftpd regex when the LogPID option is on. Thanks to Roderick Schertler git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@586 a942ae1a-1317-0410-a47c-b1dcaea8d605	2007-05-29 20:08:37 +00:00
Cyril Jaquier	9ace6dfa2e	- Made interactive mode optional in fail2ban-client git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@585 a942ae1a-1317-0410-a47c-b1dcaea8d605	2007-05-22 19:51:53 +00:00
Cyril Jaquier	b71c6335f4	- Updated git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@584 a942ae1a-1317-0410-a47c-b1dcaea8d605	2007-05-21 21:18:07 +00:00
Cyril Jaquier	c1f5c4d189	- Removed Python 2.4 code. Need more testing git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@583 a942ae1a-1317-0410-a47c-b1dcaea8d605	2007-05-20 21:46:23 +00:00
Cyril Jaquier	e39d79b013	- Updated git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@582 a942ae1a-1317-0410-a47c-b1dcaea8d605	2007-05-20 21:33:27 +00:00
Cyril Jaquier	2eaff70956	- Changed label git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@581 a942ae1a-1317-0410-a47c-b1dcaea8d605	2007-05-20 21:21:09 +00:00