- 0.7.0 release

git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/tags/FAIL2BAN-0_7_0@296 a942ae1a-1317-0410-a47c-b1dcaea8d605

CHANGELOG

@@ -0,0 +1,205 @@
+               __      _ _ ___ _               
+              / _|__ _(_) |_  ) |__  __ _ _ _  
+             |  _/ _` | | |/ /| '_ \/ _` | ' \ 
+             |_| \__,_|_|_/___|_.__/\__,_|_||_|
+
+=============================================================
+Fail2Ban (version 0.7.0)                           2006/08/23
+=============================================================
+
+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
+- Client/Server architecture
+- 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
+- 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
+- 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
+- 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 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.
+
+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).
+  * 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)
+
+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
+  * 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
+	
+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
+- 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
+
+ver. 0.5.2 (2005/08/06) - beta
+----------
+- Better PID lock file handling. Should close #1239562
+- Added man pages
+- Removed log4py dependency. Use logging module instead
+- "maxretry" and "bantime" can be overridden in each section
+- Fixed bug #1246278 (excessive memory usage)
+- Fixed crash on wrong option value in configuration file
+- Changed custom chains to lowercase
+
+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
+- Fixed static banList in firewall.py
+- Added an initd script for Debian. Thanks to Yaroslav
+  Halchenko
+- Check for obsolete files after install
+
+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
+- Removed "interface" and "firewall" options
+- 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
+
+ver. 0.4.1 (2005/06/30) - stable
+----------
+- 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
+
+ver. 0.4.0 (2005/04/24) - stable
+----------
+- Fixed textToDNS which did not recognize strings like
+  "12-345-67-890.abcd.mnopqr.xyz"
+
+ver. 0.3.1 (2005/03/31) - beta
+----------
+- Corrected level of messages
+- Added DNS lookup support
+- Improved parsing speed. Only parse the new log messages
+- Added a second verbose level (-vv)
+
+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
+- Removed sshd.py because it is no more needed
+- Fixed a bug when exiting with IP in the ban list
+- Added PID lock file
+- Improved some parts of the code
+- Added ipfw-start-rule option (thanks to Robert Edeker)
+- Added -k option which kills a currently running Fail2Ban
+
+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
+- 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 /etc/fail2ban.conf configuration support
+- Code documentation
+
+
+ver. 0.1.0 (2004/10/12) - alpha
+----------
+- Initial release

COPYING

@@ -1,368 +0,0 @@
-The following copyright applies to all files present in the Fail2ban package,
-except if a different copyright is explicitly defined in this file.
-
-
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
-
----------------------------------
-The file server/iso8601.py is licensed under the following terms.
-
-
-Copyright (c) 2007 Michael Twomey
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

ChangeLog

@@ -1,439 +0,0 @@
-                         __      _ _ ___ _               
-                        / _|__ _(_) |_  ) |__  __ _ _ _  
-                       |  _/ _` | | |/ /| '_ \/ _` | ' \ 
-                       |_| \__,_|_|_/___|_.__/\__,_|_||_|
-
-================================================================================
-Fail2Ban (version 0.8.5)                                              2011/07/28
-================================================================================
-
-ver. 0.8.5 (2011/07/28) - stable
-----------
-- 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
-
-ver. 0.8.4 (2009/09/07) - stable
-----------
-- 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.
-
-ver. 0.8.3 (2008/07/17) - 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.
-- Fixed "fail2ban-client get <jail> logpath". Bug #1916986.
-- 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.
-
-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 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
-- 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.
-- 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.
-- 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
-- Fixed Debian bug #456567, #468477, #462060, #461426
-- 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
-- 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
-  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
-----------
-- Fixed RedHat init script. Thanks to Jonathan Underwood
-- Added Solaris 10 files. Thanks to Hanno 'Rince' Wagner
-
-ver. 0.7.9 (2007/04/19) - release candidate
-----------
-- Close opened handlers. Thanks to Yaroslav Halchenko
-- Fixed "reload" bug. Many many thanks to Yaroslav Halchenko
-- Added date format for asctime without year
-- Modified filters config. Thanks to Michael C. Haller
-- Fixed a small bug in mail-buffered.conf
-
-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
-- 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
-- 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 cacti script and template.
-- Added IP list in "status <JAIL>". Thanks to Eric Gerbier
-
-ver. 0.7.6 (2007/01/04) - beta
-----------
-- Added a "sleep 1" in redhat-initd. Thanks to Jim Wight
-- 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 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
-
-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>
-- Fixed refactoring bug (getLastcommand -> getLastAction)
-- 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
-- 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
-
-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 "backend" option in "jail.conf"
-- 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
-- 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)
-
-ver. 0.7.3 (2006/09/28) - beta
-----------
-- Added man pages. Thanks to Yaroslav Halchenko
-- Added wildcard support for "logpath"
-- Added Gamin (file and directory monitoring system) support
-- (Re)added "ignoreip" option
-- Added more concurrency protection
-- First attempt at solving bug #1457620 (locale issue)
-- Performance improvements
-- (Re)added permanent banning with banTime < 0
-- Added DNS support to "ignoreip". Feature Request #1285859
-
-ver. 0.7.2 (2006/09/10) - beta
-----------
-- Refactoring and code cleanup
-- 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
-- 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
-
-ver. 0.7.1 (2006/08/23) - alpha
-----------
-- Fixed daemon mode bug
-- Added Gentoo init.d script
-- Fixed path bug when trying to start "fail2ban-server"
-- Fixed reload command
-
-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
-- Client/Server architecture
-- 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
-- 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
-- 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
-- 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 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.
-
-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).
-  * 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)
-
-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
-  * 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
-	
-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
-- 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
-
-ver. 0.5.2 (2005/08/06) - beta
-----------
-- Better PID lock file handling. Should close #1239562
-- Added man pages
-- Removed log4py dependency. Use logging module instead
-- "maxretry" and "bantime" can be overridden in each section
-- Fixed bug #1246278 (excessive memory usage)
-- Fixed crash on wrong option value in configuration file
-- Changed custom chains to lowercase
-
-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
-- Fixed static banList in firewall.py
-- Added an initd script for Debian. Thanks to Yaroslav Halchenko
-- Check for obsolete files after install
-
-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
-- Removed "interface" and "firewall" options
-- 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
-
-ver. 0.4.1 (2005/06/30) - stable
-----------
-- 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
-
-ver. 0.4.0 (2005/04/24) - stable
-----------
-- Fixed textToDNS which did not recognize strings like
-  "12-345-67-890.abcd.mnopqr.xyz"
-
-ver. 0.3.1 (2005/03/31) - beta
-----------
-- Corrected level of messages
-- Added DNS lookup support
-- Improved parsing speed. Only parse the new log messages
-- Added a second verbose level (-vv)
-
-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
-- Removed sshd.py because it is no more needed
-- Fixed a bug when exiting with IP in the ban list
-- Added PID lock file
-- Improved some parts of the code
-- Added ipfw-start-rule option (thanks to Robert Edeker)
-- Added -k option which kills a currently running Fail2Ban
-
-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
-- 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 /etc/fail2ban.conf configuration support
-- Code documentation
-
-ver. 0.1.0 (2004/10/12) - alpha
-----------
-- Initial release

MANIFEST

@@ -0,0 +1,50 @@
+README
+CHANGELOG
+TODO
+fail2ban-client
+fail2ban-server
+fail2ban-testcases
+client/configreader.py
+client/jailreader.py
+client/fail2banreader.py
+client/jailsreader.py
+client/filterreader.py
+client/actionreader.py
+client/__init__.py
+client/configurator.py
+client/csocket.py
+server/ssocket.py
+server/banticket.py
+server/filter.py
+server/server.py
+server/failticket.py
+server/actions.py
+server/faildata.py
+server/failmanager.py
+server/jailthread.py
+server/transmitter.py
+server/action.py
+server/ticket.py
+server/jail.py
+server/__init__.py
+server/banmanager.py
+setup.py
+testcases/banmanagertestcase.py
+testcases/failmanagertestcase.py
+testcases/clientreadertestcase.py
+testcases/filtertestcase.py
+testcases/__init__.py
+testcases/servertestcase.py
+testcases/files/testcase01.log
+testcases/files/testcase02.log
+version.py
+config/jail.conf
+config/filter.d/vsftpd.conf
+config/filter.d/apache-auth.conf
+config/filter.d/sshd.conf
+config/action.d/iptables.conf
+config/action.d/mail-whois.conf
+config/action.d/dummy.conf
+config/action.d/mail.conf
+config/action.d/hostsdeny.conf
+config/fail2ban.conf

PKG-INFO

@@ -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

README

@@ -1,91 +1,151 @@
-                         __      _ _ ___ _               
-                        / _|__ _(_) |_  ) |__  __ _ _ _  
-                       |  _/ _` | | |/ /| '_ \/ _` | ' \ 
-                       |_| \__,_|_|_/___|_.__/\__,_|_||_|
+               __      _ _ ___ _               
+              / _|__ _(_) |_  ) |__  __ _ _ _  
+             |  _/ _` | | |/ /| '_ \/ _` | ' \ 
+             |_| \__,_|_|_/___|_.__/\__,_|_||_|
 
-================================================================================
-Fail2Ban (version 0.8.5)                                              2011/07/26
-================================================================================
+=============================================================
+Fail2Ban (version 0.7.0)                           2006/08/23
+=============================================================
 
-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 is my first Python program. Moreover, English is not my
+mother tongue...
+
+
+More details:
+-------------
+
+Fail2Ban is rather simple. I have a home server connected to
+the Internet which runs apache, samba, sshd, ... I see in my
+logs that people are trying to log into my box using "manual"
+brute force or scripts. They try 10, 20 and sometimes more
+user/password (without success anyway). In order to
+discourage these script kiddies, I wanted that sshd refuse
+login from a specific ip after 3 password failures. After
+some Google searches, I found that sshd was not able of that.
+So I search for a script or program that do it. I found
+nothing :-( So I decide to write mine and to learn Python :-)
+
+For each sections defined in the configuration file, Fail2Ban
+tries to find lines which match the failregex. Then it
+retrieves the message time using timeregex and timepattern.
+It finally gets the ip and if it has already done 3 or more
+password failures in the last banTime, the ip is banned for
+banTime using a firewall rule. This rule is set by the user
+in the configuration file. Thus, Fail2Ban can be adapted for
+lots of firewall. After banTime, the rule is deleted. Notice
+that if no "plain" ip is available, Fail2Ban try to do DNS
+lookup in order to found one or several ip's to ban.
+
+Sections can be freely added so it is possible to monitor
+several daemons at the same time.
+
+Runs on my server and does its job rather well :-) The idea
+is to make fail2ban usable with daemons and services that
+require a login (sshd, telnetd, ...) and with different
+firewalls.
 
-This README is a quick introduction to Fail2ban. More documentation, FAQ, HOWTOs
-are available on the project website: http://www.fail2ban.org
 
 Installation:
 -------------
 
