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

Merge branch 'staging' into nightly

Browse Source
This commit is contained in:
FreddleSpl0it
2025-01-23 08:11:45 +01:00
parent 1e70a20188 1fca328266
commit d430b595c1
71 changed files with 2260 additions and 1544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,7 @@ if (!empty($_GET['sso_token'])) {
$username = domain_admin_sso('check', $_GET['sso_token']);
if ($username !== false) {
session_regenerate_id();
$_SESSION['mailcow_cc_username'] = $username;
$_SESSION['mailcow_cc_role'] = 'domainadmin';
header('Location: /mailbox');
@@ -137,13 +138,15 @@ if (isset($_POST["login_user"]) && isset($_POST["pass_user"])) {
$login_user = strtolower(trim($_POST["login_user"]));
$as = check_login($login_user, $_POST["pass_user"]);
if ($as == "admin") {
if ($as == "admin") {
session_regenerate_id();
$_SESSION['mailcow_cc_username'] = $login_user;
$_SESSION['mailcow_cc_role'] = "admin";
header("Location: /debug");
die();
}
elseif ($as == "domainadmin") {
session_regenerate_id();
$_SESSION['mailcow_cc_username'] = $login_user;
$_SESSION['mailcow_cc_role'] = "domainadmin";
header("Location: /mailbox");
@@ -151,6 +154,7 @@ if (isset($_POST["login_user"]) && isset($_POST["pass_user"])) {
}
elseif ($as == "user") {
set_user_loggedin_session($login_user);
session_regenerate_id();
$http_parameters = explode('&', $_SESSION['index_query_string']);
unset($_SESSION['index_query_string']);
if (in_array('mobileconfig', $http_parameters)) {
@@ -170,6 +174,10 @@ if (isset($_POST["login_user"]) && isset($_POST["pass_user"])) {
} else {
header("Location: /user");
die();
}
if (!isset($_SESSION['oauth2_request'])) {
header("Location: /user");
die();
}
}
elseif ($as != "pending") {
@@ -178,7 +186,9 @@ if (isset($_POST["login_user"]) && isset($_POST["pass_user"])) {
unset($_SESSION['pending_tfa_methods']);
unset($_SESSION['mailcow_cc_username']);
unset($_SESSION['mailcow_cc_role']);
}
} else {
session_regenerate_id();
}
}
if (isset($_SESSION['mailcow_cc_role']) && (isset($_SESSION['acl']['login_as']) && $_SESSION['acl']['login_as'] == "1")) {