Merge pull request #1226 from pablorf-dev/master

Minor fix and enhancement (fake google domains)

ChangeLog

@@ -21,6 +21,7 @@ ver. 0.9.4 (2015/XX/XXX) - wanna-be-released
    * Treat failed and killed execution of commands identically (only
      different log messages), which addresses different behavior on different
      exit codes of dash and bash (gh-1155)
+   * Fix jail.conf.5 man's section (gh-1226)
 
 - New Features:
 
@@ -34,6 +35,8 @@ ver. 0.9.4 (2015/XX/XXX) - wanna-be-released
      (Thanks M. Maraun)
    * Added check against atacker's Googlebot PTR fake records
      (Thanks Pablo Rodriguez Fernandez)
+   * Enhance filter against atacker's Googlebot PTR fake records
+     (gh-1226)
 
 ver. 0.9.3 (2015/08/01) - lets-all-stay-friends
 ----------

config/filter.d/ignorecommands/apache-fakegooglebot

@@ -26,7 +26,7 @@ def is_googlebot(ip):
     from fail2ban.server.filter import DNSUtils
 
     host = DNSUtils.ipToName(ip)
-    if not host or not re.match('crawl-.*\.googlebot\.com', host):
+    if not host or not re.match('.*\.google(bot)?\.com$', host):
        sys.exit(1)
     host_ips = DNSUtils.dnsToIp(host)
     sys.exit(0 if ip in host_ips else 1)

man/jail.conf.5

@@ -1,4 +1,4 @@
-.TH JAIL.CONF "10" "October 2013" "Fail2Ban" "Fail2Ban Configuration"
+.TH JAIL.CONF "5" "October 2013" "Fail2Ban" "Fail2Ban Configuration"
 .SH NAME
 jail.conf \- configuration for the fail2ban server
 .SH SYNOPSIS