-Required:
-   >=python-2.3 (http://www.python.org)
-
-Optional:
-   >=gamin-0.0.21 (http://www.gnome.org/~veillard/gamin)
+Require: python-2.4 (http://www.python.org)
 
 To install, just do:
 
-> tar xvfj fail2ban-0.8.4.tar.bz2
-> cd fail2ban-0.8.4
+> tar xvfj fail2ban-0.7.0.tar.bz2
+> cd fail2ban-0.7.0
 > 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/lib/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.
+Gentoo: ebuilds are available on the website.
+Debian: Fail2Ban is in Debian unstable.
+RedHat: packages are available on the website.
 
-Fail2Ban should be correctly installed now. Just type:
+Fail2Ban should now be correctly installed. 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.
 
 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
+or using command line. Here are the available command line
+options (not complete yet):
+
+  <COMMAND>
+
+    start                   start the server and the jails
+    reload                  reload the configuration
+    stop                    stop all jails and terminate the
+                            server
+    status                  get the current status
+
+    set loglevel <LEVEL>    set loglevel to <LEVEL>
+    get loglevel            get loglevel
+    set logtarget <TARGET>  set log target to <TARGET>
+    get logtarget           get log target
+
+    add <JAIL>              create <JAIL>
+    set <JAIL> <CMD>        set the <CMD> value for <JAIL>
+    get <JAIL> <CMD>        get the <CMD> value for <JAIL>
+    start <JAIL>            start <JAIL>
+    stop <JAIL>             stop <JAIL>. The jail is removed
+    status <JAIL>           get the current status of <JAIL>
+
+  [OPTIONS]
+
+    -c <DIR>                configuration directory
+    -d                      dump configuration. For debugging
+    -v                      increase verbosity
+    -q                      decrease verbosity
+    -x                      force execution of the server
+    -h                      display this help message
 
 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
+Website: http://fail2ban.sourceforge.net
+
+Cyril Jaquier: <lostcontrol@users.sourceforge.net>
 
-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
 
 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

TODO

@@ -1,11 +1,11 @@
-                         __      _ _ ___ _               
-                        / _|__ _(_) |_  ) |__  __ _ _ _  
-                       |  _/ _` | | |/ /| '_ \/ _` | ' \ 
-                       |_| \__,_|_|_/___|_.__/\__,_|_||_|
+               __      _ _ ___ _               
+              / _|__ _(_) |_  ) |__  __ _ _ _  
+             |  _/ _` | | |/ /| '_ \/ _` | ' \ 
+             |_| \__,_|_|_/___|_.__/\__,_|_||_|
 
-================================================================================
-ToDo                                                            $Revision: 732 $
-================================================================================
+=============================================================
+ToDo                                         $Revision$
+=============================================================
 
 Legend:
 - not yet done
@@ -13,42 +13,103 @@ Legend:
 # partially done
 * done
 
-- Removed relative imports
+- correct handling of threads (join???)
 
-- Cleanup fail2ban-client and fail2ban-server. Move code to server/ and client/
+- signal handling (ctrl-c, etc)
 
-- Add timeout to external commands (signal alarm, watchdog thread, etc)
+- add a reload option to fail2ban-client
 
-- New backend: pyinotify
+- see Feature Request Tracking System at SourceForge.net
 
-- Uniformize filters and actions name. Use the software name (openssh, postfix,
-  proftp)
+* findall in dns.py should be no more needed
 
-- Added <USER> tag for failregex. Add features using this information. Maybe add
-  more tags
+* remove utils/ directory
 
-- 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
-
-- Improve parsing of the action parameters in jailreader.py
-
-- Better handling of the protocol in transmitter.py
-
-- Add gettext support (I18N)
-
-- Multiline log reading
-
-- Improve execution of action. Why does subprocess.call deadlock with
-  multi-jails?
-
-# see Feature Request Tracking System at SourceForge.net
+- improve installation process (better prefix support)
 
 # improve documentation and website for user
 
+* use Doxygen
+
+- use PyLint to check the code
+
+* better configuration files
+
+- add a check to see if the time of the log messages is
+  correctly detected (valid regexp)
+
+? use Gentoo Portage style for scripts.
+  - banning engines script in /etc/fail2ban/scripts.d
+    Example: /etc/fail2ban/scripts.d/iptables
+    Will be mostly bash scripting which is more "user
+    friendly".
+  - split configuration files in /etc/fail2ban/services.d
+    for log files
+    Example: /etc/fail2ban/services.d/apache
+    Mainly regular expressions.
+  - template for common regex in /etc/fail2ban/templates.d
+    Example: /etc/fail2ban/templates.d/date
+    Mainly regular expressions.
+
+* remove debug mode (root check)
+
 # better return values in function
 
-# refactoring in server.py, actions.py, filter.py
+? use more email.Utils in mail.py
+
+? add gettext support. Is this really needed for a server
+  utility?
+
+* send an email when fail2ban is running
+
+* add multithreading. Python threading is not really
+  efficient. However, fail2ban could benefit of it. We could
+  use threads like this:
+  - one thread which check for host to unban.
+  - one thread per file to watch. This will allow things like
+    different polling time for each file.
+  <srv> is read-only (we only read log files) thus no locks
+  are required. However, <meth> is read-write and must take
+  care of concurrency in case of multithreading.
+
+- add FAM/Gamin support. Should be quite efficient with
+  threading. Take care that handle_one_event() release the
+  Python lock.
+
+# add a test framework. We could use unittest which is in
+  Python since 2.1. It should be possible to run all tests
+  automatically.
+
+* add client/server using socket. Something similar to
+  gdesklets. DBUS seems to be designed for desktop use.
+  - fail2ban start -> start the daemon.
+  - fail2ban stop -> stop the daemon.
+  - fail2ban add <srv> <meth> -> add <srv> monitoring with
+    <meth> ban method (iptables, hosts.deny, etc).
+  - fail2ban del <srv> -> remove <srv> monitoring.
+  - fail2ban status <srv> -> query current fail2ban status.
+    Should return infos like a ban counter. Could be graph
+    with rrdtool.
+  - fail2ban pause <srv> -> suspend monitoring.
+  - fail2ban resume <srv> -> resume monitoring.
+  - fail2ban list -> list available services.
+  - fail2ban flush <srv> -> flush the <srv> ban list.
+  
+* remove PID file.
+
+* remove most of the command lines options if possible.
+
+- add the possibility to specify wildcard in log files.
+  Example: logfile = /var/log/apache2/access-*.log
+  Should we start one thread per file or just one thread per
+  serivce?
+
+- autodetect date format in log file. Match the most popular
+  format and sort them using the hit ratio. Should avoid
+  user problem with regex and not have a big impact on perfs.
+
+- restart automatically the daemon if an exception occurs.
+
+- do not close socket after a send
+
+- refactoring in server.py, actions.py, filter.py

client/__init__.py

@@ -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"
+__license__ = "GPL"

client/actionreader.py

@@ -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"
 
@@ -34,24 +34,24 @@ class ActionReader(ConfigReader):
 	
 	def __init__(self, action, name):
 		ConfigReader.__init__(self)
-		self.__file = action[0]
-		self.__cInfo = action[1]
-		self.__name = name
+		self.file = action[0]
+		self.cInfo = action[1]
+		self.name = name
 	
-	def setFile(self, fileName):
-		self.__file = fileName
+	def setFile(self, file):
+		self.file = file
 	
 	def getFile(self):
-		return self.__file
+		return self.file
 	
 	def setName(self, name):
-		self.__name = name
+		self.name = name
 	
 	def getName(self):
-		return self.__name
+		return self.name
 	
 	def read(self):
-		return ConfigReader.read(self, "action.d/" + self.__file)
+		ConfigReader.read(self, "action.d/" + self.file)
 	
 	def getOptions(self, pOpts):
 		opts = [["string", "actionstart", ""],
@@ -59,32 +59,32 @@ class ActionReader(ConfigReader):
 				["string", "actioncheck", ""],
 				["string", "actionban", ""],
 				["string", "actionunban", ""]]
-		self.__opts = ConfigReader.getOptions(self, "Definition", opts, pOpts)
+		self.opts = ConfigReader.getOptions(self, "Definition", opts, pOpts)
 		
 		if self.has_section("Init"):
 			for opt in self.options("Init"):
-				if not self.__cInfo.has_key(opt):
-					self.__cInfo[opt] = self.get("Init", opt)
+				if not self.cInfo.has_key(opt):
+					self.cInfo[opt] = self.get("Init", opt)
 	
 	def convert(self):
-		head = ["set", self.__name]
+		head = ["set", self.name]
 		stream = list()
-		stream.append(head + ["addaction", self.__file])
-		for opt in self.__opts:
+		stream.append(head + ["addaction", self.file])
+		for opt in self.opts:
 			if opt == "actionstart":
-				stream.append(head + ["actionstart", self.__file, self.__opts[opt]])
+				stream.append(head + ["actionstart", self.file, self.opts[opt]])
 			elif opt == "actionstop":
-				stream.append(head + ["actionstop", self.__file, self.__opts[opt]])
+				stream.append(head + ["actionstop", self.file, self.opts[opt]])
 			elif opt == "actioncheck":
-				stream.append(head + ["actioncheck", self.__file, self.__opts[opt]])
+				stream.append(head + ["actioncheck", self.file, self.opts[opt]])
 			elif opt == "actionban":
-				stream.append(head + ["actionban", self.__file, self.__opts[opt]])
+				stream.append(head + ["actionban", self.file, self.opts[opt]])
 			elif opt == "actionunban":
-				stream.append(head + ["actionunban", self.__file, self.__opts[opt]])
+				stream.append(head + ["actionunban", self.file, self.opts[opt]])
 		# cInfo
-		if self.__cInfo:
-			for p in self.__cInfo:
-				stream.append(head + ["setcinfo", self.__file, p, self.__cInfo[p]])
+		if self.cInfo:
+			for p in self.cInfo:
+				stream.append(head + ["setcinfo", self.file, p, self.cInfo[p]])
 
 		return stream
 		

client/beautifier.py

@@ -1,151 +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: 644 $
-
-__author__ = "Cyril Jaquier"
-__version__ = "$Revision: 644 $"
-__date__ = "$Date: 2008-01-15 00:12:21 +0100 (Tue, 15 Jan 2008) $"
-__copyright__ = "Copyright (c) 2004 Cyril Jaquier"
-__license__ = "GPL"
-
-from server.jails import UnknownJailException
-from server.jails import DuplicateJailException
-import logging
-
-# Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.client.config")
-
-##
-# Beautify the output of the client.
-#
-# Fail2ban server only return unformatted return codes which need to be
-# converted into user readable messages.
-
-class Beautifier:
-	
-	def __init__(self, cmd = None):
-		self.__inputCmd = cmd
-
-	def setInputCmd(self, cmd):
-		self.__inputCmd = cmd
-		
-	def getInputCmd(self):
-		return self.__inputCmd
-		
-	def beautify(self, response):
-		logSys.debug("Beautify " + `response` + " with " + `self.__inputCmd`)
-		inC = self.__inputCmd
-		msg = response
-		try:
-			if inC[0] == "ping":
-				msg = "Server replied: " + response
-			elif inC[0] == "start":
-				msg = "Jail started"
-			elif inC[0] == "stop":
-				if len(inC) == 1:
-					if response == None:
-						msg = "Shutdown successful"
-				else:
-					if response == None:
-						msg = "Jail stopped"
-			elif inC[0] == "add":
-				msg = "Added jail " + response
-			elif inC[0:1] == ['status']:
-				if len(inC) > 1:
-					# Create IP list
-					ipList = ""
-					for ip in response[1][1][2][1]:
-						ipList += ip + " "
-					# Creates file list.
-					fileList = ""
-					for f in response[0][1][2][1]:
-						fileList += f + " "
-					# Display information
-					msg = "Status for the jail: " + inC[1] + "\n"
-					msg = msg + "|- " + response[0][0] + "\n"
-					msg = msg + "|  |- " + response[0][1][2][0] + ":\t" + fileList + "\n"
-					msg = msg + "|  |- " + response[0][1][0][0] + ":\t" + `response[0][1][0][1]` + "\n"
-					msg = msg + "|  `- " + response[0][1][1][0] + ":\t" + `response[0][1][1][1]` + "\n"
-					msg = msg + "`- " + response[1][0] + "\n"
-					msg = msg + "   |- " + response[1][1][0][0] + ":\t" + `response[1][1][0][1]` + "\n"
-					msg = msg + "   |  `- " + response[1][1][2][0] + ":\t" + ipList + "\n"
-					msg = msg + "   `- " + response[1][1][1][0] + ":\t" + `response[1][1][1][1]`
-				else:
-					msg = "Status\n"
-					msg = msg + "|- " + response[0][0] + ":\t" + `response[0][1]` + "\n"
-					msg = msg + "`- " + response[1][0] + ":\t\t" + response[1][1]
-			elif inC[1] == "logtarget":
-				msg = "Current logging target is:\n"
-				msg = msg + "`- " + response
-			elif inC[1:2] == ['loglevel']:
-				msg = "Current logging level is "
-				if response == 1:
-					msg = msg + "ERROR"
-				elif response == 2:
-					msg = msg + "WARN"
-				elif response == 3:
-					msg = msg + "INFO"
-				elif response == 4:
-					msg = msg + "DEBUG"
-				else:
-					msg = msg + `response`
-			elif inC[2] in ("logpath", "addlogpath", "dellogpath"):
-				if len(response) == 0:
-					msg = "No file is currently monitored"
-				else:
-					msg = "Current monitored log file(s):\n"
-					for path in response[:-1]:
-						msg = msg + "|- " + path + "\n"
-					msg = msg + "`- " + response[len(response)-1]
-			elif inC[2] in ("ignoreip", "addignoreip", "delignoreip"):
-				if len(response) == 0:
-					msg = "No IP address/network is ignored"
-				else:
-					msg = "These IP addresses/networks are ignored:\n"
-					for ip in response[:-1]:
-						msg = msg + "|- " + ip + "\n"
-					msg = msg + "`- " + response[len(response)-1]
-			elif inC[2] in ("failregex", "addfailregex", "delfailregex",
-							"ignoreregex", "addignoreregex", "delignoreregex"):
-				if len(response) == 0:
-					msg = "No regular expression is defined"
-				else:
-					msg = "The following regular expression are defined:\n"
-					c = 0
-					for ip in response[:-1]:
-						msg = msg + "|- [" + str(c) + "]: " + ip + "\n"
-						c += 1
-					msg = msg + "`- [" + str(c) + "]: " + response[len(response)-1]
-		except Exception:
-			logSys.warn("Beautifier error. Please report the error")
-			logSys.error("Beautify " + `response` + " with " + `self.__inputCmd` +
-						 " failed")
-			msg = msg + `response`
-		return msg
-
-	def beautifyError(self, response):
-		logSys.debug("Beautify (error) " + `response` + " with " + `self.__inputCmd`)
-		msg = response
-		if isinstance(response, UnknownJailException):
-			msg = "Sorry but the jail '" + response[0] + "' does not exist"
-		elif isinstance(response, IndexError):
-			msg = "Sorry but the command is invalid"
-		elif isinstance(response, DuplicateJailException):
-			msg = "The jail '" + response[0] + "' already exists"
-		return msg

client/configparserinc.py

@@ -1,108 +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: Yaroslav Halchenko
-# Modified: Cyril Jaquier
-# $Revision: 656 $
-
-__author__ = 'Yaroslav Halhenko'
-__revision__ = '$Revision: $'
-__date__ = '$Date:  $'
-__copyright__ = 'Copyright (c) 2007 Yaroslav Halchenko'
-__license__ = 'GPL'
-
-import logging, os
-from ConfigParser import SafeConfigParser
-
-# Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.client.config")
-
-class SafeConfigParserWithIncludes(SafeConfigParser):
-	"""
-	Class adds functionality to SafeConfigParser to handle included
-	other configuration files (or may be urls, whatever in the future)
-
-	File should have section [includes] and only 2 options implemented
-	are 'files_before' and 'files_after' where files are listed 1 per
-	line.
-
-	Example:
-
-[INCLUDES]
-before = 1.conf
-         3.conf
-
-after = 1.conf
-
-	It is a simple implementation, so just basic care is taken about
-	recursion. Includes preserve right order, ie new files are
-	inserted to the list of read configs before original, and their
-	includes correspondingly so the list should follow the leaves of
-	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
-
-	"""
-
-	SECTION_NAME = "INCLUDES"
-
-	#@staticmethod
-	def getIncludes(resource, seen = []):
-		"""
-		Given 1 config resource returns list of included files
-		(recursively) with the original one as well
-		Simple loops are taken care about
-		"""
-		
-		# Use a short class name ;)
-		SCPWI = SafeConfigParserWithIncludes
-		
-		parser = SafeConfigParser()
-		parser.read(resource)
-		
-		resourceDir = os.path.dirname(resource)
-
-		newFiles = [ ('before', []), ('after', []) ]
-		if SCPWI.SECTION_NAME in parser.sections():
-			for option_name, option_list in newFiles:
-				if option_name in parser.options(SCPWI.SECTION_NAME):
-					newResources = parser.get(SCPWI.SECTION_NAME, option_name)
-					for newResource in newResources.split('\n'):
-						if os.path.isabs(newResource):
-							r = newResource
-						else:
-							r = os.path.join(resourceDir, newResource)
-						if r in seen:
-							continue
-						s = seen + [resource]
-						option_list += SCPWI.getIncludes(r, s)
-		# combine lists
-		return newFiles[0][1] + [resource] + newFiles[1][1]
-		#print "Includes list for " + resource + " is " + `resources`
-	getIncludes = staticmethod(getIncludes)
-
-
-	def read(self, filenames):
-		fileNamesFull = []
-		if not isinstance(filenames, list):
-			filenames = [ filenames ]
-		for filename in filenames:
-			fileNamesFull += SafeConfigParserWithIncludes.getIncludes(filename)
-		logSys.debug("Reading files: %s" % fileNamesFull)
-		return SafeConfigParser.read(self, fileNamesFull)
-

client/configreader.py

@@ -15,52 +15,45 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 # 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"
 
-import logging, os
-from configparserinc import SafeConfigParserWithIncludes
-from ConfigParser import NoOptionError, NoSectionError
+import logging
+from ConfigParser import *
 
 # Gets the instance of the logger.
 logSys = logging.getLogger("fail2ban.client.config")
 
-class ConfigReader(SafeConfigParserWithIncludes):
+class ConfigReader(SafeConfigParser):
 	
-	BASE_DIRECTORY = "/etc/fail2ban/"
+	basedir = "/etc/fail2ban/"
 	
 	def __init__(self):
-		SafeConfigParserWithIncludes.__init__(self)
-		self.__opts = None
+		SafeConfigParser.__init__(self)
+		self.opts = None
 	
-	#@staticmethod
-	def setBaseDir(folderName):
-		path = folderName.rstrip('/')
-		ConfigReader.BASE_DIRECTORY = path + '/'
-	setBaseDir = staticmethod(setBaseDir)
+	@staticmethod
+	def setBaseDir(dir):
+		global basedir
+		path = dir.rstrip('/')
+		basedir = path + '/'
 		
-	#@staticmethod
+	@staticmethod
 	def getBaseDir():
-		return ConfigReader.BASE_DIRECTORY
-	getBaseDir = staticmethod(getBaseDir)
+		global basedir
+		return basedir
 	
 	def read(self, filename):
-		basename = ConfigReader.BASE_DIRECTORY + filename
+		global basedir
+		basename = basedir + filename
 		logSys.debug("Reading " + basename)
-		bConf = basename + ".conf"
-		bLocal = basename + ".local"
-		if os.path.exists(bConf) or os.path.exists(bLocal):
-			SafeConfigParserWithIncludes.read(self, [bConf, bLocal])
-			return True
-		else:
-			logSys.error(bConf + " and " + bLocal + " do not exist")
-			return False
+		SafeConfigParser.read(self, [basename + ".conf", basename + ".local"])
 	
 	##
 	# Read the options.
@@ -71,7 +64,6 @@ class ConfigReader(SafeConfigParserWithIncludes):
 	# 0 -> the type of the option
 	# 1 -> the name of the option
 	# 2 -> the default value for the option
-	
 	def getOptions(self, sec, options, pOptions = None):
 		values = dict()
 		for option in options:
@@ -88,14 +80,12 @@ class ConfigReader(SafeConfigParserWithIncludes):
 			except NoSectionError, e:
 				# No "Definition" section or wrong basedir
 				logSys.error(e)
-				values[option[1]] = option[2]
 			except NoOptionError:
 				if not option[2] == None:
-					logSys.warn("'%s' not defined in '%s'. Using default value"
-								% (option[1], sec))
+					logSys.warn("No '" + option[1] + "' defined in '" + sec + "'")
 					values[option[1]] = option[2]
 			except ValueError:
 				logSys.warn("Wrong value for '" + option[1] + "' in '" + sec +
 							"'. Using default one: '" + `option[2]` + "'")
 				values[option[1]] = option[2]
-		return values
+		return values

client/configurator.py

@@ -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"
 
@@ -35,44 +35,34 @@ logSys = logging.getLogger("fail2ban.client.config")
 class Configurator:
 	
 	def __init__(self):
-		self.__settings = dict()
-		self.__streams = dict()
-		self.__fail2ban = Fail2banReader()
-		self.__jails = JailsReader()
+		self.settings = dict()
+		self.streams = dict()
+		self.fail2ban = Fail2banReader()
+		self.jails = JailsReader()
 	
-	#@staticmethod
-	def setBaseDir(folderName):
-		ConfigReader.setBaseDir(folderName)
-	setBaseDir = staticmethod(setBaseDir)
+	def setBaseDir(self, dir):
+		ConfigReader.setBaseDir(dir)
 	
-	#@staticmethod
-	def getBaseDir():
+	def getBaseDir(self):
 		return ConfigReader.getBaseDir()
-	getBaseDir = staticmethod(getBaseDir)
-	
-	def readEarly(self):
-		self.__fail2ban.read()
 	
 	def readAll(self):
-		self.readEarly()
-		self.__jails.read()
+		self.fail2ban.read()
+		self.jails.read()
 	
-	def getEarlyOptions(self):
-		return self.__fail2ban.getEarlyOptions()
-
-	def getOptions(self, jail = None):
-		self.__fail2ban.getOptions()
-		return self.__jails.getOptions(jail)
+	def getAllOptions(self):
+		self.settings["general"] = self.fail2ban.getOptions()
+		self.settings["jails"] = self.jails.getOptions()
 		
 	def convertToProtocol(self):
-		self.__streams["general"] = self.__fail2ban.convert()
-		self.__streams["jails"] = self.__jails.convert()
+		self.streams["general"] = self.fail2ban.convert()
+		self.streams["jails"] = self.jails.convert()
 	
 	def getConfigStream(self):
 		cmds = list()
-		for opt in self.__streams["general"]:
+		for opt in self.streams["general"]:
 			cmds.append(opt)
-		for opt in self.__streams["jails"]:
+		for opt in self.streams["jails"]:
 			cmds.append(opt)
 		return cmds
 	

client/csocket.py

@@ -16,44 +16,39 @@
 
 # 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"
 
-#from cPickle import dumps, loads, HIGHEST_PROTOCOL
-from pickle import dumps, loads, HIGHEST_PROTOCOL
-import socket
+import socket, pickle
 
 class CSocket:
 	
-	END_STRING = "<F2B_END_COMMAND>"
-	
-	def __init__(self, sock = "/var/run/fail2ban/fail2ban.sock"):
+	def __init__(self):
+		self.socketFile = "/tmp/fail2ban.sock"
 		# Create an INET, STREAMing socket
 		#self.csock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-		self.__csock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+		self.csock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
 		#self.csock.connect(("localhost", 2222))
-		self.__csock.connect(sock)
+		self.csock.connect(self.socketFile)
 	
 	def send(self, msg):
 		# Convert every list member to string
-		obj = dumps([str(m) for m in msg], HIGHEST_PROTOCOL)
-		self.__csock.send(obj + CSocket.END_STRING)
-		ret = self.receive(self.__csock)
-		self.__csock.close()
+		obj = pickle.dumps(map(str, msg))
+		self.csock.send(obj + "<F2B_END_COMMAND>")
+		ret = self.receive(self.csock)
+		self.csock.close()
 		return ret
 	
-	#@staticmethod
-	def receive(sock):
+	def receive(self, socket):
 		msg = ''
-		while msg.rfind(CSocket.END_STRING) == -1:
-			chunk = sock.recv(6)
+		while msg.rfind("<F2B_END_COMMAND>") == -1:
+			chunk = socket.recv(6)
 			if chunk == '':
 				raise RuntimeError, "socket connection broken"
 			msg = msg + chunk
-		return loads(msg)
-	receive = staticmethod(receive)
+		return pickle.loads(msg)

client/fail2banreader.py

@@ -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"
 
@@ -38,21 +38,17 @@ class Fail2banReader(ConfigReader):
 	def read(self):
 		ConfigReader.read(self, "fail2ban")
 	
-	def getEarlyOptions(self):
-		opts = [["string", "socket", "/tmp/fail2ban.sock"]]
-		return ConfigReader.getOptions(self, "Definition", opts)
-	
 	def getOptions(self):
 		opts = [["int", "loglevel", 1],
 				["string", "logtarget", "STDERR"]]
-		self.__opts = ConfigReader.getOptions(self, "Definition", opts)
+		self.opts = ConfigReader.getOptions(self, "Definition", opts)
 	
 	def convert(self):
 		stream = list()
-		for opt in self.__opts:
+		for opt in self.opts:
 			if opt == "loglevel":
-				stream.append(["set", "loglevel", self.__opts[opt]])
+				stream.append(["set", "loglevel", self.opts[opt]])
 			elif opt == "logtarget":
-				stream.append(["set", "logtarget", self.__opts[opt]])
+				stream.append(["set", "logtarget", self.opts[opt]])
 		return stream
 	

client/filterreader.py

@@ -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"
 
@@ -32,43 +32,49 @@ logSys = logging.getLogger("fail2ban.client.config")
 
 class FilterReader(ConfigReader):
 	
-	def __init__(self, fileName, name):
+	def __init__(self, file, name):
 		ConfigReader.__init__(self)
-		self.__file = fileName
-		self.__name = name
+		self.file = file
+		self.name = name
 	
-	def setFile(self, fileName):
-		self.__file = fileName
+	def setFile(self, file):
+		self.file = file
 	
 	def getFile(self):
-		return self.__file
+		return self.file
 	
 	def setName(self, name):
-		self.__name = name
+		self.name = name
 	
 	def getName(self):
-		return self.__name
+		return self.name
 	
 	def read(self):
-		return ConfigReader.read(self, "filter.d/" + self.__file)
+		ConfigReader.read(self, "filter.d/" + self.file)
 	
 	def getOptions(self, pOpts):
-		opts = [["string", "ignoreregex", ""],
-				["string", "failregex", ""]]
-		self.__opts = ConfigReader.getOptions(self, "Definition", opts, pOpts)
+		opts = [["string", "logpath", "/var/log/sshd.log"],
+				["string", "timeregex", ""],
+				["string", "timepattern", ""],
+				["string", "failregex", ""],
+				["int", "maxtime", 600],
+				["int", "maxretry", 3]]
+		self.opts = ConfigReader.getOptions(self, "Definition", opts, pOpts)
 	
 	def convert(self):
 		stream = list()
-		for opt in self.__opts:
-			if opt == "failregex":
-				for regex in self.__opts[opt].split('\n'):
-					# Do not send a command if the rule is empty.
-					if regex != '':
-						stream.append(["set", self.__name, "addfailregex", regex])
-			elif opt == "ignoreregex":
-				for regex in self.__opts[opt].split('\n'):
-					# Do not send a command if the rule is empty.
-					if regex != '':
-						stream.append(["set", self.__name, "addignoreregex", regex])		
+		for opt in self.opts:
+			if opt == "logpath":
+				stream.append(["set", self.name, "logpath", self.opts[opt]])
+			elif 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":
+				stream.append(["set", self.name, "failregex", self.opts[opt]])
+			elif opt == "maxtime":
+				stream.append(["set", self.name, "maxtime", self.opts[opt]])
+			elif opt == "maxretry":
+				stream.append(["set", self.name, "maxretry", self.opts[opt]])
 		return stream
 		

client/jailreader.py

@@ -16,16 +16,15 @@
 
 # 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"
 
-import logging, re, glob
-
+import logging, re
 from configreader import ConfigReader
 from filterreader import FilterReader
 from actionreader import ActionReader
@@ -39,133 +38,66 @@ class JailReader(ConfigReader):
 	
 	def __init__(self, name):
 		ConfigReader.__init__(self)
-		self.__name = name
-		self.__filter = None
-		self.__actions = list()
+		self.name = name
+		self.filter = None
+		self.actions = list()
 	
 	def setName(self, value):
-		self.__name = value
+		self.name = value
 	
 	def getName(self):
-		return self.__name
+		return self.name
 	
 	def read(self):
 		ConfigReader.read(self, "jail")
 	
 	def isEnabled(self):
-		return self.__opts["enabled"]
+		return self.opts["enabled"]
 	
 	def getOptions(self):
 		opts = [["bool", "enabled", "false"],
-				["string", "logpath", "/var/log/messages"],
-				["string", "backend", "auto"],
-				["int", "maxretry", 3],
-				["int", "findtime", 600],
+				["int", "maxretry", None],
 				["int", "bantime", 600],
-				["string", "failregex", None],
-				["string", "ignoreregex", None],
-				["string", "ignoreip", None],
 				["string", "filter", ""],
 				["string", "action", ""]]
-		self.__opts = ConfigReader.getOptions(self, self.__name, opts)
+		self.opts = ConfigReader.getOptions(self, self.name, opts)
 		
 		if self.isEnabled():
 			# Read filter
-			self.__filter = FilterReader(self.__opts["filter"], self.__name)
-			ret = self.__filter.read()
-			if ret:
-				self.__filter.getOptions(self.__opts)
-			else:
-				logSys.error("Unable to read the filter")
-				return False
+			self.filter = FilterReader(self.opts["filter"], self.name)
+			self.filter.read()
+			self.filter.getOptions(self.opts)
 			
 			# Read action
-			for act in self.__opts["action"].split('\n'):
+			for act in self.opts["action"].split('\n'):
 				try:
 					splitAct = JailReader.splitAction(act)
-					action = ActionReader(splitAct, self.__name)
-					ret = action.read()
-					if ret:
-						action.getOptions(self.__opts)
-						self.__actions.append(action)
-					else:
-						raise AttributeError("Unable to read action")
-				except Exception, e:
+					action = ActionReader(splitAct, self.name)
+					action.read()
+					action.getOptions(self.opts)
+					self.actions.append(action)
+				except AttributeError, e:
 					logSys.error("Error in action definition " + act)
 					logSys.debug(e)
-					return False
-		return True
 	
 	def convert(self):
-		stream = []
-		for opt in self.__opts:
-			if opt == "logpath":
-				for path in self.__opts[opt].split("\n"):
-					pathList = glob.glob(path)
-					if len(pathList) == 0:
-						logSys.error("No file found for " + path)
-					for p in pathList:
-						stream.append(["set", self.__name, "addlogpath", p])
-			elif opt == "backend":
-				backend = self.__opts[opt]
-			elif opt == "maxretry":
-				stream.append(["set", self.__name, "maxretry", self.__opts[opt]])
-			elif opt == "ignoreip":
-				for ip in self.__opts[opt].split():
-					# Do not send a command if the rule is empty.
-					if ip != '':
-						stream.append(["set", self.__name, "addignoreip", ip])
-			elif opt == "findtime":
-				stream.append(["set", self.__name, "findtime", self.__opts[opt]])
+		stream = [["add", self.name]]
+		for opt in self.opts:
+			if opt == "maxretry":
+				stream.append(["set", self.name, "maxretry", self.opts[opt]])
 			elif opt == "bantime":
-				stream.append(["set", self.__name, "bantime", self.__opts[opt]])
-			elif opt == "failregex":
-				stream.append(["set", self.__name, "addfailregex", self.__opts[opt]])
-			elif opt == "ignoreregex":
-				for regex in self.__opts[opt].split('\n'):
-					# Do not send a command if the rule is empty.
-					if regex != '':
-						stream.append(["set", self.__name, "addignoreregex", regex])
-		stream.extend(self.__filter.convert())
-		for action in self.__actions:
+				stream.append(["set", self.name, "bantime", self.opts[opt]])
+		stream.extend(self.filter.convert())
+		for action in self.actions:
 			stream.extend(action.convert())
-		stream.insert(0, ["add", self.__name, backend])
 		return stream
 	
-	#@staticmethod
+	@staticmethod
 	def splitAction(action):
 		m = JailReader.actionCRE.match(action)
 		d = dict()
-		if not m.group(2) == None:
-			# Huge bad hack :( This method really sucks. TODO Reimplement it.
-			actions = ""
-			escapeChar = None
-			allowComma = False
-			for c in m.group(2):
-				if c in ('"', "'") and not allowComma:
-					# Start
-					escapeChar = c
-					allowComma = True
-				elif c == escapeChar:
-					# End
-					escapeChar = None
-					allowComma = False
-				else:
-					if c == ',' and allowComma:
-						actions += "<COMMA>"
-					else:
-						actions += c
-			
-			# Split using ,
-			actionsSplit = actions.split(',')
-			# Replace the tag <COMMA> with ,
-			actionsSplit = [n.replace("<COMMA>", ',') for n in actionsSplit]
-			
-			for param in actionsSplit:
+		if m.group(2) <> None:
+			for param in m.group(2).split(','):
 				p = param.split('=')
-				try:
-					d[p[0].strip()] = p[1].strip()
-				except IndexError:
-					logSys.error("Invalid argument %s in '%s'" % (p, m.group(2)))
+				d[p[0].strip()] = p[1].strip()
 		return [m.group(1), d]
-	splitAction = staticmethod(splitAction)

client/jailsreader.py

@@ -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"
 
@@ -35,52 +35,38 @@ class JailsReader(ConfigReader):
 	
 	def __init__(self):
 		ConfigReader.__init__(self)
-		self.__jails = list()
+		self.jails = list()
 	
 	def read(self):
 		ConfigReader.read(self, "jail")
 	
-	def getOptions(self, section = None):
+	def getOptions(self):
 		opts = []
-		self.__opts = ConfigReader.getOptions(self, "Definition", opts)
+		self.opts = ConfigReader.getOptions(self, "Definition", opts)
 
-		if section:
-			# Get the options of a specific jail.
-			jail = JailReader(section)
+		for sec in self.sections():
+			jail = JailReader(sec)
 			jail.read()
-			ret = jail.getOptions()
-			if ret:
-				if jail.isEnabled():
-					# We only add enabled jails
-					self.__jails.append(jail)
-			else:
-				logSys.error("Errors in jail '%s'. Skipping..." % section)
-				return False
-		else:
-			# Get the options of all jails.
-			for sec in self.sections():
-				jail = JailReader(sec)
-				jail.read()
-				ret = jail.getOptions()
-				if ret:
-					if jail.isEnabled():
-						# We only add enabled jails
-						self.__jails.append(jail)
-				else:
-					logSys.error("Errors in jail '" + sec + "'. Skipping...")
-					return False
-		return True
+			jail.getOptions()
+			if jail.isEnabled():
+				# We only add enabled jails
+				self.jails.append(jail)
+	
+	def getFilterOptions(self, file):
+		filter = FilterReader(file)
+		filter.read()
+		return filter.getOptions()
 	
 	def convert(self):
 		stream = list()
-		for opt in self.__opts:
+		for opt in self.opts:
 			if opt == "":
 				stream.append([])
 		# Convert jails
-		for jail in self.__jails:
+		for jail in self.jails:
 			stream.extend(jail.convert())
 		# Start jails
-		for jail in self.__jails:
+		for jail in self.jails:
 			stream.append(["start", jail.getName()])
 		
 		return stream

common/protocol.py

@@ -1,134 +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: 751 $
-
-__author__ = "Cyril Jaquier"
-__version__ = "$Revision: 751 $"
-__date__ = "$Date: 2009-09-01 22:25:32 +0200 (Tue, 01 Sep 2009) $"
-__copyright__ = "Copyright (c) 2004 Cyril Jaquier"
-__license__ = "GPL"
-
-import textwrap
-
-##
-# Describes the protocol used to communicate with the server.
-
-protocol = [
-['', "BASIC", ""],
-["start", "starts the server and the jails"], 
-["reload", "reloads the configuration"], 
-["reload <JAIL>", "reloads the jail <JAIL>"], 
-["stop", "stops all jails and terminate the server"], 
-["status", "gets the current status of the server"], 
-["ping", "tests if the server is alive"], 
-['', "LOGGING", ""],
-["set loglevel <LEVEL>", "sets logging level to <LEVEL>. 0 is minimal, 4 is debug"], 
-["get loglevel", "gets the logging level"], 
-["set logtarget <TARGET>", "sets logging target to <TARGET>. Can be STDOUT, STDERR, SYSLOG or a file"], 
-["get logtarget", "gets logging target"], 
-['', "JAIL CONTROL", ""],
-["add <JAIL> <BACKEND>", "creates <JAIL> using <BACKEND>"], 
-["start <JAIL>", "starts the jail <JAIL>"], 
-["stop <JAIL>", "stops the jail <JAIL>. The jail is removed"], 
-["status <JAIL>", "gets the current status of <JAIL>"],
-['', "JAIL CONFIGURATION", ""],
-["set <JAIL> idle on|off", "sets the idle state of <JAIL>"], 
-["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> 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>"],
-["set <JAIL> delignoreregex <INDEX>", "removes the regular expression at <INDEX> for ignoreregex"], 
-["set <JAIL> findtime <TIME>", "sets the number of seconds <TIME> for which the filter will look back for <JAIL>"], 
-["set <JAIL> bantime <TIME>", "sets the number of seconds <TIME> a host will be banned for <JAIL>"], 
-["set <JAIL> banip <IP>", "manually Ban <IP> for <JAIL>"], 
-["set <JAIL> maxretry <RETRY>", "sets the number of failures <RETRY> before banning the host for <JAIL>"], 
-["set <JAIL> addaction <ACT>", "adds a new action named <NAME> for <JAIL>"], 
-["set <JAIL> delaction <ACT>", "removes the action <NAME> from <JAIL>"], 
-["set <JAIL> setcinfo <ACT> <KEY> <VALUE>", "sets <VALUE> for <KEY> of the action <NAME> for <JAIL>"], 
-["set <JAIL> delcinfo <ACT> <KEY>", "removes <KEY> for the action <NAME> for <JAIL>"], 
-["set <JAIL> actionstart <ACT> <CMD>", "sets the start command <CMD> of the action <ACT> for <JAIL>"], 
-["set <JAIL> actionstop <ACT> <CMD>", "sets the stop command <CMD> of the action <ACT> for <JAIL>"], 
-["set <JAIL> actioncheck <ACT> <CMD>", "sets the check command <CMD> of the action <ACT> for <JAIL>"], 
-["set <JAIL> actionban <ACT> <CMD>", "sets the ban command <CMD> of the action <ACT> for <JAIL>"],
-["set <JAIL> actionunban <ACT> <CMD>", "sets the unban command <CMD> of the action <ACT> for <JAIL>"], 
-['', "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> 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>"],
-["get <JAIL> bantime", "gets the time a host is banned for <JAIL>"],
-["get <JAIL> maxretry", "gets the number of failures allowed for <JAIL>"],
-["get <JAIL> addaction", "gets the last action which has been added for <JAIL>"],
-["get <JAIL> actionstart <ACT>", "gets the start command for the action <ACT> for <JAIL>"],
-["get <JAIL> actionstop <ACT>", "gets the stop command for the action <ACT> for <JAIL>"],
-["get <JAIL> actioncheck <ACT>", "gets the check command for the action <ACT> for <JAIL>"],
-["get <JAIL> actionban <ACT>", "gets the ban command for the action <ACT> for <JAIL>"],
-["get <JAIL> actionunban <ACT>", "gets the unban command for the action <ACT> for <JAIL>"],
-]
-
-##
-# Prints the protocol in a "man" format. This is used for the
-# "-h" output of fail2ban-client.
-
-def printFormatted():
-	INDENT=4
-	MARGIN=41
-	WIDTH=34
-	firstHeading = False
-	for m in protocol:
-		if m[0] == '' and firstHeading:
-			print
-		firstHeading = True
-		first = True
-		for n in textwrap.wrap(m[1], WIDTH):
-			if first:
-				line = ' ' * INDENT + m[0] + ' ' * (MARGIN - len(m[0])) + n
-				first = False
-			else:
-				line = ' ' * (INDENT + MARGIN) + n
-			print line
-
-##
-# Prints the protocol in a "mediawiki" format.
-
-def printWiki():
-	firstHeading = False
-	for m in protocol:
-		if m[0] == '':
-			if firstHeading:
-				print "|}"
-			__printWikiHeader(m[1], m[2])
-			firstHeading = True
-		else:
-			print "|-"
-			print "| <span style=\"white-space:nowrap;\"><tt>" + m[0] + "</tt></span> || || " + m[1]
-	print "|}"
-
-def __printWikiHeader(section, desc):
-	print
-	print "=== " + section + " ==="
-	print
-	print desc
-	print
-	print "{|"
-	print "| '''Command''' || || '''Description'''"

config/action.d/complain.conf

@@ -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 =
-

config/action.d/dshield.conf

@@ -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
-

config/action.d/dummy.conf

@@ -0,0 +1,54 @@
+# Fail2Ban configuration file
+#
+# Author: Cyril Jaquier
+#
+# $Revision$
+#
+
+[Definition]
+
+# Option:  fwstart
+# Notes.:  command executed once at the start of Fail2Ban.
+# Values:  CMD  Default:
+#
+actionstart = touch /tmp/fail2ban.dummy
+              echo "<init>" >> /tmp/fail2ban.dummy
+
+# Option:  fwend
+# Notes.:  command executed once at the end of Fail2Ban
+# Values:  CMD  Default:
+#
+actionstop = rm /tmp/fail2ban.dummy
+
+# Option:  fwcheck
+# Notes.:  command executed once before each fwban command
+# Values:  CMD  Default:
+#
+actioncheck = 
+
+# Option:  fwban
+# 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
+# Default: iptables -I INPUT 1 -s <ip> -j DROP
+#
+actionban = echo "+<ip>" >> /tmp/fail2ban.dummy
+
+# Option:  fwunban
+# 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
+# Default: iptables -D INPUT -s <ip> -j DROP
+#
+actionunban = echo "-<ip>" >> /tmp/fail2ban.dummy
+
+[Init]
+
+init = 123

config/action.d/hostsdeny.conf

@@ -2,49 +2,54 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 660 $
+# $Revision$
 #
 
 [Definition]
 
-# Option:  actionstart
+# Option:  fwstart
 # Notes.:  command executed once at the start of Fail2Ban.
-# Values:  CMD
+# Values:  CMD  Default:
 #
-actionstart = 
+actionstart = touch <tmpfile>
 
-# Option:  actionstop
+# Option:  fwend
 # Notes.:  command executed once at the end of Fail2Ban
-# Values:  CMD
+# Values:  CMD  Default:
 #
-actionstop = 
+actionstop = rm -f <tmpfile>
 
-# Option:  actioncheck
-# Notes.:  command executed once before each actionban command
-# Values:  CMD
+# Option:  fwcheck
+# Notes.:  command executed once before each fwban command
+# Values:  CMD  Default:
 #
 actioncheck = 
 
-# Option:  actionban
+# Option:  fwban
 # 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
+#          <failtime>  unix timestamp of the last failure
+#          <bantime>  unix timestamp of the ban time
 # Values:  CMD
+# Default: iptables -I INPUT 1 -s <ip> -j DROP
 #
 actionban = IP=<ip> &&
-            printf %%b "ALL: $IP\n" >> <file>
+            echo "ALL: $IP" >> <file>
 
-# Option:  actionunban
+# Option:  fwunban
 # 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
+#          <bantime>  unix timestamp of the ban time
+#          <unbantime>  unix timestamp of the unban time
 # Values:  CMD
+# Default: iptables -D INPUT -s <ip> -j DROP
 #
-actionunban = IP=<ip> && sed -i.old /ALL:\ $IP/d <file>
+actionunban = IP=<ip> &&
+              grep -v "ALL: $IP" <file> > <tmpfile> &&
+              mv <tmpfile> <file>
 
 [Init]
 
@@ -53,3 +58,9 @@ actionunban = IP=<ip> && sed -i.old /ALL:\ $IP/d <file>
 # Values:  STR  Default:  /etc/hosts.deny
 #
 file = /etc/hosts.deny
+
+# Option:  file
+# Notes.:  hosts.deny temporary file path.
+# Values:  STR  Default:  /etc/hostsdeny.failban
+#
+tmpfile = /tmp/hosts.deny.tmp

config/action.d/ipfilter.conf

@@ -1,57 +0,0 @@
-# Fail2Ban configuration file
-#
-# NetBSD ipfilter (ipf command) ban/unban
-#
-# Author: Ed Ravin <eravin@panix.com>
-#
-#
-
-[Definition]
-
-# Option:  actionstart
-# Notes.:  command executed once at the start of Fail2Ban.
-# Values:  CMD
-#
-# enable IPF if not already enabled
-actionstart = /sbin/ipf -E
-
-
-# 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 = 
-
-
-# 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 = echo block in quick from <ip>/32 | /sbin/ipf -f -
-
-
-# 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
-#
-# note -r option used to remove matching rule
-actionunban = echo block in quick from <ip>/32 | /sbin/ipf -r -f -
-
-[Init]
-

config/action.d/ipfw.conf

@@ -1,65 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Nick Munger
-# Modified by: Cyril Jaquier
-#
-# $Revision: 658 $
-#
-
-[Definition]
-
-# Option:  actionstart
-# Notes.:  command executed once at the start of Fail2Ban.
-# Values:  CMD
-#
-actionstart = 
-
-
-# Option:  actionstop
-# Notes.:  command executed once at the end of Fail2Ban
-# Values:  CMD
-#
-actionstop = 
-
-
-# Option:  actioncheck
-# Notes.:  command executed once before each actionban command
-# Values:  CMD
-#
-actioncheck = 
-
-
-# Option:  actionban
-# Notes.:  command executed when banning an IP. Take care that the
-#          command is executed with Fail2Ban user rights.
-# Tags:    <ip>  IP address
-#          <failures>  number of failures
-#          <time>  unix timestamp of the ban time
-# Values:  CMD
-#
-actionban = ipfw add deny tcp from <ip> to <localhost> <port>
-
-
-# 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 = ipfw delete `ipfw list | grep -i <ip> | awk '{print $1;}'`
-
-[Init]
-
-# Option:  port
-# Notes.:  specifies port to monitor
-# Values:  [ NUM | STRING ]
-#
-port = ssh
-
-# Option:  localhost
-# Notes.:  the local IP address of the network interface
-# Values:  IP
-#
-localhost = 127.0.0.1

config/action.d/iptables-allports.conf

@@ -1,70 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Cyril Jaquier
-# Modified: Yaroslav O. Halchenko <debian@onerussian.com>
-# 			made active on all ports from original iptables.conf
-#
-# $Revision: 658 $
-#
-
-[Definition]
-
-# Option:  actionstart
-# Notes.:  command executed once at the start of Fail2Ban.
-# Values:  CMD
-#
-actionstart = iptables -N fail2ban-<name>
-              iptables -A fail2ban-<name> -j RETURN
-              iptables -I <chain> -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>
-             iptables -F fail2ban-<name>
-             iptables -X fail2ban-<name>
-
-# Option:  actioncheck
-# Notes.:  command executed once before each actionban command
-# Values:  CMD
-#
-actioncheck = iptables -n -L <chain> | grep -q fail2ban-<name>
-
-# 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 = iptables -I fail2ban-<name> 1 -s <ip> -j DROP
-
-# 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 = iptables -D fail2ban-<name> -s <ip> -j DROP
-
-[Init]
-
-# Defaut name of the chain
-#
-name = default
-
-# Option:  protocol
-# Notes.:  internally used by config reader for interpolations.
-# 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

config/action.d/iptables-multiport-log.conf

@@ -1,84 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Guido Bozzetto
-# Modified: Cyril Jaquier
-#
-# 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
-#
-# $Revision: 668 $
-#
-
-[Definition]
-
-# Option:  actionstart
-# Notes.:  command executed once at the start of Fail2Ban.
-# Values:  CMD
-#
-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 -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
-
-# Option:  actionstop
-# Notes.:  command executed once at the end of Fail2Ban
-# Values:  CMD
-#
-actionstop = iptables -D <chain> -p <protocol> -m multiport --dports <port> -j fail2ban-<name>
-             iptables -F fail2ban-<name>
-             iptables -F fail2ban-<name>-log
-             iptables -X fail2ban-<name>
-             iptables -X fail2ban-<name>-log
-
-# Option:  actioncheck
-# Notes.:  command executed once before each actionban command
-# Values:  CMD
-#
-actioncheck = iptables -n -L fail2ban-<name>-log >/dev/null
-
-# 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 = iptables -I fail2ban-<name> 1 -s <ip> -j fail2ban-<name>-log
-
-# 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 = iptables -D fail2ban-<name> -s <ip> -j fail2ban-<name>-log
-
-[Init]
-
-# Defaut name of the chain
-#
-name = default
-
-# Option:  port
-# Notes.:  specifies port to monitor
-# Values:  [ NUM | STRING ]  Default:
-#
-port = ssh
-
-# Option:  protocol
-# Notes.:  internally used by config reader for interpolations.
-# 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

config/action.d/iptables-new.conf

@@ -1,76 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Cyril Jaquier
-# Copied from iptables.conf and modified by Yaroslav Halchenko 
-#  to fullfill the needs of bugreporter dbts#350746.
-#
-# $Revision: 658 $
-#
-
-[Definition]
-
-# Option:  actionstart
-# Notes.:  command executed once at the start of Fail2Ban.
-# Values:  CMD
-#
-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>
-
-# 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>
-             iptables -F fail2ban-<name>
-             iptables -X fail2ban-<name>
-
-# Option:  actioncheck
-# Notes.:  command executed once before each actionban command
-# Values:  CMD
-#
-actioncheck = iptables -n -L <chain> | grep -q fail2ban-<name>
-
-# 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 = iptables -I fail2ban-<name> 1 -s <ip> -j DROP
-
-# 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 = iptables -D fail2ban-<name> -s <ip> -j DROP
-
-[Init]
-
-# Defaut name of the chain
-#
-name = default
-
-# Option:  port
-# Notes.:  specifies port to monitor
-# Values:  [ NUM | STRING ]  Default:
-#
-port = ssh
-
-# Option:  protocol
-# Notes.:  internally used by config reader for interpolations.
-# 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

config/action.d/iptables.conf

@@ -2,50 +2,53 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 658 $
+# $Revision$
 #
 
 [Definition]
 
-# Option:  actionstart
+# Option:  fwstart
 # Notes.:  command executed once at the start of Fail2Ban.
-# Values:  CMD
+# Values:  CMD  Default:
 #
 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:  fwend
 # Notes.:  command executed once at the end of Fail2Ban
-# Values:  CMD
+# Values:  CMD  Default:
 #
-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>
 
-# Option:  actioncheck
-# Notes.:  command executed once before each actionban command
-# Values:  CMD
+# Option:  fwcheck
+# Notes.:  command executed once before each fwban command
+# Values:  CMD  Default:
 #
-actioncheck = iptables -n -L <chain> | grep -q fail2ban-<name>
+actioncheck = iptables -L INPUT | grep -q fail2ban-<name>
 
-# Option:  actionban
+# Option:  fwban
 # 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
+#          <failtime>  unix timestamp of the last failure
+#          <bantime>  unix timestamp of the ban time
 # Values:  CMD
+# Default: iptables -I INPUT 1 -s <ip> -j DROP
 #
 actionban = iptables -I fail2ban-<name> 1 -s <ip> -j DROP
 
-# Option:  actionunban
+# Option:  fwunban
 # 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
+#          <bantime>  unix timestamp of the ban time
+#          <unbantime>  unix timestamp of the unban time
 # Values:  CMD
+# Default: iptables -D INPUT -s <ip> -j DROP
 #
 actionunban = iptables -D fail2ban-<name> -s <ip> -j DROP
 
@@ -66,9 +69,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

config/action.d/mail-buffered.conf

@@ -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

config/action.d/mail-whois.conf

@@ -2,44 +2,46 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 660 $
+# $Revision: 254 $
 #
 
 [Definition]
 
-# Option:  actionstart
+# Option:  fwstart
 # Notes.:  command executed once at the start of Fail2Ban.
-# Values:  CMD
+# Values:  CMD  Default:
 #
-actionstart = printf %%b "Hi,\n
-              The jail <name> has been started successfully.\n
+actionstart = echo -en "Hi,\n
+              The jail <name> has been started successfuly.\n
               Regards,\n
               Fail2Ban"|mail -s "[Fail2Ban] <name>: started" <dest>
 
-# Option:  actionstop
+# Option:  fwend
 # Notes.:  command executed once at the end of Fail2Ban
-# Values:  CMD
+# Values:  CMD  Default:
 #
-actionstop = printf %%b "Hi,\n
+actionstop = echo -en "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
+# Option:  fwcheck
+# Notes.:  command executed once before each fwban command
+# Values:  CMD  Default:
 #
 actioncheck = 
 
-# Option:  actionban
+# Option:  fwban
 # 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
+#          <failtime>  unix timestamp of the last failure
+#          <bantime>  unix timestamp of the ban time
 # Values:  CMD
+# Default: iptables -I INPUT 1 -s <ip> -j DROP
 #
-actionban = printf %%b "Hi,\n
+actionban = echo -en "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
@@ -47,13 +49,14 @@ actionban = printf %%b "Hi,\n
             Regards,\n
             Fail2Ban"|mail -s "[Fail2Ban] <name>: banned <ip>" <dest>
 
-# Option:  actionunban
+# Option:  fwunban
 # 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
+#          <bantime>  unix timestamp of the ban time
+#          <unbantime>  unix timestamp of the unban time
 # Values:  CMD
+# Default: iptables -D INPUT -s <ip> -j DROP
 #
 actionunban = 
 
@@ -63,7 +66,6 @@ actionunban =
 #
 name = default
 
-# Destination/Addressee of the mail
+# Destinataire of the mail
 #
 dest = root
-

config/action.d/mail.conf

@@ -2,56 +2,59 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 660 $
+# $Revision: 254 $
 #
 
 [Definition]
 
-# Option:  actionstart
+# Option:  fwstart
 # Notes.:  command executed once at the start of Fail2Ban.
-# Values:  CMD
+# Values:  CMD  Default:
 #
-actionstart = printf %%b "Hi,\n
-              The jail <name> has been started successfully.\n
+actionstart = echo -en "Hi,\n
+              The jail <name> has been started successfuly.\n
               Regards,\n
               Fail2Ban"|mail -s "[Fail2Ban] <name>: started" <dest>
 
-# Option:  actionstop
+# Option:  fwend
 # Notes.:  command executed once at the end of Fail2Ban
-# Values:  CMD
+# Values:  CMD  Default:
 #
-actionstop = printf %%b "Hi,\n
+actionstop = echo -en "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
+# Option:  fwcheck
+# Notes.:  command executed once before each fwban command
+# Values:  CMD  Default:
 #
 actioncheck = 
 
-# Option:  actionban
+# Option:  fwban
 # 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
+#          <failtime>  unix timestamp of the last failure
+#          <bantime>  unix timestamp of the ban time
 # Values:  CMD
+# Default: iptables -I INPUT 1 -s <ip> -j DROP
 #
-actionban = printf %%b "Hi,\n
+actionban = echo -en "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
+# Option:  fwunban
 # 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
+#          <bantime>  unix timestamp of the ban time
+#          <unbantime>  unix timestamp of the unban time
 # Values:  CMD
+# Default: iptables -D INPUT -s <ip> -j DROP
 #
 actionunban = 
 
@@ -61,7 +64,6 @@ actionunban =
 #
 name = default
 
-# Destination/Addressee of the mail
+# Destinataire of the mail
 #
 dest = root
-

config/action.d/mynetwatchman.conf

@@ -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

config/action.d/sendmail-buffered.conf

@@ -1,105 +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 "Subject: [Fail2Ban] <name>: started
-              From: Fail2Ban <<sender>>
-              To: <dest>\n
-              Hi,\n
-              The jail <name> has been started successfully.\n
-              Output will be buffered until <lines> lines are available.\n
-              Regards,\n
-              Fail2Ban" | /usr/sbin/sendmail -f <sender> <dest>
-
-# Option:  actionstop
-# Notes.:  command executed once at the end of Fail2Ban
-# Values:  CMD
-#
-actionstop = if [ -f <tmpfile> ]; then
-                 printf %%b "Subject: [Fail2Ban] <name>: summary
-                 From: Fail2Ban <<sender>>
-                 To: <dest>\n
-                 Hi,\n
-                 These hosts have been banned by Fail2Ban.\n
-                 `cat <tmpfile>`
-                 Regards,\n
-                 Fail2Ban" | /usr/sbin/sendmail -f <sender> <dest>
-                 rm <tmpfile>
-             fi
-             printf %%b "Subject: [Fail2Ban] <name>: stopped
-             From: Fail2Ban <<sender>>
-             To: <dest>\n
-             Hi,\n
-             The jail <name> has been stopped.\n
-             Regards,\n
-             Fail2Ban" | /usr/sbin/sendmail -f <sender> <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 "Subject: [Fail2Ban] <name>: summary
-                From: Fail2Ban <<sender>>
-                To: <dest>\n
-                Hi,\n
-                These hosts have been banned by Fail2Ban.\n
-                `cat <tmpfile>`
-                Regards,\n
-                Fail2Ban" | /usr/sbin/sendmail -f <sender> <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]
-
-# Defaut name of the chain
-#
-name = default
-
-# Destination/Addressee of the mail
-#
-dest = root
-
-# Sender of the mail
-#
-sender = fail2ban
-
-# Default number of lines that are buffered
-#
-lines = 5
-
-# Default temporary file
-#
-tmpfile = /var/run/fail2ban/tmp-mail.txt
-

config/action.d/sendmail-whois-lines.conf

@@ -1,88 +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 "Subject: [Fail2Ban] <name>: started
-              From: Fail2Ban <<sender>>
-              To: <dest>\n
-              Hi,\n
-              The jail <name> has been started successfully.\n
-              Regards,\n
-              Fail2Ban" | /usr/sbin/sendmail -f <sender> <dest>
-
-# Option:  actionstop
-# Notes.:  command executed once at the end of Fail2Ban
-# Values:  CMD
-#
-actionstop = printf %%b "Subject: [Fail2Ban] <name>: stopped
-             From: Fail2Ban <<sender>>
-             To: <dest>\n
-             Hi,\n
-             The jail <name> has been stopped.\n
-             Regards,\n
-             Fail2Ban" | /usr/sbin/sendmail -f <sender> <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 "Subject: [Fail2Ban] <name>: banned <ip>
-            From: Fail2Ban <<sender>>
-            To: <dest>\n
-            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
-            `/usr/bin/whois <ip>`\n\n
-            Lines containing IP:<ip> in <logpath>\n
-            `/bin/grep '\<<ip>\>' <logpath>`\n\n
-            Regards,\n
-            Fail2Ban" | /usr/sbin/sendmail -f <sender> <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
-
-# Sender of the mail
-#
-sender = fail2ban
-
-# Path to the log files which contain relevant lines for the abuser IP
-#
-logpath = /dev/null
-

config/action.d/sendmail-whois.conf

@@ -1,82 +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 "Subject: [Fail2Ban] <name>: started
-              From: Fail2Ban <<sender>>
-              To: <dest>\n
-              Hi,\n
-              The jail <name> has been started successfully.\n
-              Regards,\n
-              Fail2Ban" | /usr/sbin/sendmail -f <sender> <dest>
-
-# Option:  actionstop
-# Notes.:  command executed once at the end of Fail2Ban
-# Values:  CMD
-#
-actionstop = printf %%b "Subject: [Fail2Ban] <name>: stopped
-             From: Fail2Ban <<sender>>
-             To: <dest>\n
-             Hi,\n
-             The jail <name> has been stopped.\n
-             Regards,\n
-             Fail2Ban" | /usr/sbin/sendmail -f <sender> <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 "Subject: [Fail2Ban] <name>: banned <ip>
-            From: Fail2Ban <<sender>>
-            To: <dest>\n
-            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
-            `/usr/bin/whois <ip>`\n
-            Regards,\n
-            Fail2Ban" | /usr/sbin/sendmail -f <sender> <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
-
-# Sender of the mail
-#
-sender = fail2ban
-

config/action.d/sendmail.conf

@@ -1,80 +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 "Subject: [Fail2Ban] <name>: started
-              From: Fail2Ban <<sender>>
-              To: <dest>\n
-              Hi,\n
-              The jail <name> has been started successfully.\n
-              Regards,\n
-              Fail2Ban" | /usr/sbin/sendmail -f <sender> <dest>
-
-# Option:  actionstop
-# Notes.:  command executed once at the end of Fail2Ban
-# Values:  CMD
-#
-actionstop = printf %%b "Subject: [Fail2Ban] <name>: stopped
-             From: Fail2Ban <<sender>>
-             To: <dest>\n
-             Hi,\n
-             The jail <name> has been stopped.\n
-             Regards,\n
-             Fail2Ban" | /usr/sbin/sendmail -f <sender> <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 "Subject: [Fail2Ban] <name>: banned <ip>
-            From: Fail2Ban <<sender>>
-            To: <dest>\n
-            Hi,\n
-            The IP <ip> has just been banned by Fail2Ban after
-            <failures> attempts against <name>.\n
-            Regards,\n
-            Fail2Ban" | /usr/sbin/sendmail -f <sender> <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
-
-# Sender of the mail
-#
-sender = fail2ban
-

config/action.d/shorewall.conf

@@ -1,54 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Cyril Jaquier
-#
-# $Revision: 661 $
-#
-# 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]
-
-# Option:  actionstart
-# Notes.:  command executed once at the start of Fail2Ban.
-# Values:  CMD
-#
-actionstart = 
-
-# Option:  actionstop
-# Notes.:  command executed once at the end of Fail2Ban
-# Values:  CMD
-#
-actionstop = 
-
-# Option:  actioncheck
-# Notes.:  command executed once before each actionban command
-# Values:  CMD
-#
-actioncheck = 
-
-# Option:  actionban
-# Notes.:  command executed when banning an IP. Take care that the
-#          command is executed with Fail2Ban user rights.
-# Tags:    <ip>  IP address
-#          <failures>  number of failures
-#          <time>  unix timestamp of the ban time
-# Values:  CMD
-#
-actionban = shorewall drop <ip>
-
-# 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 = shorewall allow <ip>

config/fail2ban.conf

@@ -2,7 +2,7 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 629 $
+# $Revision$
 #
 
 [Definition]
@@ -18,17 +18,7 @@
 loglevel = 3
 
 # Option:  logtarget
-# Notes.:  Set the log target. This could be a file, SYSLOG, STDERR or STDOUT.
-#          Only one log target can be specified.
-# Values:  STDOUT STDERR SYSLOG file  Default:  /var/log/fail2ban.log
+# Notes.:  Set the log target. This could be a file, SYSLOG, STDERR.
+# Values:  STDERR SYSLOG file  Default:  /var/log/fail2ban.log
 #
 logtarget = /var/log/fail2ban.log
-
-# Option: socket
-# Notes.: Set the socket file. This is used to communicate with the daemon. Do
-#         not remove this file when Fail2ban runs. It will not be possible to
-#         communicate with the server afterwards.
-# Values: FILE  Default:  /var/run/fail2ban/fail2ban.sock
-#
-socket = /var/run/fail2ban/fail2ban.sock
-

config/filter.d/apache-auth.conf

@@ -2,24 +2,41 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 728 $
+# $Revision$
 #
 
 [Definition]
 
-# Option:  failregex
-# 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\-.^_]+)
-# Values:  TEXT
+# Option:  maxretry
+# Notes.:  number of failures before IP gets banned.
+# Values:  NUM  Default:  5
 #
-failregex = [[]client <HOST>[]] user .* authentication failure
-            [[]client <HOST>[]] user .* not found
-            [[]client <HOST>[]] user .* password mismatch
+maxretry = 5
 
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
+# Option:  logfile
+# Notes.:  logfile to monitor.
+# Values:  FILE  Default:  /var/log/httpd/access_log
 #
-ignoreregex = 
+logfile = /var/log/httpd/access_log
+
+# Option:  timeregex
+# Notes.:  regex to match timestamp in Apache logfile. For TAI64N format,
+#          use timeregex = @[0-9a-f]{24}
+# Values:  [Wed Jan 05 15:08:01 2005]
+# Default: \S{3} \S{3} \d{2} \d{2}:\d{2}:\d{2} \d{4}
+#
+timeregex = \S{3} \S{3} \d{2} \d{2}:\d{2}:\d{2} \d{4}
+
+# Option:  timepattern
+# Notes.:  format used in "timeregex" fields definition. Note that '%' must be
+#          escaped with '%' (see http://rgruet.free.fr/PQR2.3.html#timeModule).
+#          For TAI64N format, use timepattern = tai64n
+# Values:  TEXT  Default:  %%a %%b %%d %%H:%%M:%%S %%Y
+#
+timepattern = %%a %%b %%d %%H:%%M:%%S %%Y
+
+# Option:  failregex
+# Notes.:  regex to match the password failure messages in the logfile.
+# Values:  TEXT  Default:  authentication failure|user .* not found
+#
+failregex = authentication failure|user .* not found

config/filter.d/apache-badbots.conf

@@ -1,28 +0,0 @@
-# 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
-#
-# Author: Yaroslav Halchenko
-#
-# $Revision: 668 $
-#
-
-[Definition]
-
-badbotscustom = EmailCollector|WebEMailExtrac|TrackBack/1\.02|sogou music spider
-badbots = atSpider/1\.0|autoemailspider|China Local Browse 2\.6|ContentSmartz|DataCha0s/2\.0|DataCha0s/2\.0|DBrowse 1\.4b|DBrowse 1\.4d|Demo Bot DOT 16b|Demo Bot Z 16b|DSurf15a 01|DSurf15a 71|DSurf15a 81|DSurf15a VA|EBrowse 1\.4b|Educate Search VxB|EmailSiphon|EmailWolf 1\.00|ESurf15a 15|ExtractorPro|Franklin Locator 1\.8|FSurf15a 01|Full Web Bot 0416B|Full Web Bot 0516B|Full Web Bot 2816B|Industry Program 1\.0\.x|ISC Systems iRc Search 2\.1|IUPUI Research Bot v 1\.9a|LARBIN-EXPERIMENTAL \(efp@gmx\.net\)|LetsCrawl\.com/1\.0 +http\://letscrawl\.com/|Lincoln State Web Browser|LWP\:\:Simple/5\.803|Mac Finder 1\.0\.xx|MFC Foundation Class Library 4\.0|Microsoft URL Control - 6\.00\.8xxx|Missauga Locate 1\.0\.0|Missigua Locator 1\.9|Missouri College Browse|Mizzu Labs 2\.2|Mo College 1\.9|Mozilla/2\.0 \(compatible; NEWT ActiveX; Win32\)|Mozilla/3\.0 \(compatible; Indy Library\)|Mozilla/4\.0 \(compatible; Advanced Email Extractor v2\.xx\)|Mozilla/4\.0 \(compatible; Iplexx Spider/1\.0 http\://www\.iplexx\.at\)|Mozilla/4\.0 \(compatible; MSIE 5\.0; Windows NT; DigExt; DTS Agent|Mozilla/4\.0 efp@gmx\.net|Mozilla/5\.0 \(Version\: xxxx Type\:xx\)|MVAClient|NASA Search 1\.0|Nsauditor/1\.x|PBrowse 1\.4b|PEval 1\.4b|Poirot|Port Huron Labs|Production Bot 0116B|Production Bot 2016B|Production Bot DOT 3016B|Program Shareware 1\.0\.2|PSurf15a 11|PSurf15a 51|PSurf15a VA|psycheclone|RSurf15a 41|RSurf15a 51|RSurf15a 81|searchbot admin@google\.com|sogou spider|sohu agent|SSurf15a 11 |TSurf15a 11|Under the Rainbow 2\.2|User-Agent\: Mozilla/4\.0 \(compatible; MSIE 6\.0; Windows NT 5\.1\)|WebVulnCrawl\.blogspot\.com/1\.0 libwww-perl/5\.803|Wells Search II|WEP Search 00
-
-# 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 = ^<HOST> -.*"(GET|POST).*HTTP.*"(?:%(badbots)s|%(badbotscustom)s)"$
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex =

config/filter.d/apache-nohome.conf

@@ -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 = 

config/filter.d/apache-noscript.conf

@@ -1,24 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Cyril Jaquier
-#
-# $Revision: 728 $
-#
-
-[Definition]
-
-# Option:  failregex
-# 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\-.^_]+)
-# 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 *$
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 

config/filter.d/apache-overflows.conf

@@ -1,20 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Tim Connors
-#
-# $Revision: 668 $
-#
-
-[Definition]
-
-# Option:  failregex
-# 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)
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex =

config/filter.d/common.conf

@@ -1,41 +0,0 @@
-# Generic configuration items (to be used as interpolations) in other
-# filters  or actions configurations
-#
-# Author: Yaroslav Halchenko
-#
-# $Revision: 728 $
-#
-
-[INCLUDES]
-
-# Load customizations if any available
-after = common.local
-
-
-[DEFAULT]
-
-# Daemon definition is to be specialized (if needed) in .conf file
-_daemon = \S*
-
-#
-# Shortcuts for easier comprehension of the failregex
-#
-# PID.
-# EXAMPLES: [123]
-__pid_re = (?:\[\d+\])
-
-# Daemon name (with optional source_file:line or whatever)
-# EXAMPLES: pam_rhosts_auth, [sshd], pop(pam_unix)
-__daemon_re = [\[\(]?%(_daemon)s(?:\(\S+\))?[\]\)]?:?
-
-# Combinations of daemon name and PID
-# EXAMPLES: sshd[31607], pop(pam_unix)[4920]
-__daemon_combs_re = (?:%(__pid_re)s?:\s+%(__daemon_re)s|%(__daemon_re)s%(__pid_re)s?:)
-
-#
-# Common line prefixes (beginnings) which could be used in filters
-#
-#       [hostname] [vserver tag] daemon_id spaces
-# this can be optional (for instance if we match named native log files)
-__prefix_line = \s*(?:\S+ )?(?:@vserver_\S+ )?%(__daemon_combs_re)s?\s*
-

config/filter.d/courierlogin.conf

@@ -1,24 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Christoph Haas
-# Modified by: Cyril Jaquier
-#
-# $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 = LOGIN FAILED, .*, ip=\[<HOST>\]$
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 

config/filter.d/couriersmtp.conf

@@ -1,23 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Cyril Jaquier
-#
-# $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 = error,relay=<HOST>,.*550 User unknown
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 

config/filter.d/cyrus-imap.conf

@@ -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 = 

config/filter.d/dovecot.conf

@@ -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 = 

config/filter.d/dropbear.conf

@@ -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 = 

config/filter.d/exim.conf

@@ -1,23 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Cyril Jaquier
-#
-# $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 = \[<HOST>\] .*(?:rejected by local_scan|Unrouteable address)
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 

config/filter.d/gssftpd.conf

@@ -1,20 +0,0 @@
-# Fail2Ban configuration file for wuftpd
-#
-# Author: Kevin Zembower (copied from wsftpd.conf)
-#
-# $Revision: 699 $
-#
-
-[Definition]
-
-# Option: failregex
-# Notes.: regex to match the password failures messages in the logfile.
-# Values: TEXT
-#
-failregex = ftpd(?:\[\d+\])?:\s+repeated login failures from <HOST> \(\S+\)$
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 

config/filter.d/lighttpd-fastcgi.conf

@@ -1,18 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Arturo 'Buanzo' Busleiman <buanzo@buanzo.com.ar>
-#
-
-[Definition]
-
-# Option:  failregex
-# Notes.:  regex to match ALERTS as notified by lighttpd's FastCGI Module
-# Values:  TEXT
-#
-failregex = .*ALERT\ -\ .*attacker\ \'<HOST>\'
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 

config/filter.d/named-refused.conf

@@ -1,35 +0,0 @@
-# Fail2Ban configuration file for named (bind9). Trying to generalize the
-#          structure which is general to capture general patterns in log
-#          lines to cover different configurations/distributions
-#
-# Author: Yaroslav Halchenko
-#
-# $Revision: 730 $
-#
-
-[Definition]
-
-# 
-# Daemon name
-_daemon=named
-
-#
-# Shortcuts for easier comprehension of the failregex
-__pid_re=(?:\[\d+\])
-__daemon_re=\(?%(_daemon)s(?:\(\S+\))?\)?:?
-__daemon_combs_re=(?:%(__pid_re)s?:\s+%(__daemon_re)s|%(__daemon_re)s%(__pid_re)s?:)
-#       hostname       daemon_id         spaces
-# this can be optional (for instance if we match named native log files)
-__line_prefix=(?:\s\S+ %(__daemon_combs_re)s\s+)?
-
-# Option: failregex
-# Notes.: regex to match the password failures messages in the logfile.
-# Values: TEXT
-#
-failregex = %(__line_prefix)sclient <HOST>#.+: query(?: \(cache\))? '.*' denied\s*$
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 

config/filter.d/pam-generic.conf

@@ -1,31 +0,0 @@
-# Fail2Ban configuration file for generic PAM authentication errors
-#
-# Author: Yaroslav Halchenko
-#
-# $Revision:  $
-#
-
-[Definition]
-
-# if you want to catch only login erros from specific daemons, use smth like
-#_ttys_re=(?:ssh|pure-ftpd|ftp)
-# To catch all failed logins
-_ttys_re=\S*
-
-#
-# Shortcuts for easier comprehension of the failregex
-__pid_re=(?:\[\d+\])
-__pam_re=\(?pam_unix(?:\(\S+\))?\)?:?
-__pam_combs_re=(?:%(__pid_re)s?:\s+%(__pam_re)s|%(__pam_re)s%(__pid_re)s?:)
-
-# Option: failregex
-# Notes.: regex to match the password failures messages in the logfile.
-# Values: TEXT
-#
-failregex = \s\S+ \S+%(__pam_combs_re)s\s+authentication failure; logname=\S* uid=\S* euid=\S* tty=%(_ttys_re)s ruser=\S* rhost=<HOST>(?:\s+user=.*)?\s*$
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 

config/filter.d/php-url-fopen.conf

@@ -1,23 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Arturo 'Buanzo' Busleiman <buanzo@buanzo.com.ar>
-# Version 2
-# fixes the failregex so REFERERS that contain =http:// don't get blocked
-# (mentioned by "fasuto" (no real email provided... blog comment) in this entry:
-# http://blogs.buanzo.com.ar/2009/04/fail2ban-filter-for-php-injection-attacks.html#comment-1489
-#
-
-[Definition]
-
-# Option:  failregex
-# Notes.:  regex to match this kind of request:
-#
-# 66.185.212.172 - - [26/Mar/2009:08:44:20 -0500] "GET /index.php?n=http://eatmyfood.hostinginfive.com/pizza.htm? HTTP/1.1" 200 114 "-" "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.1.4322; .NET CLR 2.0.50727)"
-#
-failregex = ^<HOST> -.*"(GET|POST).*\?.*\=http\:\/\/.* HTTP\/.*$
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 

config/filter.d/postfix.conf

@@ -1,23 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Cyril Jaquier
-#
-# $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 = reject: RCPT from (.*)\[<HOST>\]: 554
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 

config/filter.d/proftpd.conf

@@ -1,26 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Yaroslav Halchenko
-#
-# $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 = \(\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 *$
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 

config/filter.d/pure-ftpd.conf

@@ -1,29 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Cyril Jaquier
-# Modified: Yaroslav Halchenko for pure-ftpd
-#
-# $Revision: 3$
-#
-
-[Definition]
-
-# Error message specified in multiple languages
-__errmsg = (?:Authentication failed for user|Erreur d'authentification pour l'utilisateur)
-
-#
-# 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 = pure-ftpd(?:\[\d+\])?: \(.+?@<HOST>\) \[WARNING\] %(__errmsg)s \[.+\]\s*$
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 
-

config/filter.d/qmail.conf

@@ -1,23 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Cyril Jaquier
-#
-# $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 = (?:[\d,.]+[\d,.] rblsmtpd: |421 badiprbl: ip )<HOST>
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 

config/filter.d/sasl.conf

@@ -1,23 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Yaroslav Halchenko
-#
-# $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 = (?i): warning: [-._\w]+\[<HOST>\]: SASL (?:LOGIN|PLAIN|(?:CRAM|DIGEST)-MD5) authentication failed(: [ A-Za-z0-9+/]*={0,2})?$
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 

config/filter.d/sieve.conf

@@ -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 = 

config/filter.d/sshd-ddos.conf

@@ -1,23 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Yaroslav Halchenko
-#
-# $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 = sshd(?:\[\d+\])?: Did not receive identification string from <HOST>$
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 

config/filter.d/sshd.conf

@@ -2,40 +2,42 @@
 #
 # 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:  maxretry
+# Notes.:  number of failures before IP gets banned.
+# Values:  NUM  Default:  5
+#
+maxretry = 5
+
+# Option:  logpath
+# Notes.:  logfile to monitor.
+# Values:  FILE  Default:  /var/log/secure
+#
+logpath = /var/log/secure
+
+# Option:  timeregex
+# Notes.:  regex to match timestamp in SSH logfile. For TAI64N format,
+#          use timeregex = @[0-9a-f]{24}
+# Values:  [Mar  7 17:53:28]
+# Default: \S{3}\s{1,2}\d{1,2} \d{2}:\d{2}:\d{2}
+#
+timeregex = \S{3}\s{1,2}\d{1,2} \d{2}:\d{2}:\d{2}
+
+# Option:  timepattern
+# Notes.:  format used in "timeregex" fields definition. Note that '%' must be
+#          escaped with '%' (see http://rgruet.free.fr/PQR2.3.html#timeModule).
+#          For TAI64N format, use timepattern = tai64n
+# Values:  TEXT  Default:  %%b %%d %%H:%%M:%%S
+#
+timepattern = %%b %%d %%H:%%M:%%S
 
 # 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
+# Notes.:  regex to match the password failures messages in the logfile.
+# Values:  TEXT  Default:  Authentication failure|Failed password|Invalid user
 #
-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 = (?:(?:Authentication failure|Failed [-/\w+]+) for(?: [iI](?:llegal|nvalid) user)?|[Ii](?:llegal|nvalid) user|ROOT LOGIN REFUSED) .*(?: from|FROM) (?:::f{4,6}:)?(?P<host>\S*)
 
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 

config/filter.d/vsftpd.conf

@@ -2,23 +2,39 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 728 $
+# $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
+# Option:  maxretry
+# Notes.:  number of failures before IP gets banned.
+# Values:  NUM  Default:  5
 #
-failregex = vsftpd(?:\(pam_unix\))?(?:\[\d+\])?:.* authentication failure; .* rhost=<HOST>(?:\s+user=\S*)?\s*$
-            \[.+\] FAIL LOGIN: Client "<HOST>"\s*$
+maxretry = 5
 
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
+# Option: logfile
+# Notes.: logfile to monitor.
+# Values: FILE Default: /var/log/vsftpd.log
 #
-ignoreregex = 
+logfile = /var/log/vsftpd.log
+
+# Option: timeregex
+# Notes.: regex to match timestamp in VSFTPD logfile.
+# Values: [Mar 7 17:53:28]
+# Default: \S{3}\s{1,2}\d{1,2} \d{2}:\d{2}:\d{2}
+#
+timeregex = \S{3}\s{1,2}\d{1,2} \d{2}:\d{2}:\d{2}
+
+# Option: timepattern
+# Notes.: format used in "timeregex" fields definition. Note that '%' must be
+# escaped with '%' (see http://rgruet.free.fr/PQR2.3.html#timeModule)
+# Values: TEXT Default: %%b %%d %%H:%%M:%%S
+#
+timepattern = %%b %%d %%H:%%M:%%S
+
+# Option: failregex
+# Notes.: regex to match the password failures messages in the logfile.
+# Values: TEXT Default: Authentication failure|Failed password|Invalid user
+#
+failregex = FAIL LOGIN

config/filter.d/webmin-auth.conf

@@ -1,28 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Cyril Jaquier
-# Rule by : Delvit Guillaume
-#
-# $Revision: 728 $
-#
-
-[Definition]
-
-# patern :      webmin[15673]: Non-existent login as toto from 86.0.6.217
-#               webmin[29544]: Invalid login as root from 86.0.6.217
-#
-# Option:  failregex
-# 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\-.^_]+)
-# Values:  TEXT
-#
-failregex = webmin.* Non-existent login as .+ from <HOST>$
-            webmin.* Invalid login as .+ from <HOST>$
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 

config/filter.d/wuftpd.conf

@@ -1,20 +0,0 @@
-# Fail2Ban configuration file for wuftpd
-#
-# Author: Yaroslav Halchenko
-#
-# $Revision: 699 $
-#
-
-[Definition]
-
-# Option: failregex
-# Notes.: regex to match the password failures messages in the logfile.
-# Values: TEXT
-#
-failregex = wu-ftpd(?:\[\d+\])?:\s+\(pam_unix\)\s+authentication failure.* rhost=<HOST>$
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 

config/filter.d/xinetd-fail.conf

@@ -1,30 +0,0 @@
-# Fail2Ban configuration file
-#
-# Author: Guido Bozzetto
-#
-# $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
-#
-# Cfr.: /var/log/(daemon\.|sys)log
-# libwrap => tcp wrappers: hosts.(allow|deny)
-# address => xinetd: deny_from|only_from
-# load => xinetd: max_load (temporary problem)
-#
-
-failregex = xinetd(?:\[\d{1,5}\])?: FAIL: \S+ address from=<HOST>$
-            xinetd(?:\[\d{1,5}\])?: FAIL: \S+ libwrap from=<HOST>$
-
-# Option:  ignoreregex
-# Notes.:  regex to ignore. If this regex matches, the line is ignored.
-# Values:  TEXT
-#
-ignoreregex = 

config/jail.conf

@@ -2,240 +2,14 @@
 #
 # Author: Cyril Jaquier
 #
-# $Revision: 747 $
+# $Revision$
 #
 
-# The DEFAULT allows a global definition of the options. They can be overridden
-# in each jail afterwards.
-
-[DEFAULT]
-
-# "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
-
-# "bantime" is the number of seconds that a host is banned.
-bantime  = 600
-
-# A host is banned if it has generated "maxretry" during the last "findtime"
-# seconds.
-findtime  = 600
-
-# "maxretry" is the number of failures before a host get banned.
-maxretry = 3
-
-# "backend" specifies the backend used to get files modification. Available
-# options are "gamin", "polling" and "auto". This option can be overridden in
-# each jail too (use "gamin" for a jail and "polling" for another).
-#
-# gamin:   requires Gamin (a file alteration monitor) to be installed. If Gamin
-#          is not installed, Fail2ban will use polling.
-# polling: uses a polling algorithm which does not require external libraries.
-# auto:    will choose Gamin if available and polling otherwise.
-backend = auto
-
-
-# This jail corresponds to the standard configuration in Fail2ban 0.6.
-# The mail-whois action send a notification e-mail with a whois request
-# in the body.
-
-[ssh-iptables]
-
-enabled  = false
-filter   = sshd
-action   = iptables[name=SSH, port=ssh, protocol=tcp]
-           sendmail-whois[name=SSH, dest=you@example.com, sender=fail2ban@example.com]
-logpath  = /var/log/sshd.log
-maxretry = 5
-
-[proftpd-iptables]
-
-enabled  = false
-filter   = proftpd
-action   = iptables[name=ProFTPD, port=ftp, protocol=tcp]
-           sendmail-whois[name=ProFTPD, dest=you@example.com]
-logpath  = /var/log/proftpd/proftpd.log
-maxretry = 6
-
-# This jail forces the backend to "polling".
-
-[sasl-iptables]
-
-enabled  = false
-filter   = sasl
-backend  = polling
-action   = iptables[name=sasl, port=smtp, protocol=tcp]
-           sendmail-whois[name=sasl, dest=you@example.com]
-logpath  = /var/log/mail.log
-
-# Here we use TCP-Wrappers instead of Netfilter/Iptables. "ignoreregex" is
-# used to avoid banning the user "myuser".
-
-[ssh-tcpwrapper]
-
-enabled     = false
-filter      = sshd
-action      = hostsdeny
-              sendmail-whois[name=SSH, dest=you@example.com]
-ignoreregex = for myuser from
-logpath     = /var/log/sshd.log
-
-# This jail demonstrates the use of wildcards in "logpath".
-# Moreover, it is possible to give other files on a new line.
-
-[apache-tcpwrapper]
-
-enabled  = false
-filter	 = apache-auth
-action   = hostsdeny
-logpath  = /var/log/apache*/*error.log
-           /home/www/myhomepage/error.log
-maxretry = 6
-
-# The hosts.deny path can be defined with the "file" argument if it is
-# not in /etc.
-
-[postfix-tcpwrapper]
-
-enabled  = false
-filter   = postfix
-action   = hostsdeny[file=/not/a/standard/path/hosts.deny]
-           sendmail[name=Postfix, dest=you@example.com]
-logpath  = /var/log/postfix.log
-bantime  = 300
-
-# Do not ban anybody. Just report information about the remote host.
-# A notification is sent at most every 600 seconds (bantime).
-
-[vsftpd-notification]
-
-enabled  = false
-filter   = vsftpd
-action   = sendmail-whois[name=VSFTPD, dest=you@example.com]
-logpath  = /var/log/vsftpd.log
-maxretry = 5
-bantime  = 1800
-
-# Same as above but with banning the IP address.
-
-[vsftpd-iptables]
-
-enabled  = false
-filter   = vsftpd
-action   = iptables[name=VSFTPD, port=ftp, protocol=tcp]
-           sendmail-whois[name=VSFTPD, dest=you@example.com]
-logpath  = /var/log/vsftpd.log
-maxretry = 5
-bantime  = 1800
-
-# Ban hosts which agent identifies spammer robots crawling the web
-# for email addresses. The mail outputs are buffered.
-
-[apache-badbots]
-
-enabled  = false
-filter   = apache-badbots
-action   = iptables-multiport[name=BadBots, port="http,https"]
-           sendmail-buffered[name=BadBots, lines=5, dest=you@example.com]
-logpath  = /var/www/*/logs/access_log
-bantime  = 172800
-maxretry = 1
-
-# Use shorewall instead of iptables.
-
-[apache-shorewall]
-
-enabled  = false
-filter   = apache-noscript
-action   = shorewall
-           sendmail[name=Postfix, dest=you@example.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.
-
-[php-url-fopen]
+[dummy]
 
 enabled = false
-port    = http,https
-filter  = php-url-fopen
-logpath = /var/www/*/logs/access_log
-maxretry = 1
-
-# A simple PHP-fastcgi jail which works with lighttpd.
-# If you run a lighttpd server, then you probably will
-# find these kinds of messages in your error_log:
-# ALERT – tried to register forbidden variable ‘GLOBALS’
-# through GET variables (attacker '1.2.3.4', file '/var/www/default/htdocs/index.php')
-# This jail would block the IP 1.2.3.4.
-
-[lighttpd-fastcgi]
-
-enabled = false
-port    = http,https
-filter  = lighttpd-fastcgi
-# adapt the following two items as needed
-logpath = /var/log/lighttpd/error.log
+filter = sshd
+action = hostsdeny[file=/tmp/hosts.deny]
+         mail[name=SSH, dest=cyril.jaquier@bluewin.ch]
 maxretry = 2
-
-# This jail uses ipfw, the standard firewall on FreeBSD. The "ignoreip"
-# option is overridden in this jail. Moreover, the action "mail-whois" defines
-# the variable "name" which contains a comma using "". The characters '' are
-# valid too.
-
-[ssh-ipfw]
-
-enabled  = false
-filter   = sshd
-action   = ipfw[localhost=192.168.0.1]
-           sendmail-whois[name="SSH,IPFW", dest=you@example.com]
-logpath  = /var/log/auth.log
-ignoreip = 168.192.0.1
-
-# These jails block attacks against named (bind9). By default, logging is off
-# with bind9 installation. You will need something like this:
-#
-# logging {
-#     channel security_file {
-#         file "/var/log/named/security.log" versions 3 size 30m;
-#         severity dynamic;
-#         print-time yes;
-#     };
-#     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
-#   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
-#    http://nion.modprobe.de/blog/archives/690-fail2ban-+-dns-fail.html
-#   Please DO NOT USE this jail unless you know what you are doing.
-#
-# [named-refused-udp]
-#
-# enabled  = false
-# filter   = named-refused
-# action   = iptables-multiport[name=Named, port="domain,953", protocol=udp]
-#            sendmail-whois[name=Named, dest=you@example.com]
-# logpath  = /var/log/named/security.log
-# ignoreip = 168.192.0.1
-
-# This jail blocks TCP traffic for DNS requests.
-
-[named-refused-tcp]
-
-enabled  = false
-filter   = named-refused
-action   = iptables-multiport[name=Named, port="domain,953", protocol=tcp]
-           sendmail-whois[name=Named, dest=you@example.com]
-logpath  = /var/log/named/security.log
-ignoreip = 168.192.0.1
-
+bantime = 10

fail2ban-client

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # This file is part of Fail2Ban.
 #
 # Fail2Ban is free software; you can redistribute it and/or modify
@@ -17,27 +17,24 @@
 
 # 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"
 
-import sys, string, os, pickle, re, logging, signal
-import getopt, time, shlex, socket
+import sys, string, os, pickle, re, logging, getopt, time
 
 # Inserts our own modules path first in the list
 # fix for bug #343821
-sys.path.insert(1, "/usr/share/fail2ban")
+sys.path.insert(1, "/usr/lib/fail2ban")
 
 # Now we can import our modules
-from common.version import version
-from common.protocol import printFormatted
+from version import version
 from client.csocket import CSocket
 from client.configurator import Configurator
-from client.beautifier import Beautifier
 
 # Gets the instance of the logger.
 logSys = logging.getLogger("fail2ban.client")
@@ -48,119 +45,91 @@ logSys = logging.getLogger("fail2ban.client")
 
 class Fail2banClient:
 
-	SERVER = "fail2ban-server"
-	PROMPT = "fail2ban> "
-
 	def __init__(self):
-		self.__argv = None
-		self.__stream = None
-		self.__configurator = Configurator()
-		self.__conf = dict()
-		self.__conf["conf"] = "/etc/fail2ban"
-		self.__conf["dump"] = False
-		self.__conf["force"] = False
-		self.__conf["verbose"] = 1
-		self.__conf["interactive"] = False
-		self.__conf["socket"] = None
-		
-	def dispVersion(self):
-		print "Fail2Ban v" + version
-		print
-		print "Copyright (c) 2004-2008 Cyril Jaquier"
-		print "Copyright of modifications held by their respective authors."
-		print "Licensed under the GNU General Public License v2 (GPL)."
-		print
-		print "Written by Cyril Jaquier <cyril.jaquier@fail2ban.org>."
-		print "Many contributions by Yaroslav O. Halchenko <debian@onerussian.com>."
+		self.argv = None
+		self.stream = None
+		self.conf = dict()
+		self.conf["conf"] = "/etc/fail2ban"
+		self.conf["dump"] = False
+		self.conf["force"] = False
+		self.conf["verbose"] = 2
 	
 	def dispUsage(self):
 		""" Prints Fail2Ban command line options and exits
 		"""
-		print "Usage: "+self.__argv[0]+" [OPTIONS] <COMMAND>"
+		print "Usage: "+self.argv[0]+" [OPTIONS] <COMMAND>"
 		print
 		print "Fail2Ban v" + version + " reads log file that contains password failure report"
 		print "and bans the corresponding IP addresses using firewall rules."
 		print
-		print "Options:"
+		print "  <COMMAND>"
+		print
+		print "    start                   start the server and the jails"
+		print "    reload                  reload the configuration"
+		print "    stop                    stop all jails and terminate the server"
+		print "    status                  get the current status"
+		print
+		print "    set loglevel <LEVEL>    set loglevel to <LEVEL>"
+		print "    get loglevel            get loglevel"
+		print "    set logtarget <TARGET>  set log target to <TARGET>"
+		print "    get logtarget           get log target"
+		print
+		print "    add <JAIL>              create <JAIL>"
+		print "    set <JAIL> <CMD>        set the <CMD> value for <JAIL>"
+		print "    get <JAIL> <CMD>        get the <CMD> value for <JAIL>"
+		print "    start <JAIL>            start <JAIL>"
+		print "    stop <JAIL>             stop <JAIL>. The jail is removed"
+		print "    status <JAIL>           get the current status of <JAIL>"
+		print
+		print "  [OPTIONS]"
+		print
 		print "    -c <DIR>                configuration directory"
-		print "    -s <FILE>               socket path"
 		print "    -d                      dump configuration. For debugging"
-		print "    -i                      interactive mode"
 		print "    -v                      increase verbosity"
 		print "    -q                      decrease verbosity"
-		print "    -x                      force execution of the server (remove socket file)"
-		print "    -h, --help              display this help message"
-		print "    -V, --version           print the version"
+		print "    -x                      force execution of the server"
+		print "    -h                      display this help message"
 		print
-		print "Command:"
-		
-		# Prints the protocol
-		printFormatted()
-		
-		print
-		print "Report bugs to <cyril.jaquier@fail2ban.org>"
+		print "Report bugs to <lostcontrol@users.sourceforge.net>"
 	
-	def dispInteractive(self):
-		print "Fail2Ban v" + version + " reads log file that contains password failure report"
-		print "and bans the corresponding IP addresses using firewall rules."
-		print 
-
-	def __sigTERMhandler(self, signum, frame):
-		# Print a new line because we probably come from wait
-		print
-		logSys.warn("Caught signal %d. Exiting" % signum)
-		sys.exit(-1)
-
-	def __getCmdLineOptions(self, optList):
+	def getCmdLineOptions(self, optList):
 		""" Gets the command line options
 		"""
 		for opt in optList:
 			if opt[0] == "-c":
-				self.__conf["conf"] = opt[1]
-			elif opt[0] == "-s":
-				self.__conf["socket"] = opt[1]
+				self.conf["conf"] = opt[1]
 			elif opt[0] == "-d":
-				self.__conf["dump"] = True
+				self.conf["dump"] = True
 			elif opt[0] == "-v":
-				self.__conf["verbose"] = self.__conf["verbose"] + 1
+				self.conf["verbose"] = self.conf["verbose"] + 1
 			elif opt[0] == "-q":
-				self.__conf["verbose"] = self.__conf["verbose"] - 1
+				self.conf["verbose"] = self.conf["verbose"] - 1
 			elif opt[0] == "-x":
-				self.__conf["force"] = True
-			elif opt[0] == "-i":
-				self.__conf["interactive"] = True
+				self.conf["force"] = True
 			elif opt[0] in ["-h", "--help"]:
 	 			self.dispUsage()
 	 			sys.exit(0)
-	 		elif opt[0] in ["-V", "--version"]:
-	 			self.dispVersion()
-	 			sys.exit(0)
 	
-	def __ping(self):
-		return self.__processCmd([["ping"]], False)
+	def ping(self):
+		return self.processCmd([["ping"]], False)
 	
-	def __processCmd(self, cmd, showRet = True):
-		beautifier = Beautifier()
+	@staticmethod
+	def processCmd(cmd, showRet = True):
 		for c in cmd:
-			beautifier.setInputCmd(c)
 			try:
-				client = CSocket(self.__conf["socket"])
-				ret = client.send(c)
-				if ret[0] == 0:
-					logSys.debug("OK : " + `ret[1]`)
-					if showRet:
-						print beautifier.beautify(ret[1])
-				else:
-					logSys.debug("NOK: " + `ret[1].args`)
-					print beautifier.beautifyError(ret[1])
-					return False
-			except socket.error:
-				if showRet:
-					logSys.error("Unable to contact server. Is it running?")
-				return False
+				client = CSocket()
 			except Exception, e:
 				if showRet:
 					logSys.error(e)
+					logSys.error("Arrggh... Start the server first")
+				return False
+			ret = client.send(c)
+			if ret[0] == 0:
+				logSys.debug("OK : " + `ret[1]`)
+				if showRet:
+					print `ret[1]`
+			else:
+				logSys.error("NOK: " + `ret[1].args`)
 				return False
 		return True
 		
@@ -170,60 +139,44 @@ class Fail2banClient:
 	# Process one command line and exit.
 	# @param cmd the command line
 
-	def __processCommand(self, cmd):
+	def processCommand(self, cmd):
+		if self.conf["dump"]:
+			self.readConfig()
+			self.dumpConfig(self.stream)
+			return True
+		
+		if len(sys.argv) < 2:
+			self.dispUsage()
+			return False
+		
 		if len(cmd) == 1 and cmd[0] == "start":
-			if self.__ping():
-				logSys.error("Server already running")
+			if self.ping():
+				logSys.info("Server already running")
 				return False
 			else:
-				# Read the config
-				ret = self.__readConfig()
-				# Do not continue if configuration is not 100% valid
-				if not ret:
-					return False
-				# Start the server
-				self.__startServerAsync(self.__conf["socket"],
-										self.__conf["force"])
+				self.startServerAsync(self.conf["force"])
+				# Read the config while the server is starting
+				self.readConfig()
 				try:
 					# Wait for the server to start
-					self.__waitOnServer()
+					self.waitOnServer()
 					# Configure the server
-					self.__processCmd(self.__stream, False)
+					self.processCmd(self.stream, False)
 					return True
 				except ServerExecutionException:
-					logSys.error("Could not start server. Maybe an old " +
-								 "socket file is still present. Try to " +
-								 "remove " + self.__conf["socket"] + ". If " +
-								 "you used fail2ban-client to start the " +
-								 "server, adding the -x option will do it")
+					logSys.error("Could not start server. Try -x option")
 					return False
 		elif len(cmd) == 1 and cmd[0] == "reload":
-			if self.__ping():
-				ret = self.__readConfig()
-				# Do not continue if configuration is not 100% valid
-				if not ret:
-					return False
-				self.__processCmd([['stop', 'all']], False)
+			if self.ping():
+				self.readConfig()
+				self.processCmd(['stop', 'all'], False)
 				# Configure the server
-				return self.__processCmd(self.__stream, False)
-			else:
-				logSys.error("Could not find server")
-				return False
-		elif len(cmd) == 2 and cmd[0] == "reload":
-			if self.__ping():
-				jail = cmd[1]
-				ret = self.__readJailConfig(jail)
-				# Do not continue if configuration is not 100% valid
-				if not ret:
-					return False
-				self.__processCmd([['stop', jail]], False)
-				# Configure the server
-				return self.__processCmd(self.__stream, False)
+				return self.processCmd(self.stream, False)
 			else:
 				logSys.error("Could not find server")
 				return False
 		else:
-			return self.__processCmd([cmd])
+			return self.processCmd([cmd])
 	
 	
 	##
@@ -231,82 +184,44 @@ class Fail2banClient:
 	#
 	# Start the Fail2ban server in daemon mode.
 	
-	def __startServerAsync(self, socket, force = False):
-		# Forks the current process.
+	def startServerAsync(self, force = False):
+		args = list()
+		
+		args.append("fail2ban-server")
+		args.append("-b")
+		if force:
+			args.append("-x")
+		
 		pid = os.fork()
 		if pid == 0:
-			args = list()
-			args.append(self.SERVER)
-			# Start in background mode.
-			args.append("-b")
-			# Set the socket path.
-			args.append("-s")
-			args.append(socket)
-			# Force the execution if needed.
-			if force:
-				args.append("-x")
-			try:
-				# Use the current directory.
-				exe = os.path.abspath(os.path.join(sys.path[0], self.SERVER))
-				os.execv(exe, args)
-			except OSError:
-				try:
-					# Use the PATH env.
-					os.execvp(self.SERVER, args)
-				except OSError:
-					print "Could not find %s" % self.SERVER
-					os.exit(-1)
+			os.execv("fail2ban-server", args)
 						
 			
-	def __waitOnServer(self):
+	def waitOnServer(self):
 		# Wait for the server to start
 		cnt = 0
-		if self.__conf["verbose"] > 1:
-			pos = 0
-			delta = 1
-			mask = "[          ]"
-		while not self.__ping():
-			# Wonderful visual :)
-			if self.__conf["verbose"] > 1:
-				pos += delta
-				sys.stdout.write("\rINFO   " + mask[:pos] + '#' + mask[pos+1:] +
-								 " Waiting on the server...")
-				sys.stdout.flush()
-				if pos > len(mask)-3:
-					delta = -1
-				elif pos < 2:
-					delta = 1
-			# The server has 30 secondes to start.
-			if cnt >= 300:
-				if self.__conf["verbose"] > 1:
-					sys.stdout.write('\n')
+		while not self.ping():
+			if cnt > 10:
 				raise ServerExecutionException("Failed to start server")
 			time.sleep(0.1)
-			cnt += 1
-		if self.__conf["verbose"] > 1:
-			sys.stdout.write('\n')
+			cnt = cnt + 1
 			
 	
 	def start(self, argv):
 		# Command line options
-		self.__argv = argv
-		
-		# Install signal handlers
-		signal.signal(signal.SIGTERM, self.__sigTERMhandler)
-		signal.signal(signal.SIGINT, self.__sigTERMhandler)
+		self.argv = argv
 		
 		# Reads the command line options.
 		try:
-			cmdOpts = 'hc:s:xdviqV'
-			cmdLongOpts = ['help', 'version']
-			optList, args = getopt.getopt(self.__argv[1:], cmdOpts, cmdLongOpts)
+			cmdOpts = 'hc:xdvq'
+			cmdLongOpts = ['help']
+			optList, args = getopt.getopt(self.argv[1:], cmdOpts, cmdLongOpts)
 		except getopt.GetoptError:
 			self.dispUsage()
-			return False
 			
-		self.__getCmdLineOptions(optList)
+		self.getCmdLineOptions(optList)
 		
-		verbose = self.__conf["verbose"]
+		verbose = self.conf["verbose"]
 		if verbose <= 0:
 			logSys.setLevel(logging.ERROR)
 		elif verbose == 1:
@@ -323,73 +238,22 @@ class Fail2banClient:
 		stdout.setFormatter(formatter)
 		logSys.addHandler(stdout)
 
-		# Set the configuration path
-		self.__configurator.setBaseDir(self.__conf["conf"])
-		
-		# Set socket path
-		self.__configurator.readEarly()
-		socket = self.__configurator.getEarlyOptions()
-		if self.__conf["socket"] == None:
-			self.__conf["socket"] = socket["socket"]
-		logSys.info("Using socket file " + self.__conf["socket"])
+		return self.processCommand(args)
 
-		if self.__conf["dump"]:
-			ret = self.__readConfig()
-			self.dumpConfig(self.__stream)
-			return ret
-		
-		# Interactive mode
-		if self.__conf["interactive"]:
-			try:
-				import readline
-			except ImportError:
-				logSys.error("Readline not available")
-				return False
-			try:
-				ret = True
-				if len(args) > 0:
-					ret = self.__processCommand(args)
-				if ret:
-					readline.parse_and_bind("tab: complete")
-					self.dispInteractive()
-					while True:
-						cmd = raw_input(self.PROMPT)
-						if cmd == "exit" or cmd == "quit":
-							# Exit
-							return True
-						if not cmd == "":
-							self.__processCommand(shlex.split(cmd))
-			except (EOFError, KeyboardInterrupt):
-				print
-				return True
-		# Single command mode
-		else:
-			if len(args) < 1:
-				self.dispUsage()
-				return False
-			return self.__processCommand(args)
-
-	def __readConfig(self):
+	def readConfig(self):
 		# Read the configuration
-		self.__configurator.readAll()
-		ret = self.__configurator.getOptions()
-		self.__configurator.convertToProtocol()
-		self.__stream = self.__configurator.getConfigStream()
-		return ret
+		cfg = Configurator()
+		cfg.setBaseDir(self.conf["conf"])
+		cfg.readAll()
+		cfg.getAllOptions()
+		cfg.convertToProtocol()
+		self.stream = cfg.getConfigStream()
 	
-	def __readJailConfig(self, jail):
-		self.__configurator.readAll()
-		ret = self.__configurator.getOptions(jail)
-		self.__configurator.convertToProtocol()
-		self.__stream = self.__configurator.getConfigStream()
-		return ret
-	
-	#@staticmethod
+	@staticmethod
 	def dumpConfig(cmd):
 		for c in cmd:
 			print c
 		return True
-	dumpConfig = staticmethod(dumpConfig)
 
 
 class ServerExecutionException(Exception):
@@ -402,3 +266,4 @@ if __name__ == "__main__":
 		sys.exit(0)
 	else:
 		sys.exit(-1)
+

fail2ban-regex

@@ -1,390 +0,0 @@
-#!/usr/bin/python
-# 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: 672 $
-
-__author__ = "Cyril Jaquier"
-__version__ = "$Revision: 672 $"
-__date__ = "$Date: 2008-03-06 00:18:06 +0100 (Thu, 06 Mar 2008) $"
-__copyright__ = "Copyright (c) 2004 Cyril Jaquier"
-__license__ = "GPL"
-
-import getopt, sys, time, logging, os
-
-# Inserts our own modules path first in the list
-# fix for bug #343821
-sys.path.insert(1, "/usr/share/fail2ban")
-
-from client.configparserinc import SafeConfigParserWithIncludes
-from ConfigParser import NoOptionError, NoSectionError, MissingSectionHeaderError
-from common.version import version
-from server.filter import Filter
-from server.failregex import RegexException
-
-# Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.regex")
-
-class RegexStat:
-
-	def __init__(self, failregex):
-		self.__stats = 0
-		self.__failregex = failregex
-		self.__ipList = list()
-	
-	def inc(self):
-		self.__stats += 1
-	
-	def getStats(self):
-		return self.__stats
-
-	def getFailRegex(self):
-		return self.__failregex
-	
-	def appendIP(self, value):
-		self.__ipList.extend(value)
-	
-	def getIPList(self):
-		return self.__ipList
-
-class Fail2banRegex:
-	
-	test = None
-
-	CONFIG_DEFAULTS = {'configpath' : "/etc/fail2ban/"}
-
-	def __init__(self):
-		self.__filter = Filter(None)
-		self.__ignoreregex = list()
-		self.__failregex = list()
-		# Setup logging
-		logging.getLogger("fail2ban").handlers = []
-		self.__hdlr = logging.StreamHandler(Fail2banRegex.test)
-		# set a format which is simpler for console use
-		formatter = logging.Formatter("%(message)s")
-		# tell the handler to use this format
-		self.__hdlr.setFormatter(formatter)
-		logging.getLogger("fail2ban").addHandler(self.__hdlr)
-		logging.getLogger("fail2ban").setLevel(logging.ERROR)
-	
-	#@staticmethod
-	def dispVersion():
-		print "Fail2Ban v" + version
-		print
-		print "Copyright (c) 2004-2008 Cyril Jaquier"
-		print "Copyright of modifications held by their respective authors."
-		print "Licensed under the GNU General Public License v2 (GPL)."
-		print
-		print "Written by Cyril Jaquier <cyril.jaquier@fail2ban.org>."
-		print "Many contributions by Yaroslav O. Halchenko <debian@onerussian.com>."
-	dispVersion = staticmethod(dispVersion)
-	
-	#@staticmethod
-	def dispUsage():
-		print "Usage: "+sys.argv[0]+" [OPTIONS] <LOG> <REGEX> [IGNOREREGEX]"
-		print
-		print "Fail2Ban v" + version + " reads log file that contains password failure report"
-		print "and bans the corresponding IP addresses using firewall rules."
-		print
-		print "This tools can test regular expressions for \"fail2ban\"."
-		print
-		print "Options:"
-		print "    -h, --help              display this help message"
-		print "    -V, --version           print the version"
-		print
-		print "Log:"
-		print "    string                  a string representing a log line"
-		print "    filename                path to a log file (/var/log/auth.log)"
-		print
-		print "Regex:"
-		print "    string                  a string representing a 'failregex'"
-		print "    filename                path to a filter file (filter.d/sshd.conf)"
-		print
-		print "IgnoreRegex:"
-		print "    string                  a string representing an 'ignoreregex'"
-		print "    filename                path to a filter file (filter.d/sshd.conf)"
-		print
-		print "Report bugs to <cyril.jaquier@fail2ban.org>"
-	dispUsage = staticmethod(dispUsage)
-	
-	def getCmdLineOptions(self, optList):
-		""" Gets the command line options
-		"""
-		for opt in optList:
-			if opt[0] in ["-h", "--help"]:
-				self.dispUsage()
-				sys.exit(0)
-			elif opt[0] in ["-V", "--version"]:
-				self.dispVersion()
-				sys.exit(0)
-
-	#@staticmethod
-	def logIsFile(value):
-		return os.path.isfile(value)
-	logIsFile = staticmethod(logIsFile)
-
-	def readIgnoreRegex(self, value):
-		if os.path.isfile(value):
-			reader = SafeConfigParserWithIncludes(defaults=self.CONFIG_DEFAULTS)
-			try:
-				reader.read(value)
-				print "Use ignoreregex file : " + value
-				self.__ignoreregex = [RegexStat(m)
-									for m in reader.get("Definition", "ignoreregex").split('\n')]
-			except NoSectionError:
-				print "No [Definition] section in " + value
-				print
-				return False
-			except NoOptionError:
-				print "No failregex option in " + value
-				print
-				return False
-			except MissingSectionHeaderError:
-				print "No section headers in " + value
-				print
-				return False
-		else:
-			if len(value) > 53:
-				stripReg = value[0:50] + "..."
-			else:
-				stripReg = value
-			print "Use ignoreregex line : " + stripReg
-			self.__ignoreregex = [RegexStat(value)]
-		return True
-
-	def readRegex(self, value):
-		if os.path.isfile(value):
-			reader = SafeConfigParserWithIncludes(defaults=self.CONFIG_DEFAULTS)
-			try:
-				reader.read(value)
-				print "Use regex file : " + value
-				self.__failregex = [RegexStat(m)
-									for m in reader.get("Definition", "failregex").split('\n')]
-			except NoSectionError:
-				print "No [Definition] section in " + value
-				print
-				return False
-			except NoOptionError:
-				print "No failregex option in " + value
-				print
-				return False
-			except MissingSectionHeaderError:
-				print "No section headers in " + value
-				print
-				return False
-		else:
-			if len(value) > 53:
-				stripReg = value[0:50] + "..."
-			else:
-				stripReg = value
-			print "Use regex line : " + stripReg
-			self.__failregex = [RegexStat(value)]
-		return True
-	
-	def testIgnoreRegex(self, line):
-		found = False
-		for regex in self.__ignoreregex:
-			logging.getLogger("fail2ban").setLevel(logging.DEBUG)
-			try:
-				self.__filter.addIgnoreRegex(regex.getFailRegex())
-				try:
-					ret = self.__filter.ignoreLine(line)
-					if ret:
-						regex.inc()
-				except RegexException, e:
-					print e
-					return False
-			finally:
-				self.__filter.delIgnoreRegex(0)
-				logging.getLogger("fail2ban").setLevel(logging.CRITICAL)
-	
-	def testRegex(self, line):
-		found = False
-		for regex in self.__ignoreregex:
-			self.__filter.addIgnoreRegex(regex.getFailRegex())
-		for regex in self.__failregex:
-			logging.getLogger("fail2ban").setLevel(logging.DEBUG)
-			try:
-				self.__filter.addFailRegex(regex.getFailRegex())
-				try:
-					ret = self.__filter.processLine(line)
-					if not len(ret) == 0:
-						if found == True:
-							ret[0].append(True)
-						else:
-							found = True
-							ret[0].append(False)
-						regex.inc()
-						regex.appendIP(ret)
-				except RegexException, e:
-					print e
-					return False
-				except IndexError:
-					print "Sorry, but no <host> found in regex"
-					return False
-			finally:
-				self.__filter.delFailRegex(0)
-				logging.getLogger("fail2ban").setLevel(logging.CRITICAL)
-		for regex in self.__ignoreregex:
-					self.__filter.delIgnoreRegex(0)
-	
-	def printStats(self):
-		print
-		print "Results"
-		print "======="
-		print
-		
-		# Print title
-		cnt = 1
-		print "Failregex"
-		print "|- Regular expressions:"
-		for failregex in self.__failregex:
-			print "|  [" + str(cnt) + "] " + failregex.getFailRegex()
-			cnt += 1
-		cnt = 1
-		
-		print "|"
-		
-		# Print stats
-		cnt = 1
-		total = 0
-		print "`- Number of matches:"
-		for failregex in self.__failregex:
-			match = failregex.getStats()
-			total += match
-			print "   [" + str(cnt) + "] " + str(match) + " match(es)"
-			cnt += 1
-		
-		print
-		
-		# Print title
-		cnt = 1
-		print "Ignoreregex"
-		print "|- Regular expressions:"
-		for failregex in self.__ignoreregex:
-			print "|  [" + str(cnt) + "] " + failregex.getFailRegex()
-			cnt += 1
-		cnt = 1
-		
-		print "|"
-		
-		# Print stats
-		cnt = 1
-		print "`- Number of matches:"
-		for failregex in self.__ignoreregex:
-			match = failregex.getStats()
-			print "   [" + str(cnt) + "] " + str(match) + " match(es)"
-			cnt += 1
-		
-		print
-		print "Summary"
-		print "======="
-		print
-		
-		if total == 0:
-			print "Sorry, no match"
-			print
-			print "Look at the above section 'Running tests' which could contain important"
-			print "information."
-			return False
-		else:
-			# Print stats
-			cnt = 1
-			print "Addresses found:"
-			for failregex in self.__failregex:
-				print "[" + str(cnt) + "]"
-				for ip in failregex.getIPList():
-					timeTuple = time.localtime(ip[1])
-					timeString = time.strftime("%a %b %d %H:%M:%S %Y", timeTuple)
-					if ip[2]:
-						dup = " (already matched)"
-					else:
-						dup = ""
-					print "    " + ip[0] + " (" + timeString + ")" + dup
-				cnt += 1
-			
-			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"
-			print "information."
-			return True
-
-			
-if __name__ == "__main__":
-	fail2banRegex = Fail2banRegex()
-	# Reads the command line options.
-	try:
-		cmdOpts = 'hV'
-		cmdLongOpts = ['help', 'version']
-		optList, args = getopt.getopt(sys.argv[1:], cmdOpts, cmdLongOpts)
-	except getopt.GetoptError:
-		fail2banRegex.dispUsage()
-		sys.exit(-1)
-	# Process command line
-	fail2banRegex.getCmdLineOptions(optList)
-	# We need exactly 3 parameters
-	if not len(sys.argv) in (3, 4):
-		fail2banRegex.dispUsage()
-		sys.exit(-1)
-	else:
-		print
-		print "Running tests"
-		print "============="
-		print
-
-		if len(sys.argv) == 4:
-			if fail2banRegex.readIgnoreRegex(sys.argv[3]) == False:
-				sys.exit(-1)
-
-		if fail2banRegex.readRegex(sys.argv[2]) == False:
-			sys.exit(-1)
-
-		if fail2banRegex.logIsFile(sys.argv[1]):
-			try:
-				hdlr = open(sys.argv[1])
-				print "Use log file   : " + sys.argv[1]
-				print
-				for line in hdlr:
-					fail2banRegex.testIgnoreRegex(line)
-					fail2banRegex.testRegex(line)
-			except IOError, e:
-				print e
-				print
-				sys.exit(-1)
-		else:
-			if len(sys.argv[1]) > 53:
-				stripLog = sys.argv[1][0:50] + "..."
-			else:
-				stripLog = sys.argv[1]
-			print "Use single line: " + stripLog
-			print
-			fail2banRegex.testIgnoreRegex(sys.argv[1])
-			fail2banRegex.testRegex(sys.argv[1])
-		
-		if fail2banRegex.printStats():
-			sys.exit(0)
-		else:
-			sys.exit(-1)

fail2ban-server

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # This file is part of Fail2Ban.
 #
 # Fail2Ban is free software; you can redistribute it and/or modify
@@ -17,25 +17,23 @@
 
 # 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"
 
-import getopt, sys, logging
+import locale, getopt, sys
 
 # Inserts our own modules path first in the list
 # fix for bug #343821
-sys.path.insert(1, "/usr/share/fail2ban")
+sys.path.insert(1, "/usr/lib/fail2ban")
 
-from common.version import version
+from version import version
 from server.server import Server
-
-# Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban")
+from utils.process import *
 
 ##
 # \mainpage Fail2Ban
@@ -48,91 +46,76 @@ logSys = logging.getLogger("fail2ban")
 class Fail2banServer:
 	
 	def __init__(self):
-		self.__server = None
-		self.__argv = None
-		self.__conf = dict()
-		self.__conf["background"] = True
-		self.__conf["force"] = False
-		self.__conf["socket"] = "/var/run/fail2ban/fail2ban.sock"
-	
-	def dispVersion(self):
-		print "Fail2Ban v" + version
-		print
-		print "Copyright (c) 2004-2008 Cyril Jaquier"
-		print "Copyright of modifications held by their respective authors."
-		print "Licensed under the GNU General Public License v2 (GPL)."
-		print
-		print "Written by Cyril Jaquier <cyril.jaquier@fail2ban.org>."
-		print "Many contributions by Yaroslav O. Halchenko <debian@onerussian.com>."
+		self.server = None
+		self.argv = None
+		self.conf = dict()
+		self.conf["background"] = True
+		self.conf["force"] = False
 	
 	def dispUsage(self):
 		""" Prints Fail2Ban command line options and exits
 		"""
-		print "Usage: "+self.__argv[0]+" [OPTIONS]"
+		print "Usage: "+self.argv[0]+" [OPTIONS]"
 		print
 		print "Fail2Ban v" + version + " reads log file that contains password failure report"
 		print "and bans the corresponding IP addresses using firewall rules."
 		print
-		print "Only use this command for debugging purpose. Start the server with"
-		print "fail2ban-client instead. The default behaviour is to start the server"
-		print "in background."
+		print "  -b         start in background"
+		print "  -f         start in foreground"
+		print "  -x         force execution of the server"
+		print "  -h         display this help message"
 		print
-		print "Options:"
-		print "    -b                   start in background"
-		print "    -f                   start in foreground"
-		print "    -s <FILE>            socket path"
-		print "    -x                   force execution of the server (remove socket file)"
-		print "    -h, --help           display this help message"
-		print "    -V, --version        print the version"
-		print
-		print "Report bugs to <cyril.jaquier@fail2ban.org>"
+		print "Report bugs to <lostcontrol@users.sourceforge.net>"
+		sys.exit(0)
 	
-	def __getCmdLineOptions(self, optList):
+	def getCmdLineOptions(self, optList):
 		""" Gets the command line options
 		"""
 		for opt in optList:
 			if opt[0] == "-b":
-				self.__conf["background"] = True
+				self.conf["background"] = True
 			if opt[0] == "-f":
-				self.__conf["background"] = False
-			if opt[0] == "-s":
-				self.__conf["socket"] = opt[1]
+				self.conf["background"] = False
 			if opt[0] == "-x":
-				self.__conf["force"] = True
+				self.conf["force"] = True
 			if opt[0] in ["-h", "--help"]:
 	 			self.dispUsage()
-				sys.exit(0)
-			if opt[0] in ["-V", "--version"]:
-	 			self.dispVersion()
-				sys.exit(0)
-		
+	
+	#def sigTERMhandler(signum, frame):
+	#	""" Handles the TERM signal when in daemon mode in order to
+	#		exit properly.
+	#	"""
+	#	logSys.debug("Signal handler called with sig "+`signum`)
+	#	server.quit()
+	
 	def start(self, argv):
 		# Command line options
-		self.__argv = argv
+		self.argv = argv
 		
 		# Reads the command line options.
 		try:
-			cmdOpts = 'bfs:xhV'
-			cmdLongOpts = ['help', 'version']
-			optList, args = getopt.getopt(self.__argv[1:], cmdOpts, cmdLongOpts)
+			cmdOpts = 'bfxh'
+			cmdLongOpts = ['help']
+			optList, args = getopt.getopt(self.argv[1:], cmdOpts, cmdLongOpts)
 		except getopt.GetoptError:
 			self.dispUsage()
-			sys.exit(-1)
 			
-		self.__getCmdLineOptions(optList)
+		self.getCmdLineOptions(optList)
+		
+		if self.conf["background"]:
+			retCode = createDaemon()
+			#signal.signal(signal.SIGTERM, sigTERMhandler)
+			if not retCode:
+				print "Unable to start daemon"
+				sys.exit(-1)
 		
 		try:
-			self.__server = Server(self.__conf["background"])
-			self.__server.start(self.__conf["socket"], self.__conf["force"])
-			return True
+			self.server = Server()
+			self.server.start(self.conf["force"])
 		except Exception, e:
-			logSys.exception(e)
-			self.__server.quit()
-			return False
+			print e
+			self.server.quit()
 		
 if __name__ == "__main__":
 	server = Fail2banServer()
-	if server.start(sys.argv):
-		sys.exit(0)
-	else:
-		sys.exit(-1)
+	server.start(sys.argv)

fail2ban-testcases

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # This file is part of Fail2Ban.
 #
 # Fail2Ban is free software; you can redistribute it and/or modify
@@ -17,30 +17,27 @@
 
 # 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"
 
 
 import unittest, logging, sys
 
-from common.version import version
+# Inserts our own modules path first in the list
+# fix for bug #343821
+sys.path.insert(1, "/usr/lib/fail2ban")
+
+from version import version
 from testcases import banmanagertestcase
 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
-
-# Set the time to a fixed, known value
-# Sun Aug 14 12:00:00 CEST 2005
-MyTime.setTime(1124013600)
 
 # Gets the instance of the logger.
 logSys = logging.getLogger("fail2ban")
@@ -56,19 +53,16 @@ tests = unittest.TestSuite()
 # Filter
 tests.addTest(unittest.makeSuite(filtertestcase.IgnoreIP))
 tests.addTest(unittest.makeSuite(filtertestcase.LogFile))
-tests.addTest(unittest.makeSuite(filtertestcase.GetFailures))
+#tests.addTest(unittest.makeSuite(filtertestcase.GetFailures))
 # Server
 #tests.addTest(unittest.makeSuite(servertestcase.StartStop))
 #tests.addTest(unittest.makeSuite(servertestcase.Transmitter))
-tests.addTest(unittest.makeSuite(actiontestcase.ExecuteAction))
 # FailManager
 tests.addTest(unittest.makeSuite(failmanagertestcase.AddFailure))
 # BanManager
 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()

files/cacti/README

@@ -1,53 +0,0 @@
-               __      _ _ ___ _               
-              / _|__ _(_) |_  ) |__  __ _ _ _  
-             |  _/ _` | | |/ /| '_ \/ _` | ' \ 
-             |_| \__,_|_|_/___|_.__/\__,_|_||_|
-
-=============================================================
-Fail2Ban (version 0.8.2)                           2008/03/06
-=============================================================
-
-Cacti is a graphing solution using RRDTool. It is possible to
-use Cacti to display statistics about Fail2ban.
-
-Installation:
--------------
-
-1/ Install Fail2ban version 0.8 or higher and ensure that it
-   works properly.
-2/ The user running poller.php must have read and write
-   access to the socket used by Fail2ban.
-3/ Copy fail2ban_stats.sh to scripts/. You can test it with
-   bash scripts/fail2ban_stats.sh
-4/ Import the template cacti_host_template_fail2ban.xml
-5/ TO BE CONTINUED...
-
-Contact:
---------
-
-You need some new features, you found bugs or you just
-appreciate this program, you can contact me at:
-
-Website: http://www.fail2ban.org
-
-Cyril Jaquier: <cyril.jaquier@fail2ban.org>
-
-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
-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

files/cacti/cacti_host_template_fail2ban.xml

@@ -1,297 +0,0 @@
-<cacti>	
-	<hash_02001346a4e9f7498a8129f0dfc2e1c8c7b35a>
-		<name>Fail2ban</name>
-		<graph_templates>hash_0000132fe631a3ac1f1705e332d0aee925d21b</graph_templates>
-		<data_queries></data_queries>
-	</hash_02001346a4e9f7498a8129f0dfc2e1c8c7b35a>
-	<hash_0000132fe631a3ac1f1705e332d0aee925d21b>
-		<name>Fail2ban - Statistics</name>
-		<graph>
-			<t_title>on</t_title>
-			<title>|host_description| - Statistics</title>
-			<t_image_format_id></t_image_format_id>
-			<image_format_id>1</image_format_id>
-			<t_height></t_height>
-			<height>120</height>
-			<t_width></t_width>
-			<width>500</width>
-			<t_auto_scale></t_auto_scale>
-			<auto_scale>on</auto_scale>
-			<t_auto_scale_opts></t_auto_scale_opts>
-			<auto_scale_opts>2</auto_scale_opts>
-			<t_auto_scale_log></t_auto_scale_log>
-			<auto_scale_log></auto_scale_log>
-			<t_auto_scale_rigid></t_auto_scale_rigid>
-			<auto_scale_rigid></auto_scale_rigid>
-			<t_auto_padding></t_auto_padding>
-			<auto_padding>on</auto_padding>
-			<t_export></t_export>
-			<export>on</export>
-			<t_upper_limit></t_upper_limit>
-			<upper_limit>100</upper_limit>
-			<t_lower_limit></t_lower_limit>
-			<lower_limit>0</lower_limit>
-			<t_base_value></t_base_value>
-			<base_value>1000</base_value>
-			<t_unit_value></t_unit_value>
-			<unit_value></unit_value>
-			<t_unit_exponent_value></t_unit_exponent_value>
-			<unit_exponent_value></unit_exponent_value>
-			<t_vertical_label></t_vertical_label>
-			<vertical_label>hits/5min</vertical_label>
-		</graph>
-		<items>
-			<hash_100013f76575fdcd7f2684843e8f2cbae4ef96>
-				<task_item_id>hash_0800132d7bfb27a7ecb33f23433863e6f90612</task_item_id>
-				<color_id>00CF00</color_id>
-				<graph_type_id>4</graph_type_id>
-				<consolidation_function_id>1</consolidation_function_id>
-				<cdef_id>hash_050013e961cc8ec04fda6ed4981cf5ad501aa5</cdef_id>
-				<value></value>
-				<gprint_id>hash_060013e9c43831e54eca8069317a2ce8c6f751</gprint_id>
-				<text_format>Failed</text_format>
-				<hard_return></hard_return>
-				<sequence>1</sequence>
-			</hash_100013f76575fdcd7f2684843e8f2cbae4ef96>
-			<hash_100013ca0d59c48dde83a1753e21eb1f44a396>
-				<task_item_id>hash_0800132d7bfb27a7ecb33f23433863e6f90612</task_item_id>
-				<color_id>0</color_id>
-				<graph_type_id>9</graph_type_id>
-				<consolidation_function_id>4</consolidation_function_id>
-				<cdef_id>hash_050013e961cc8ec04fda6ed4981cf5ad501aa5</cdef_id>
-				<value></value>
-				<gprint_id>hash_060013e9c43831e54eca8069317a2ce8c6f751</gprint_id>
-				<text_format>Current:</text_format>
-				<hard_return></hard_return>
-				<sequence>2</sequence>
-			</hash_100013ca0d59c48dde83a1753e21eb1f44a396>
-			<hash_1000132f8d371932ebedbb665f80abf427ffb4>
-				<task_item_id>hash_0800132d7bfb27a7ecb33f23433863e6f90612</task_item_id>
-				<color_id>0</color_id>
-				<graph_type_id>9</graph_type_id>
-				<consolidation_function_id>1</consolidation_function_id>
-				<cdef_id>hash_050013e961cc8ec04fda6ed4981cf5ad501aa5</cdef_id>
-				<value></value>
-				<gprint_id>hash_060013e9c43831e54eca8069317a2ce8c6f751</gprint_id>
-				<text_format>Average:</text_format>
-				<hard_return></hard_return>
-				<sequence>3</sequence>
-			</hash_1000132f8d371932ebedbb665f80abf427ffb4>
-			<hash_1000131b8e847f7be22014f1f0b3d098c9e702>
-				<task_item_id>hash_0800132d7bfb27a7ecb33f23433863e6f90612</task_item_id>
-				<color_id>0</color_id>
-				<graph_type_id>9</graph_type_id>
-				<consolidation_function_id>3</consolidation_function_id>
-				<cdef_id>hash_050013e961cc8ec04fda6ed4981cf5ad501aa5</cdef_id>
-				<value></value>
-				<gprint_id>hash_060013e9c43831e54eca8069317a2ce8c6f751</gprint_id>
-				<text_format>Maximum:</text_format>
-				<hard_return>on</hard_return>
-				<sequence>4</sequence>
-			</hash_1000131b8e847f7be22014f1f0b3d098c9e702>
-			<hash_1000130e6084fd4ed86d8c86dea8f84b115eaa>
-				<task_item_id>hash_080013b224f2764ba5a827de959b1ff44cbc1d</task_item_id>
-				<color_id>FF0000</color_id>
-				<graph_type_id>5</graph_type_id>
-				<consolidation_function_id>1</consolidation_function_id>
-				<cdef_id>hash_050013e961cc8ec04fda6ed4981cf5ad501aa5</cdef_id>
-				<value></value>
-				<gprint_id>hash_060013e9c43831e54eca8069317a2ce8c6f751</gprint_id>
-				<text_format>Banned</text_format>
-				<hard_return></hard_return>
-				<sequence>5</sequence>
-			</hash_1000130e6084fd4ed86d8c86dea8f84b115eaa>
-			<hash_1000132812e5f3ee8261819268854c67093b94>
-				<task_item_id>hash_080013b224f2764ba5a827de959b1ff44cbc1d</task_item_id>
-				<color_id>0</color_id>
-				<graph_type_id>9</graph_type_id>
-				<consolidation_function_id>4</consolidation_function_id>
-				<cdef_id>hash_050013e961cc8ec04fda6ed4981cf5ad501aa5</cdef_id>
-				<value></value>
-				<gprint_id>hash_060013e9c43831e54eca8069317a2ce8c6f751</gprint_id>
-				<text_format>Current:</text_format>
-				<hard_return></hard_return>
-				<sequence>6</sequence>
-			</hash_1000132812e5f3ee8261819268854c67093b94>
-			<hash_10001336fcfc1d017e975fa22a3ce0d0492daf>
-				<task_item_id>hash_080013b224f2764ba5a827de959b1ff44cbc1d</task_item_id>
-				<color_id>0</color_id>
-				<graph_type_id>9</graph_type_id>
-				<consolidation_function_id>1</consolidation_function_id>
-				<cdef_id>hash_050013e961cc8ec04fda6ed4981cf5ad501aa5</cdef_id>
-				<value></value>
-				<gprint_id>hash_060013e9c43831e54eca8069317a2ce8c6f751</gprint_id>
-				<text_format>Average:</text_format>
-				<hard_return></hard_return>
-				<sequence>7</sequence>
-			</hash_10001336fcfc1d017e975fa22a3ce0d0492daf>
-			<hash_100013e5fddd5da42b9bf296d7f344b2a00446>
-				<task_item_id>hash_080013b224f2764ba5a827de959b1ff44cbc1d</task_item_id>
-				<color_id>0</color_id>
-				<graph_type_id>9</graph_type_id>
-				<consolidation_function_id>3</consolidation_function_id>
-				<cdef_id>hash_050013e961cc8ec04fda6ed4981cf5ad501aa5</cdef_id>
-				<value></value>
-				<gprint_id>hash_060013e9c43831e54eca8069317a2ce8c6f751</gprint_id>
-				<text_format>Maximum:</text_format>
-				<hard_return>on</hard_return>
-				<sequence>8</sequence>
-			</hash_100013e5fddd5da42b9bf296d7f344b2a00446>
-		</items>
-		<inputs>
-			<hash_090013a5d69bc5ca8b53ef62b61221a69b8055>
-				<name>Data Source [banned]</name>
-				<description></description>
-				<column_name>task_item_id</column_name>
-				<items>hash_0000130e6084fd4ed86d8c86dea8f84b115eaa|hash_0000132812e5f3ee8261819268854c67093b94|hash_00001336fcfc1d017e975fa22a3ce0d0492daf|hash_000013e5fddd5da42b9bf296d7f344b2a00446</items>
-			</hash_090013a5d69bc5ca8b53ef62b61221a69b8055>
-			<hash_0900132cee6f79f051b0dd39cafcbfcfd87960>
-				<name>Data Source [failed]</name>
-				<description></description>
-				<column_name>task_item_id</column_name>
-				<items>hash_000013f76575fdcd7f2684843e8f2cbae4ef96|hash_000013ca0d59c48dde83a1753e21eb1f44a396|hash_0000131b8e847f7be22014f1f0b3d098c9e702|hash_0000132f8d371932ebedbb665f80abf427ffb4</items>
-			</hash_0900132cee6f79f051b0dd39cafcbfcfd87960>
-		</inputs>
-	</hash_0000132fe631a3ac1f1705e332d0aee925d21b>
-	<hash_0100130fce21647570158d210c7832cd50e98a>
-		<name>Fail2ban - Statistics</name>
-		<ds>
-			<t_name></t_name>
-			<name>|host_description| - Statistics</name>
-			<data_input_id>hash_030013a3adf3f2607747859b08262d972eabf0</data_input_id>
-			<t_rra_id></t_rra_id>
-			<t_rrd_step></t_rrd_step>
-			<rrd_step>300</rrd_step>
-			<t_active></t_active>
-			<active>on</active>
-			<rra_items>hash_150013c21df5178e5c955013591239eb0afd46|hash_1500130d9c0af8b8acdc7807943937b3208e29|hash_1500136fc2d038fb42950138b0ce3e9874cc60|hash_150013e36f3adb9f152adfa5dc50fd2b23337e</rra_items>
-		</ds>
-		<items>
-			<hash_0800132d7bfb27a7ecb33f23433863e6f90612>
-				<t_data_source_name></t_data_source_name>
-				<data_source_name>failed</data_source_name>
-				<t_rrd_minimum></t_rrd_minimum>
-				<rrd_minimum>0</rrd_minimum>
-				<t_rrd_maximum></t_rrd_maximum>
-				<rrd_maximum>0</rrd_maximum>
-				<t_data_source_type_id></t_data_source_type_id>
-				<data_source_type_id>2</data_source_type_id>
-				<t_rrd_heartbeat></t_rrd_heartbeat>
-				<rrd_heartbeat>600</rrd_heartbeat>
-				<t_data_input_field_id></t_data_input_field_id>
-				<data_input_field_id>hash_0700134027ae7d3baefb02f510c09de07d159f</data_input_field_id>
-			</hash_0800132d7bfb27a7ecb33f23433863e6f90612>
-			<hash_080013b224f2764ba5a827de959b1ff44cbc1d>
-				<t_data_source_name></t_data_source_name>
-				<data_source_name>banned</data_source_name>
-				<t_rrd_minimum></t_rrd_minimum>
-				<rrd_minimum>0</rrd_minimum>
-				<t_rrd_maximum></t_rrd_maximum>
-				<rrd_maximum>0</rrd_maximum>
-				<t_data_source_type_id></t_data_source_type_id>
-				<data_source_type_id>2</data_source_type_id>
-				<t_rrd_heartbeat></t_rrd_heartbeat>
-				<rrd_heartbeat>600</rrd_heartbeat>
-				<t_data_input_field_id></t_data_input_field_id>
-				<data_input_field_id>hash_07001319c32c9466152aa6cfc2bbc639a246d8</data_input_field_id>
-			</hash_080013b224f2764ba5a827de959b1ff44cbc1d>
-		</items>
-		<data>
-			<item_000>
-				<data_input_field_id>hash_0700131cda0f872b68c87e508a29e8976a6a7a</data_input_field_id>
-				<t_value>on</t_value>
-				<value>ssh-iptables</value>
-			</item_000>
-		</data>
-	</hash_0100130fce21647570158d210c7832cd50e98a>
-	<hash_030013a3adf3f2607747859b08262d972eabf0>
-		<name>Fail2ban - Get statistics</name>
-		<type_id>1</type_id>
-		<input_string>bash &lt;path_cacti&gt;/scripts/fail2ban_stats.sh &lt;jail&gt;</input_string>
-		<fields>
-			<hash_0700131cda0f872b68c87e508a29e8976a6a7a>
-				<name>Jail name</name>
-				<update_rra></update_rra>
-				<regexp_match></regexp_match>
-				<allow_nulls></allow_nulls>
-				<type_code></type_code>
-				<input_output>in</input_output>
-				<data_name>jail</data_name>
-			</hash_0700131cda0f872b68c87e508a29e8976a6a7a>
-			<hash_0700134027ae7d3baefb02f510c09de07d159f>
-				<name>Total of failed logins</name>
-				<update_rra>on</update_rra>
-				<regexp_match></regexp_match>
-				<allow_nulls></allow_nulls>
-				<type_code></type_code>
-				<input_output>out</input_output>
-				<data_name>failed</data_name>
-			</hash_0700134027ae7d3baefb02f510c09de07d159f>
-			<hash_07001319c32c9466152aa6cfc2bbc639a246d8>
-				<name>Total of banned hosts</name>
-				<update_rra>on</update_rra>
-				<regexp_match></regexp_match>
-				<allow_nulls></allow_nulls>
-				<type_code></type_code>
-				<input_output>out</input_output>
-				<data_name>banned</data_name>
-			</hash_07001319c32c9466152aa6cfc2bbc639a246d8>
-		</fields>
-	</hash_030013a3adf3f2607747859b08262d972eabf0>
-	<hash_150013c21df5178e5c955013591239eb0afd46>
-		<name>Daily (5 Minute Average)</name>
-		<x_files_factor>0.5</x_files_factor>
-		<steps>1</steps>
-		<rows>600</rows>
-		<timespan>86400</timespan>
-		<cf_items>1|2|3|4</cf_items>
-	</hash_150013c21df5178e5c955013591239eb0afd46>
-	<hash_1500130d9c0af8b8acdc7807943937b3208e29>
-		<name>Weekly (30 Minute Average)</name>
-		<x_files_factor>0.5</x_files_factor>
-		<steps>6</steps>
-		<rows>700</rows>
-		<timespan>604800</timespan>
-		<cf_items>1|2|3|4</cf_items>
-	</hash_1500130d9c0af8b8acdc7807943937b3208e29>
-	<hash_1500136fc2d038fb42950138b0ce3e9874cc60>
-		<name>Monthly (2 Hour Average)</name>
-		<x_files_factor>0.5</x_files_factor>
-		<steps>24</steps>
-		<rows>775</rows>
-		<timespan>2678400</timespan>
-		<cf_items>1|2|3|4</cf_items>
-	</hash_1500136fc2d038fb42950138b0ce3e9874cc60>
-	<hash_150013e36f3adb9f152adfa5dc50fd2b23337e>
-		<name>Yearly (1 Day Average)</name>
-		<x_files_factor>0.5</x_files_factor>
-		<steps>288</steps>
-		<rows>797</rows>
-		<timespan>33053184</timespan>
-		<cf_items>1|2|3|4</cf_items>
-	</hash_150013e36f3adb9f152adfa5dc50fd2b23337e>
-	<hash_050013e961cc8ec04fda6ed4981cf5ad501aa5>
-		<name>Make Per 5 Minutes</name>
-		<items>
-			<hash_14001340bb7a1143b0f2e2efca14eb356236de>
-				<sequence>1</sequence>
-				<type>4</type>
-				<value>CURRENT_DATA_SOURCE</value>
-			</hash_14001340bb7a1143b0f2e2efca14eb356236de>
-			<hash_140013faf1b148b2c0e0527362ed5b8ca1d351>
-				<sequence>2</sequence>
-				<type>6</type>
-				<value>300</value>
-			</hash_140013faf1b148b2c0e0527362ed5b8ca1d351>
-			<hash_14001342686ea0925c0220924b7d333599cd67>
-				<sequence>3</sequence>
-				<type>2</type>
-				<value>3</value>
-			</hash_14001342686ea0925c0220924b7d333599cd67>
-		</items>
-	</hash_050013e961cc8ec04fda6ed4981cf5ad501aa5>
-	<hash_060013e9c43831e54eca8069317a2ce8c6f751>
-		<name>Normal</name>
-		<gprint_text>%8.2lf %s</gprint_text>
-	</hash_060013e9c43831e54eca8069317a2ce8c6f751>
-</cacti>

files/cacti/fail2ban_stats.sh

@@ -1,47 +0,0 @@
-#!/bin/bash
-# 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
-#
-# This script can be used to collect data for Cacti. One parameter is needed,
-# the jail name. It must be a currently running jail. The script returns two
-# value: the number of failures and the number of banned host.
-#
-# If Fail2ban is not available in the path, you can change the value of the
-# variable FAIL2BAN below.. You can add option to this variable too. Please
-# look at the man page of fail2ban-client for more information.
-#
-# Author: Cyril Jaquier
-# 
-# $Revision: 527 $
-
-FAIL2BAN="fail2ban-client"
-
-JAIL=$1
-
-if [ -z $JAIL ]; then
-	echo "Usage:" `basename $0` "<jail>"
-	exit
-fi
-
-IFS=""
-
-STATS=$($FAIL2BAN status $JAIL)
-
-TOTAL_FAILED=$(echo $STATS | grep "Total failed:" | awk '{ print $5 }')
-TOTAL_BANNED=$(echo $STATS | grep "Total banned:" | awk '{ print $4 }')
-
-echo "failed:"$TOTAL_FAILED "banned:"$TOTAL_BANNED
-

files/gentoo-confd

@@ -1,8 +0,0 @@
-# Config file for /etc/init.d/fail2ban
-#
-# For information on options, see "/usr/bin/fail2ban-client -h".
-
-FAIL2BAN_OPTIONS=""
-
-# Force execution of the server even if the socket already exists:
-#FAIL2BAN_OPTIONS="-x"

files/gentoo-initd

@@ -1,60 +0,0 @@
-#!/sbin/runscript
-# 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: Sireyessire, Cyril Jaquier
-# 
-# $Revision: 559 $
-
-opts="start stop restart reload showlog"
-
-FAIL2BAN="/usr/bin/fail2ban-client ${FAIL2BAN_OPTIONS}"
-
-depend() {
-	need net
-	need logger
-	after iptables
-}
-
-start() {
-	ebegin "Starting fail2ban"
-	${FAIL2BAN} start &> /dev/null
-	eend $? "Failed to start fail2ban"
-}
-
-stop() {
-	ebegin "Stopping fail2ban"
-	${FAIL2BAN} stop &> /dev/null
-	eend $? "Failed to stop fail2ban"
-}
-
-restart() {
-	if ! service_stopped "${SVCNAME}" ; then
-		svc_stop || return "$?"
-		sleep 1
-	fi
-	svc_start
-}
-
-reload() {
-	ebegin "Reloading fail2ban"
-	${FAIL2BAN} reload > /dev/null
-	eend $? "Failed to reload fail2ban"
-}
-
-showlog(){
-	less /var/log/fail2ban.log
-}

files/macosx-initd

@@ -1,19 +0,0 @@
-/Library/LaunchDaemonsm/org.fail2ban.plist
-===================================
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>Disabled</key>
-        <false/>
-        <key>Label</key>
-        <string>fail2ban</string>
-        <key>ProgramArguments</key>
-        <array>
-                <string>/usr/local/bin/fail2ban-client</string>
-                <string>start</string>
-        </array>
-        <key>RunAtLoad</key>
-        <true/>
-</dict>
-</plist>

files/nagios/check_fail2ban

@@ -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

files/nagios/f2ban.txt

@@ -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 ;-) 

files/redhat-initd

@@ -1,93 +0,0 @@
-#!/bin/bash
-#
-# chkconfig: 345 92 08
-# description: Fail2ban daemon
-#              http://fail2ban.sourceforge.net/wiki/index.php/Main_Page
-# process name: fail2ban-server
-#
-#
-# Author: Tyler Owen
-#
-
-# Source function library.
-. /etc/init.d/functions
-
-# Check that the config file exists
-[ -f /etc/fail2ban/fail2ban.conf ] || exit 0
-
-FAIL2BAN="/usr/bin/fail2ban-client"
-
-RETVAL=0
-
-getpid() {
-    pid=`ps -eo pid,comm | grep fail2ban- | awk '{ print $1 }'`
-}
-
-start() {
-    echo -n $"Starting fail2ban: "
-    getpid
-    if [ -z "$pid" ]; then
-	rm -rf /var/run/fail2ban/fail2ban.sock # in case of unclean shutdown
-        $FAIL2BAN start > /dev/null
-        RETVAL=$?
-    fi
-    if [ $RETVAL -eq 0 ]; then
-        touch /var/lock/subsys/fail2ban
-        echo_success
-    else
-        echo_failure
-    fi
-    echo
-    return $RETVAL
-}
-
-stop() {
-    echo -n $"Stopping fail2ban: "
-    getpid
-    RETVAL=$?
-    if [ -n "$pid" ]; then
-        $FAIL2BAN stop > /dev/null
-    sleep 1
-    getpid
-    if [ -z "$pid" ]; then
-        rm -f /var/lock/subsys/fail2ban
-        echo_success
-    else
-        echo_failure
-    fi
-    else
-        echo_failure
-    fi
-    echo
-    return $RETVAL
-}
-
-# See how we were called.
-case "$1" in
-  start)
-        start
-        ;;
-  stop)
-        stop
-        ;;
-  status)
-        getpid
-        if [ -n "$pid" ]; then
-                echo "Fail2ban (pid $pid) is running..."
-                $FAIL2BAN status
-        else
-                RETVAL=1
-                echo "Fail2ban is stopped"
-        fi
-        ;;
-  restart)
-        stop
-        start
-        ;;
-  *)
-        echo $"Usage: $0 {start|stop|status|restart}"
-        exit 1
-        ;;
-esac
-
-exit $RETVAL

files/solaris-fail2ban.xml

@@ -1,74 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
-<!--
-	Hanno 'Rince' Wagner 03 2007
-	Service manifest for fail2ban
-	E-Mail: wagner@rince.de
--->
-
-<service_bundle type='manifest' name='fail2ban:fail2ban'>
-
-<service
-	name='network/fail2ban'
-	type='service'
-	version='1'>
-	<create_default_instance enabled='false' />
-	<single_instance />
-
-	<dependency name='fs'
-		grouping='require_all'
-		restart_on='none'
-		type='service'>
-		<service_fmri value='svc:/system/filesystem/local' />
-	</dependency>
-
-	<dependency name='net'
-		grouping='require_all'
-		restart_on='none'
-		type='service'>
-		<service_fmri value='svc:/network/loopback' />
-	</dependency>
-
-
-	<exec_method
-		type='method'
-		name='start'
-		exec='/lib/svc/method/svc-fail2ban start'
-		timeout_seconds='-1'>
-		<method_context>
-			<method_credential user='root' group='root' />
-		</method_context>
-	</exec_method>
-
-	<exec_method
-		type='method'
-		name='stop'
-		exec='/lib/svc/method/svc-fail2ban stop'
-		timeout_seconds='-1'>
-	</exec_method>
-
-        <exec_method
-                type='method'
-                name='reload'
-                exec='/lib/svc/method/svc-fail2ban reload'
-                timeout_seconds='-1'>
-        </exec_method>
-
-       <exec_method
-                type='method'
-                name='refresh'
-                exec='/lib/svc/method/svc-fail2ban refresh'
-                timeout_seconds='-1'>
-        </exec_method>
-
-
-	<exec_method
-		type='method'
-		name='restart'
-		exec='/lib/svc/method/svc-fail2ban restart'
-		timeout_seconds='-1'>
-	</exec_method>
-
-</service>
-
-</service_bundle>

files/solaris-svc-fail2ban

@@ -1,47 +0,0 @@
-#!/usr/bin/bash -e
-#
-# fail2ban		This init.d script is used to start fail2ban.
-# (C) by Hanno Wagner <wagner@rince.de>, License is GPL
- 
-#set -x
-
-. /lib/svc/share/smf_include.sh
-
-set -e
-
-
-F2B_CONF="/etc/fail2ban/fail2ban.conf"
-if [ -n "$2" ] && [ -f "$F2B_CONF" ]; then
-  F2B_CONF="$2"
-fi
-
-ENV="/usr/bin/env -i LANG=C PATH=/usr/local/bin:/usr/bin:/bin:/opt/sfw/bin:/usr/sfw/bin"
-
-case $1 in
-	start)
-		[ -f /etc/fail2ban.conf ] || touch /etc/fail2ban.conf
-		echo "Starting fail2ban-server with $F2B_CONF"
-		eval $ENV /usr/local/bin/fail2ban-client start &
-	;;
-	stop)
-		echo "Stopping fail2ban-server with $F2B_CONF"
-		eval $ENV /usr/local/bin/fail2ban-client stop &
-	;;
-	reload | refresh )
-		echo "Reloading fail2ban-server with $F2B_CONF"
-		eval $ENV /usr/local/bin/fail2ban-client reload &
-	;;
-	restart | force-reload)
-		echo "Forcing reload of fail2ban-server with $F2B_CONF"
-		eval $ENV /usr/local/bin/fail2ban-client stop &
-		sleep 2
-		eval $ENV /usr/local/bin/fail2ban-client start &
-	;;
-	status)
-		/usr/local/bin/fail2ban-client status &
-	;;
-	*)
-		echo "Usage: /lib/svc/method/svc-fail2ban start|stop|status|refresh|restart|reload|force-reload" >&2
-		exit 2
-	;;
-esac

files/suse-initd

@@ -1,103 +0,0 @@
-#!/bin/sh
-#
-# /etc/init.d/fail2ban
-#   and its symbolic link
-# /usr/sbin/rcfail2ban
-#
-### BEGIN INIT INFO
-# Provides:          fail2ban
-# Required-Start:    $syslog $remote_fs sendmail
-# Required-Stop:     $syslog $remote_fs
-# Should-Stop: $time ypbind sendmail
-# Default-Start:     3 5
-# Default-Stop:      0 1 2 6
-# Description:       startup Fail2Ban
-### END INIT INFO
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/sbin:/usr/bin:/bin
-FAIL2BAN_BIN=/usr/local/bin/fail2ban-client
-FAIL2BAN_SERVER=/usr/local/bin/fail2ban-server
-FAIL2BAN_SOCKET=/var/run/fail2ban/fail2ban.sock
-test -x $FAIL2BAN_BIN || { echo "$FAIL2BAN_BIN not installed";
-        if [ "$1" = "stop" ]; then exit 0;
-        else exit 5; fi; }
-
-# Check for existence of needed config file and read it
-FAIL2BAN_CONFIG=/etc/fail2ban/fail2ban.conf
-test -r $FAIL2BAN_CONFIG || { echo "$FAIL2BAN_CONFIG not existing";
-        if [ "$1" = "stop" ]; then exit 0;
-        else exit 6; fi; }
-
-. /etc/rc.status
-
-# Reset status of this service
-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
-        ;;
-    stop)
-        echo -n "Shutting down Fail2ban "
-        /sbin/startproc $FAIL2BAN_BIN -q stop
-        rc_status -v
-        ;;
-    try-restart|condrestart)
-        if test "$1" = "condrestart"; then
-                echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}"
-        fi
-        $0 status
-        if test $? = 0; then
-                $0 restart
-        else
-                rc_reset        # Not running is not a failure.
-        fi
-        rc_status
-        ;;
-    restart)
-        $0 stop
-        echo -n "-wait a minute "
-        i=60
-        while [ -e $FAIL2BAN_SOCKET ] && [ $i -gt 0 ]; do
-                sleep 1
-                i=$[$i-1]
-                echo -n "."
-        done
-        echo "."
-        $0 start
-
-        # Remember status and be quiet
-        rc_status
-        ;;
-    force-reload)
-        echo -n "Reload service Fail2ban "
-        /sbin/startproc $FAIL2BAN_BIN -q reload
-        rc_status -v
-        ;;
-    reload)
-        echo -n "Reload service Fail2ban "
-        /sbin/startproc $FAIL2BAN_BIN -q reload
-        rc_status -v
-        ;;
-    status)
-        echo -n "Checking for service Fail2ban "
-        /sbin/checkproc $FAIL2BAN_SERVER
-        rc_status -v
-        ;;
-    probe)
-        test /etc/fail2ban/fail2ban.conf -nt /var/run/fail2ban.pid && echo reload
-        ;;
-    *)
-        echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"
-        exit 1
-        ;;
-esac
-rc_exit

kill-server

@@ -0,0 +1,2 @@
+#!/bin/bash
+kill `ps ax|grep fail2ban|grep -v grep|awk '{print $1}'`

man/fail2ban-client.1

@@ -1,262 +0,0 @@
-.\" 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"
-.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
-and bans the corresponding IP addresses using firewall rules.
-.SH OPTIONS
-.TP
-\fB\-c\fR <DIR>
-configuration directory
-.TP
-\fB\-s\fR <FILE>
-socket path
-.TP
-\fB\-d\fR
-dump configuration. For debugging
-.TP
-\fB\-i\fR
-interactive mode
-.TP
-\fB\-v\fR
-increase verbosity
-.TP
-\fB\-q\fR
-decrease verbosity
-.TP
-\fB\-x\fR
-force execution of the server (remove socket file)
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-display this help message
-.TP
-\fB\-V\fR, \fB\-\-version\fR
-print the version
-.SH COMMAND
-.IP
-BASIC
-.TP
-\fBstart\fR
-starts the server and the jails
-.TP
-\fBreload\fR
-reloads the configuration
-.TP
-\fBreload <JAIL>\fR
-reloads the jail <JAIL>
-.TP
-\fBstop\fR
-stops all jails and terminate the
-server
-.TP
-\fBstatus\fR
-gets the current status of the
-server
-.TP
-\fBping\fR
-tests if the server is alive
-.IP
-LOGGING
-.TP
-\fBset loglevel <LEVEL>\fR
-sets logging level to <LEVEL>. 0
-is minimal, 4 is debug
-.TP
-\fBget loglevel\fR
-gets the logging level
-.TP
-\fBset logtarget <TARGET>\fR
-sets logging target to <TARGET>.
-Can be STDOUT, STDERR, SYSLOG or a
-file
-.TP
-\fBget logtarget\fR
-gets logging target
-.IP
-JAIL CONTROL
-.TP
-\fBadd <JAIL> <BACKEND>\fR
-creates <JAIL> using <BACKEND>
-.TP
-\fBstart <JAIL>\fR
-starts the jail <JAIL>
-.TP
-\fBstop <JAIL>\fR
-stops the jail <JAIL>. The jail is
-removed
-.TP
-\fBstatus <JAIL>\fR
-gets the current status of <JAIL>
-.IP
-JAIL CONFIGURATION
-.TP
-\fBset <JAIL> idle on|off\fR
-sets the idle state of <JAIL>
-.TP
-\fBset <JAIL> addignoreip <IP>\fR
-adds <IP> to the ignore list of
-<JAIL>
-.TP
-\fBset <JAIL> delignoreip <IP>\fR
-removes <IP> from the ignore list
-of <JAIL>
-.TP
-\fBset <JAIL> addlogpath <FILE>\fR
-adds <FILE> to the monitoring list
-of <JAIL>
-.TP
-\fBset <JAIL> dellogpath <FILE>\fR
-removes <FILE> to the monitoring
-list of <JAIL>
-.TP
-\fBset <JAIL> addfailregex <REGEX>\fR
-adds the regular expression
-<REGEX> which must match failures
-for <JAIL>
-.TP
-\fBset <JAIL> delfailregex <INDEX>\fR
-removes the regular expression at
-<INDEX> for failregex
-.TP
-\fBset <JAIL> addignoreregex <REGEX>\fR
-adds the regular expression
-<REGEX> which should match pattern
-to exclude for <JAIL>
-.TP
-\fBset <JAIL> delignoreregex <INDEX>\fR
-removes the regular expression at
-<INDEX> for ignoreregex
-.TP
-\fBset <JAIL> findtime <TIME>\fR
-sets the number of seconds <TIME>
-for which the filter will look
-back for <JAIL>
-.TP
-\fBset <JAIL> bantime <TIME>\fR
-sets the number of seconds <TIME>
-a host will be banned for <JAIL>
-.TP
-\fBset <JAIL> maxretry <RETRY>\fR
-sets the number of failures
-<RETRY> before banning the host
-for <JAIL>
-.TP
-\fBset <JAIL> addaction <ACT>\fR
-adds a new action named <NAME> for
-<JAIL>
-.TP
-\fBset <JAIL> delaction <ACT>\fR
-removes the action <NAME> from
-<JAIL>
-.TP
-\fBset <JAIL> setcinfo <ACT> <KEY> <VALUE>\fR
-sets <VALUE> for <KEY> of the
-action <NAME> for <JAIL>
-.TP
-\fBset <JAIL> delcinfo <ACT> <KEY>\fR
-removes <KEY> for the action
-<NAME> for <JAIL>
-.TP
-\fBset <JAIL> actionstart <ACT> <CMD>\fR
-sets the start command <CMD> of
-the action <ACT> for <JAIL>
-.TP
-\fBset <JAIL> actionstop <ACT> <CMD>\fR
-sets the stop command <CMD> of the
-action <ACT> for <JAIL>
-.TP
-\fBset <JAIL> actioncheck <ACT> <CMD>\fR
-sets the check command <CMD> of
-the action <ACT> for <JAIL>
-.TP
-\fBset <JAIL> actionban <ACT> <CMD>\fR
-sets the ban command <CMD> of the
-action <ACT> for <JAIL>
-.TP
-\fBset <JAIL> actionunban <ACT> <CMD>\fR
-sets the unban command <CMD> of
-the action <ACT> for <JAIL>
-.IP
-JAIL INFORMATION
-.TP
-\fBget <JAIL> logpath\fR
-gets the list of the monitored
-files for <JAIL>
-.TP
-\fBget <JAIL> ignoreip\fR
-gets the list of ignored IP
-addresses for <JAIL>
-.TP
-\fBget <JAIL> timeregex\fR
-gets the regular expression used
-for the time detection for <JAIL>
-.TP
-\fBget <JAIL> timepattern\fR
-gets the pattern used for the time
-detection for <JAIL>
-.TP
-\fBget <JAIL> failregex\fR
-gets the list of regular
-expressions which matches the
-failures for <JAIL>
-.TP
-\fBget <JAIL> ignoreregex\fR
-gets the list of regular
-expressions which matches patterns
-to ignore for <JAIL>
-.TP
-\fBget <JAIL> findtime\fR
-gets the time for which the filter
-will look back for failures for
-<JAIL>
-.TP
-\fBget <JAIL> bantime\fR
-gets the time a host is banned for
-<JAIL>
-.TP
-\fBget <JAIL> maxretry\fR
-gets the number of failures
-allowed for <JAIL>
-.TP
-\fBget <JAIL> addaction\fR
-gets the last action which has
-been added for <JAIL>
-.TP
-\fBget <JAIL> actionstart <ACT>\fR
-gets the start command for the
-action <ACT> for <JAIL>
-.TP
-\fBget <JAIL> actionstop <ACT>\fR
-gets the stop command for the
-action <ACT> for <JAIL>
-.TP
-\fBget <JAIL> actioncheck <ACT>\fR
-gets the check command for the
-action <ACT> for <JAIL>
-.TP
-\fBget <JAIL> actionban <ACT>\fR
-gets the ban command for the
-action <ACT> for <JAIL>
-.TP
-\fBget <JAIL> actionunban <ACT>\fR
-gets the unban command for the
-action <ACT> for <JAIL>
-.SH FILES
-\fI/etc/fail2ban/*\fR
-.SH AUTHOR
-Written by Cyril Jaquier <cyril.jaquier@fail2ban.org>.
-Many contributions by Yaroslav O. Halchenko <debian@onerussian.com>.
-.SH "REPORTING BUGS"
-Report bugs to <cyril.jaquier@fail2ban.org>
-.SH COPYRIGHT
-Copyright \(co 2004-2008 Cyril Jaquier
-.br
-Copyright of modifications held by their respective authors.
-Licensed under the GNU General Public License v2 (GPL).
-.SH "SEE ALSO"
-.br 
-fail2ban-server(1)

man/fail2ban-client.h2m

@@ -1,12 +0,0 @@
-Include file for help2man man page
-$Id:  $
-
-[name]
-fail2ban-client \- configure and control the server
-
-[files]
-\fI/etc/fail2ban/*\fR
-
-[see also]
-.br 
-fail2ban-server(1)

man/fail2ban-regex.1

@@ -1,54 +0,0 @@
-.\" 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"
-.SH NAME
-fail2ban-regex \- test Fail2ban "failregex" option
-.SH SYNOPSIS
-.B fail2ban-regex
-[\fIOPTIONS\fR] \fI<LOG> <REGEX> \fR[\fIIGNOREREGEX\fR]
-.SH DESCRIPTION
-Fail2Ban v0.8.2 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".
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-display this help message
-.TP
-\fB\-V\fR, \fB\-\-version\fR
-print the version
-.SH LOG
-.TP
-\fBstring\fR
-a string representing a log line
-.TP
-\fBfilename\fR
-path to a log file (/var/log/auth.log)
-.SH REGEX
-.TP
-\fBstring\fR
-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>.
-Many contributions by Yaroslav O. Halchenko <debian@onerussian.com>.
-.SH "REPORTING BUGS"
-Report bugs to <cyril.jaquier@fail2ban.org>
-.SH COPYRIGHT
-Copyright \(co 2004-2008 Cyril Jaquier
-.br
-Copyright of modifications held by their respective authors.
-Licensed under the GNU General Public License v2 (GPL).
-.SH "SEE ALSO"
-.br 
-fail2ban-client(1)
-fail2ban-server(1)

man/fail2ban-regex.h2m

@@ -1,10 +0,0 @@
-Include file for help2man man page
-$Id:  $
-
-[name]
-fail2ban-regex \- test Fail2ban "failregex" option
-
-[see also]
-.br 
-fail2ban-client(1)
-fail2ban-server(1)

man/fail2ban-server.1

@@ -1,46 +0,0 @@
-.\" 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"
-.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
-and bans the corresponding IP addresses using firewall rules.
-.PP
-Only use this command for debugging purpose. Start the server with
-fail2ban\-client instead. The default behaviour is to start the server
-in background.
-.SH OPTIONS
-.TP
-\fB\-b\fR
-start in background
-.TP
-\fB\-f\fR
-start in foreground
-.TP
-\fB\-s\fR <FILE>
-socket path
-.TP
-\fB\-x\fR
-force execution of the server (remove socket file)
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-display this help message
-.TP
-\fB\-V\fR, \fB\-\-version\fR
-print the version
-.SH AUTHOR
-Written by Cyril Jaquier <cyril.jaquier@fail2ban.org>.
-Many contributions by Yaroslav O. Halchenko <debian@onerussian.com>.
-.SH "REPORTING BUGS"
-Report bugs to <cyril.jaquier@fail2ban.org>
-.SH COPYRIGHT
-Copyright \(co 2004-2008 Cyril Jaquier
-.br
-Copyright of modifications held by their respective authors.
-Licensed under the GNU General Public License v2 (GPL).
-.SH "SEE ALSO"
-.br 
-fail2ban-client(1)

man/fail2ban-server.h2m

@@ -1,9 +0,0 @@
-Include file for help2man man page
-$Id:  $
-
-[name]
-fail2ban-server \- start the server
-
-[see also]
-.br 
-fail2ban-client(1)

man/generate-man

@@ -1,69 +0,0 @@
-#!/bin/bash
-
-# fail2ban-client
-echo -n "Generating fail2ban-client "
-help2man --section=1 --no-info --include=fail2ban-client.h2m --output fail2ban-client.1 ../fail2ban-client
-echo "[done]"
-echo -n "Patching fail2ban-client   "
-# Changes the title.
-sed -i -e 's/.SS "Command:"/.SH COMMAND/' fail2ban-client.1
-# Sets bold font for commands.
-IFS="
-"
-NEXT=0
-FOUND=0
-LINES=$( cat fail2ban-client.1 )
-echo -n "" > fail2ban-client.1
-for LINE in $LINES; do
-	if [ "$LINE" = ".SH COMMAND" ]; then
-		FOUND=1
-	fi
-	if [ $NEXT -eq 1 ] && [ $FOUND -eq 1 ]; then
-		echo "\fB$LINE\fR" >> fail2ban-client.1
-	else
-		echo "$LINE" >> fail2ban-client.1
-	fi
-	if [ "$LINE" = ".TP" ]; then
-		NEXT=1
-	else
-		NEXT=0
-	fi
-done
-echo "[done]"
-
-# fail2ban-server
-echo -n "Generating fail2ban-server "
-help2man --section=1 --no-info --include=fail2ban-server.h2m --output fail2ban-server.1 ../fail2ban-server
-echo "[done]"
-
-# fail2ban-regex
-echo -n "Generating fail2ban-regex  "
-help2man --section=1 --no-info --include=fail2ban-regex.h2m --output fail2ban-regex.1 ../fail2ban-regex
-echo "[done]"
-echo -n "Patching fail2ban-regex    "
-# Changes the title.
-sed -i -e 's/.SS "Log:"/.SH LOG/' fail2ban-regex.1
-sed -i -e 's/.SS "Regex:"/.SH REGEX/' fail2ban-regex.1
-# Sets bold font for commands.
-IFS="
-"
-NEXT=0
-FOUND=0
-LINES=$( cat fail2ban-regex.1 )
-echo -n "" > fail2ban-regex.1
-for LINE in $LINES; do
-	if [ "$LINE" = ".SH LOG" ]; then
-		FOUND=1
-	fi
-	if [ $NEXT -eq 1 ] && [ $FOUND -eq 1 ]; then
-		echo "\fB$LINE\fR" >> fail2ban-regex.1
-	else
-		echo "$LINE" >> fail2ban-regex.1
-	fi
-	if [ "$LINE" = ".TP" ]; then
-		NEXT=1
-	else
-		NEXT=0
-	fi
-done
-echo "[done]"

server/__init__.py

@@ -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"
+__license__ = "GPL"

server/action.py

@@ -16,16 +16,15 @@
 
 # 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"
 
-import logging, os
-#from subprocess import call
+import time, logging, os
 
 # Gets the instance of the logger.
 logSys = logging.getLogger("fail2ban.actions.action")
@@ -40,64 +39,34 @@ logSys = logging.getLogger("fail2ban.actions.action")
 class Action:
 	
 	def __init__(self, name):
-		self.__name = name
-		self.__cInfo = dict()
+		self.name = name
+		self.cInfo = dict()
 		## Command executed in order to initialize the system.
-		self.__actionStart = ''
+		self.actionStart = ''
 		## Command executed when an IP address gets banned.
-		self.__actionBan = ''
+		self.actionBan = ''
 		## Command executed when an IP address gets removed.
-		self.__actionUnban = ''
+		self.actionUnban = ''
 		## Command executed in order to check requirements.
-		self.__actionCheck = ''
+		self.actionCheck = ''
 		## Command executed in order to stop the system.
-		self.__actionStop = ''
+		self.actionStop = ''
 		logSys.debug("Created Action")
 	
-	##
-	# Sets the action name.
-	#
-	# @param name the name of the action
-	
 	def setName(self, name):
-		self.__name = name
-	
-	##
-	# Returns the action name.
-	#
-	# @return the name of the action
+		self.name = name
 	
 	def getName(self):
-		return self.__name
-	
-	##
-	# Sets a "CInfo".
-	#
-	# CInfo are statically defined properties. They can be definied by
-	# the user and are used to set e-mail addresses, port, host or
-	# anything that should not change during the life of the server.
-	#
-	# @param key the property name
-	# @param value the property value
+		return self.name
 	
 	def setCInfo(self, key, value):
-		self.__cInfo[key] = value
-	
-	##
-	# Returns a "CInfo".
-	#
-	# @param key the property name
+		self.cInfo[key] = value
 	
 	def getCInfo(self, key):
-		return self.__cInfo[key]
-	
-	##
-	# Removes a "CInfo".
-	#
-	# @param key the property name
+		return self.cInfo[key]
 	
 	def delCInfo(self, key):
-		del self.__cInfo[key]
+		del self.cInfo[key]
 	
 	##
 	# Set the "start" command.
@@ -105,8 +74,8 @@ class Action:
 	# @param value the command
 		
 	def setActionStart(self, value):
-		self.__actionStart = value
-		logSys.debug("Set actionStart = %s" % value)
+		self.actionStart = value
+		logSys.info("Set actionStart = %s" % value)
 	
 	##
 	# Get the "start" command.
@@ -114,18 +83,10 @@ class Action:
 	# @return the command
 	
 	def getActionStart(self):
-		return self.__actionStart
-	
-	##
-	# Executes the action "start" command.
-	#
-	# Replaces the tags in the action command with value of "cInfo"
-	# and executes the resulting command.
-	#
-	# @return True if the command succeeded
+		return self.actionStart
 	
 	def execActionStart(self):
-		startCmd = Action.replaceTag(self.__actionStart, self.__cInfo)
+		startCmd = Action.replaceTag(self.actionStart, self.cInfo)
 		return Action.executeCmd(startCmd)
 	
 	##
@@ -134,8 +95,8 @@ class Action:
 	# @param value the command
 	
 	def setActionBan(self, value):
-		self.__actionBan = value
-		logSys.debug("Set actionBan = %s" % value)
+		self.actionBan = value
+		logSys.info("Set actionBan = %s" % value)
 	
 	##
 	# Get the "ban" command.
@@ -143,15 +104,10 @@ class Action:
 	# @return the command
 	
 	def getActionBan(self):
-		return self.__actionBan
-	
-	##
-	# Executes the action "ban" command.
-	#
-	# @return True if the command succeeded
+		return self.actionBan
 	
 	def execActionBan(self, aInfo):
-		return self.__processCmd(self.__actionBan, aInfo)
+		return self.processCmd(self.actionBan, aInfo);
 	
 	##
 	# Set the "unban" command.
@@ -159,8 +115,8 @@ class Action:
 	# @param value the command
 	
 	def setActionUnban(self, value):
-		self.__actionUnban = value
-		logSys.debug("Set actionUnban = %s" % value)
+		self.actionUnban = value
+		logSys.info("Set actionUnban = %s" % value)
 	
 	##
 	# Get the "unban" command.
@@ -168,15 +124,10 @@ class Action:
 	# @return the command
 	
 	def getActionUnban(self):
-		return self.__actionUnban
-	
-	##
-	# Executes the action "unban" command.
-	#
-	# @return True if the command succeeded
+		return self.actionUnban
 	
 	def execActionUnban(self, aInfo):
-		return self.__processCmd(self.__actionUnban, aInfo)
+		return self.processCmd(self.actionUnban, aInfo);
 	
 	##
 	# Set the "check" command.
@@ -184,8 +135,8 @@ class Action:
 	# @param value the command
 	
 	def setActionCheck(self, value):
-		self.__actionCheck = value
-		logSys.debug("Set actionCheck = %s" % value)
+		self.actionCheck = value
+		logSys.info("Set actionCheck = %s" % value)
 	
 	##
 	# Get the "check" command.
@@ -193,7 +144,7 @@ class Action:
 	# @return the command
 	
 	def getActionCheck(self):
-		return self.__actionCheck
+		return self.actionCheck
 	
 	##
 	# Set the "stop" command.
@@ -201,8 +152,8 @@ class Action:
 	# @param value the command
 	
 	def setActionStop(self, value):
-		self.__actionStop = value
-		logSys.debug("Set actionStop = %s" % value)
+		self.actionStop = value
+		logSys.info("Set actionStop = %s" % value)
 	
 	##
 	# Get the "stop" command.
@@ -210,28 +161,13 @@ class Action:
 	# @return the command
 	
 	def getActionStop(self):
-		return self.__actionStop
-	
-	##
-	# Executes the action "stop" command.
-	#
-	# Replaces the tags in the action command with value of "cInfo"
-	# and executes the resulting command.
-	#
-	# @return True if the command succeeded
+		return self.actionStop
 	
 	def execActionStop(self):
-		stopCmd = Action.replaceTag(self.__actionStop, self.__cInfo)
+		stopCmd = Action.replaceTag(self.actionStop, self.cInfo)
 		return Action.executeCmd(stopCmd)
 	
-	##
-	# Replaces tags in query with property values in aInfo.
-	#
-	# @param query the query string with tags
-	# @param aInfo the properties
-	# @return a string
-	
-	#@staticmethod
+	@staticmethod
 	def replaceTag(query, aInfo):
 		""" Replace tags in query
 		"""
@@ -241,35 +177,21 @@ class Action:
 		# New line
 		string = string.replace("<br>", '\n')
 		return string
-	replaceTag = staticmethod(replaceTag)
 	
-	##
-	# Executes a command with preliminary checks and substitutions.
-	#
-	# Before executing any commands, executes the "check" command first
-	# in order to check if prerequirements are met. If this check fails,
-	# it tries to restore a sane environnement before executing the real
-	# command.
-	# Replaces "aInfo" and "cInfo" in the query too.
-	#
-	# @param cmd The command to execute
-	# @param aInfo Dynamic properties
-	# @return True if the command succeeded
-	
-	def __processCmd(self, cmd, aInfo = None):
+	def processCmd(self, cmd, aInfo = None):
 		""" Executes an OS command.
 		"""
 		if cmd == "":
 			logSys.debug("Nothing to do")
 			return True
 		
-		checkCmd = Action.replaceTag(self.__actionCheck, self.__cInfo)
+		checkCmd = Action.replaceTag(self.actionCheck, self.cInfo)
 		if not Action.executeCmd(checkCmd):
 			logSys.error("Invariant check failed. Trying to restore a sane" +
 						 " environment")
-			stopCmd = Action.replaceTag(self.__actionStop, self.__cInfo)
+			stopCmd = Action.replaceTag(self.actionStop, self.cInfo)
 			Action.executeCmd(stopCmd)
-			startCmd = Action.replaceTag(self.__actionStart, self.__cInfo)
+			startCmd = Action.replaceTag(self.actionStart, self.cInfo)
 			Action.executeCmd(startCmd)
 			if not Action.executeCmd(checkCmd):
 				logSys.fatal("Unable to restore environment")
@@ -282,36 +204,20 @@ class Action:
 			realCmd = cmd
 		
 		# Replace static fields
-		realCmd = Action.replaceTag(realCmd, self.__cInfo)
+		realCmd = Action.replaceTag(realCmd, self.cInfo)
 		
-		return Action.executeCmd(realCmd)
+  		return Action.executeCmd(realCmd)
 
-	##
-	# Executes a command.
-	#
-	# We need a shell here because commands are mainly shell script. They
-	# contain pipe, redirection, etc.
-	# 
-	# @todo Force the use of bash!?
-	# @todo Kill the command after a given timeout
-	#
-	# @param realCmd the command to execute
-	# @return True if the command succeeded
-
-	#@staticmethod
+  	@staticmethod
 	def executeCmd(realCmd):
 		logSys.debug(realCmd)
-		try:
-			# The following line gives deadlock with multiple jails
-			#retcode = call(realCmd, shell=True)
-			retcode = os.system(realCmd)
-			if retcode == 0:
-				logSys.debug("%s returned successfully" % realCmd)
-				return True
-			else:
-				logSys.error("%s returned %x" % (realCmd, retcode))
-		except OSError, e:
-			logSys.error("%s failed with %s" % (realCmd, e))
-		return False
-	executeCmd = staticmethod(executeCmd)
-	
+		retval = os.system(realCmd)
+		#if not retval == 0:
+		#	logSys.error("'" + cmd + "' returned " + `retval`)
+		#	raise Exception("Execution of command '%s' failed" % cmd)
+		if retval == 0:
+			return True
+		else:
+			logSys.error("%s returned %x" % (realCmd, retval))
+			return False
+		

server/actions.py

@@ -16,19 +16,19 @@
 
 # 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"
 
 from banmanager import BanManager
+from failmanager import FailManager, FailManagerEmpty
 from jailthread import JailThread
 from action import Action
-from mytime import MyTime
-import time, logging
+import time, logging, os
 
 # Gets the instance of the logger.
 logSys = logging.getLogger("fail2ban.actions")
@@ -49,55 +49,32 @@ class Actions(JailThread):
 	# @param jail the jail object
 	
 	def __init__(self, jail):
-		JailThread.__init__(self)
+		JailThread.__init__(self, jail)
 		## The jail which contains this action.
 		self.jail = jail
-		self.__actions = list()
+		self.actions = list()
 		## The ban manager.
-		self.__banManager = BanManager()
-	
-	##
-	# Adds an action.
-	#
-	# @param name The action name
+		self.banManager = BanManager()
 	
 	def addAction(self, name):
 		action = Action(name)
-		self.__actions.append(action)
-	
-	##
-	# Removes an action.
-	#
-	# @param name The action name
+		self.actions.append(action)
 	
 	def delAction(self, name):
-		for action in self.__actions:
+		for action in self.actions:
 			if action.getName() == name:
-				self.__actions.remove(action)
+				self.actions.remove(action)
 				break
 	
-	##
-	# Returns an action.
-	#
-	# Raises a KeyError exception if the action does not exist.
-	#
-	# @param name the action name
-	# @return the action
-	
 	def getAction(self, name):
-		for action in self.__actions:
+		for action in self.actions:
 			if action.getName() == name:
 				return action
 		raise KeyError
 	
-	##
-	# Returns the last defined action.
-	#
-	# @return The last defined action.
-	
 	def getLastAction(self):
-		action = self.__actions.pop()
-		self.__actions.append(action)
+		action = self.actions.pop()
+		self.actions.append(action)
 		return action
 	
 	##
@@ -106,7 +83,7 @@ class Actions(JailThread):
 	# @param value the time
 	
 	def setBanTime(self, value):
-		self.__banManager.setBanTime(value)
+		self.banManager.setBanTime(value)
 		logSys.info("Set banTime = %s" % value)
 	
 	##
@@ -115,7 +92,7 @@ class Actions(JailThread):
 	# @return the time
 	
 	def getBanTime(self):
-		return self.__banManager.getBanTime()
+		return self.banManager.getBanTime()
 	
 	##
 	# Main loop.
@@ -125,20 +102,20 @@ class Actions(JailThread):
 	# @return True when the thread exits nicely
 	
 	def run(self):
-		self.setActive(True)
-		for action in self.__actions:
+		for action in self.actions:
 			action.execActionStart()
-		while self._isActive():
-			if not self.getIdle():
+		self.setActive(True)
+		while self.isActive():
+			if not self.isIdle:
 				#logSys.debug(self.jail.getName() + ": action")
-				ret = self.__checkBan()
+				ret = self.checkBan()
 				if not ret:
-					self.__checkUnBan()
-					time.sleep(self.getSleepTime())
+					self.checkUnBan()
+					time.sleep(self.sleepTime)
 			else:
-				time.sleep(self.getSleepTime())
-		self.__flushBan()
-		for action in self.__actions:
+				time.sleep(self.sleepTime)
+		self.flushBan()
+		for action in self.actions:
 			action.execActionStop()
 		logSys.debug(self.jail.getName() + ": action terminated")
 		return True
@@ -150,22 +127,19 @@ class Actions(JailThread):
 	# it executes the "ban" command and add a ticket to the BanManager.
 	# @return True if an IP address get banned
 	
-	def __checkBan(self):
+	def checkBan(self):
+		logSys.debug("Check for IP address to ban")
 		ticket = self.jail.getFailTicket()
 		if ticket != False:
 			aInfo = dict()
 			bTicket = BanManager.createBanTicket(ticket)
 			aInfo["ip"] = bTicket.getIP()
 			aInfo["failures"] = bTicket.getAttempt()
-			aInfo["time"] = bTicket.getTime()
-			if self.__banManager.addBanTicket(bTicket):
-				logSys.warn("[%s] Ban %s" % (self.jail.getName(), aInfo["ip"]))
-				for action in self.__actions:
-					action.execActionBan(aInfo)
-				return True
-			else:
-				logSys.warn("[%s] %s already banned" % (self.jail.getName(), 
-														aInfo["ip"]))
+			logSys.info("Ban %s" % aInfo["ip"])
+			for action in self.actions:
+				action.execActionBan(aInfo)
+			self.banManager.addBanTicket(bTicket)
+			return True
 		return False
 	
 	##
@@ -173,35 +147,28 @@ class Actions(JailThread):
 	#
 	# Unban IP address which are outdated.
 	
-	def __checkUnBan(self):
-		for ticket in self.__banManager.unBanList(MyTime.time()):
-			self.__unBan(ticket)
+	def checkUnBan(self):
+		logSys.debug("Check for IP address to unban")
+		for ticket in self.banManager.unBanList(time.time()):
+			aInfo = dict()
+			aInfo["ip"] = ticket.getIP()
+			logSys.info("Unban %s" % aInfo["ip"])
+			for action in self.actions:
+				action.execActionUnban(aInfo)
 	
 	##
 	# Flush the ban list.
 	#
 	# Unban all IP address which are still in the banning list.
 	
-	def __flushBan(self):
+	def flushBan(self):
 		logSys.debug("Flush ban list")
-		for ticket in self.__banManager.flushBanList():
-			self.__unBan(ticket)
-	
-	##
-	# Unbans host corresponding to the ticket.
-	#
-	# Executes the actions in order to unban the host given in the
-	# ticket.
-	
-	def __unBan(self, ticket):
-		aInfo = dict()
-		aInfo["ip"] = ticket.getIP()
-		aInfo["failures"] = ticket.getAttempt()
-		aInfo["time"] = ticket.getTime()
-		logSys.warn("[%s] Unban %s" % (self.jail.getName(), aInfo["ip"]))
-		for action in self.__actions:
-			action.execActionUnban(aInfo)
-			
+		for ticket in self.banManager.flushBanList():
+			aInfo = dict()
+			aInfo["ip"] = ticket.getIP()
+			logSys.info("Unban %s" % aInfo["ip"])
+			for action in self.actions:
+				action.execActionUnban(aInfo)
 	
 	##
 	# Get the status of the filter.
@@ -211,7 +178,7 @@ class Actions(JailThread):
 	# @return a list with tuple
 	
 	def status(self):
-		ret = [("Currently banned", self.__banManager.size()), 
-			   ("Total banned", self.__banManager.getBanTotal()),
-			   ("IP list", self.__banManager.getBanList())]
+		ret = [("Currently banned", self.banManager.size()),
+			   ("Total banned", self.banManager.getBanTotal())]
 		return ret
+		

server/asyncserver.py

@@ -1,164 +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: 567 $
-
-__author__ = "Cyril Jaquier"
-__version__ = "$Revision: 567 $"
-__date__ = "$Date: 2007-03-26 23:17:31 +0200 (Mon, 26 Mar 2007) $"
-__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
-
-# Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.server")
-
-##
-# Request handler class.
-#
-# This class extends asynchat in order to provide a request handler for
-# incoming query.
-
-class RequestHandler(asynchat.async_chat):
-	
-	END_STRING = "<F2B_END_COMMAND>"
-
-	def __init__(self, conn, transmitter):
-		asynchat.async_chat.__init__(self, conn)
-		self.__transmitter = transmitter
-		self.__buffer = []
-		# Sets the terminator.
-		self.set_terminator(RequestHandler.END_STRING)
-
-	def collect_incoming_data(self, data):
-		#logSys.debug("Received raw data: " + str(data))
-		self.__buffer.append(data)
-
-	##
-	# Handles a new request.
-	#
-	# This method is called once we have a complete request.
-
-	def found_terminator(self):
-		# Joins the buffer items.
-		message = loads("".join(self.__buffer))
-		# Gives the message to the transmitter.
-		message = self.__transmitter.proceed(message)
-		# Serializes the response.
-		message = dumps(message, HIGHEST_PROTOCOL)
-		# Sends the response to the client.
-		self.send(message + RequestHandler.END_STRING)
-		# Closes the channel.
-		self.close_when_done()
-		
-	def handle_error(self):
-		e1,e2 = helpers.formatExceptionInfo()
-		logSys.error("Unexpected communication error: "+e2)
-		logSys.error(traceback.format_exc().splitlines())
-		self.close()
-		
-##
-# Asynchronous server class.
-#
-# This class extends asyncore and dispatches connection requests to
-# RequestHandler.
-
-class AsyncServer(asyncore.dispatcher):
-
-	def __init__(self, transmitter):
-		asyncore.dispatcher.__init__(self)
-		self.__transmitter = transmitter
-		self.__sock = "/var/run/fail2ban/fail2ban.sock"
-		self.__init = False
-
-	##
-	# Returns False as we only read the socket first.
-
-	def writable(self):
-		return False
-
-	def handle_accept(self):
-		try:
-			conn, addr = self.accept()
-		except socket.error:
-			logSys.warning("Socket error")
-			return
-		except TypeError:
-			logSys.warning("Type error")
-			return
-		# Creates an instance of the handler class to handle the
-		# request/response on the incoming connection.
-		RequestHandler(conn, self.__transmitter)
-	
-	##
-	# Starts the communication server.
-	#
-	# @param sock: socket file.
-	# @param force: remove the socket file if exists.
-	
-	def start(self, sock, force):
-		self.__sock = sock
-		# Remove socket
-		if os.path.exists(sock):
-			logSys.error("Fail2ban seems to be already running")
-			if force:
-				logSys.warn("Forcing execution of the server")
-				os.remove(sock)
-			else:
-				raise AsyncServerException("Server already running")
-		# Creates the socket.
-		self.create_socket(socket.AF_UNIX, socket.SOCK_STREAM)
-		self.set_reuse_addr()
-		try:
-			self.bind(sock)
-		except Exception:
-			raise AsyncServerException("Unable to bind socket %s" % self.__sock)
-		self.listen(1)
-		# 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)
-	
-	##
-	# Stops the communication server.
-	
-	def stop(self):
-		if self.__init:
-			# Only closes the socket if it was initialized first.
-			self.close()
-		# Remove socket
-		if os.path.exists(self.__sock):
-			logSys.debug("Removed socket file " + self.__sock)
-			os.remove(self.__sock)
-		logSys.debug("Socket shutdown")
-
-
-##
-# AsyncServerException is used to wrap communication exceptions.
-
-class AsyncServerException(Exception):
-	pass

server/banmanager.py

@@ -16,18 +16,17 @@
 
 # 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"
 
-from ticket import BanTicket
+from banticket import BanTicket
 from threading import Lock
-from mytime import MyTime
-import logging
+import time, logging
 
 # Gets the instance of the logger.
 logSys = logging.getLogger("fail2ban.action")
@@ -47,13 +46,13 @@ class BanManager:
 	
 	def __init__(self):
 		## Mutex used to protect the ban list.
-		self.__lock = Lock()
+		self.lock = Lock()
 		## The ban list.
-		self.__banList = list()
+		self.banList = list()
 		## The amount of time an IP address gets banned.
-		self.__banTime = 600
+		self.banTime = 600
 		## Total number of banned IP address
-		self.__banTotal = 0
+		self.banTotal = 0
 	
 	##
 	# Set the ban time.
@@ -62,11 +61,7 @@ class BanManager:
 	# @param value the time
 	
 	def setBanTime(self, value):
-		try:
-			self.__lock.acquire()
-			self.__banTime = int(value)
-		finally:
-			self.__lock.release()
+		self.banTime = int(value)
 	
 	##
 	# Get the ban time.
@@ -75,11 +70,7 @@ class BanManager:
 	# @return the time
 	
 	def getBanTime(self):
-		try:
-			self.__lock.acquire()
-			return self.__banTime
-		finally:
-			self.__lock.release()
+		return self.banTime
 	
 	##
 	# Set the total number of banned address.
@@ -87,11 +78,7 @@ class BanManager:
 	# @param value total number
 	
 	def setBanTotal(self, value):
-		try:
-			self.__lock.acquire()
-			self.__banTotal = value
-		finally:
-			self.__lock.release()
+		self.banTotal = value
 	
 	##
 	# Get the total number of banned address.
@@ -99,24 +86,8 @@ class BanManager:
 	# @return the total number
 	
 	def getBanTotal(self):
-		try:
-			self.__lock.acquire()
-			return self.__banTotal
-		finally:
-			self.__lock.release()
-
-	##
-	# Returns a copy of the IP list.
-	#
-	# @return IP list
+		return self.banTotal
 	
-	def getBanList(self):
-		try:
-			self.__lock.acquire()
-			return [m.getIP() for m in self.__banList]
-		finally:
-			self.__lock.release()
-
 	##
 	# Create a ban ticket.
 	#
@@ -125,15 +96,14 @@ class BanManager:
 	# @param ticket the FailTicket
 	# @return a BanTicket
 	
-	#@staticmethod
+	@staticmethod
 	def createBanTicket(ticket):
 		ip = ticket.getIP()
 		#lastTime = ticket.getTime()
-		lastTime = MyTime.time()
+		lastTime = time.time()
 		banTicket = BanTicket(ip, lastTime)
 		banTicket.setAttempt(ticket.getAttempt())
 		return banTicket
-	createBanTicket = staticmethod(createBanTicket)
 	
 	##
 	# Add a ban ticket.
@@ -143,16 +113,23 @@ class BanManager:
 	# @return True if the IP address is not in the ban list
 	
 	def addBanTicket(self, ticket):
-		try:
-			self.__lock.acquire()
-			if not self.__inBanList(ticket):
-				self.__banList.append(ticket)
-				self.__banTotal += 1
-				return True
-			return False
-		finally:
-			self.__lock.release()
+		self.lock.acquire()
+		if not self.inBanList(ticket):
+			self.banList.append(ticket)
+			self.banTotal += 1
+			self.lock.release()
+			return True
+		self.lock.release()
+		return False
 	
+	##
+	# Delete a ban ticket.
+	#
+	# Remove a BanTicket from the ban list.
+	# @param ticket the ticket
+	
+	def delBanTicket(self, ticket):
+		self.banList.remove(ticket)
 	
 	##
 	# Get the size of the ban list.
@@ -160,11 +137,7 @@ class BanManager:
 	# @return the size
 	
 	def size(self):
-		try:
-			self.__lock.acquire()
-			return len(self.__banList)
-		finally:
-			self.__lock.release()
+		return len(self.banList)
 	
 	##
 	# Check if a ticket is in the list.
@@ -174,8 +147,8 @@ class BanManager:
 	# @param ticket the ticket
 	# @return True if a ticket already exists
 	
-	def __inBanList(self, ticket):
-		for i in self.__banList:
+	def inBanList(self, ticket):
+		for i in self.banList:
 			if ticket.getIP() == i.getIP():
 				return True
 		return False
@@ -186,25 +159,17 @@ class BanManager:
 	# Return a list of BanTicket which need to be unbanned.
 	# @param time the time
 	# @return the list of ticket to unban
+	# @todo Check the delete operation
 	
 	def unBanList(self, time):
-		try:
-			self.__lock.acquire()
-			# Permanent banning
-			if self.__banTime < 0:
-				return list()
-
-			# Gets the list of ticket to remove.
-			unBanList = [ticket for ticket in self.__banList
-						 if ticket.getTime() < time - self.__banTime]
-			
-			# Removes tickets.
-			self.__banList = [ticket for ticket in self.__banList
-							  if ticket not in unBanList]
-						
-			return unBanList
-		finally:
-			self.__lock.release()
+		uBList = list()
+		self.lock.acquire()
+		for ticket in self.banList:
+			if ticket.getTime() < time - self.banTime:
+				uBList.append(ticket)
+				self.delBanTicket(ticket)
+		self.lock.release()
+		return uBList
 	
 	##
 	# Flush the ban list.
@@ -213,10 +178,9 @@ class BanManager:
 	# @return the complete ban list
 	
 	def flushBanList(self):
-		try:
-			self.__lock.acquire()
-			uBList = self.__banList
-			self.__banList = list()
-			return uBList
-		finally:
-			self.__lock.release()
+		self.lock.acquire()
+		uBList = self.banList
+		self.banList = list()
+		self.lock.release()
+		return uBList
+	

server/banticket.py

@@ -0,0 +1,50 @@
+# 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$
+
+__author__ = "Cyril Jaquier"
+__version__ = "$Revision$"
+__date__ = "$Date$"
+__copyright__ = "Copyright (c) 2004 Cyril Jaquier"
+__license__ = "GPL"
+
+import time, logging
+from ticket import Ticket
+
+# Gets the instance of the logger.
+logSys = logging.getLogger("fail2ban")
+
+##
+# Ban Ticket.
+#
+# This class extends the Ticket class. It is mainly used by the BanManager.
+
+class BanTicket(Ticket):
+	
+	##
+	# Constructor.
+	#
+	# Call the Ticket (parent) constructor and initialize default
+	# values.
+	# @param ip the IP address
+	# @param time the ban time
+	
+	def __init__(self, ip, time):
+		Ticket.__init__(self, ip, time)
+