public/mailcow-dockerized
1
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2025-12-13 09:56:01 +00:00
Code Issues Releases Wiki Activity

Merge branch 'staging' into nightly

Browse Source
This commit is contained in:
FreddleSpl0it
2025-01-23 12:06:47 +01:00
parent 1e77f8d8a1 da02e26172
commit 9d791d0c4f
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/conf/dovecot/conf.d/fts.conf
View File

@@ -21,7 +21,7 @@ plugin {
fts_filters = normalizer-icu snowball stopwords fts_filters = normalizer-icu snowball stopwords
fts_filters_en = lowercase snowball english-possessive 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! ### ### THIS PART WILL BE CHANGED BY MODIFYING mailcow.conf AUTOMATICALLY DURING RUNTIME! ###

1
data/web/inc/functions.inc.php
View File

@@ -3101,6 +3101,7 @@ function clear_session(){
session_write_close(); session_write_close();
} }
function set_user_loggedin_session($user) { function set_user_loggedin_session($user) {
session_regenerate_id(true);
$_SESSION['mailcow_cc_username'] = $user; $_SESSION['mailcow_cc_username'] = $user;
$_SESSION['mailcow_cc_role'] = 'user'; $_SESSION['mailcow_cc_role'] = 'user';
$sogo_sso_pass = file_get_contents("/etc/sogo-sso/sogo-sso.pass"); $sogo_sso_pass = file_get_contents("/etc/sogo-sso/sogo-sso.pass");

9
data/web/inc/triggers.inc.php
View File

@@ -32,7 +32,7 @@ if (!empty($_GET['sso_token'])) {
$username = domain_admin_sso('check', $_GET['sso_token']); $username = domain_admin_sso('check', $_GET['sso_token']);
if ($username !== false) { if ($username !== false) {
session_regenerate_id(); session_regenerate_id(true);
$_SESSION['mailcow_cc_username'] = $username; $_SESSION['mailcow_cc_username'] = $username;
$_SESSION['mailcow_cc_role'] = 'domainadmin'; $_SESSION['mailcow_cc_role'] = 'domainadmin';
header('Location: /mailbox'); header('Location: /mailbox');
@@ -139,14 +139,14 @@ if (isset($_POST["login_user"]) && isset($_POST["pass_user"])) {
$as = check_login($login_user, $_POST["pass_user"]); $as = check_login($login_user, $_POST["pass_user"]);
if ($as == "admin") { if ($as == "admin") {
session_regenerate_id(); session_regenerate_id(true);
$_SESSION['mailcow_cc_username'] = $login_user; $_SESSION['mailcow_cc_username'] = $login_user;
$_SESSION['mailcow_cc_role'] = "admin"; $_SESSION['mailcow_cc_role'] = "admin";
header("Location: /debug"); header("Location: /debug");
die(); die();
} }
elseif ($as == "domainadmin") { elseif ($as == "domainadmin") {
session_regenerate_id(); session_regenerate_id(true);
$_SESSION['mailcow_cc_username'] = $login_user; $_SESSION['mailcow_cc_username'] = $login_user;
$_SESSION['mailcow_cc_role'] = "domainadmin"; $_SESSION['mailcow_cc_role'] = "domainadmin";
header("Location: /mailbox"); header("Location: /mailbox");
@@ -154,7 +154,6 @@ if (isset($_POST["login_user"]) && isset($_POST["pass_user"])) {
} }
elseif ($as == "user") { elseif ($as == "user") {
set_user_loggedin_session($login_user); set_user_loggedin_session($login_user);
session_regenerate_id();
$http_parameters = explode('&', $_SESSION['index_query_string']); $http_parameters = explode('&', $_SESSION['index_query_string']);
unset($_SESSION['index_query_string']); unset($_SESSION['index_query_string']);
if (in_array('mobileconfig', $http_parameters)) { if (in_array('mobileconfig', $http_parameters)) {
@@ -187,7 +186,7 @@ if (isset($_POST["login_user"]) && isset($_POST["pass_user"])) {
unset($_SESSION['mailcow_cc_username']); unset($_SESSION['mailcow_cc_username']);
unset($_SESSION['mailcow_cc_role']); unset($_SESSION['mailcow_cc_role']);
} else { } else {
session_regenerate_id(); session_regenerate_id(true);
} }
} }

4
update.sh
View File

@@ -682,14 +682,14 @@ migrate_solr_config_options() {
read -r -p "Remove $solr_volume? [y/N] " response read -r -p "Remove $solr_volume? [y/N] " response
if [[ "$response" =~ ^([yY][eE][sS]|[yY])+$ ]]; then if [[ "$response" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
echo -e "\e[33mRemoving $solr_volume...\e[0m" 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" echo -e "\e[32mSuccessfully removed $solr_volume!\e[0m"
else else
echo -e "Not removing $solr_volume. Run \`docker volume rm $solr_volume\` manually if needed." echo -e "Not removing $solr_volume. Run \`docker volume rm $solr_volume\` manually if needed."
fi fi
else else
echo -e "\e[33mForce removing $solr_volume...\e[0m" 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" echo -e "\e[32mSuccessfully removed $solr_volume!\e[0m"
fi fi
fi fi