77aa523f22
Merge branch 'master' into py3
...
Conflicts:
.travis.yml
server/datetemplate.py
server/server.py
testcases/filtertestcase.py
2013-03-30 22:51:36 +00:00
33a31e096a
RF+TST: bring inBanList back from private to protected and enabled its rudimentary unittests
2013-03-29 15:33:08 -04:00
ba042c6e3a
ENH: move pyinotify callback debug message into callback + delay string interpolations
2013-03-25 23:05:55 -04:00
c29553354b
ENH: FailManager -- improve log message to report total # of detected failures as well
2013-03-25 23:05:47 -04:00
5ea2ab14e6
ENH: elaborated debug log message about already detected failures
...
Now it should be evaluated only if logging mode is debug or "lower", and also
should happen not only on initial detections but for every added failure.
It also reports counts per each IP now
2013-03-25 23:05:47 -04:00
3b4084d471
BF: fixing up for handling of TAI64N timestamps and adding some unittest for prev commit (not effective much though)
2013-03-25 10:41:13 -04:00
7813340e1c
Merge branch 'master' of https://github.com/sebres/fail2ban
...
* 'master' of https://github.com/sebres/fail2ban :
invalid date recognition, irregular because of sorting template list, now via setRegex
invalid date recognition, irregular because of sorting template list (sometimes not reproducible by fail2ban-regex, cause will be not sorted)
2013-03-25 10:00:55 -04:00
8ddc9de928
BF: Handle expected errors for python3.{0,1} when changing log target
2013-03-23 19:04:58 +00:00
e3d3a6ac02
Merge branch 'datedetector-testcase' of https://github.com/kwirk/fail2ban
...
* 'datedetector-testcase' of https://github.com/kwirk/fail2ban :
Correct datedetector testcases for TAI64N format
Additional date/time formats for datedetector testcases
2013-03-22 20:27:39 -04:00
7a442f079f
BF: When changing log target with python2.{4,5} handle KeyError
2013-03-22 21:19:31 +00:00
883892a683
Additional date/time formats for datedetector testcases
...
Also made a note that some workarounds for certain date/time formats
may cause week/year day to be incorrect. This does not affect
functionality of fail2ban so no urgency to fix.
2013-03-16 17:55:22 +00:00
b6bb2f88c1
invalid date recognition, irregular because of sorting template list, now via setRegex
2013-03-11 13:52:31 +01:00
be42522bba
Merge branch 'transmitter-testcase' of https://github.com/kwirk/fail2ban
...
* 'transmitter-testcase' of https://github.com/kwirk/fail2ban :
Added additional Transmitter tests, and some associated fixes
2013-03-10 21:23:04 -04:00
5e5eaaf838
Merge pull request #134 from grooverdan/misc-fixes
...
BF: fail2ban client can't handle multi word setcinfo or action[*] values
2013-03-10 18:01:17 -07:00
a2b29b4875
Fixed typos
2013-03-10 22:05:33 +00:00
4bbbc07872
Added additional Transmitter tests, and some associated fixes
...
This includes some tweaks such that errors are raised for certain
commands
2013-03-10 14:55:39 +00:00
23bbc60b1c
do catch all exception
2013-03-10 17:10:40 +11:00
f0610c01d5
BF: allow more than single word for command action[start,stop,ban,unban,check] and for setcinfo too
2013-03-10 15:29:48 +11:00
c8c7b0b984
BF: general Exception catch was excessive. Only IOError and OSError are possible and has different meanings
2013-03-10 15:29:27 +11:00
3665e6dc44
Add development documentation and framework for code coverage measurement
2013-03-10 15:18:42 +11:00
d17b415371
invalid date recognition, irregular because of sorting template list (sometimes not reproducible by fail2ban-regex, cause will be not sorted)
...
date in following log line (from nginx) will be wrong detected:
2012/10/11 02:37:17 [error] 18434#0: *947 user "test" was not found in "/www/...", client: 192.168.1.5, ...
sometimes it is [correct] - 2012/10/11 (%Y/%m/%d) = 1349919861.71
sometimes it is [invalid] - 12/10/11 (%d/%m/%y) = 1349915838.06
and older as now - 1800 seconds (therefore will be not found)
solution: regular expression fixed, cause date in log used always after non symbol (\W) character, so r"\d{2}/\d{2}/\d{2}" will be r"(?<!\w)\d{2}/\d{2}/\d{2}".
2013-03-05 00:02:39 +01:00
59c35bc44a
Downgrade log rotation detection message to DEBUG level from INFO. Closes: gh-129
...
This message useful only when debugging problems so it is more reasonable
to have it suppressed otherwise
2013-03-01 19:57:56 -05:00
66367876bb
Add ability to set log encoding for jail
2013-02-27 18:09:55 +00:00
d23d365be2
Move handling of unicode decoding to FileContainer readline
...
Also print warning for unicode decode failure, leaving as str in python2
and ignoring erroneous characters in python3
2013-02-25 22:45:16 +00:00
184e0eccb6
Remove redundant reassignment of variable
2013-02-24 19:28:41 +00:00
3a3d07ef39
Undo removal of unicode prefix in server/datetemplate.py
2013-02-24 19:22:50 +00:00
c8c9ed4dfc
Fix DNSUtils dnsToIp not catching general socket.error exception
2013-02-24 18:13:48 +00:00
0dd3a81ba2
Fix use of python3 bytes in client/server socket for python2.5
2013-02-24 18:04:40 +00:00
46a2b6e428
Fix up for client/server socket for python3
2013-02-24 10:10:15 +00:00
df255063ae
python3: Default open encoding for files to UTF-8
...
Also tidy up unicode check in processLine, which is handled by `2to3`
2013-02-23 22:20:55 +00:00
5d0d362e3f
Ensure jail names return in alphabetical order in status
...
Primarily to support testing as order can switch
2013-02-23 22:06:16 +00:00
2bb3469644
Change filter to ignore unicode errors in python3
...
Also do not try to convert unicode to unicode again for python3 and
python2
2013-02-23 21:03:51 +00:00
ad7119a3fe
time.mktime argument should be tuple
2013-02-23 21:01:39 +00:00
2ecf34540e
Change sort in datedetector to use key based comparison
2013-02-23 19:34:05 +00:00
99c92a56ca
Check for unicode and encode before md5sum in filter
2013-02-23 18:52:10 +00:00
c926c88ea1
Remove spurious space at start of line
2013-02-23 18:42:50 +00:00
154aa38e3f
BF: do not shutdown logging until all jails stop -- so move into Server.quit()
...
Together with previous commit it should resolve failures with the server tests on python < 2.6
2013-02-21 20:59:46 -05:00
012264dce1
BF: safeguard closing of log handlers + close in reverse order
...
otherwise there might be "stuck" handler in the queue. and closing
exceptions can occur -- even stock logging guards in recent versions
2013-02-21 20:58:27 -05:00
b36835f6f0
Added transmitter get cinfo option for action
2013-02-20 23:33:39 +00:00
b6a68f5138
Fix for missing value in transmitter delaction
2013-02-20 23:24:46 +00:00
ce3ab34dd8
Added ability to specify PID file
2013-02-17 22:14:01 +00:00
f8983872ad
BF: return str(host) to avoid spurious characters in the logs (Close gh-113)
...
thanks to opoplawski@github
2013-02-01 16:24:04 -05:00
acab23bdfe
RF: move exceptions used by both client and server into common/exceptions.py
...
this prevents importing of server while operating with client only
2013-01-28 09:46:50 -05:00
6b2e76ba7f
BF: pyinotify - use bitwise op on masks and do not try tracking newly created directories
2013-01-25 16:06:41 -05:00
96eb8986cc
Escape ' and " in matches tag
2013-01-25 13:37:22 +01:00
fd7929863b
name -> IP is a normal DNS lookup not a reverse
2012-12-12 21:59:01 +11:00
67145d8b78
ENH: assure that all date templates have unique names
2012-12-11 11:18:52 -05:00
d1625253eb
ENH: debug msgs on which template was taken (+ use "is" for None comparisons)
2012-12-11 11:18:52 -05:00
2b6366656f
BF: make sorting of date templates stable
...
Before, it would first do stable sort followed with explicit reverse.
Now reverse is given as an argument to sort, and it results in actually
preserving the order in case of e.g. no sorting needed
2012-12-11 11:18:52 -05:00
37a2e59d69
BF: guarantee that IP is stored as a base, non-unicode str (Closes gh-91)
...
Otherwise it might lead to spurious characters dumped into the
terminal at few places, unless casted upon every use in the logs. To
prevent those issues in the source, store IP as a basic string if it
is a string at all
2012-11-26 12:01:42 -05:00
Steven Hiscocks