Commit graph

3760 commits

Author SHA1 Message Date
Yaroslav Halchenko
8b8cf2a660 ENH: exim filters -- make more use of %(host_info)s which in turn made more flexible 2016-05-21 10:29:09 -04:00
Yaroslav Halchenko
743a531eb5 BF: make :port and I=[ip]:port optional for a "AUTH command used when not advertised"
Closes #1430
2016-05-21 10:29:01 -04:00
sebres
f62266659f Merge branch 'master' into '0.10' 2016-05-21 13:48:00 +02:00
Serg G. Brester
b56f4c533e Merge pull request #1436 from sebres/speedup-db
extremely speedup of all database operations
2016-05-21 13:39:48 +02:00
sebres
3d99833570 forgotten convert for bantime (str2seconds) in action, as long as it should be supplied as parameter of action executable;
covered via test cases now
2016-05-21 13:33:22 +02:00
sebres
1718c8dbe9 pypy: switch journal mode after upgrade (save it during the upgrade), to prevent errors like "database table is locked" 2016-05-20 15:12:32 +02:00
sebres
baafac36a4 ChangeLog entry 2016-05-20 14:51:13 +02:00
sebres
db9e724038 extremely speedup of all database operations:
- (synchronous = OFF) write data through OS without syncing
- (journal_mode = MEMORY) use memory for the transaction logging
2016-05-20 12:06:04 +02:00
sebres
34ae0b916e Merge pull request #1421 from sebres/fix-1405
filter.d/common.conf: fixes unexpected extra regex-space in generic `__prefix_line` (gh-1405)
2016-05-20 11:20:34 +02:00
sebres
caecb2080b Merge pull request #1435 from sebres/fix-1434
fixed --pidfile bug, introduced in gh-1322
2016-05-20 11:02:42 +02:00
sebres
932708de9e fixed --pidfile bug, introduced in gh-1322:
gentoo-initd fixed --pidfile bug: `--pidfile` is option of start-stop-daemon, not argument of fail2ban (see gh-1434)
closes gh-1434
2016-05-20 11:01:00 +02:00
sebres
52377984cd back to mandatory space, ungrouping of sub parameters in __prefix_line + small code review; 2016-05-19 17:57:48 +02:00
sebres
0fdc56546f Fixed misunderstanding of port in (ban)action: port will be always specified in jail config ([DEFAULT] or jail) 2016-05-19 17:45:41 +02:00
Yaroslav Halchenko
1ebc3facb1 BF: maintain previous default beh for pf -- ban a port (ssh) only 2016-05-19 17:14:33 +02:00
sebres
4cdca8c258 amend-merge for pull request #1429 from sebres/0.10-freebsd-fix-pf
actiontype for PF action (all- and multi port)
2016-05-19 14:52:10 +02:00
sebres
4d51c591c1 pf.conf: warranted consistently echoing for the pf actiontype if actiontype or multiport tags will be customized; 2016-05-19 14:50:41 +02:00
Serg G. Brester
01d9a41ba1 Merge pull request #1429 from koeppea/0.10-freebsd-fix-pf
actiontype for PF action (all- and multi port)
2016-05-18 11:12:31 +02:00
Alexander Koeppe
b5e031f3c3 some documentation for multiport use in pf.conf 2016-05-17 21:32:21 +02:00
Serg G. Brester
482e1abe9c Merge pull request #1431 from sebres/0.10-muti-option-groups
jailreader: support multiple option groups (brackets)
2016-05-17 21:17:12 +02:00
sebres
1e7fd26f5f rename actionoptions to actiontype in pf-action (multiport) + fixed test cases 2016-05-17 20:51:12 +02:00
sebres
25af11215b test case for generic common moved to ./fail2ban/tests/config/filter.d/zzz-generic-example.conf to prevent shipping it with fail2ban installations 2016-05-17 20:08:46 +02:00
Yaroslav Halchenko
af1cc41053 Merge pull request #1426 from koeppea/0.10-freebsd-fix-shebang
no hardcoded python interpreter path
2016-05-17 13:50:26 -04:00
Alexander Koeppe
e74047ae49 revert to common config for PF covering multi and allports 2016-05-17 18:19:40 +02:00
Alexander Koeppe
3e1328c83b split PF config files between all- and multi port 2016-05-17 18:19:27 +02:00
sebres
c6f63c7263 jailreader: support multiple option groups, syntax action = act[p1=...][p2=...] + test case for it
(see gh-1425, gh-1429)
2016-05-17 18:06:46 +02:00
Alexander Koeppe
5e06e8be62 removed shebang and changed mode for fail2banregex.py 2016-05-17 16:42:23 +02:00
sebres
06dcad7650 fixed mixed indentation (spaces through tabs), duplicate code removed 2016-05-17 12:27:01 +02:00
Yaroslav Halchenko
d7ff7d18cd RF+ENH: @with_kill_srv fixture to kill_srv in the tests 2016-05-17 12:26:58 +02:00
Yaroslav Halchenko
e57321ab1e BF+ENH: import signal used in the code, withtmpdir -> with_tmpdir (more readable)
case shows how evil except Exception can be ;)
2016-05-17 12:26:56 +02:00
sebres
6353de8b0f possibility to increase verbosity up to heavy debug (command line parameter -vvv) 2016-05-17 12:26:54 +02:00
sebres
cb4f9be8b2 the date brackets removed from filters using __prefix_line, because __prefix_line already contains the date ambit; 2016-05-17 11:55:02 +02:00
sebres
de813acf51 extends generic __prefix_line with optional brackets for the date ambit (gh-1421), added new parameter __date_ambit + test case added; 2016-05-17 11:54:43 +02:00
Alexander Koeppe
975608dfb6 no hardcoded python interpreter path 2016-05-15 21:08:32 +02:00
sebres
be3e95b76d Merge branch '0.10-fwcmd-fix-test' into 0.10 2016-05-14 15:05:21 +02:00
sebres
0c44ecfc77 action.d/firewallcmd-ipset.conf: different name of the match set's for IPv4/IPv6, using conditional <ipmset>, analog to the iptables-ipset;
test cases for 3 firewallcmd extended;
2016-05-14 15:01:35 +02:00
Serg G. Brester
0d0e1853c4 Merge pull request #1424 from TorontoMedia/firewallcmd
ENH: Branch 0.10 - updated firewallcmd actions
2016-05-14 13:34:23 +02:00
Serg G. Brester
e0da359a5a Merge pull request #1423 from yarikoptic/0.10
ENH: version Fail2Ban in this branch as 0.10.0 alpha 1
2016-05-14 13:26:23 +02:00
Serg G. Brester
d742bc2834 Merge pull request #1422 from sebres/0.10-fix-multi-set
0.10 fix multi-set and database binding parameters
2016-05-14 13:25:14 +02:00
TorontoMedia
ffebde68e0 Update firewallcmd-multiport.conf 2016-05-13 22:38:36 -04:00
TorontoMedia
07de83e04a Update firewallcmd-common.conf 2016-05-13 22:38:10 -04:00
TorontoMedia
810d5996b5 Update firewallcmd-rich-logging.conf 2016-05-13 22:10:25 -04:00
TorontoMedia
7e54cee8d6 updated firewallcmd actions 2016-05-13 21:36:27 -04:00
Yaroslav Halchenko
2b6f8737a7 ENH: version Fail2Ban in this branch as 0.10.0 alpha 1 2016-05-13 17:17:46 -04:00
sebres
d420148055 database: always explicit convert ip to str, because may be an IPAddr, that will be unsupported type by bind parameter (as long as we've found any default wrapper handler for sqlite3) 2016-05-13 22:53:57 +02:00
sebres
cb280b817f csocket multi-set fix: prevent to convert list, dict, set during transfer (send), this offers a sending of 'multi-set' arrays
(missed by cherry-picking from multi-set branch)
2016-05-13 22:43:02 +02:00
sebres
e0924e0d1b test case fix (always sort result of DNSUtils.textToIp, because order of result from socket.getaddrinfo is undefined (system depended) 2016-05-13 21:44:07 +02:00
sebres
3e49522b7a fixes unexpected extra regex-space in generic __prefix_line (gh-1405, misleadingly committed in d2a9537568);
all optional spaces normalized in generic include `common.conf` + test cases are extended (using new example pseudo-filter and test log `zzz-generic-example`);
2016-05-13 20:26:37 +02:00
Yaroslav Halchenko
d6eae28eb5 Merge pull request #1419 from sebres/gh-1417
fixes gh-1417 Grave tags substitution bug. [part. cherry-picked from 0.10]
2016-05-13 10:28:29 -04:00
sebres
cce63926ce ChangeLog entry added 2016-05-13 16:11:38 +02:00
sebres
a4b8f6e49e [part. cherry-picked from 0.10] invalid recursion check in substituteRecursiveTags: for example action bsd-ipfw produced ValueError('properties contain self referencing definitions and cannot be resolved...')
test cases extended for exactly this case;
closes gh-1417
2016-05-13 14:12:17 +02:00