From d9ac321f257dd052a36b4905b876a37c7fb90550 Mon Sep 17 00:00:00 2001
From: Michael Kroes <michael@kroes.email>
Date: Sun, 26 Jun 2016 14:17:12 +0200
Subject: [PATCH] Owncloud needs more time to detect blocks. It doesn't respond
 as fast as the other services. Also owncloud logs UTC (since latest update)
 even though the timezone is not UTC. Also to detect a block, we get a timeout
 instead of a refused)

---
 conf/fail2ban/jails.conf | 2 +-
 setup/owncloud.sh        | 2 ++
 tests/fail2ban.py        | 8 +++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/conf/fail2ban/jails.conf b/conf/fail2ban/jails.conf
index 7cc90975..0146b64c 100644
--- a/conf/fail2ban/jails.conf
+++ b/conf/fail2ban/jails.conf
@@ -36,7 +36,7 @@ port     = http,https
 filter   = miab-owncloud
 logpath  = STORAGE_ROOT/owncloud/owncloud.log
 maxretry = 20
-findtime = 30
+findtime = 120
 
 [miab-postfix587]
 enabled  = true
diff --git a/setup/owncloud.sh b/setup/owncloud.sh
index eb12d5c9..e8d1df1f 100755
--- a/setup/owncloud.sh
+++ b/setup/owncloud.sh
@@ -126,6 +126,7 @@ if [ ! -f $STORAGE_ROOT/owncloud/owncloud.db ]; then
   'mail_from_address' => 'owncloud',
   'mail_domain' => '$PRIMARY_HOSTNAME',
   'logtimezone' => '$TIMEZONE',
+  'logdateformat' => 'Y-m-d H:i:s',
 );
 ?>
 EOF
@@ -179,6 +180,7 @@ include("$STORAGE_ROOT/owncloud/config.php");
 \$CONFIG['mail_from_address'] = 'administrator'; # just the local part, matches our master administrator address
 
 \$CONFIG['logtimezone'] = '$TIMEZONE';
+\$CONFIG['logdateformat'] = 'Y-m-d H:i:s';
 
 echo "<?php\n\\\$CONFIG = ";
 var_export(\$CONFIG);
diff --git a/tests/fail2ban.py b/tests/fail2ban.py
index feda2796..0f2f1e9f 100644
--- a/tests/fail2ban.py
+++ b/tests/fail2ban.py
@@ -86,6 +86,8 @@ def http_test(url, expected_status, postdata=None, qsargs=None, auth=None):
 			data=postdata,
 			headers={'User-Agent': 'Mail-in-a-Box fail2ban tester'},
 			timeout=8)
+	except requests.exceptions.ConnectTimeout as e:
+		raise IsBlocked()
 	except requests.exceptions.ConnectionError as e:
 		if "Connection refused" in str(e):
 			raise IsBlocked()
@@ -180,14 +182,14 @@ if __name__ == "__main__":
 	# IMAP
 	run_test(imap_test, [], 20, 30, 4)
 
-	# Mail-in-a-Box contorl panel
+	# Mail-in-a-Box control panel
 	run_test(http_test, ["/admin/me", 200], 20, 30, 1)
 
-	# Munin via the Mail-in-a-Box contorl panel
+	# Munin via the Mail-in-a-Box control panel
 	run_test(http_test, ["/admin/munin/", 401], 20, 30, 1)
 
 	# ownCloud
-	run_test(http_test, ["/cloud/remote.php/webdav", 401, None, None, ["aa", "aa"]], 20, 30, 1)
+	run_test(http_test, ["/cloud/remote.php/webdav", 401, None, None, ["aa", "aa"]], 20, 120, 1)
 
 	# restart fail2ban so that this client machine is no longer blocked
 	restart_fail2ban_service(final=True)