sebres
|
b49c1ab4b3
|
Merge branch '0.10' into 0.11
|
2018-11-21 13:06:44 +01:00 |
sebres
|
555b29e8e6
|
Merge remote-tracking branch 'remotes/gh-upstream/master' into 0.10
|
2018-11-21 13:05:42 +01:00 |
dienteperro
|
0df221b54b
|
"be" instead of "me" in shorewall.conf
|
2018-11-15 14:34:51 -05:00 |
sebres
|
f9f7e29295
|
Merge branch '0.10' into 0.11 (version bump after r.0.10.4)
|
2018-10-04 13:08:25 +02:00 |
Sergey G. Brester
|
1752c19b6f
|
Merge pull request #2205 from benrubson/patch-1
Add loglevel option to badips.py
|
2018-10-02 13:12:03 +02:00 |
Sergey G. Brester
|
65676baf8c
|
fixed py3 incompatibility (for some reasons this file seems to be excluded from 2to3), anyway not needed, because int-type is already checked in str2LogLevel
|
2018-10-02 13:00:20 +02:00 |
Sergey G. Brester
|
4b751c84c3
|
badips.py: Rewrite new bool option "log" as "loglevel" and revert default to log-level (DEBUG).
|
2018-10-02 12:32:15 +02:00 |
sebres
|
8a0c06ba9e
|
Merge branch '0.10' into 0.11
|
2018-09-14 11:01:40 +02:00 |
sebres
|
d01fe9d22a
|
action.d/*.conf: correct comments for actionstart/actionstop
|
2018-09-12 16:01:57 +02:00 |
Ben RUBSON
|
9d7c0e00c1
|
Also log number of IPs removed/added
|
2018-09-08 09:28:42 +02:00 |
Ben RUBSON
|
70e53b55c5
|
Typo
|
2018-08-19 22:39:18 +02:00 |
Ben RUBSON
|
ec4c4b12c1
|
Add yes/no log option to badips.py
|
2018-08-19 22:35:09 +02:00 |
sebres
|
9de1657aab
|
Merge branch '0.10' into 0.11
|
2018-07-06 11:43:56 +02:00 |
sebres
|
6ce67a6d21
|
coverage
|
2018-07-05 16:27:36 +02:00 |
sebres
|
0eaa0ecd86
|
Merge branch '0.10' into 0.11
|
2018-06-14 12:36:22 +02:00 |
sebres
|
8cbe1e6b13
|
Merge pull request #2155
|
2018-06-14 12:35:57 +02:00 |
cheese1
|
43db4411de
|
small typo
|
2018-06-14 12:35:04 +02:00 |
sebres
|
0d40dd42b1
|
Merge branch '0.10' into 0.11
|
2018-04-26 13:43:15 +02:00 |
sebres
|
bba7a6c5cf
|
amend to (gh-2067) / b34ae5999e0d8ee1af8939527305c13152844b3d: fix parameter in config (dynamic parameters stating with '_' are protected and don't allowed in command-actions);
the interpolation of hostsdeny is test-covered now;
closes gh-2114.
|
2018-04-17 18:59:24 +02:00 |
sebres
|
0707695146
|
Merge branch '0.10' into 0.11, version bump
# Conflicts resolved:
# fail2ban/server/database.py
|
2018-04-05 12:58:11 +02:00 |
sebres
|
8069eef50c
|
badips: try to fix sporadic test errors if badips-server timed out resp. not available (502 bad gateway or similar).
|
2018-04-05 12:31:29 +02:00 |
sebres
|
1fdad90b4d
|
Merge branch '0.10' into 0.11
|
2018-04-04 16:49:57 +02:00 |
Luis Aranguren
|
fc76ccf192
|
Fixes abuseipdb curl cypher error and comment $f2bV_matches
Fixed https://github.com/fail2ban/fail2ban/issues/2044 #2044
and used https://github.com/fail2ban/fail2ban/issues/2039 to fix comment in abuseipdb.com only showing $f2bV_matches
|
2018-04-04 16:39:16 +02:00 |
sebres
|
7dfd61f462
|
Merge branch '0.10' into 0.11-2
|
2018-04-03 14:14:44 +02:00 |
Sergey G. Brester
|
b34ae5999e
|
action.d/hostdeny.conf: fixes IPv6 syntax
differentiate the IPv4 and IPv6 syntax (where it is enclosed in square brackets)
|
2018-03-05 19:35:10 +01:00 |
sebres
|
5ea76789c6
|
Merge branch '0.10' into 0.11
|
2018-03-02 17:18:37 +01:00 |
Ben RUBSON
|
b112250ef0
|
(Free)BSD IPFW does not allow 2 identical rules (#2054)
ipfw actionban fixed to allow same rule added several times (and actionunban to ignore error by deletion of missing rule)
|
2018-02-27 10:18:59 +01:00 |
Ben RUBSON
|
857767f04b
|
Add 'any' badips.py bancategory (#2056)
action.d/badips.py: allow `any` as bancategory to retrieve IPs from all categories
|
2018-02-27 10:12:22 +01:00 |
sebres
|
47a7f83a0b
|
Merge branch '0.10' into 0.11
|
2018-02-26 19:30:54 +01:00 |
sebres
|
07fcb24ff6
|
Merge pull request #2057 from benrubson/https
Use httpS with badips
|
2018-02-26 18:50:35 +01:00 |
sebres
|
f52c67238a
|
action.d/badips.py: code review, ban command covered, debug log-messages, etc;
|
2018-02-26 18:16:20 +01:00 |
benrubson
|
fce2a50165
|
badips.py, solve a str() issue under FreeBSD
|
2018-02-26 15:55:21 +01:00 |
benrubson
|
e2665d39fd
|
Use httpS with badips
|
2018-02-26 09:58:37 +01:00 |
sebres
|
201ae0dac2
|
Merge branch '0.10' into 0.11
|
2018-01-31 12:20:34 +01:00 |
sebres
|
0be0e43d47
|
amend to 03b577d7b92a120e325abe20a99b6956a7e0657c: add new-line after matches via tag `<br>` without usage of interim variable
|
2018-01-30 12:52:26 +01:00 |
sebres
|
03b577d7b9
|
action.d/blocklist_de.conf: fixed tag substitution (in 0.10 it can be variables supplied via shell-arguments), expand `<matches>` with trailing newline;
tests extended;
closes gh-2028
|
2018-01-30 12:27:03 +01:00 |
sebres
|
faab77cc79
|
Merge branch '0.10' into 0.11, with resolved conflicts.
|
2018-01-24 17:56:58 +01:00 |
Yaroslav Halchenko
|
527bb9a7c3
|
dos2unix for helpers-common.conf
Original report: http://bugs.debian.org/888110
|
2018-01-23 08:48:36 -05:00 |
sebres
|
1ca3df877b
|
Merge branch '0.10' into 0.11
|
2018-01-18 14:32:00 +01:00 |
sebres
|
f69e28adfc
|
action.d/pf.conf: compatibility fix - recognizes that parameter `port` specified as empty, with or without braces (should be more backwards compatible to 0.9 now).
|
2018-01-18 14:05:22 +01:00 |
sebres
|
576eeb70dd
|
Merge branch '0.10' into 0.11
|
2018-01-15 18:17:18 +01:00 |
sebres
|
2b7b0da943
|
Merge remote-tracking branch 'remotes/gh-upstream/master' into 0.10
|
2018-01-15 18:16:43 +01:00 |
Serg G. Brester
|
7e05976ead
|
action.d/hostsdeny.conf: actionunban rewritten using sed, also dots in IP were escaped now.
Closes #2000
|
2018-01-11 12:38:34 +01:00 |
sebres
|
0e68c9a720
|
Merge branch '0.10' into 0.11
|
2018-01-10 12:22:31 +01:00 |
sebres
|
c30144b37a
|
Merge branch '0.9' into 0.10
# Conflicts:
# config/action.d/firewallcmd-ipset.conf
# config/filter.d/asterisk.conf
# Merge-point after cherry-pick, no changes:
# fail2ban/client/jailreader.py
# fail2ban/helpers.py
|
2018-01-10 12:05:26 +01:00 |
sebres
|
131b94e11e
|
firewallcmd-ipset-allports: implemented in `action.d/firewallcmd-ipset.conf` now (`action.d/firewallcmd-ipset-allports.conf` removed), usage:
banaction = firewallcmd-ipset[actiontype="<allports>"]
|
2018-01-10 10:58:03 +01:00 |
Danila Vershinin
|
c190631f88
|
New ban action firewallcmd-ipset-allports. Closes #1167
|
2018-01-10 10:58:01 +01:00 |
sebres
|
5028f17f64
|
Merge branch '0.10' into 0.11, rewrite updateDb because it can be executed after repair, and some tables can be missing.
# Conflicts:
# fail2ban/server/database.py
# fail2ban/tests/fail2banclienttestcase.py
# fail2ban/tests/sockettestcase.py
|
2017-12-22 17:05:45 +01:00 |
root
|
79f414c6a2
|
fix <family> typo
|
2017-12-09 15:55:45 +01:00 |
root
|
7c63eb2378
|
In the CentOS7 and epel environment, result of "firewall-cmd -direct -get -chains ipv4 filter" is displayed one line
Changed to be multiple lines with reference to firewallcmd-multiport.conf
|
2017-12-09 15:55:45 +01:00 |