paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update sogo-auth.php 

Consistency again. :)

I moved the prerequisites require_once to the top, ok?
master
André Peters 2019-02-23 22:26:41 +01:00 committed by GitHub
parent 0c8f217f49
commit 88fbc6bf16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
data/web/sogo-auth.php
View File

@ -1,4 +1,5 @@
<?php <?php
require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/prerequisites.inc.php';
/** /**
* currently disabled: we could add auth_request to ningx sogo_eas.template * currently disabled: we could add auth_request to ningx sogo_eas.template
@ -6,57 +7,57 @@
*/ */
/* /*
if (substr($_SERVER['HTTP_X_ORIGINAL_URI'], 0, 28) === "/Microsoft-Server-ActiveSync") { if (substr($_SERVER['HTTP_X_ORIGINAL_URI'], 0, 28) === "/Microsoft-Server-ActiveSync") {
require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/prerequisites.inc.php'; require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/prerequisites.inc.php';
$server=print_r($_SERVER, true); $server=print_r($_SERVER, true);
$username = $_SERVER['PHP_AUTH_USER']; $username = $_SERVER['PHP_AUTH_USER'];
$password = $_SERVER['PHP_AUTH_PW']; $password = $_SERVER['PHP_AUTH_PW'];
$login_check = check_login($username, $password); $login_check = check_login($username, $password);
if ($login_check !== 'user') { if ($login_check !== 'user') {
header('HTTP/1.0 401 Unauthorized'); header('HTTP/1.0 401 Unauthorized');
echo 'Invalid login'; echo 'Invalid login';
exit; exit;
} else { } else {
echo 'Login OK'; echo 'Login OK';
exit; exit;
} }
} else { } else {
// other code // other code
} }
*/ */
$ALLOW_ADMIN_EMAIL_LOGIN = (preg_match( $ALLOW_ADMIN_EMAIL_LOGIN = (preg_match(
"/^([yY][eE][sS]|[yY])+$/", "/^([yY][eE][sS]|[yY])+$/",
$_ENV["ALLOW_ADMIN_EMAIL_LOGIN"] $_ENV["ALLOW_ADMIN_EMAIL_LOGIN"]
)); ));
$session_variable = 'sogo-sso-user'; $session_variable = 'sogo-sso-user';
if (!$ALLOW_ADMIN_EMAIL_LOGIN) { if (!$ALLOW_ADMIN_EMAIL_LOGIN) {
header("Location: /"); header("Location: /");
exit; exit;
} else if (isset($_GET['login'])) { }
require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/prerequisites.inc.php'; elseif (isset($_GET['login'])) {
if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['acl']['login_as'] == "1") { if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['acl']['login_as'] == "1") {
$login = html_entity_decode(rawurldecode($_GET["login"])); $login = html_entity_decode(rawurldecode($_GET["login"]));
if (filter_var($login, FILTER_VALIDATE_EMAIL)) { if (filter_var($login, FILTER_VALIDATE_EMAIL)) {
if (!empty(mailbox('get', 'mailbox_details', $login))) { if (!empty(mailbox('get', 'mailbox_details', $login))) {
$_SESSION[$session_variable] = $login; $_SESSION[$session_variable] = $login;
header("Location: /SOGo/"); header("Location: /SOGo/");
exit; exit;
} }
} }
} }
header("Location: /"); header("Location: /");
exit; exit;
} else { }
// this is an nginx auth_request call, we check for an existing sogo-sso-user session variable else {
session_start(); // this is an nginx auth_request call, we check for an existing sogo-sso-user session variable
$username = ""; $username = "";
if (isset($_SESSION[$session_variable]) && filter_var($_SESSION[$session_variable], FILTER_VALIDATE_EMAIL)) { if (isset($_SESSION[$session_variable]) && filter_var($_SESSION[$session_variable], FILTER_VALIDATE_EMAIL)) {
$username = $_SESSION[$session_variable]; $username = $_SESSION[$session_variable];
} }
// if username is empty, SOGo will display the normal login form // if username is empty, SOGo will display the normal login form
header("X-Username: $username"); header("X-Username: $username");
exit; exit;
} }