diff --git a/ChangeLog b/ChangeLog index c9967067..22db55d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -269,15 +269,15 @@ and bug requests. Daniel Black & Sebastian Arcus * filter.d/asterisk -- more regexes Daniel Black - * action.d/hostsdeny -- NOTE: new dependancy 'ed'. Switched to use 'ed' across + * action.d/hostsdeny -- NOTE: new dependency 'ed'. Switched to use 'ed' across all platforms to ensure permissions are the same before and after a ban. Closes gh-266. hostsdeny supports daemon_list now too. - * action.d/bsd-ipfw - action option unsed. Change blocktype to port unreach + * action.d/bsd-ipfw - action option unused. Change blocktype to port unreach instead of deny for consistancy. * filter.d/dovecot - added to support different dovecot failure "..disallowed plaintext auth". Closes Debian bug #709324 * filter.d/roundcube-auth - timezone offset can be positive or negative - * action.d/bsd-ipfw - action option unsed. Fixed to blocktype for + * action.d/bsd-ipfw - action option unused. Fixed to blocktype for consistency. default to port unreach instead of deny * filter.d/dropbear - fix regexs to match standard dropbear and the patched http://www.unchartedbackwaters.co.uk/files/dropbear/dropbear-0.52.patch diff --git a/config/action.d/blocklist_de.conf b/config/action.d/blocklist_de.conf index d4170cab..6d520694 100644 --- a/config/action.d/blocklist_de.conf +++ b/config/action.d/blocklist_de.conf @@ -7,13 +7,13 @@ # Action to report IP address to blocklist.de # Blocklist.de must be signed up to at www.blocklist.de # Once registered, one or more servers can be added. -# This action requires the server 'email address' and the assoicate apikey. +# This action requires the server 'email address' and the associated apikey. # # From blocklist.de: # www.blocklist.de is a free and voluntary service provided by a # Fraud/Abuse-specialist, whose servers are often attacked on SSH-, # Mail-Login-, FTP-, Webserver- and other services. -# The mission is to report all attacks to the abuse deparments of the +# The mission is to report all attacks to the abuse departments of the # infected PCs/servers to ensure that the responsible provider can inform # the customer about the infection and disable them # @@ -25,7 +25,7 @@ # * The recidive where the IP has been banned multiple times # * Where maxretry has been set quite high, beyond the normal user typing # password incorrectly. -# * For filters that have a low likelyhood of receiving human errors +# * For filters that have a low likelihood of receiving human errors # [Definition] diff --git a/config/action.d/xarf-login-attack.conf b/config/action.d/xarf-login-attack.conf index 32c611a1..1282d4c8 100644 --- a/config/action.d/xarf-login-attack.conf +++ b/config/action.d/xarf-login-attack.conf @@ -8,7 +8,7 @@ # * The recidive where the IP has been banned multiple times # * Where maxretry has been set quite high, beyond the normal user typing # password incorrectly. -# * For filters that have a low likelyhood of receiving human errors +# * For filters that have a low likelihood of receiving human errors # # DEPENDANCIES: # diff --git a/config/filter.d/dovecot.conf b/config/filter.d/dovecot.conf index 732eb3a3..0b154ffb 100644 --- a/config/filter.d/dovecot.conf +++ b/config/filter.d/dovecot.conf @@ -23,7 +23,7 @@ journalmatch = _SYSTEMD_UNIT=dovecot.service # * the first regex is essentially a copy of pam-generic.conf # * Probably doesn't do dovecot sql/ldap backends properly # * Removed the 'no auth attempts' log lines from the matches because produces -# lots of false positives on misconfigured MTAs making regexp unuseable +# lots of false positives on misconfigured MTAs making regexp unusable # # Author: Martin Waschbuesch # Daniel Black (rewrote with begin and end anchors) diff --git a/config/filter.d/solid-pop3d.conf b/config/filter.d/solid-pop3d.conf index d97cc134..ba19d664 100644 --- a/config/filter.d/solid-pop3d.conf +++ b/config/filter.d/solid-pop3d.conf @@ -1,4 +1,4 @@ -# Fail2Ban filter for unsuccesful solid-pop3 authentication attempts +# Fail2Ban filter for unsuccessful solid-pop3 authentication attempts # # Doesn't currently provide PAM support as PAM log messages don't include rhost as # remote IP. diff --git a/config/jail.conf b/config/jail.conf index 8b29bc11..96b3096f 100644 --- a/config/jail.conf +++ b/config/jail.conf @@ -595,7 +595,7 @@ logpath = /var/log/nsd.log # -# Miscelaneous +# Miscellaneous # [asterisk] diff --git a/fail2ban/client/jailreader.py b/fail2ban/client/jailreader.py index 7bdb11d2..42c04ffb 100644 --- a/fail2ban/client/jailreader.py +++ b/fail2ban/client/jailreader.py @@ -222,7 +222,7 @@ class JailReader(ConfigReader): def extractOptions(option): match = JailReader.optionCRE.match(option) if not match: - # TODO propper error handling + # TODO proper error handling return None, None option_name, optstr = match.groups() option_opts = dict() diff --git a/fail2ban/server/database.py b/fail2ban/server/database.py index 2f6667cd..0fad396b 100644 --- a/fail2ban/server/database.py +++ b/fail2ban/server/database.py @@ -156,7 +156,7 @@ class Fail2BanDb(object): logSys.warning( "Database updated from '%i' to '%i'", version, newversion) else: - logSys.error( "Database update failed to acheive version '%i'" + logSys.error( "Database update failed to achieve version '%i'" ": updated from '%i' to '%i'", Fail2BanDb.__version__, version, newversion) raise RuntimeError('Failed to fully update') @@ -357,7 +357,7 @@ class Fail2BanDb(object): Parameters ---------- jail : Jail - Jail in which the ban has occured. + Jail in which the ban has occurred. ticket : BanTicket Ticket of the ban to be added. """ diff --git a/fail2ban/server/datetemplate.py b/fail2ban/server/datetemplate.py index 9989e22b..19bdd0ef 100644 --- a/fail2ban/server/datetemplate.py +++ b/fail2ban/server/datetemplate.py @@ -73,7 +73,7 @@ class DateTemplate(object): The regex the template will use for searching for a date. wordBegin : bool Defines whether the regex should be modified to search at - begining of a word, by adding "\\b" to start of regex. + beginning of a word, by adding "\\b" to start of regex. Default True. Raises diff --git a/fail2ban/server/filter.py b/fail2ban/server/filter.py index cc171fea..c82395ea 100644 --- a/fail2ban/server/filter.py +++ b/fail2ban/server/filter.py @@ -717,7 +717,7 @@ class FileContainer: self.setEncoding(encoding) self.__tail = tail self.__handler = None - # Try to open the file. Raises an exception if an error occured. + # Try to open the file. Raises an exception if an error occurred. handler = open(filename, 'rb') stats = os.fstat(handler.fileno()) self.__ino = stats.st_ino diff --git a/fail2ban/tests/servertestcase.py b/fail2ban/tests/servertestcase.py index c4163db9..9aba7a62 100644 --- a/fail2ban/tests/servertestcase.py +++ b/fail2ban/tests/servertestcase.py @@ -155,7 +155,7 @@ class Transmitter(TransmitterBase): def testDatabase(self): _, tmpFilename = tempfile.mkstemp(".db", "Fail2Ban_") - # Jails present, cant change database + # Jails present, can't change database self.setGetTestNOK("dbfile", tmpFilename) self.server.delJail(self.jailName) self.setGetTest("dbfile", tmpFilename) @@ -581,7 +581,7 @@ class Transmitter(TransmitterBase): if not filtersystemd: # pragma: no cover if sys.version_info >= (2, 7): raise unittest.SkipTest( - "systemd python interface not avilable") + "systemd python interface not available") return jailName = "TestJail2" self.server.addJail(jailName, "systemd") diff --git a/fail2ban/tests/sockettestcase.py b/fail2ban/tests/sockettestcase.py index e668be39..8a548998 100644 --- a/fail2ban/tests/sockettestcase.py +++ b/fail2ban/tests/sockettestcase.py @@ -68,7 +68,7 @@ class Socket(unittest.TestCase): self.assertRaises( AsyncServerException, self.server.start, self.sock_name, False) - # Try agin with force set + # Try again with force set serverThread = threading.Thread( target=self.server.start, args=(self.sock_name, True)) serverThread.daemon = True diff --git a/man/fail2ban.1 b/man/fail2ban.1 index 660168f1..23c74b88 100644 --- a/man/fail2ban.1 +++ b/man/fail2ban.1 @@ -34,7 +34,7 @@ mechanisms if you really want to protect services. A local user is able to inject messages into syslog and using a Fail2Ban jail that reads from syslog, they can effectively trigger a DoS attack against -any IP. Know this risk and configure Fail2Ban/grant shell access acordingly. +any IP. Know this risk and configure Fail2Ban/grant shell access accordingly. .SH FILES \fI/etc/fail2ban/*\fR diff --git a/man/jail.conf.5 b/man/jail.conf.5 index de7fd44b..c4215fdd 100644 --- a/man/jail.conf.5 +++ b/man/jail.conf.5 @@ -137,7 +137,7 @@ The following options are applicable to any jail. They appear in a section speci name of the filter -- filename of the filter in /etc/fail2ban/filter.d/ without the .conf/.local extension. Only one filter can be specified. .TP .B logpath -filename(s) of the log files to be monitored, seperate by new lines. Globs -- paths containing * and ? or [0-9] -- can be used however only the files that exist at start up matching this glob pattern will be considered. +filename(s) of the log files to be monitored, separated by new lines. Globs -- paths containing * and ? or [0-9] -- can be used however only the files that exist at start up matching this glob pattern will be considered. Optional space separated option 'tail' can be added to the end of the path to cause the log file to be read from the end, else default 'head' option reads file from the beginning