sebres
5ca275876b
Merge remote-tracking branch 'remotes/upstream/master' into sebres:ban-time-incr
2014-12-01 23:28:58 +01:00
Yaroslav Halchenko
c5b5695eb9
Merge pull request #868 from sebres/addfailregex-gh-867
...
"known/" prefix to allow reuse specs from prev files for addfailregex/addignoreregex (Close #867 )
2014-12-01 09:02:50 -05:00
sebres
5dc1a583b4
Merge remote-tracking branch 'remotes/upstream/master' into sebres:ban-time-incr
...
Conflicts:
fail2ban/server/actions.py
fail2ban/server/database.py
fail2ban/tests/databasetestcase.py
fail2ban/tests/servertestcase.py
2014-12-01 13:57:51 +01:00
sebres
80fb48c5b0
Merge remote-tracking branch 'remotes/upstream/master' into sebres:addfailregex-gh-867
2014-12-01 13:14:42 +01:00
Yaroslav Halchenko
a170afcb76
Merge pull request #839 from sebres/fix-none-getattempt-lambda
...
Fix none getattempt lambda (close #838 , close #848 )
2014-11-29 21:33:09 -05:00
sebres
effdb450fc
better and scalable solution for gh-867 (and gh-868), using only name convention like %(known/failregex)s to add custom expressions, so no interface changes in jail.conf are necessary (for example see test-known-interp in test cases);
2014-11-29 20:33:32 +01:00
Yaroslav Halchenko
9bab6d0009
Changelog entry for preceding fix
2014-11-29 09:52:25 -05:00
Yaroslav Halchenko
4a620aa2ba
Merge pull request #869 from opoplawski/logpath
...
Separate php-url-fopen logpath by newline
2014-11-29 09:50:42 -05:00
Orion Poplawski
d8867807f5
Separate php-url-fopen logpath by newline
2014-11-28 22:04:09 -07:00
sebres
00c2ac4b03
python 2.6 compatibility: preventing RuntimeError: dictionary changed size during iteration.
2014-11-28 19:50:52 +01:00
sebres
d63b125877
interpolation of config readers extended with `%(known/parameter)s`.
...
(means last known option with name `parameter`).
2014-11-28 19:06:17 +01:00
sebres
1439152121
test cases extended (now correct)
2014-11-28 14:52:12 +01:00
sebres
cad09d2df3
BF: failregex declared direct in jail was joined to single line, (specifying of multiple expressions was not possible);
...
feature request (gh-867): new options for jail introduced addfailregex/addignoreregex: extends regex specified in filter (opposite to failregex/ignoreregex that overwrites it);
2014-11-28 03:17:47 +01:00
Yaroslav Halchenko
72370d2574
Merge pull request #858 from g1franc/master
...
Add ignoreregex to avoid warning on start
2014-11-15 10:22:12 -05:00
Guillaume FRANCOIS
a6a2dc868b
Add ignoreregex to avoid warning on start
2014-11-12 11:05:56 +01:00
Guillaume FRANCOIS
9269664350
Add ignoreregex to avoid warning on start
2014-11-12 10:30:28 +01:00
Yaroslav Halchenko
b379f5d51b
Merge pull request #852 from sebres/patch-1
...
Bug fix in formatJournalEntry, gh-851
2014-11-07 07:45:27 -05:00
Serg G. Brester
6dfddbcdf6
Bug fix in formatJournalEntry, gh-851
...
Unhandled exception in fail2ban 0.9.1 #851
2014-11-07 01:21:38 +01:00
Yaroslav Halchenko
a44cfba9ae
Merge pull request #841 from opoplawski/firewallcmd-multiport
...
ChangeLog for firewallcmd-new multiport support
2014-10-30 18:32:26 -04:00
Orion Poplawski
21be983620
ChangeLog for firewallcmd-new multiport support
2014-10-30 16:11:34 -06:00
Yaroslav Halchenko
967485c2d0
improving grepping
2014-10-29 23:14:47 -04:00
Yaroslav Halchenko
efbf5064a1
Merge pull request #807 from xslidian/patch-1
...
grep IP at the start of lines
2014-10-29 23:07:10 -04:00
Yaroslav Halchenko
6d345a13f0
Merge pull request #840 from opoplawski/firewallcmd-multiport
...
Use multiport for firewallcmd-new
2014-10-29 23:03:56 -04:00
Orion Poplawski
01b2673e34
Use multiport for firewallcmd-new
2014-10-29 16:27:37 -06:00
sebres
92ba5ae09c
few confusing merge info helper
2014-10-29 22:08:44 +01:00
sebres
46a8899f20
code review
2014-10-29 19:27:45 +01:00
Yaroslav Halchenko
36abb5ed96
BF: fix $ for % in jail.conf. Debian bug #767255
2014-10-29 13:08:51 -04:00
sebres
8dbc04aa06
Test cases fixed:
...
testFail2BanExceptHook - use local sys.__excepthook__ to check was really executed and prevent write error in stderr.
2014-10-29 13:30:24 +01:00
sebres
518cc92ccc
actions: bug fix in lambdas in checkBan, because getBansMerged could return None (purge resp. asynchronous addBan), make the logic all around more stable;
...
test cases: extended with test to check action together with database functionality (ex.: to verify lambdas in checkBan);
database: getBansMerged should work within lock, using reentrant lock (cause call of getBans inside of getBansMerged);
2014-10-29 12:36:21 +01:00
sebres
595edc8d46
increase code coverage
2014-10-28 21:57:16 +01:00
sebres
c1db282fcd
Merge remote-tracking branch 'remotes/upstream/master' into sebres:ban-time-incr
2014-10-28 16:38:26 +01:00
Yaroslav Halchenko
7acddcbe4a
Post-release boost to .dev
2014-10-27 23:45:51 -04:00
Yaroslav Halchenko
a0115ee458
ENH: additional versioning changes
2014-10-27 21:49:40 -04:00
Yaroslav Halchenko
d0a5fe620f
Refreshed manpages
2014-10-27 21:47:48 -04:00
Yaroslav Halchenko
564eb3389b
ENH: fail early in generate-man + provide PYTHONPATH upstairs
2014-10-27 21:47:07 -04:00
Yaroslav Halchenko
987356d6c0
Changes for the 0.9.1 release versioning
2014-10-27 21:43:17 -04:00
Yaroslav Halchenko
9e8e4dde69
Populated MANIFEST with more entries which were preiously missed or duplicated. Sorted within each "section"
2014-10-27 21:43:11 -04:00
sebres
286ef6aa87
code review
2014-10-26 22:14:57 +01:00
sebres
361c220846
Merge remote-tracking branch 'remotes/upstream/master' into sebres:ban-time-incr;
...
normalize code to python >= 2.6;
2014-10-25 19:05:53 +02:00
Yaroslav Halchenko
fc145eb795
Merge pull request #748 from pacop/master
...
ENH: Add dateTime format for PortSentry
2014-10-25 12:34:00 -04:00
Yaroslav Halchenko
8a453018a9
Merge pull request #830 from sebres/_tent/cache-config-read-fix1
...
fix: fail2ban-regex with filter file failed
2014-10-25 12:30:55 -04:00
pacop
b60e2bf42f
Add portsentry to changelog
2014-10-25 18:17:57 +02:00
pacop
e3a037ee3f
merge master
2014-10-25 18:15:34 +02:00
sebres
3dac765598
ConfigReader.touch renamed into protected _create_unshared
2014-10-25 17:20:01 +02:00
Yaroslav Halchenko
0b5413ec0b
Merge branch 'master' of git://github.com/fail2ban/fail2ban
...
* 'master' of git://github.com/fail2ban/fail2ban:
2014-10-25 10:38:28 -04:00
Florian Pelgrim
3dabd5fc83
DOC: documentation about available vagrantfile setup
...
manually picked up from a commit within
https://github.com/fail2ban/fail2ban/pull/786
2014-10-25 10:38:18 -04:00
Florian Pelgrim
6293e44889
Added myself into THANKS
2014-10-25 10:37:28 -04:00
Yaroslav Halchenko
b2b5d0b41c
Merge pull request #829 from yarikoptic/minimal_python2.6
...
ENH: remove obsolete code for python < 2.6 (we support >= 2.6)
2014-10-25 10:32:10 -04:00
Yaroslav Halchenko
e1a5decc00
DOC: adjust docs in mytime to place docs into docstrings
2014-10-25 09:34:37 -04:00
Yaroslav Halchenko
caa6006a31
ENH: do use @staticmethod (we are well beyond support of 2.4 now)
2014-10-25 09:25:18 -04:00