diff --git a/MANIFEST b/MANIFEST index a38d55d4..6471df66 100644 --- a/MANIFEST +++ b/MANIFEST @@ -40,6 +40,7 @@ config/action.d/mail.conf config/action.d/mail-whois-common.conf config/action.d/mail-whois.conf config/action.d/mail-whois-lines.conf +config/action.d/mikrotik.conf config/action.d/mynetwatchman.conf config/action.d/netscaler.conf config/action.d/nftables-allports.conf @@ -90,6 +91,7 @@ config/filter.d/counter-strike.conf config/filter.d/courier-auth.conf config/filter.d/courier-smtp.conf config/filter.d/cyrus-imap.conf +config/filter.d/dante.conf config/filter.d/directadmin.conf config/filter.d/domino-smtp.conf config/filter.d/dovecot.conf @@ -121,6 +123,7 @@ config/filter.d/nagios.conf config/filter.d/named-refused.conf config/filter.d/nginx-bad-request.conf config/filter.d/nginx-botsearch.conf +config/filter.d/nginx-forbidden.conf config/filter.d/nginx-http-auth.conf config/filter.d/nginx-limit-req.conf config/filter.d/nsd.conf @@ -298,6 +301,7 @@ fail2ban/tests/files/logs/counter-strike fail2ban/tests/files/logs/courier-auth fail2ban/tests/files/logs/courier-smtp fail2ban/tests/files/logs/cyrus-imap +fail2ban/tests/files/logs/dante fail2ban/tests/files/logs/directadmin fail2ban/tests/files/logs/domino-smtp fail2ban/tests/files/logs/dovecot @@ -327,6 +331,7 @@ fail2ban/tests/files/logs/nagios fail2ban/tests/files/logs/named-refused fail2ban/tests/files/logs/nginx-bad-request fail2ban/tests/files/logs/nginx-botsearch +fail2ban/tests/files/logs/nginx-forbidden fail2ban/tests/files/logs/nginx-http-auth fail2ban/tests/files/logs/nginx-limit-req fail2ban/tests/files/logs/nsd diff --git a/README.md b/README.md index d6dce406..38340fbe 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ / _|__ _(_) |_ ) |__ __ _ _ _ | _/ _` | | |/ /| '_ \/ _` | ' \ |_| \__,_|_|_/___|_.__/\__,_|_||_| - v1.0.3.dev1 20??/??/?? + v1.1.0.dev1 20??/??/?? ## Fail2Ban: ban hosts that cause multiple authentication errors diff --git a/fail2ban/version.py b/fail2ban/version.py index 96a0760a..7c47e814 100644 --- a/fail2ban/version.py +++ b/fail2ban/version.py @@ -24,7 +24,7 @@ __author__ = "Cyril Jaquier, Yaroslav Halchenko, Steven Hiscocks, Daniel Black" __copyright__ = "Copyright (c) 2004 Cyril Jaquier, 2005-2016 Yaroslav Halchenko, 2013-2014 Steven Hiscocks, Daniel Black" __license__ = "GPL-v2+" -version = "1.0.3.dev1" +version = "1.1.0.dev1" def normVersion(): """ Returns fail2ban version in normalized machine-readable format""" diff --git a/man/fail2ban-client.1 b/man/fail2ban-client.1 index 9fa0b803..ed68e7a5 100644 --- a/man/fail2ban-client.1 +++ b/man/fail2ban-client.1 @@ -1,12 +1,12 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.1. -.TH FAIL2BAN-CLIENT "1" "November 2022" "Fail2Ban v1.0.3.dev1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. +.TH FAIL2BAN-CLIENT "1" "June 2023" "Fail2Ban v1.1.0.dev1" "User Commands" .SH NAME fail2ban-client \- configure and control the server .SH SYNOPSIS .B fail2ban-client [\fI\,OPTIONS\/\fR] \fI\,\/\fR .SH DESCRIPTION -Fail2Ban v1.0.3.dev1 reads log file that contains password failure report +Fail2Ban v1.1.0.dev1 reads log file that contains password failure report and bans the corresponding IP addresses using firewall rules. .SH OPTIONS .TP @@ -425,8 +425,8 @@ gets the usedns setting for gets the list of of banned IP addresses for . Optionally the separator character ('', -default is space) or the option -\&'\-\-with\-time' (printing the times +default is space) or the option ' +\fB\-\-with\-time\fR' (printing the times of ban) may be specified. The IPs are ordered by end of ban. .TP diff --git a/man/fail2ban-python.1 b/man/fail2ban-python.1 index f40c160f..367e1f61 100644 --- a/man/fail2ban-python.1 +++ b/man/fail2ban-python.1 @@ -1,72 +1,69 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.1. -.TH FAIL2BAN-PYTHON "1" "November 2022" "fail2ban-python 1.0.3.1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. +.TH FAIL2BAN-PYTHON "1" "June 2023" "fail2ban-python 1.1.0.1" "User Commands" .SH NAME fail2ban-python \- a helper for Fail2Ban to assure that the same Python is used .SH DESCRIPTION usage: fail2ban\-python [option] ... [\-c cmd | \fB\-m\fR mod | file | \fB\-]\fR [arg] ... -Options and arguments (and corresponding environment variables): -\fB\-b\fR : issue warnings about comparing bytearray with unicode +Options (and corresponding environment variables): +\fB\-b\fR : issue warnings about str(bytes_instance), str(bytearray_instance) .IP -(\fB\-bb\fR: issue errors) +and comparing bytes/bytearray with str. (\fB\-bb\fR: issue errors) .PP -\fB\-B\fR : don't write .py[co] files on import; also PYTHONDONTWRITEBYTECODE=x +\fB\-B\fR : don't write .pyc files on import; also PYTHONDONTWRITEBYTECODE=x \fB\-c\fR cmd : program passed in as string (terminates option list) -\fB\-d\fR : debug output from parser; also PYTHONDEBUG=x +\fB\-d\fR : turn on parser debugging output (for experts only, only works on +.IP +debug builds); also PYTHONDEBUG=x +.PP \fB\-E\fR : ignore PYTHON* environment variables (such as PYTHONPATH) -\fB\-h\fR : print this help message and exit (also \fB\-\-help\fR) +\fB\-h\fR : print this help message and exit (also \-? or \fB\-\-help\fR) \fB\-i\fR : inspect interactively after running script; forces a prompt even .IP if stdin does not appear to be a terminal; also PYTHONINSPECT=x .PP +\fB\-I\fR : isolate Python from the user's environment (implies \fB\-E\fR and \fB\-s\fR) \fB\-m\fR mod : run library module as a script (terminates option list) -\fB\-O\fR : optimize generated bytecode slightly; also PYTHONOPTIMIZE=x -\fB\-OO\fR : remove doc\-strings in addition to the \fB\-O\fR optimizations -\fB\-R\fR : use a pseudo\-random salt to make hash() values of various types be +\fB\-O\fR : remove assert and __debug__\-dependent statements; add .opt\-1 before .IP -unpredictable between separate invocations of the interpreter, as -a defense against denial\-of\-service attacks +\&.pyc extension; also PYTHONOPTIMIZE=x .PP -\fB\-Q\fR arg : division options: \fB\-Qold\fR (default), \fB\-Qwarn\fR, \fB\-Qwarnall\fR, \fB\-Qnew\fR +\fB\-OO\fR : do \fB\-O\fR changes and also discard docstrings; add .opt\-2 before +.IP +\&.pyc extension +.PP +\fB\-P\fR : don't prepend a potentially unsafe path to sys.path +\fB\-q\fR : don't print version and copyright messages on interactive startup \fB\-s\fR : don't add user site directory to sys.path; also PYTHONNOUSERSITE \fB\-S\fR : don't imply 'import site' on initialization -\fB\-t\fR : issue warnings about inconsistent tab usage (\fB\-tt\fR: issue errors) -\fB\-u\fR : unbuffered binary stdout and stderr; also PYTHONUNBUFFERED=x +\fB\-u\fR : force the stdout and stderr streams to be unbuffered; .IP -see man page for details on internal buffering relating to '\-u' +this option has no effect on stdin; also PYTHONUNBUFFERED=x .PP \fB\-v\fR : verbose (trace import statements); also PYTHONVERBOSE=x .IP can be supplied multiple times to increase verbosity .PP \fB\-V\fR : print the Python version number and exit (also \fB\-\-version\fR) +.IP +when given twice, print more information about the build +.PP \fB\-W\fR arg : warning control; arg is action:message:category:module:lineno .IP also PYTHONWARNINGS=arg .PP \fB\-x\fR : skip first line of source, allowing use of non\-Unix forms of #!cmd -\fB\-3\fR : warn about Python 3.x incompatibilities that 2to3 cannot trivially fix +\fB\-X\fR opt : set implementation\-specific option +\fB\-\-check\-hash\-based\-pycs\fR always|default|never: +.IP +control how Python invalidates hash\-based .pyc files +.PP +\fB\-\-help\-env\fR : print help about Python environment variables and exit +\fB\-\-help\-xoptions\fR : print help about implementation\-specific \fB\-X\fR options and exit +\fB\-\-help\-all\fR : print complete help information and exit +Arguments: file : program read from script file \- : program read from stdin (default; interactive mode if a tty) arg ...: arguments passed to program in sys.argv[1:] -.PP -Other environment variables: -PYTHONSTARTUP: file executed on interactive startup (no default) -PYTHONPATH : ':'\-separated list of directories prefixed to the -.TP -default module search path. -The result is sys.path. -.PP -PYTHONHOME : alternate directory (or :). -.IP -The default module search path uses /pythonX.X. -.PP -PYTHONCASEOK : ignore case in 'import' statements (Windows). -PYTHONIOENCODING: Encoding[:errors] used for stdin/stdout/stderr. -PYTHONHASHSEED: if this variable is set to 'random', the effect is the same -.IP -as specifying the \fB\-R\fR option: a random value is used to seed the hashes of -str, bytes and datetime objects. It can also be set to an integer -in the range [0,4294967295] to get hash values with a predictable seed. .SH "SEE ALSO" .br fail2ban-client(1) diff --git a/man/fail2ban-regex.1 b/man/fail2ban-regex.1 index 40e8a1e8..0fb721b9 100644 --- a/man/fail2ban-regex.1 +++ b/man/fail2ban-regex.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.1. -.TH FAIL2BAN-REGEX "1" "November 2022" "fail2ban-regex 1.0.3.dev1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. +.TH FAIL2BAN-REGEX "1" "June 2023" "fail2ban-regex 1.1.0.dev1" "User Commands" .SH NAME fail2ban-regex \- test Fail2ban "failregex" option .SH SYNOPSIS diff --git a/man/fail2ban-server.1 b/man/fail2ban-server.1 index eb404dc9..3437feb5 100644 --- a/man/fail2ban-server.1 +++ b/man/fail2ban-server.1 @@ -1,12 +1,12 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.1. -.TH FAIL2BAN-SERVER "1" "November 2022" "Fail2Ban v1.0.3.dev1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. +.TH FAIL2BAN-SERVER "1" "June 2023" "Fail2Ban v1.1.0.dev1" "User Commands" .SH NAME fail2ban-server \- start the server .SH SYNOPSIS .B fail2ban-server [\fI\,OPTIONS\/\fR] .SH DESCRIPTION -Fail2Ban v1.0.3.dev1 reads log file that contains password failure report +Fail2Ban v1.1.0.dev1 reads log file that contains password failure report and bans the corresponding IP addresses using firewall rules. .SH OPTIONS .TP diff --git a/man/fail2ban-testcases.1 b/man/fail2ban-testcases.1 index 3e37c723..1e778d7e 100644 --- a/man/fail2ban-testcases.1 +++ b/man/fail2ban-testcases.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.1. -.TH FAIL2BAN-TESTCASES "1" "November 2022" "fail2ban-testcases 1.0.3.dev1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. +.TH FAIL2BAN-TESTCASES "1" "June 2023" "fail2ban-testcases 1.1.0.dev1" "User Commands" .SH NAME fail2ban-testcases \- run Fail2Ban unit-tests .SH SYNOPSIS