From 433e0c8f9a7b33a6e58e538ea3d1238d459cf932 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Tue, 27 Jun 2017 09:32:57 +0200
Subject: [PATCH] Allow /0 to whitelist all, push f2b version in yml

---
 data/web/inc/functions.inc.php | 4 ++--
 docker-compose.yml             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/web/inc/functions.inc.php b/data/web/inc/functions.inc.php
index 82a4ab1c..68a09531 100644
--- a/data/web/inc/functions.inc.php
+++ b/data/web/inc/functions.inc.php
@@ -1503,10 +1503,10 @@ function edit_f2b_parameters($postarray) {
       if (is_array($wl_array)) {
         foreach ($wl_array as $wl_item) {
           $cidr = explode('/', $wl_item);
-          if (filter_var($cidr[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) && (!isset($cidr[1]) || ($cidr[1] >= 8 && $cidr[1] <= 32))) {
+          if (filter_var($cidr[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) && (!isset($cidr[1]) || ($cidr[1] >= 0 && $cidr[1] <= 32))) {
             $redis->hSet('F2B_WHITELIST', $wl_item, 1);
           }
-          elseif (filter_var($cidr[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) && (!isset($cidr[1]) || ($cidr[1] >= 16 && $cidr[1] <= 128))) {
+          elseif (filter_var($cidr[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) && (!isset($cidr[1]) || ($cidr[1] >= 0 && $cidr[1] <= 128))) {
             $redis->hSet('F2B_WHITELIST', $wl_item, 1);
           }
         }
diff --git a/docker-compose.yml b/docker-compose.yml
index ad092f1c..51e190b7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -319,7 +319,7 @@ services:
             - acme
 
     fail2ban-mailcow:
-      image: mailcow/fail2ban:1.2
+      image: mailcow/fail2ban:1.3
       build: ./data/Dockerfiles/fail2ban
       depends_on:
         - dovecot-mailcow