Daniel Black
d5291517a7
MISC: merge from master
2013-07-28 19:43:54 +10:00
Daniel Black
56faf7f5ad
DOC: fix ChangeLog merge
2013-07-28 18:02:38 +10:00
Steven Hiscocks
1e270078b4
TST: Warn if date templates overlap in default detectors
2013-07-27 20:21:05 +01:00
Steven Hiscocks
088e7f92aa
ENH: fail2ban-regex uses iterable for files and journal access
2013-07-27 12:35:42 +01:00
Steven Hiscocks
879c1a32f7
ENH: fail2ban-regex now uses iteraable for log file
...
Previosuly, the whole file was read in first
2013-07-27 11:36:01 +01:00
Steven Hiscocks
af46cd0e4f
ENH: fail2ban-regex now sorts date templates, similar to actual filters
...
Sort occurs every 10 lines, as to not overly effect performance
2013-07-27 11:34:10 +01:00
Steven Hiscocks
3392190924
DOC: Point to jail.conf(5) manpage when date not matched by datedetector
2013-07-26 18:14:31 +01:00
Steven Hiscocks
9fb926ebae
DOC: Add datepattern to jail.conf man page
2013-07-26 17:55:20 +01:00
Steven Hiscocks
27feb57e80
Merge pull request #299 from kwirk/datepatterns-dateregex
...
Custom date templates and date detector changes
2013-07-26 03:53:40 -07:00
Yaroslav Halchenko
1721991755
Merge pull request #304 from yarikoptic/master
...
RF(ENH): JailsReader.getOptions -- avoid code duplication when asking for 1 jail or all
upon @kwirk blessing ;)
2013-07-25 18:45:10 -07:00
Daniel Black
2d52fc3d18
Merge pull request #302 from grooverdan/perdition
...
ENH: new filter perdition.conf
2013-07-23 18:31:27 -07:00
Daniel Black
8f532f9148
NIT: space remove
2013-07-24 11:29:58 +10:00
Daniel Black
7d7ef08145
ENH: authentication_id can be an imap4 quoted string, whatever that is, so using .+ as its id
2013-07-24 10:44:52 +10:00
Daniel Black
abc4146079
ENH: perdition proxies other types hence daemon can include (perdidtion.(imap|pop)s?|managesieve). Also support local authentication resulting in the log message: local authentication failure
2013-07-24 10:27:12 +10:00
Yaroslav Halchenko
3b52eca608
ENH+TST: Ticket -- drop unused/bogus get|setFile + enh __str__ + basic testing
2013-07-22 12:09:33 -04:00
Yaroslav Halchenko
149a83545f
TST: basic test for reading of a bogus jail
2013-07-22 11:52:51 -04:00
Yaroslav Halchenko
b92316ff17
RF(ENH): JailsReader.getOptions -- avoid code duplication when asking for 1 jail or all
2013-07-22 11:47:36 -04:00
Daniel Black
0de02f9ab0
Merge pull request #300 from kwirk/ejabberd-auth
...
ENH: Add ejabberd-auth filter and sample log lines
2013-07-20 15:39:01 -07:00
Daniel Black
bdcde678d1
TST: fix year
2013-07-20 15:15:02 +10:00
Daniel Black
6fdfd8d356
BF: fix port
2013-07-20 15:09:25 +10:00
Daniel Black
eea5b071e6
ENH: jail for perdition
2013-07-19 20:27:15 +10:00
Daniel Black
fcf79b475f
ENH: new filter perdition.conf
2013-07-19 20:14:53 +10:00
Steven Hiscocks
a012b54117
TST: Add additional postfix filter sample
2013-07-18 22:17:31 +01:00
Steven Hiscocks
2a3a627322
TST: Add sample for sieve regex
2013-07-18 22:17:14 +01:00
Steven Hiscocks
26b472f70f
ENH: Add ejabberd-auth filter and sample log lines
2013-07-18 21:31:51 +01:00
Yaroslav Halchenko
60aa44f42d
DOC: added a note on commit comments for merges with Conflicts
2013-07-18 14:43:41 -04:00
Steven Hiscocks
2b6ecfe56a
TST: More verbose when multiple regexs matched in sample test case
2013-07-17 22:25:27 +01:00
Steven Hiscocks
7c3a2a0223
ENH: Allow setting of date pattern as part of filter config Init section
2013-07-17 21:27:19 +01:00
Steven Hiscocks
614fb8505e
BF: globally make HEAVYDEBUG logging level when importing fail2ban
2013-07-17 21:12:48 +01:00
Steven Hiscocks
674e1d82f4
TST: vsftpd fail data update due to recent date pattern changes
2013-07-17 21:12:16 +01:00
Steven Hiscocks
bf86edb3ae
BF: ISO8601 format now returns time in local time zone
2013-07-17 21:11:29 +01:00
Steven Hiscocks
d661b8c046
BF: Apache regex and sample fail data update due to date pattern changes
2013-07-17 21:09:30 +01:00
Steven Hiscocks
72430e805d
Merge branch 'datepatterns' into datepatterns-dateregex
...
Conflicts:
bin/fail2ban-regex
fail2ban/client/beautifier.py
fail2ban/server/datedetector.py
2013-07-17 21:07:09 +01:00
Steven Hiscocks
05fac65a50
BF: fail2ban-regex multiline regex matches no longer in missed lines
...
Closes #263
Closes #282
2013-07-17 00:08:43 +01:00
Steven Hiscocks
c61ba9f0de
ENH+BF: Allow multi lines regex to be tested with samples test case
...
Multi line regex currently only flags on last line, and other lines must
be labelled as not matched.
TODO: Create extension to fail JSON data to allow tying together of
multiple lines
2013-07-16 23:47:28 +01:00
Steven Hiscocks
774c9ce4fd
BF: setup.py build now includes sample log files for tests
2013-07-16 23:37:44 +01:00
Steven Hiscocks
1eea0dcec8
Merge branch 'master' into 0.9
...
Conflicts:
ChangeLog
bin/fail2ban-regex
bin/fail2ban-testcases
config/jail.conf
fail2ban/server/failregex.py
fail2ban/server/filter.py
fail2ban/tests/files/logs/lighttpd
fail2ban/tests/files/logs/mysqld.log
fail2ban/tests/files/logs/wu-ftpd
fail2ban/tests/filtertestcase.py
fail2ban/tests/utils.py
testcases/files/logs/lighttpd
testcases/files/logs/lighttpd-auth
testcases/files/logs/mysqld-auth
testcases/files/logs/mysqld.log
testcases/files/logs/wu-ftpd
testcases/files/logs/wuftpd
2013-07-16 23:16:22 +01:00
Steven Hiscocks
bf05f2ac95
Merge branch 'filter-failregex-return'
...
Conflicts:
server/filter.py
2013-07-16 21:17:18 +01:00
Steven Hiscocks
ba29f6bef3
DOC: Update doc in reference to changes for sample testcases
2013-07-16 21:11:10 +01:00
Steven Hiscocks
c2bdfefb62
DOC: Comment to fail2ban-regex - flagging lines matched multiple regexs
2013-07-16 20:58:44 +01:00
Yaroslav Halchenko
e4d759ac94
Merge pull request #283 from yarikoptic/master
...
Roundcube failregex -- anchor at the beginning as well + mandate <HOST> to end with alphanumeric
2013-07-16 12:49:25 -07:00
Yaroslav Halchenko
90ec82669c
DOC: changelog entries for preceeding changes
2013-07-16 15:10:41 -04:00
Yaroslav Halchenko
f6a8a04cf3
ENH: roundcube-auth - adopt for current format with trailing error message. thanks @kwirk for the review/feedback
...
I also used non-greedy .*? for the login portion since not sure if space could
be there and trying to minimize possibility of reacting on injected "from
<HOST>" somewhere within the trailing .*
2013-07-16 15:07:32 -04:00
Yaroslav Halchenko
0a02cfe9e8
ENH: <HOST> must end with alphanumeric \w (not a dot or a dash etc)
...
Otherwise <HOST> regexp might swallow period in the sentence right after the address.
I have decided to enforce alphanumeric instead of switching to non-greedy +? ... because
I think it is closer to what we actually want here
2013-07-16 15:03:06 -04:00
Yaroslav Halchenko
8add63c733
ENH: anchor roundcube-auth at the beginning as well
2013-07-16 14:16:23 -04:00
Yaroslav Halchenko
148cbd8d2a
ENH: heavier debugging -- log split date/log line even for no match. Log matching regex upon match
2013-07-16 14:16:23 -04:00
Steven Hiscocks
1a2b6442a0
ENH+BF+TST: Filter now returns reference to failregex and ignoreregex
...
This avoids duplication of code across fail2ban-regex and samples test
cases. This also now more neatly resolves the issue of double counting
date templates matches in fail2ban-regex.
In addition, the samples test cases now also print a warning message
that not all regexs have samples for them, with future plan to change
this to an assertion.
2013-07-15 22:22:13 +01:00
Yaroslav Halchenko
5bd186b854
ENH(minor): fail2ban-regex comment line doesn't have to have a space after leading #
2013-07-15 13:52:42 -04:00
Steven Hiscocks
2c8747cc76
BF: fail2ban-regex date detector template hits count now correct
...
closes #295
2013-07-15 18:40:32 +01:00
Steven Hiscocks
4855cae487
Merge branch 'sample-log-meta-data'
...
Conflicts:
testcases/files/logs/dovecot
2013-07-14 18:29:36 +01:00