diff --git a/data/web/autodiscover.php b/data/web/autodiscover.php
deleted file mode 100644
index 3baab0490..000000000
--- a/data/web/autodiscover.php
+++ /dev/null
@@ -1,164 +0,0 @@
- 'yes',
- 'autodiscoverType' => 'activesync',
- 'imap' => array(
- 'server' => $mailcow_hostname,
- 'port' => '993',
- 'ssl' => 'on',
- ),
- 'smtp' => array(
- 'server' => $mailcow_hostname,
- 'port' => '465',
- 'ssl' => 'on'
- ),
- 'activesync' => array(
- 'url' => 'https://'.$mailcow_hostname.'/Microsoft-Server-ActiveSync'
- )
-);
-
-if(file_exists('inc/vars.local.inc.php')) {
- include_once 'inc/vars.local.inc.php';
-}
-
-/* ---------- DO NOT MODIFY ANYTHING BEYOND THIS LINE. IGNORE AT YOUR OWN RISK. ---------- */
-
-error_reporting(0);
-
-$data = trim(file_get_contents("php://input"));
-
-// Desktop client needs IMAP, unless it's Outlook 2013 or higher on Windows
-if (strpos($data, 'autodiscover/outlook/responseschema')) { // desktop client
- $config['autodiscoverType'] = 'imap';
- if ($config['useEASforOutlook'] == 'yes' &&
- strpos($_SERVER['HTTP_USER_AGENT'], 'Windows NT') !== FALSE && // Windows
- preg_match('/(Outlook|Office) (1[5-9]\.|[2-9]|1[0-9][0-9])/', $_SERVER['HTTP_USER_AGENT']) && // Outlook 2013 (version 15) or higher
- strpos($_SERVER['HTTP_USER_AGENT'], 'MS Connectivity Analyzer') === FALSE // https://testconnectivity.microsoft.com doesn't support EAS for Outlook
- ) {
- $config['autodiscoverType'] = 'activesync';
- }
-}
-
-$dsn = "$database_type:host=$database_host;dbname=$database_name";
-$opt = [
- PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
- PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
- PDO::ATTR_EMULATE_PREPARES => false,
-];
-$pdo = new PDO($dsn, $database_user, $database_pass, $opt);
-$login_user = strtolower(trim($_SERVER['PHP_AUTH_USER']));
-$as = check_login($login_user, $_SERVER['PHP_AUTH_PW']);
-
-if (!isset($_SERVER['PHP_AUTH_USER']) OR $as !== "user") {
- header('WWW-Authenticate: Basic realm=""');
- header('HTTP/1.0 401 Unauthorized');
- exit;
-} else {
- if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
- if ($as === "user") {
- header("Content-Type: application/xml");
- echo '
';
-
- if(!$data) {
- list($usec, $sec) = explode(' ', microtime());
- echo '';
- echo '';
- echo '600Invalid Request';
- echo '';
- echo '';
- exit(0);
- }
- $discover = new SimpleXMLElement($data);
- $email = $discover->Request->EMailAddress;
-
- if ($config['autodiscoverType'] == 'imap') {
- ?>
-
-
-
-
-
- email
- settings
-
- IMAP
-
-
- off
-
- off
-
- on
-
-
- SMTP
-
-
- off
-
- off
-
- on
- on
- off
-
-
- CalDAV
- https:///SOGo/dav//Calendar
- off
-
-
-
- CardDAV
- https:///SOGo/dav//Contacts
- off
-
-
-
-
- prepare("SELECT `name` FROM `mailbox` WHERE `username`= :username");
- $stmt->execute(array(':username' => $username));
- $MailboxData = $stmt->fetch(PDO::FETCH_ASSOC);
- }
- catch(PDOException $e) {
- die("Failed to determine name from SQL");
- }
- if (!empty($MailboxData['name'])) {
- $displayname = utf8_encode($MailboxData['name']);
- }
- else {
- $displayname = $email;
- }
- ?>
-
- en:en
-
-
-
-
-
-
-
- MobileSync
-
-
-
-
-
-
-
-
-
diff --git a/data/web/css/admin.css b/data/web/css/admin.css
index 0253f33c9..d2bb24897 100644
--- a/data/web/css/admin.css
+++ b/data/web/css/admin.css
@@ -11,6 +11,11 @@ table.footable>tbody>tr.footable-empty>td {
.table-responsive {
overflow: visible !important;
}
+@media screen and (max-width: 767px) {
+ .table-responsive {
+ overflow-x: scroll !important;
+ }
+}
body {
overflow-y:scroll;
}
diff --git a/data/web/css/edit.css b/data/web/css/edit.css
index 605a10102..fe4d9fffa 100644
--- a/data/web/css/edit.css
+++ b/data/web/css/edit.css
@@ -11,6 +11,11 @@ table.footable>tbody>tr.footable-empty>td {
.table-responsive {
overflow: visible !important;
}
+@media screen and (max-width: 767px) {
+ .table-responsive {
+ overflow-x: scroll !important;
+ }
+}
.footer-add-item {
display:block;
text-align: center;
diff --git a/data/web/css/mailbox.css b/data/web/css/mailbox.css
index 8f7116695..9f07debe9 100644
--- a/data/web/css/mailbox.css
+++ b/data/web/css/mailbox.css
@@ -11,6 +11,11 @@ table.footable>tbody>tr.footable-empty>td {
.table-responsive {
overflow: visible !important;
}
+@media screen and (max-width: 767px) {
+ .table-responsive {
+ overflow-x: scroll !important;
+ }
+}
.footer-add-item {
display:block;
text-align: center;
@@ -30,4 +35,3 @@ table.footable>tbody>tr.footable-empty>td {
.inputMissingAttr {
border-color: #FF4136;
}
-
diff --git a/data/web/css/user.css b/data/web/css/user.css
index 2222b624a..07d4e7457 100644
--- a/data/web/css/user.css
+++ b/data/web/css/user.css
@@ -11,6 +11,11 @@ table.footable>tbody>tr.footable-empty>td {
.table-responsive {
overflow: visible !important;
}
+@media screen and (max-width: 767px) {
+ .table-responsive {
+ overflow-x: scroll !important;
+ }
+}
.footer-add-item {
display:block;
text-align: center;
diff --git a/data/web/inc/functions.inc.php b/data/web/inc/functions.inc.php
index 9498cf307..68a095316 100644
--- a/data/web/inc/functions.inc.php
+++ b/data/web/inc/functions.inc.php
@@ -229,6 +229,7 @@ function check_login($user, $pass) {
}
if (!isset($_SESSION['ldelay'])) {
$_SESSION['ldelay'] = "0";
+ error_log("Mailcow UI: Invalid password for " . $user . " by " . $_SERVER['REMOTE_ADDR']);
}
elseif (!isset($_SESSION['mailcow_cc_username'])) {
$_SESSION['ldelay'] = $_SESSION['ldelay']+0.5;
@@ -1434,4 +1435,94 @@ function get_logs($container, $lines = 100) {
}
return false;
}
+function get_f2b_parameters() {
+ global $lang;
+ global $redis;
+ $data = array();
+ if ($_SESSION['mailcow_cc_role'] != "admin") {
+ return false;
+ }
+ try {
+ $data['ban_time'] = $redis->Get('F2B_BAN_TIME');
+ $data['max_attempts'] = $redis->Get('F2B_MAX_ATTEMPTS');
+ $data['retry_window'] = $redis->Get('F2B_RETRY_WINDOW');
+ $wl = $redis->hGetAll('F2B_WHITELIST');
+ if (is_array($wl)) {
+ foreach ($wl as $key => $value) {
+ $tmp_data[] = $key;
+ }
+ $data['whitelist'] = implode(PHP_EOL, $tmp_data);
+ }
+ else {
+ $data['whitelist'] = "";
+ }
+ }
+ catch (RedisException $e) {
+ $_SESSION['return'] = array(
+ 'type' => 'danger',
+ 'msg' => 'Redis: '.$e
+ );
+ return false;
+ }
+ return $data;
+}
+function edit_f2b_parameters($postarray) {
+ global $lang;
+ global $redis;
+ if ($_SESSION['mailcow_cc_role'] != "admin") {
+ $_SESSION['return'] = array(
+ 'type' => 'danger',
+ 'msg' => sprintf($lang['danger']['access_denied'])
+ );
+ return false;
+ }
+ $is_now = get_f2b_parameters();
+ if (!empty($is_now)) {
+ $ban_time = intval((isset($postarray['ban_time'])) ? $postarray['ban_time'] : $is_now['ban_time']);
+ $max_attempts = intval((isset($postarray['max_attempts'])) ? $postarray['max_attempts'] : $is_now['active_int']);
+ $retry_window = intval((isset($postarray['retry_window'])) ? $postarray['retry_window'] : $is_now['retry_window']);
+ }
+ else {
+ $_SESSION['return'] = array(
+ 'type' => 'danger',
+ 'msg' => sprintf($lang['danger']['access_denied'])
+ );
+ return false;
+ }
+ $wl = $postarray['whitelist'];
+ $ban_time = ($ban_time < 60) ? 60 : $ban_time;
+ $max_attempts = ($max_attempts < 1) ? 1 : $max_attempts;
+ $retry_window = ($retry_window < 1) ? 1 : $retry_window;
+ try {
+ $redis->Set('F2B_BAN_TIME', $ban_time);
+ $redis->Set('F2B_MAX_ATTEMPTS', $max_attempts);
+ $redis->Set('F2B_RETRY_WINDOW', $retry_window);
+ $redis->Del('F2B_WHITELIST');
+ if(!empty($wl)) {
+ $wl_array = array_map('trim', preg_split( "/( |,|;|\n)/", $wl));
+ 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] >= 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] >= 0 && $cidr[1] <= 128))) {
+ $redis->hSet('F2B_WHITELIST', $wl_item, 1);
+ }
+ }
+ }
+ }
+ }
+ catch (RedisException $e) {
+ $_SESSION['return'] = array(
+ 'type' => 'danger',
+ 'msg' => 'Redis: '.$e
+ );
+ return false;
+ }
+ $_SESSION['return'] = array(
+ 'type' => 'success',
+ 'msg' => 'Saved changes to Fail2ban configuration'
+ );
+}
?>
diff --git a/data/web/inc/vars.inc.php b/data/web/inc/vars.inc.php
index f2d09c5c7..7ee06c3a9 100644
--- a/data/web/inc/vars.inc.php
+++ b/data/web/inc/vars.inc.php
@@ -17,6 +17,28 @@ $database_name = getenv('DBNAME');
// Other variables
$mailcow_hostname = getenv('MAILCOW_HOSTNAME');
+// Autodiscover settings
+$autodiscover_config = array(
+ // Enable the autodiscover service for Outlook desktop clients
+ 'useEASforOutlook' => 'yes',
+ // General autodiscover service type: "activesync" or "imap"
+ 'autodiscoverType' => 'activesync',
+ 'imap' => array(
+ 'server' => $mailcow_hostname,
+ 'port' => getenv('IMAPS_PORT'),
+ 'ssl' => 'on',
+ ),
+ 'smtp' => array(
+ 'server' => $mailcow_hostname,
+ 'port' => getenv('SMTPS_PORT'),
+ 'ssl' => 'on'
+ ),
+ 'activesync' => array(
+ 'url' => 'https://'.$mailcow_hostname.'/Microsoft-Server-ActiveSync'
+ )
+);
+
+
// Where to go after adding and editing objects
// Can be "form" or "previous"
// "form" will stay in the current form, "previous" will redirect to previous page
diff --git a/data/web/json_api.php b/data/web/json_api.php
index b3b22a7d4..d891f88d6 100644
--- a/data/web/json_api.php
+++ b/data/web/json_api.php
@@ -1921,6 +1921,41 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u
));
}
break;
+ case "fail2ban":
+ // No items
+ if (isset($_POST['attr'])) {
+ $attr = (array)json_decode($_POST['attr'], true);
+ if (edit_f2b_parameters($attr) === false) {
+ if (isset($_SESSION['return'])) {
+ echo json_encode($_SESSION['return']);
+ }
+ else {
+ echo json_encode(array(
+ 'type' => 'error',
+ 'msg' => 'Edit failed'
+ ));
+ }
+ exit();
+ }
+ else {
+ if (isset($_SESSION['return'])) {
+ echo json_encode($_SESSION['return']);
+ }
+ else {
+ echo json_encode(array(
+ 'type' => 'success',
+ 'msg' => 'Task completed'
+ ));
+ }
+ }
+ }
+ else {
+ echo json_encode(array(
+ 'type' => 'error',
+ 'msg' => 'Incomplete post data'
+ ));
+ }
+ break;
case "admin":
// No items as there is only one admin
if (isset($_POST['attr'])) {
diff --git a/docker-compose.yml b/docker-compose.yml
index 2c9f6666e..8847c80f0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -122,6 +122,14 @@ services:
- DBUSER=${DBUSER}
- DBPASS=${DBPASS}
- MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
+ - IMAP_PORT=${IMAP_PORT:-143}
+ - IMAPS_PORT=${IMAPS_PORT:-993}
+ - POP_PORT=${POP_PORT:-110}
+ - POPS_PORT=${POPS_PORT:-995}
+ - SIEVE_PORT=${SIEVE_PORT:-4190}
+ - SUBMISSION_PORT=${SUBMISSION_PORT:-587}
+ - SMTPS_PORT=${SMTPS_PORT:-465}
+ - SMTP_PORT=${SMTP_PORT:-25}
restart: always
logging:
options:
@@ -285,7 +293,7 @@ services:
acme-mailcow:
depends_on:
- nginx-mailcow
- image: mailcow/acme:1.4
+ image: mailcow/acme:1.5
build: ./data/Dockerfiles/acme
dns:
- 172.22.1.254
@@ -311,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
@@ -323,6 +331,7 @@ services:
privileged: true
environment:
- TZ=${TZ}
+ - SKIP_FAIL2BAN=${SKIP_FAIL2BAN:-no}
network_mode: "host"
dns:
- 172.22.1.254
@@ -330,7 +339,6 @@ services:
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
- /lib/modules:/lib/modules:ro
-
ipv6nat:
image: robbertkl/ipv6nat
restart: always
diff --git a/generate_config.sh b/generate_config.sh
index 43b46cfec..4cd170743 100755
--- a/generate_config.sh
+++ b/generate_config.sh
@@ -81,6 +81,8 @@ ADDITIONAL_SAN=
# To never run acme-mailcow for Let's Encrypt, set this to y
SKIP_LETS_ENCRYPT=n
+# To never run fail2ban-mailcow
+SKIP_FAIL2BAN=n
EOF