sebres
00b7205a3c
Merge remote-tracking branch 'remotes/upstream/master', fix test cases (see bellow)
...
Conflicts resolved:
ChangeLog
fail2ban/server/filter.py
fail2ban/server/jail.py
fail2ban/tests/actionstestcase.py
Test cases fixed:
testBanActionsAInfo - fail ticket with current time (otherwise ticket will be ignored - ban time too old)
testFail2BanExceptHook - use local sys.__excepthook__ to check was really executed and prevent write error in stderr.
2014-06-24 14:02:24 +02:00
sebres
de0beeff9f
new test cases added (increase coverage);
...
prepared to merge with upstream/master;
2014-06-24 12:39:53 +02:00
Yaroslav Halchenko
c7de888cd3
DOC: Changelog for previous merge (pass a copy of aInfo)
2014-06-22 10:59:43 -04:00
Yaroslav Halchenko
602239051b
BF: reincarnated import of logging (used to obtain level constants)
2014-06-22 10:56:50 -04:00
Yaroslav Halchenko
0adb10f653
Merge branch 'ainfo-copy' of https://github.com/kwirk/fail2ban
...
* 'ainfo-copy' of https://github.com/kwirk/fail2ban :
TST: actions modifying aInfo test more robust
TST: Test for actions modifying (un)ban aInfo
BF: aInfo could be modified by actions, causing unexpected behaviour
2014-06-22 10:53:30 -04:00
Yaroslav Halchenko
305b31ae1c
DOC: ChangeLog -- Added an entry about iptables-common.conf
2014-06-22 10:29:23 -04:00
Steven Hiscocks
dd3ab858dd
TST: actions modifying aInfo test more robust
2014-06-22 13:56:32 +01:00
Steven Hiscocks
7640aa0918
TST: Test for actions modifying (un)ban aInfo
2014-06-22 13:47:25 +01:00
Steven Hiscocks
2d54161696
Merge branch 'kwirk/harmonize-log-msgs'
...
Conflicts:
ChangeLog - Keep all additions
2014-06-22 12:57:49 +01:00
Steven Hiscocks
76a5633ff9
Merge pull request #739 from ranvis/enh-iptables-ipsets
...
ENH: Add <chain> to iptables-ipsets.
2014-06-21 22:48:49 +01:00
sebres
819e4eb540
relict of obsolete code removed;
2014-06-19 18:06:07 +02:00
sebres
ccf2521a6d
Merge branch 'master' of https://github.com/fail2ban/fail2ban into ban-time-incr;
...
Conflicts in ChangeLog resolved;
obsolete imports removed;
2014-06-19 17:40:00 +02:00
SATO Kentaro
65ff3e9604
ENH: Introduce iptables-common.conf.
2014-06-18 19:04:57 +09:00
Steven Hiscocks
94232d7c31
Merge pull request #726 from pmarrapese/master
...
Minor improvement to sshd filter
2014-06-17 23:43:42 +01:00
Steven Hiscocks
8268c1641f
BF: aInfo could be modified by actions, causing unexpected behaviour
...
A separate copy of aInfo is passed to each action
2014-06-17 23:24:23 +01:00
Yaroslav Halchenko
4190a4030c
Merge branch 'sebres-strptime-bug' of https://github.com/kwirk/fail2ban
...
* 'sebres-strptime-bug' of https://github.com/kwirk/fail2ban :
DOC: Tweak ChangeLog and THANKS
DOC: Update docs in reference to time zone related fix
TST: Fix tests due to @sebres fix and based from gh-349 reverts
strptime bug fix: if gmtoff is None we have 1 hour increment of time (through utctimetuple), compare: >>>> datetime.datetime.fromtimestamp(time.mktime(datetime.datetime.now().timetuple())).strftime("%Y-%m-%d %H:%M:%S") '2014-04-29 17:26:31' >>>> datetime.datetime.fromtimestamp(time.mktime(datetime.datetime.now().utctimetuple())).strftime("%Y-%m-%d %H:%M:%S") '2014-04-29 18:26:37'
Conflicts:
ChangeLog
2014-06-16 09:28:41 -04:00
Yaroslav Halchenko
93d5c363ca
Merge branch 'enh/oracle_msg_server'
...
* enh/oracle_msg_server:
ENH: make oracleims failregex better anchored (more explicit)
Update oracleims.conf to be 'less greedy'
Update THANKS
Update jail.conf for oracleims filter.
Create test for oracleims filter
Create oracleims.conf in filter.d for new filter
2014-06-16 09:22:42 -04:00
SATO Kentaro
1e1c4ac62a
ENH: Add <chain> to iptables-ipsets.
2014-06-16 21:30:13 +09:00
Steven Hiscocks
664f1db0ba
BF: Fix getLogger for single level log level names
2014-06-10 20:58:57 +01:00
Steven Hiscocks
dd75d35420
Merge pull request #724 from yarikoptic/enh_elapsed_time_regex
...
ENH: minor -- print time which was used to process lines
2014-06-10 20:49:55 +01:00
Steven Hiscocks
9764c78415
ENH: Rename fail2ban_excepthook to excepthook
2014-06-10 20:38:18 +01:00
Steven Hiscocks
4fc7f1a831
ENH: Tweak naming of getF2BLogger, and ensure consistent use
2014-06-10 20:36:19 +01:00
sebres
6ecd7ddddf
testExecuteTimeout fixed: give a test still 1 second, because system could be too busy
2014-06-10 13:45:29 +02:00
sebres
a82cc3bcbf
prevent to early exit from main loop (tast case bug by multi-threaded execution / wait for completion);
...
idle state fixed (if observer really sleeps only);
2014-06-10 13:24:13 +02:00
sebres
00fdf5ce0a
test cases extended;
...
code review
2014-06-10 12:31:55 +02:00
sebres
bb6655e696
small fix and clarifying code and log messages
2014-06-10 10:24:55 +02:00
Yaroslav Halchenko
994fe77e59
ENH: make oracleims failregex better anchored (more explicit)
2014-06-10 03:52:16 -04:00
Yaroslav Halchenko
2a51a0176a
BF: minor type for delignoreregex in bash completions
2014-06-10 03:42:07 -04:00
JoelSnyder
5165d2f6ea
Update oracleims.conf to be 'less greedy'
...
This assumes that the protocol is always a string, which it always is, and that the other four fields in the "tr" are always numeric (which they always are). See port_access documentation at http://docs.oracle.com/cd/E19563-01/819-4428/bgaur/index.html
2014-06-09 18:44:27 -07:00
JoelSnyder
c325e88634
Update THANKS
...
Per Steven.
2014-06-09 18:38:22 -07:00
JoelSnyder
70ed93d8cc
Update jail.conf for oracleims filter.
...
This is the jail.conf update. Hopefully this will go into pull request #734 .
2014-06-09 18:37:31 -07:00
Steven Hiscocks
f7da091437
ENH: Log unhandled exceptions to Fail2Ban log
2014-06-09 22:27:51 +01:00
Steven Hiscocks
e8131475cd
ENH: Realign and harmonise log messages with getF2BLogger helper
2014-06-09 22:17:00 +01:00
Steven Hiscocks
db023be09b
BF: Fix bad syntax in badips.py action
...
Taken from https://bugzilla.redhat.com/attachment.cgi?id=895966&action=diff
2014-06-07 20:51:53 +01:00
sebres
bb0a181056
testcases extended and observer optimized to run test cases faster;
...
code review
2014-06-07 04:37:06 +02:00
sebres
e7bd8ed619
not used import removed
2014-06-06 19:52:42 +02:00
sebres
70080b112a
Merge branch 'master' of https://github.com/fail2ban/fail2ban into ban-time-incr
2014-06-06 19:46:38 +02:00
sebres
681bc2ef07
observer functionality introduced (asynchronous events in separate service thread);
...
ban time increment feature nearly completely moved into observer;
purge database will be called hourly in observer;
bug fixing and code review;
2014-06-06 18:44:59 +02:00
sebres
02055ba4eb
ignore already known tickets (from filter after restart);
...
bug fixing and optimizing;
2014-06-05 14:09:43 +02:00
JoelSnyder
54317d7c3b
Create test for oracleims filter
...
This test file shows configuration information for the application, three log lines that DO match the pattern, and one log line that does NOT match the pattern (the first one).
2014-06-02 22:58:39 -07:00
JoelSnyder
9b7c35810a
Create oracleims.conf in filter.d for new filter
...
Created oracleims.conf to catch messages from Sun/Oracle Communications Messaging Server v6.3 and above (including v7)
2014-06-02 22:55:59 -07:00
Yaroslav Halchenko
98daa9d301
Merge pull request #723 from kwirk/decode-warning
...
ENH: Clearer warning with lines which failed to decode correctly
2014-05-30 12:15:51 -04:00
pmarrapese
96918acee4
more explicit match for sshd filter & added test
2014-05-19 20:47:16 -07:00
pmarrapese
46d6e93800
adjusted sshd filter regex to catch more verbose lines
2014-05-18 22:12:54 -07:00
Yaroslav Halchenko
eb2487986c
ENH: minor -- print time which was used to process lines
2014-05-15 21:17:43 -04:00
Steven Hiscocks
0ca97431a0
ENH: Clearer warning with lines which failed to decode correctly
2014-05-15 22:48:03 +01:00
Steven Hiscocks
1fa8f9fa70
DOC: Tweak ChangeLog and THANKS
2014-05-15 22:18:07 +01:00
Steven Hiscocks
fc4b69a282
DOC: Update ChangeLog fix for ip{,jail}failures action tags
2014-05-15 22:15:12 +01:00
sebres
213c4315c3
fix a TypeError bugs like "Failed to execute ban jail 'pam-generic' action 'iptables-allports'"
...
getAttempt returns not a list (numeric), so by call of both lambda we have a TypeError except;
simplifying code;
2014-05-15 19:41:00 +02:00
sebres
8fd083a1ea
Merge remote-tracking branch 'remotes/kwirk/sebres-strptime-bug' into ban-time-incr
2014-05-15 17:12:11 +02:00