From 1331e15ac375426fef89928b5ea5d62a724c6380 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 18 Apr 2013 04:48:51 +1000 Subject: [PATCH 01/11] DOC: guidance for pull requests --- DEVELOP | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/DEVELOP b/DEVELOP index a31bf04a..124f4c01 100644 --- a/DEVELOP +++ b/DEVELOP @@ -21,6 +21,18 @@ would like to add to Fail2Ban, the best way to do so it to use the GitHub Pull Request feature. You can find more details on the Fail2Ban wiki (http://www.fail2ban.org/wiki/index.php/Get_Involved) +Pull Requests +============= + +When submitting pull requests on GitHub we ask you to: +* Clearly describe the problem you're solving; +* Don't introduce regressions that will make it hard for systems adminstrators + to update; +* Include test cases (see below); +* Include sample logs (if relevant); +* Include a change to the relevant section of the ChangeLog; and +* Include yourself in THANKS if not already there. + Testing ======= From d1c8b5795233d0a035a027381b68b62913ba57dd Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 18 Apr 2013 04:52:21 +1000 Subject: [PATCH 02/11] DOC: ChangeLog versions and dates for Releasing --- DEVELOP | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/DEVELOP b/DEVELOP index 124f4c01..438599a4 100644 --- a/DEVELOP +++ b/DEVELOP @@ -269,6 +269,10 @@ Releasing git shortlog -sn 0.8.8.. | 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. + + Ensure the top entry of the ChangeLog has the right version and current date. + # Update man pages (cd man ; ./generate-man ) From 6b260ab974efd2881cdb555966bafbeb26066263 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 18 Apr 2013 04:53:17 +1000 Subject: [PATCH 03/11] DOC: version/date of release --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c571d772..f119d310 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,7 @@ |_| \__,_|_|_/___|_.__/\__,_|_||_| ================================================================================ -Fail2Ban (version 0.8.8) 2012/12/06 +Fail2Ban (version 0.8.9) 2013/04/XX ================================================================================ ver. 0.8.9 (2013/04/XXX) - wanna-be-stable From 60fa4b5d7c5748bd3f56e0339e86c7718ece153a Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 18 Apr 2013 05:08:45 +1000 Subject: [PATCH 04/11] DOC: begining of ChangeLog --- ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index f119d310..dce5ed6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,7 +17,13 @@ Michael Gebetsroither, Orion Poplawski, Artur Penttinen, sebres, Nicolas Collignon, Pascal Borreli, blotus: - Fixes: + Yaroslav Halchenko + * [6f4dad46] Documentation python-2.4 is the minimium version. - New features: + Yaroslav Halchenko + * [9ba27353] Add support for jail.d/{confilefile} and fail2ban.d/{configfile} + to provide additional flexibility to system adminstrators. Thanks to + beilber for the idea. Close gh-114. - Enhancements: Special Kudos also go to Fabian Wenk, Arturo 'Buanzo' Busleiman, Tom From dc2f42b24dfc43fb660f2402601aeef21cac9b7e Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 18 Apr 2013 06:57:35 +1000 Subject: [PATCH 05/11] DOC: ChangeLog - current HEAD back to ce3ab34 --- ChangeLog | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/ChangeLog b/ChangeLog index dce5ed6c..3e366378 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,12 +19,67 @@ Nicolas Collignon, Pascal Borreli, blotus: - Fixes: Yaroslav Halchenko * [6f4dad46] Documentation python-2.4 is the minimium version. + * [1eb23cf8] do not rely on scripts being under /usr -- might differ eg on + Fedora. Closes gh-112. Thanks to Camusensei for the bug report. + * [bf4d4af1] Changes for atomic writes. Thanks to Steven Hiscocks for + insight. Closes gh-103. + * [ab044b75] delay check for the existence of config directory until read. + * [3b4084d4] fixing up for handling of TAI64N timestamps. + * [154aa38e] do not shutdown logging until all jails stop. + Orion Poplawski + * [e4aedfdc00] pyinotify - use bitwise op on masks and do not try tracking + newly created directories. + Nicolas Collignon + * [39667ff6] Avoid leaking file descriptors. Closes gh-167. + Sergey Brester + * [b6bb2f88 and d17b4153] invalid date recognition, irregular because of + sorting template list. + Steven Hiscocks + * [7a442f07] When changing log target with python2.{4,5} handle KeyError. + Closes gh-147, gh-148. + * [b6a68f51] Fix delaction on server side. Close gh-124. + Daniel Black + * [f0610c01] Allow more that a one word command when changing and Action via + the fail2ban-client. Closes gh-134. - New features: Yaroslav Halchenko * [9ba27353] Add support for jail.d/{confilefile} and fail2ban.d/{configfile} to provide additional flexibility to system adminstrators. Thanks to beilber for the idea. Close gh-114. - Enhancements: + Steven Hiscocks + * [c6bd8fc] Add Apache Tomcat date format. Close gh-176. + * [4d80fad] Add Guacmole filter. Close gh-176. + * [3d6791f] Ensure restart of Actions after a check fails occurs + consistently. Closes gh-172. + * [MANY] Improvements to test cases, travis, and code coverage (coveralls). + * [b36835f] Add get cinfo to fail2ban-client. Close gh-124. + * [ce3ab34] Added ability to specify PID file. + Orion Poplawski + * [ddebcab] Enhance fail2ban.service defination dependancies and Pidfile. + Closes gh-142. + Artur Penttinen + * [29d0df5] Add mysqld filter. Closes gh-152. + Erwan Ben Souiden + * [d7d5228] add nagios integration documentation and script to ensure + fail2ban is running. Closes gh-166. + ArndRaphael Brandes + * [bba3fd8] Add Sogo filter. Closes gh-117 + Yaroslav Halchenko + * [MANY] Lots of improvements to log messages and test cases. + * [91d5736] Postfix filter improvements - empty helo, from and rcpt to. + Closes gh-126. Bug report by Michael Heuberger. + * [40c5a2d] adding more of diagnostic messages into -client while starting + the daemon. + Daniel Black + * [3aeb1a9] Add jail.conf manual page. close gh-143. + * [7cd6dab] Added help command to fail2ban-client. close gh-134. + * [c8c7b0b,23bbc60] Better logging of log file read errors. close gh-134. + * [3665e6d] Added code coverage to development process. + Pascal Borreli + * [a2b29b4] Fixed lots of typos in config files and documentation. + Michael Gebetsriother + * [f9b78ba] Add action route to block at routing level. Special Kudos also go to Fabian Wenk, Arturo 'Buanzo' Busleiman, Tom Hendrikx and other TBN heroes supporting users on fail2ban-users From 3e0e0482aef1451c9a991ac1879900333c4e8d4e Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 18 Apr 2013 07:07:05 +1000 Subject: [PATCH 06/11] DOC: post release ChangeLog entry --- DEVELOP | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/DEVELOP b/DEVELOP index 438599a4..03edebbc 100644 --- a/DEVELOP +++ b/DEVELOP @@ -296,3 +296,13 @@ Releasing # Email users and development list of release TODO notifying distributors etc. + +Post Release: + +Add the following to the top of the ChangeLog + +ver. 0.8.9 (2013/XX/XXX) - wanna-be-stable +- Fixes +- New Features +- Enhancements + From 0a57b6183606d5904109cf8a7009d668acd73e44 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 18 Apr 2013 07:09:07 +1000 Subject: [PATCH 07/11] DOC: developers please rebase and use a single commit --- DEVELOP | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOP b/DEVELOP index 03edebbc..3e8e430a 100644 --- a/DEVELOP +++ b/DEVELOP @@ -28,6 +28,7 @@ When submitting pull requests on GitHub we ask you to: * Clearly describe the problem you're solving; * Don't introduce regressions that will make it hard for systems adminstrators to update; +* If adding a major feature rebase your changes on master and get to a single commit; * Include test cases (see below); * Include sample logs (if relevant); * Include a change to the relevant section of the ChangeLog; and From d4b5e8ec30600d4966e8bfbfb4368b873a403974 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 18 Apr 2013 08:45:20 +1000 Subject: [PATCH 08/11] DOC: credit man page edits --- ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3e366378..23f46aef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,13 +66,14 @@ Nicolas Collignon, Pascal Borreli, blotus: ArndRaphael Brandes * [bba3fd8] Add Sogo filter. Closes gh-117 Yaroslav Halchenko - * [MANY] Lots of improvements to log messages and test cases. + * [MANY] Lots of improvements to log messages, man pages and test cases. * [91d5736] Postfix filter improvements - empty helo, from and rcpt to. Closes gh-126. Bug report by Michael Heuberger. * [40c5a2d] adding more of diagnostic messages into -client while starting the daemon. Daniel Black * [3aeb1a9] Add jail.conf manual page. close gh-143. + * [MANY] man page edits. * [7cd6dab] Added help command to fail2ban-client. close gh-134. * [c8c7b0b,23bbc60] Better logging of log file read errors. close gh-134. * [3665e6d] Added code coverage to development process. From ed123ea403f735fceeddbc6973958a55d4fec49e Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 18 Apr 2013 11:34:44 +1000 Subject: [PATCH 09/11] DOC: tomcat and Guacmole are next release --- ChangeLog | 2 -- 1 file changed, 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23f46aef..fbdf2d48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,8 +48,6 @@ Nicolas Collignon, Pascal Borreli, blotus: beilber for the idea. Close gh-114. - Enhancements: Steven Hiscocks - * [c6bd8fc] Add Apache Tomcat date format. Close gh-176. - * [4d80fad] Add Guacmole filter. Close gh-176. * [3d6791f] Ensure restart of Actions after a check fails occurs consistently. Closes gh-172. * [MANY] Improvements to test cases, travis, and code coverage (coveralls). From 5413f9b3a18eccc120c547e2f3027205e1463567 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 18 Apr 2013 11:36:37 +1000 Subject: [PATCH 10/11] DOC: move new actions and filters to New Features in ChangeLog --- ChangeLog | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index fbdf2d48..25b1ad20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,15 @@ Nicolas Collignon, Pascal Borreli, blotus: * [9ba27353] Add support for jail.d/{confilefile} and fail2ban.d/{configfile} to provide additional flexibility to system adminstrators. Thanks to beilber for the idea. Close gh-114. + Erwan Ben Souiden + * [d7d5228] add nagios integration documentation and script to ensure + fail2ban is running. Closes gh-166. + Artur Penttinen + * [29d0df5] Add mysqld filter. Closes gh-152. + ArndRaphael Brandes + * [bba3fd8] Add Sogo filter. Closes gh-117 + Michael Gebetsriother + * [f9b78ba] Add action route to block at routing level. - Enhancements: Steven Hiscocks * [3d6791f] Ensure restart of Actions after a check fails occurs @@ -56,13 +65,6 @@ Nicolas Collignon, Pascal Borreli, blotus: Orion Poplawski * [ddebcab] Enhance fail2ban.service defination dependancies and Pidfile. Closes gh-142. - Artur Penttinen - * [29d0df5] Add mysqld filter. Closes gh-152. - Erwan Ben Souiden - * [d7d5228] add nagios integration documentation and script to ensure - fail2ban is running. Closes gh-166. - ArndRaphael Brandes - * [bba3fd8] Add Sogo filter. Closes gh-117 Yaroslav Halchenko * [MANY] Lots of improvements to log messages, man pages and test cases. * [91d5736] Postfix filter improvements - empty helo, from and rcpt to. @@ -77,8 +79,6 @@ Nicolas Collignon, Pascal Borreli, blotus: * [3665e6d] Added code coverage to development process. Pascal Borreli * [a2b29b4] Fixed lots of typos in config files and documentation. - Michael Gebetsriother - * [f9b78ba] Add action route to block at routing level. Special Kudos also go to Fabian Wenk, Arturo 'Buanzo' Busleiman, Tom Hendrikx and other TBN heroes supporting users on fail2ban-users From e5e01187175dafac23d61da640cd2e7639820505 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 18 Apr 2013 12:13:26 +1000 Subject: [PATCH 11/11] DOC: more ChangeLog entries all the way back to 0.8.8 --- ChangeLog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 25b1ad20..eb7e2cfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,11 +41,14 @@ Nicolas Collignon, Pascal Borreli, blotus: Daniel Black * [f0610c01] Allow more that a one word command when changing and Action via the fail2ban-client. Closes gh-134. + blotus + * [96eb8986] ' and " should also be escaped in action tags Closes gh-109 - New features: Yaroslav Halchenko * [9ba27353] Add support for jail.d/{confilefile} and fail2ban.d/{configfile} to provide additional flexibility to system adminstrators. Thanks to beilber for the idea. Close gh-114. + * [3ce53e87] Add exim filter. Erwan Ben Souiden * [d7d5228] add nagios integration documentation and script to ensure fail2ban is running. Closes gh-166. @@ -55,6 +58,12 @@ Nicolas Collignon, Pascal Borreli, blotus: * [bba3fd8] Add Sogo filter. Closes gh-117 Michael Gebetsriother * [f9b78ba] Add action route to block at routing level. + Teodor Micu & Yaroslav Halchenko + * [5f2d383] Add roundcube auth filter. Close Debian bug #699442. + Daniel Black + * [be06b1b] Add action for iptables-ipsets. Close gh-102. + Soulard Morgan + * [f336d9f] Add filter for webmin. Close gh-99 - Enhancements: Steven Hiscocks * [3d6791f] Ensure restart of Actions after a check fails occurs @@ -79,6 +88,8 @@ Nicolas Collignon, Pascal Borreli, blotus: * [3665e6d] Added code coverage to development process. Pascal Borreli * [a2b29b4] Fixed lots of typos in config files and documentation. + hamilton5 + * [7ede1e8] Update dovecot filter config Special Kudos also go to Fabian Wenk, Arturo 'Buanzo' Busleiman, Tom Hendrikx and other TBN heroes supporting users on fail2ban-users