From c19a685ee3d37c53d3df31fd7921fab4d4b6bd51 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 31 Oct 2013 00:58:48 +1100 Subject: [PATCH 1/6] DOC: version 0.8.11.pre --- ChangeLog | 4 ++-- common/version.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f77d9491..2e1480be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,10 +4,10 @@ |_| \__,_|_|_/___|_.__/\__,_|_||_| ================================================================================ -Fail2Ban (version 0.8.10) 2013/06/12 +Fail2Ban (version 0.8.11.pre) 2013/10/30 ================================================================================ -ver. 0.8.11 (2013/XX/XXX) - loves-unittests +ver. 0.8.11 (2013/11/XXX) - loves-unittests and tight DoS free filter regexes ----------- - Fixes: diff --git a/common/version.py b/common/version.py index 87cb5020..a0cb94ea 100644 --- a/common/version.py +++ b/common/version.py @@ -24,4 +24,4 @@ __author__ = "Cyril Jaquier, Yaroslav Halchenko" __copyright__ = "Copyright (c) 2004 Cyril Jaquier, 2011-2013 Yaroslav Halchenko" __license__ = "GPL" -version = "0.8.10.dev" +version = "0.8.11.pre1" From 363d53e8d796fe42d33ecb57030aa6f425978289 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 31 Oct 2013 01:00:38 +1100 Subject: [PATCH 2/6] update man pages for release --- man/fail2ban-client.1 | 6 ++-- man/fail2ban-regex.1 | 75 +++++++++++++++++++++++++------------------ man/fail2ban-server.1 | 6 ++-- 3 files changed, 49 insertions(+), 38 deletions(-) diff --git a/man/fail2ban-client.1 b/man/fail2ban-client.1 index a6eb461e..057f3410 100644 --- a/man/fail2ban-client.1 +++ b/man/fail2ban-client.1 @@ -1,12 +1,12 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.41.2. -.TH FAIL2BAN-CLIENT "1" "June 2013" "fail2ban-client v0.8.10" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.12. +.TH FAIL2BAN-CLIENT "1" "October 2013" "fail2ban-client v0.8.11.pre1" "User Commands" .SH NAME fail2ban-client \- configure and control the server .SH SYNOPSIS .B fail2ban-client [\fIOPTIONS\fR] \fI\fR .SH DESCRIPTION -Fail2Ban v0.8.10 reads log file that contains password failure report +Fail2Ban v0.8.11.pre1 reads log file that contains password failure report and bans the corresponding IP addresses using firewall rules. .SH OPTIONS .TP diff --git a/man/fail2ban-regex.1 b/man/fail2ban-regex.1 index 379cd761..46d260a6 100644 --- a/man/fail2ban-regex.1 +++ b/man/fail2ban-regex.1 @@ -1,56 +1,67 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.41.2. -.TH FAIL2BAN-REGEX "1" "June 2013" "fail2ban-regex v0.8.10" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.12. +.TH FAIL2BAN-REGEX "1" "October 2013" "fail2ban-regex 0.8.11.pre1" "User Commands" .SH NAME fail2ban-regex \- test Fail2ban "failregex" option .SH SYNOPSIS .B fail2ban-regex [\fIOPTIONS\fR] \fI \fR[\fIIGNOREREGEX\fR] .SH DESCRIPTION -Fail2Ban v0.8.10 reads log file that contains password failure report +Fail2Ban 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 +\fB\-\-version\fR +show program's version number and exit .TP -\fB\-V\fR, \fB\-\-version\fR -print the version +\fB\-h\fR, \fB\-\-help\fR +show this help message and exit +.TP +\fB\-l\fR LOG_LEVEL, \fB\-\-log\-level\fR=\fILOG_LEVEL\fR +Log level for the Fail2Ban logger to use .TP \fB\-v\fR, \fB\-\-verbose\fR -verbose output -.SH LOG +Be verbose in output .TP -\fBstring\fR -a string representing a log line +\fB\-D\fR, \fB\-\-debuggex\fR +Produce debuggex.com urls for debugging there .TP -\fBfilename\fR -path to a log file (\fI/var/log/auth.log\fP) -.SH REGEX +\fB\-\-print\-all\-missed\fR +Either to print all missed lines .TP -\fBstring\fR -a string representing a 'failregex' +\fB\-\-print\-all\-ignored\fR +Either to print all ignored lines .TP -\fBfilename\fR -path to a filter file (filter.d/sshd.conf) -.SS "IgnoreRegex:" +\fB\-t\fR, \fB\-\-log\-traceback\fR +Enrich log\-messages with compressed tracebacks .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 . -Many contributions by Yaroslav O. Halchenko . +\fB\-\-full\-traceback\fR +Either to make the tracebacks full, not compressed (as +by default) .SH "REPORTING BUGS" Report bugs to https://github.com/fail2ban/fail2ban/issues -.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). +.SS "LOG:" +.TP +string +a string representing a log line +.TP +filename +path to a log file (/var/log/auth.log) +.SS "REGEX:" +.TP +string +a string representing a 'failregex' +.TP +filename +path to a filter file (filter.d/sshd.conf) +.SS "IGNOREREGEX:" +.TP +string +a string representing an 'ignoreregex' +.TP +filename +path to a filter file (filter.d/sshd.conf) .SH "SEE ALSO" .br fail2ban-client(1) diff --git a/man/fail2ban-server.1 b/man/fail2ban-server.1 index 3851db91..7e09b49e 100644 --- a/man/fail2ban-server.1 +++ b/man/fail2ban-server.1 @@ -1,12 +1,12 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.41.2. -.TH FAIL2BAN-SERVER "1" "June 2013" "fail2ban-server v0.8.10" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.12. +.TH FAIL2BAN-SERVER "1" "October 2013" "fail2ban-server v0.8.11.pre1" "User Commands" .SH NAME fail2ban-server \- start the server .SH SYNOPSIS .B fail2ban-server [\fIOPTIONS\fR] .SH DESCRIPTION -Fail2Ban v0.8.10 reads log file that contains password failure report +Fail2Ban v0.8.11.pre1 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 From 3a4ba2dba62b2812d8979d03cb362f4569868b47 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 31 Oct 2013 01:11:42 +1100 Subject: [PATCH 3/6] DOC: ChangeLog - TODO top summary before final release --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2e1480be..e9c1f317 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,8 @@ Fail2Ban (version 0.8.11.pre) 2013/10/30 ver. 0.8.11 (2013/11/XXX) - loves-unittests and tight DoS free filter regexes ----------- +TODO write summary here + - Fixes: Daniel Black & Marcel Dopita * filter.d/apache-auth -- fixed and apache auth samples provide. closes #286 From a5ac0a49e7aac0c7d7fa53ea3fe5747b6b428530 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 31 Oct 2013 01:12:04 +1100 Subject: [PATCH 4/6] DOC: Version number changes in DEVELOP --- DEVELOP | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/DEVELOP b/DEVELOP index 51314078..edaee92a 100644 --- a/DEVELOP +++ b/DEVELOP @@ -686,7 +686,7 @@ Releasing # Wait for feedback from distributors -# Ensure the version is correct in ./common/version.py +# Ensure the version is correct in ./common/version.py and at the top of ChangeLog # Ensure the MANIFEST is complete @@ -699,21 +699,21 @@ Look for errors like: Which indicates that testcases/files/logs/mysqld.log has been moved or is a directory - tar -C /tmp -jxf dist/fail2ban-0.8.10.dev.tar.bz2 + tar -C /tmp -jxf dist/fail2ban-0.8.11.dev.tar.bz2 # clean up current direcory - diff -rul --exclude \*.pyc . /tmp/fail2ban-0.8.10.dev/ + diff -rul --exclude \*.pyc . /tmp/fail2ban-0.8.11.dev/ # Only differences should be files that you don't want distributed. - cd /tmp/fail2ban-0.8.10.dev/ && ./fail2ban-testcases-all + cd /tmp/fail2ban-0.8.11.dev/ && ./fail2ban-testcases-all # Add/finalize the corresponding entry in the ChangeLog To generate a list of committers use e.g. - git shortlog -sn 0.8.10.. | sed -e 's,^[ 0-9\t]*,,g' | tr '\n' '\|' | sed -e 's:|:, :g' + git shortlog -sn 0.8.11.. | sed -e 's,^[ 0-9\t]*,,g' | tr '\n' '\|' | sed -e 's:|:, :g' Ensure the top of the ChangeLog has the right version and current date. From fff996c8df077f996035e1caf3038ae863c1689c Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 31 Oct 2013 10:26:49 +1100 Subject: [PATCH 5/6] ENH: fix fail2ban-regex output to generate a man page with copyright notices --- fail2ban-regex | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/fail2ban-regex b/fail2ban-regex index 7c525157..18e2a5df 100755 --- a/fail2ban-regex +++ b/fail2ban-regex @@ -23,7 +23,6 @@ and bans the corresponding IP addresses using firewall rules. This tools can test regular expressions for "fail2ban". -Report bugs to https://github.com/fail2ban/fail2ban/issues """ __author__ = "Cyril Jaquier, Yaroslav Halchenko" @@ -73,6 +72,7 @@ def pprint_list(l, header=None): s = '' print s + "| " + "\n| ".join(l) + '\n`-' + def get_opt_parser(): # use module docstring for help output p = OptionParser( @@ -89,6 +89,15 @@ REGEX: IGNOREREGEX: string a string representing an 'ignoreregex' filename path to a filter file (filter.d/sshd.conf) + +Copyright (c) 2004-2008 Cyril Jaquier, 2008- Fail2Ban Contributors +Copyright of modifications held by their respective authors. +Licensed under the GNU General Public License v2 (GPL). + +Written by Cyril Jaquier . +Many contributions by Yaroslav O. Halchenko and Steven Hiscocks. + +Report bugs to https://github.com/fail2ban/fail2ban/issues """, version="%prog " + version) @@ -110,7 +119,6 @@ IGNOREREGEX: help="Enrich log-messages with compressed tracebacks"), Option("--full-traceback", action='store_true', help="Either to make the tracebacks full, not compressed (as by default)"), - ]) return p From f860307b579ec3022f75dc3dff60d4c5de6fca06 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 31 Oct 2013 10:27:30 +1100 Subject: [PATCH 6/6] DOC: update man pages. Add references to jail.conf from fail2ban-client man page --- man/fail2ban-client.1 | 1 + man/fail2ban-client.h2m | 1 + man/fail2ban-regex.1 | 50 ++++++++++++++++++++++++----------------- 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/man/fail2ban-client.1 b/man/fail2ban-client.1 index 057f3410..aab2dde4 100644 --- a/man/fail2ban-client.1 +++ b/man/fail2ban-client.1 @@ -274,3 +274,4 @@ Licensed under the GNU General Public License v2 (GPL). .SH "SEE ALSO" .br fail2ban-server(1) +jail.conf(5) diff --git a/man/fail2ban-client.h2m b/man/fail2ban-client.h2m index 9ae9c3f2..b5300463 100644 --- a/man/fail2ban-client.h2m +++ b/man/fail2ban-client.h2m @@ -10,3 +10,4 @@ fail2ban-client \- configure and control the server [see also] .br fail2ban-server(1) +jail.conf(5) diff --git a/man/fail2ban-regex.1 b/man/fail2ban-regex.1 index 46d260a6..4a0e272b 100644 --- a/man/fail2ban-regex.1 +++ b/man/fail2ban-regex.1 @@ -10,6 +10,27 @@ Fail2Ban 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". +.SS "LOG:" +.TP +string +a string representing a log line +.TP +filename +path to a log file (/var/log/auth.log) +.SS "REGEX:" +.TP +string +a string representing a 'failregex' +.TP +filename +path to a filter file (filter.d/sshd.conf) +.SS "IGNOREREGEX:" +.TP +string +a string representing an 'ignoreregex' +.TP +filename +path to a filter file (filter.d/sshd.conf) .SH OPTIONS .TP \fB\-\-version\fR @@ -39,29 +60,16 @@ Enrich log\-messages with compressed tracebacks \fB\-\-full\-traceback\fR Either to make the tracebacks full, not compressed (as by default) +.SH AUTHOR +Written by Cyril Jaquier . +Many contributions by Yaroslav O. Halchenko and Steven Hiscocks. .SH "REPORTING BUGS" Report bugs to https://github.com/fail2ban/fail2ban/issues -.SS "LOG:" -.TP -string -a string representing a log line -.TP -filename -path to a log file (/var/log/auth.log) -.SS "REGEX:" -.TP -string -a string representing a 'failregex' -.TP -filename -path to a filter file (filter.d/sshd.conf) -.SS "IGNOREREGEX:" -.TP -string -a string representing an 'ignoreregex' -.TP -filename -path to a filter file (filter.d/sshd.conf) +.SH COPYRIGHT +Copyright \(co 2004\-2008 Cyril Jaquier, 2008\- Fail2Ban Contributors +.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)