sebres
4942578de0
Merge branch '0.10' into 0.11
2018-01-24 20:36:22 +01:00
sebres
5f3ba289d6
restore code coverage (decreased in latest "fixes") - no cover for unreachable cases;
2018-01-24 20:03:46 +01:00
sebres
faab77cc79
Merge branch '0.10' into 0.11, with resolved conflicts.
2018-01-24 17:56:58 +01:00
sebres
ac9d5f61e7
rewrite keywords reserved in python 3.7 (`async` -> `nonsync`)
2018-01-24 15:50:19 +01:00
Sergey G. Brester
6b7cca07ae
Merge pull request #2025 from yarikoptic/bf-0.10-debian
...
A number of fixes toward making tests pass while building Debian pkg for 0.10.2
2018-01-24 08:42:36 +01:00
sebres
7a757645bb
introduces new decorator/conditional helper in order to skip some STOCK-related test-cases (if running outside of stock-config environment).
2018-01-23 22:06:22 +01:00
sebres
9af9ec25f5
allow to override use_stock_cfg values (used as default value now), e. g. actions rest filters only, reject d1afbb566f0304487b5d578b4aacef8e647ee74b
2018-01-23 22:06:20 +01:00
Yaroslav Halchenko
3f51c158cd
Added manpage (still would need tuning) for fail2ban-python
2018-01-23 22:06:18 +01:00
Yaroslav Halchenko
a5b9128fcc
BF: RF test for "being a root" to check if actually can read the file
2018-01-23 22:06:16 +01:00
Yaroslav Halchenko
49be8de902
BF: look for system.journal also under system-state-logs (i.e. /var/log)
...
as it happens on Debian systems
2018-01-23 22:06:14 +01:00
Yaroslav Halchenko
2f0bc491e2
BF: use tests.utils.CONFIG_DIR instead of hardcoded "config" in fail2banclienttestcase
...
Since otherwise cannot provide custom path to the config via env var
and thus cannot test in a build directory which is out of source
2018-01-23 22:06:12 +01:00
Sergey G. Brester
3ac6166b48
Merge pull request #2027 from yarikoptic/bf-0.10-review
...
Minor spelling typos etc
2018-01-23 19:45:44 +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
077a45cc93
Merge branch '0.11-fix-get-current-bans-v2' into 0.11
2018-01-23 09:42:11 +01:00
sebres
7526f50706
amend to a54b401ee2
(0.11-fix-get-current-bans):
...
- differentiate between unknown ban-time after upgrade (-2) and persistent ban-time (-1);
- better handling to correct current ban-time, uses `bantime.maxtime` (if increment allowed) or `bantime` of jail;
- extended test-cases in order to cover the change of `bantime.maxtime`.
2018-01-23 09:41:43 +01:00
Yaroslav Halchenko
ba2538ba04
DOC: minor typos spotted around comments etc
2018-01-22 21:39:56 -05:00
Yaroslav Halchenko
af2de7ff2f
RF: COND_FAMILIES - use tuple
...
no need for a dict where tuple would be preferable (deterministic order)
2018-01-22 21:08:44 -05:00
sebres
7e1bc59f80
code review after merge (removed unnecessary code-pieces resp. code-duplication)
2018-01-22 11:10:22 +01:00
sebres
05951a23a5
Merge branch '0.10' into 0.11
2018-01-22 11:08:25 +01:00
sebres
8cfd97a68f
skip a testRepairDb if no sqlite3 command-helper available; code review (removed unnecessary code-pieces resp. code-duplication)
...
closes #2026
2018-01-22 10:42:33 +01:00
Sergey G. Brester
757ff8a7d4
Merge pull request #2022 from sebres/0.11-fix-get-current-bans
...
0.11: fix get current bans (after upgrade DB)
2018-01-22 10:00:57 +01:00
sebres
9440956575
Update ChangeLog
2018-01-19 19:37:37 +01:00
sebres
a54b401ee2
upgrade database: update new created `bips` table with entries from table `bans` (allows restore current bans after upgrade from version <= 0.10);
...
algorithm of restore current bans after restart changed: update the restored ban-time (and therefore end of ban) of the ticket with ban-time of jail (as maximum), for all tickets with ban-time greater (or persistent); not affected if ban-time of the jail is unchanged between stop/start.
2018-01-19 19:35:31 +01:00
sebres
0a4a76c4c4
Merge branch '0.10' into 0.11
2018-01-19 12:32:48 +01:00
sebres
9d5f20aab2
FilterPyinotify: fixed sporadic test-case error (multi-threaded) - 'NoneType' object has no attribute 'stop'.
2018-01-19 12:32:24 +01:00
sebres
c50875ccf6
Update ChangeLog: all major 0.11 changes combined in 0.11th block now
2018-01-19 11:41:54 +01:00
sebres
aa47937d4f
Merge branch '0.10' into 0.11: bum version after release of 0.10.2
2018-01-18 16:47:13 +01:00
sebres
9a38d5697f
bump version (0.10.2 -> 0.10.3.dev1)
2018-01-18 16:40:48 +01:00
sebres
a45488465e
prepare release: bump version, update ChangeLog, man's and MANIFEST etc.
2018-01-18 14:49:01 +01:00
sebres
1ca3df877b
Merge branch '0.10' into 0.11
2018-01-18 14:32:00 +01:00
sebres
81b61fe30c
ChangeLog update
2018-01-18 14:19:55 +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
38b3290516
Merge branch '0.10' into 0.11
2018-01-17 16:43:45 +01:00
sebres
ed22ddbbbb
Merge remote-tracking branch 'remotes/gh-upstream/master' into 0.10
2018-01-17 16:42:56 +01:00
Sergey G. Brester
37f5a6975e
Merge pull request #2015 from BenediktSeidl/nginx-http-auth--spaces-fix
...
nginx-http-auth: match usernames with spaces
2018-01-17 16:40:54 +01:00
sebres
63e906b2c1
regex rewritten: a bit fewer vulnerable now and using non-capturing groups, test-cases extended in order to cover trying of injection on user name
2018-01-17 16:35:32 +01:00
Benedikt Seidl
fed6c49c2d
nginx-http-auth: match usernames with spaces
...
# Conflicts:
# ChangeLog
2018-01-17 16:35:31 +01:00
Sergey G. Brester
9a8c4a9869
Merge pull request #2018 from riceru/patch-1
...
lighttpd-auth.conf: new log-format (http_auth -> mod_auth)
2018-01-17 12:14:38 +01:00
Sergey G. Brester
b6c6565a7e
regex updated using non-capturing groups
2018-01-16 14:23:47 +01:00
Sergey G. Brester
9a46590486
extended test-cases to cover new log-format (http_auth -> mod_auth)
2018-01-16 14:20:51 +01:00
riceru
6a1bbbf101
Update lighttpd-auth.conf
...
I have lighttpd 1.4.45 (Debian 9) and auth error log is different.
Now printing mod_auth and not http_auth.
I think that the change was in Lighttp 1.4.42
2018-01-16 12:39:55 +00: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
sebres
2bce0c5e3e
file-filter's: provide stop function in order to explicitly delete/stop monitoring of each file.
2018-01-15 18:00:15 +01:00
sebres
416240e80e
Merge branch '0.10' into 0.11
2018-01-15 17:21:23 +01:00
sebres
81c86fa83f
Remove annoying error-message "rm_watch: cannot remove WD=2, Errno=Invalid argument (EINVAL)", logged from pyinotify-module if rm_watch called with non-existing watch file descriptor (probably multi-threaded issue by dual-remove).
...
Closes gh-1865
2018-01-15 17:12:07 +01:00
sebres
0befbfd766
Merge branch '0.10' into 0.11
2018-01-11 20:23:55 +01:00
sebres
b644d2d73f
should fix sporadic coverage decrease (don't cover "return", because too sporadic to get idle in pyinotify-callback);
2018-01-11 20:23:22 +01:00
sebres
5ddab17089
Merge branch '0.10' into 0.11
2018-01-11 13:28:31 +01:00
sebres
7516cd025d
fixed restoring sane environment (via stop/start) if invariant check failed: bypass possible errors in stop (if start/check succeeded hereafter);
...
test cases extended to cover such situation.
Closes gh-1997
2018-01-11 13:21:36 +01:00