From d83111568eb98926d905aeb1667d70a1f2bfc4a3 Mon Sep 17 00:00:00 2001 From: DerLinkman Date: Thu, 23 Jan 2025 11:30:05 +0100 Subject: [PATCH 1/3] update.sh: remove accidentally added exit at end of solr volume removal --- update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update.sh b/update.sh index 268fe7326b..4240dad379 100755 --- a/update.sh +++ b/update.sh @@ -682,14 +682,14 @@ migrate_solr_config_options() { read -r -p "Remove $solr_volume? [y/N] " response if [[ "$response" =~ ^([yY][eE][sS]|[yY])+$ ]]; then echo -e "\e[33mRemoving $solr_volume...\e[0m" - docker volume rm $solr_volume || echo -e "\e[31mFailed to remove. Remove it manually!\e[0m" && exit + docker volume rm $solr_volume || echo -e "\e[31mFailed to remove. Remove it manually!\e[0m" echo -e "\e[32mSuccessfully removed $solr_volume!\e[0m" else echo -e "Not removing $solr_volume. Run \`docker volume rm $solr_volume\` manually if needed." fi else echo -e "\e[33mForce removing $solr_volume...\e[0m" - docker volume rm $solr_volume || echo -e "\e[31mFailed to remove. Remove it manually!\e[0m" && exit + docker volume rm $solr_volume || echo -e "\e[31mFailed to remove. Remove it manually!\e[0m" echo -e "\e[32mSuccessfully removed $solr_volume!\e[0m" fi fi From 43f945fe018f8b1f28bda343de72673e4776bd0a Mon Sep 17 00:00:00 2001 From: DerLinkman Date: Thu, 23 Jan 2025 11:51:41 +0100 Subject: [PATCH 2/3] dovecot: fix index timeout seconds --- data/conf/dovecot/conf.d/fts.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/conf/dovecot/conf.d/fts.conf b/data/conf/dovecot/conf.d/fts.conf index 1ad5201f7d..e8a2f73f5a 100644 --- a/data/conf/dovecot/conf.d/fts.conf +++ b/data/conf/dovecot/conf.d/fts.conf @@ -21,7 +21,7 @@ plugin { fts_filters = normalizer-icu snowball stopwords fts_filters_en = lowercase snowball english-possessive stopwords - fts_index_timeout = 300 + fts_index_timeout = 300s } ### THIS PART WILL BE CHANGED BY MODIFYING mailcow.conf AUTOMATICALLY DURING RUNTIME! ### From da02e261729a51f3a10b42daf717133b4d1fbb74 Mon Sep 17 00:00:00 2001 From: FreddleSpl0it Date: Thu, 23 Jan 2025 11:59:01 +0100 Subject: [PATCH 3/3] [Web] Delete old session_id after regenerate --- data/web/inc/triggers.inc.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/web/inc/triggers.inc.php b/data/web/inc/triggers.inc.php index a49ba78c89..5dbd44ab5c 100644 --- a/data/web/inc/triggers.inc.php +++ b/data/web/inc/triggers.inc.php @@ -4,7 +4,7 @@ $username = domain_admin_sso('check', $_GET['sso_token']); if ($username !== false) { - session_regenerate_id(); + session_regenerate_id(true); $_SESSION['mailcow_cc_username'] = $username; $_SESSION['mailcow_cc_role'] = 'domainadmin'; header('Location: /mailbox'); @@ -88,21 +88,21 @@ $as = check_login($login_user, $_POST["pass_user"]); if ($as == "admin") { - session_regenerate_id(); + session_regenerate_id(true); $_SESSION['mailcow_cc_username'] = $login_user; $_SESSION['mailcow_cc_role'] = "admin"; header("Location: /debug"); die(); } elseif ($as == "domainadmin") { - session_regenerate_id(); + session_regenerate_id(true); $_SESSION['mailcow_cc_username'] = $login_user; $_SESSION['mailcow_cc_role'] = "domainadmin"; header("Location: /mailbox"); die(); } elseif ($as == "user") { - session_regenerate_id(); + session_regenerate_id(true); $_SESSION['mailcow_cc_username'] = $login_user; $_SESSION['mailcow_cc_role'] = "user"; $http_parameters = explode('&', $_SESSION['index_query_string']); @@ -127,7 +127,7 @@ unset($_SESSION['mailcow_cc_username']); unset($_SESSION['mailcow_cc_role']); } else { - session_regenerate_id(); + session_regenerate_id(true); } }